custom sprites fixes + various map fixes

Data/Scripts/025-Randomizer/randomizer gym leader edit.rb

@@ -407,26 +407,51 @@ end
 #    return (body*NB_POKEMON)+head 
 #end
 
+
 def getCustomSpeciesList()
-  filesList = Dir["./Graphics/CustomBattlers/*"]
   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
-    fused = (body * NB_POKEMON) + head
-    if fused <= maxDexNumber && fused > 0
-      speciesList << fused
+
+  for num in 1..NB_POKEMON
+    path = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + num.to_s + "/*"
+    filesList = Dir[path]
+    echo filesList
+    echo "\n\n"
+
+    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
+      fused = (body * NB_POKEMON) + head
+      if fused <= maxDexNumber && fused > 0
+        speciesList << fused
+      end
+
     end
-
   end
-
   return speciesList
 end
+# def getCustomSpeciesList()
+#   filesList = Dir["./Graphics/CustomBattlers/*"]
+#   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
+#     fused = (body * NB_POKEMON) + head
+#     if fused <= maxDexNumber && fused > 0
+#       speciesList << fused
+#     end
+#
+#   end
+# end
+
 
 def Kernel.getBaseStats(species)
   if $pkmn_dex[species] == nil

Data/Scripts/048_Fusion/DoublePreviewScreen.rb

@@ -130,7 +130,7 @@ class DoublePreviewScreen
 
 
   def getPicturePath(head_pokemon, body_pokemon)
-    pathCustom = _INTL("Graphics/CustomBattlers/{1}.{2}.png", head_pokemon, body_pokemon)
+    pathCustom = _INTL("Graphics/CustomBattlers/indexed/{1}/{1}.{2}.png", head_pokemon, body_pokemon)
     if (pbResolveBitmap(pathCustom))
       picturePath = pathCustom
     else

Data/Scripts/050_AddOns/GeneralUtils.rb

@@ -385,7 +385,7 @@ def obtainPokemonSpritePath(bodyId, headId, include_customs = true)
 end
 
 def getCustomSpritePath(body,head)
-  return _INTL("Graphics/CustomBattlers/{1}.{2}.png", head, body)
+  return _INTL("Graphics/CustomBattlers/indexed/{1}/{1}.{2}.png", head, body)
 end
 
 def customSpriteExists(species)

Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb

@@ -147,12 +147,12 @@ class PokemonPokedexInfo_Scene
     head_id = getHeadID(@species, body_id)
 
     baseFilename = head_id.to_s + "." + body_id.to_s
-    baseFilePath = Settings::CUSTOM_BATTLERS_FOLDER + "/" + head_id.to_s + "/" + baseFilename + ".png"
+    baseFilePath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + head_id.to_s + "/" + baseFilename + ".png"
     if pbResolveBitmap(baseFilePath)
       ret << baseFilePath
     end
     POSSIBLE_ALTS.each { |alt_letter|
-      altFilePath = Settings::CUSTOM_BATTLERS_FOLDER  + "/" + head_id.to_s + "/" + baseFilename + alt_letter + ".png"
+      altFilePath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED  + "/" + head_id.to_s + "/" + baseFilename + alt_letter + ".png"
       if pbResolveBitmap(altFilePath)
         ret << altFilePath
       end