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|
-      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)
+    for num in 1..NB_POKEMON
+      pokemon = getPokemon(num)
+      pbAddPokemonSilent(pokemon,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
-  maxVal = filesList.length - 1
-  for i in 0..maxVal
-    path = filesList[i]
-    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
+  for comparedPoke in customsList
+    next if excluded.include?(comparedPoke)
+    if Kernel.isPartPokemon(comparedPoke, dexNum)
+      speciesList << comparedPoke
     end
+
   end
   if speciesList.length == 0
     speciesList << dexNum