Fixes kin island pokemon club trainers not using fusions

Data/Scripts/013_Items/004_1_PokeradarUI.rb

@@ -111,7 +111,7 @@ class PokeRadar_UI
 
     bitmap1 = AnimatedBitmap.new(GameData::Species.icon_filename(headPoke))
     bitmap2 = AnimatedBitmap.new(GameData::Species.icon_filename(bodyPoke))
-    dexNum = getDexNumberForSpecies(@pokemon.species)
+    dexNum = getDexNumberForSpecies(pokemonId)
     ensureFusionIconExists()
     bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
     headPokeFileName = GameData::Species.icon_filename(headPoke)

Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb

@@ -116,7 +116,7 @@ Hankiro, luckygirl88, Nalty,
 OceansLugiaSpirit,Pokemon-Diamond,
 rekman, Rick1234, SailorVicious,WolfPP
 
-Tileset graphics:
+Public use tileset graphics:
 Alucus BoOmxBiG<s>chimcharsfireworkd
 EpicDay<s>EternalTakai
 Gallanty Heavy-Metal-Lover<s>Hek-el-grande
@@ -130,12 +130,12 @@ Spacemotion<s>Speedialga
 ThatsSoWitty Thurpok<s>TyranitarDark
 UltimoSpriter<s>WesleyFG
 
-Music:    
+Public use music:    
 Pokeli, TailDoll666100
 Kazune Sawatari, sentsinkantéun,
 Nanashima, CharizardTheMaster, The Zame Jack 
 
-RPG Maker Scripts:
+Public use RPG Maker scripts:
 Luka S.J, shiney570, Erasus, Umbreon
 FL, KleinStudio, carmaniac, Wootius,
 andracass

Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/001_ChallengeGenerator_Data.rb

@@ -281,6 +281,7 @@ end
 #
 #===============================================================================
 def pbWriteCup(id, rules)
+  return
   return if !$DEBUG
   trlists = (load_data("Data/trainer_lists.dat") rescue [])
   list = []

Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb

@@ -604,32 +604,39 @@ DebugMenuCommands.register("fillboxes", {
     added = 0
     box_qty = $PokemonStorage.maxPokemon(0)
     completed = true
-    GameData::Species.each do |species_data|
+    for num in 1..NB_POKEMON
-      sp = species_data.species
+      pokemon = getPokemon(num)
-      f = species_data.form
+      pbAddPokemonSilent(pokemon,50)
-      # Record each form of each species as seen and owned
-      if f == 0
-        if [:AlwaysMale, :AlwaysFemale, :Genderless].include?(species_data.gender_ratio)
-          g = (species_data.gender_ratio == :AlwaysFemale) ? 1 : 0
-          $Trainer.pokedex.register(sp, g, f, false)
-        else   # Both male and female
-          $Trainer.pokedex.register(sp, 0, f, false)
-          $Trainer.pokedex.register(sp, 1, f, false)
-        end
-        $Trainer.pokedex.set_owned(sp, false)
-      elsif species_data.real_form_name && !species_data.real_form_name.empty?
-        g = (species_data.gender_ratio == :AlwaysFemale) ? 1 : 0
-        $Trainer.pokedex.register(sp, g, f, false)
-      end
-      # Add Pokémon (if form 0, i.e. one of each species)
-      next if f != 0
-      if added >= Settings::NUM_STORAGE_BOXES * box_qty
-        completed = false
-        next
-      end
-      added += 1
-      $PokemonStorage[(added - 1) / box_qty, (added - 1) % box_qty] = Pokemon.new(sp, 50)
     end
+
+
+    # GameData::Species.each do |species_data|
+    #   break if species_data.is_fusion
+    #   sp = species_data.species
+    #   f = species_data.form
+    #   # Record each form of each species as seen and owned
+    #   if f == 0
+    #     if [:AlwaysMale, :AlwaysFemale, :Genderless].include?(species_data.gender_ratio)
+    #       g = (species_data.gender_ratio == :AlwaysFemale) ? 1 : 0
+    #       $Trainer.pokedex.register(sp, g, f, false)
+    #     else   # Both male and female
+    #       $Trainer.pokedex.register(sp, 0, f, false)
+    #       $Trainer.pokedex.register(sp, 1, f, false)
+    #     end
+    #     $Trainer.pokedex.set_owned(sp, false)
+    #   elsif species_data.real_form_name && !species_data.real_form_name.empty?
+    #     g = (species_data.gender_ratio == :AlwaysFemale) ? 1 : 0
+    #     $Trainer.pokedex.register(sp, g, f, false)
+    #   end
+    #   # Add Pokémon (if form 0, i.e. one of each species)
+    #   next if f != 0
+    #   if added >= Settings::NUM_STORAGE_BOXES * box_qty
+    #     completed = false
+    #     next
+    #   end
+    #   added += 1
+    #   $PokemonStorage[(added - 1) / box_qty, (added - 1) % box_qty] = Pokemon.new(sp, 50)
+    # end
     $Trainer.pokedex.refresh_accessible_dexes
     pbMessage(_INTL("Storage boxes were filled with one Pokémon of each species."))
     if !completed

Data/Scripts/050_AddOns/BattleLounge.rb

@@ -206,22 +206,14 @@ end
 
 def getCustomSpeciesListForPokemon(dexNum,allowLegendaries=true)
   excluded = allowLegendaries ? [] : listLegendaryPokemonIds()
-  filesList = Dir["./Graphics/CustomBattlers/*"]
+  customsList = getCustomSpeciesList($PokemonSystem.download_sprites == 0)
   speciesList = []
-  maxDexNumber = (NB_POKEMON * NB_POKEMON) + NB_POKEMON
+  for comparedPoke in customsList
-  maxVal = filesList.length - 1
+    next if excluded.include?(comparedPoke)
-  for i in 0..maxVal
+    if Kernel.isPartPokemon(comparedPoke, dexNum)
-    path = filesList[i]
+      speciesList << comparedPoke
-    file = File.basename(path, ".*")
-    splitPoke = file.split(".")
-    head = splitPoke[0].to_i
-    body = splitPoke[1].to_i
-    if (head == dexNum || body == dexNum) && !(excluded.include?(head) || excluded.include?(body))
-      fused = (body * NB_POKEMON) + head
-      if fused <= maxDexNumber && fused > 0
-        speciesList << fused
-      end
     end
+
   end
   if speciesList.length == 0
     speciesList << dexNum

PBS/items.txt

@@ -547,11 +547,11 @@
 539,SURFBOARD,Surfboard,Surfboards,8,0,"A board that can be used to cross water without the use of a HM.",2,0,6
 540,TELEPORTER,Teleporter,Teleporters,8,0,"A small device that can be used to teleport to a city without the use of a HM.",2,0,6
 541,SCUBAGEAR,Scuba Gear,Scuba Gears,8,0,"Diving equipment that can be used to dive underwater without the use of a HM.",2,0,6
-542,LEVER,Handtruck,Handtrucks,8,0,"A utility dolly that allows to move large rocks without the use of a HM.",2,0,6
+542,LEVER,Dolly,Dollies,8,0,"A utility dolly that allows to move large rocks without the use of a HM.",2,0,6
 543,DEBUGGER,Debugger,Debuggers,8,0,"Use this to return to the last Pokémon Center you've visited if you get stuck somewhere.",2,0,6
 544,WOODENPLANKS,Wooden Planks,Wooden Planks,8,0,A set of wooden planks used for construction.,0,0,6,
 545,BRICKS,Bricks,Bricks,8,0,A set of bricks used for construction.,0,0,6,
-546,ROCKETID,Team Rocket ID,Team Rocket IDs,8,0,A Team Rocket ID badge that belongs to somebedy else. It could be useful.,0,0,6,
+546,ROCKETID,Team Rocket ID,Team Rocket IDs,8,0,A Team Rocket ID badge that belongs to somebedy else. It could be useful.,0,0,6,
 547,BEER,Beer,Beers,7,0,"A can of beer. It raises your Pokémon's Atk and Spd stats. But it also makes your Pokémon confused.",0,2,0,
 548,SHOOTER,Tequila,Tequilas,7,0,"A small glass of strong liquor. It raises your Pokémon's Sp.Atk and Spd stats. But it also makes your Pokémon confused.",0,2,0,
 549,SUPERSPLICERS,Super Splicers,Super Splicers,1,1000,"A splicer used to fuse two Pokémon together. It results in a higher-leveled fusion than regular splicers.",1,0,0,