diff --git a/Data/Map055.rxdata b/Data/Map055.rxdata index 08c8b9b54..b4ce7444c 100644 Binary files a/Data/Map055.rxdata and b/Data/Map055.rxdata differ diff --git a/Data/Map058.rxdata b/Data/Map058.rxdata index 10f23ecfc..a63d05d51 100644 Binary files a/Data/Map058.rxdata and b/Data/Map058.rxdata differ diff --git a/Data/Map108.rxdata b/Data/Map108.rxdata index fb18d5c85..0f4b04f72 100644 Binary files a/Data/Map108.rxdata and b/Data/Map108.rxdata differ diff --git a/Data/Map121.rxdata b/Data/Map121.rxdata index 33e19c9ca..15a8a24f7 100644 Binary files a/Data/Map121.rxdata and b/Data/Map121.rxdata differ diff --git a/Data/Map144.rxdata b/Data/Map144.rxdata index 2107e3ea0..473fb4c08 100644 Binary files a/Data/Map144.rxdata and b/Data/Map144.rxdata differ diff --git a/Data/Map154.rxdata b/Data/Map154.rxdata index d8dfa69bb..70e463dfc 100644 Binary files a/Data/Map154.rxdata and b/Data/Map154.rxdata differ diff --git a/Data/Map181.rxdata b/Data/Map181.rxdata index c9ab058df..86a134bb0 100644 Binary files a/Data/Map181.rxdata and b/Data/Map181.rxdata differ diff --git a/Data/Map559.rxdata b/Data/Map559.rxdata index ba0aef23e..5ccbfc28e 100644 Binary files a/Data/Map559.rxdata and b/Data/Map559.rxdata differ diff --git a/Data/Map660.rxdata b/Data/Map660.rxdata index 9741f1fc5..c05ac5d4a 100644 Binary files a/Data/Map660.rxdata and b/Data/Map660.rxdata differ diff --git a/Data/Map661.rxdata b/Data/Map661.rxdata index 25137a254..7cd528bb6 100644 Binary files a/Data/Map661.rxdata and b/Data/Map661.rxdata differ diff --git a/Data/Map662.rxdata b/Data/Map662.rxdata index 8108b77f7..f2eede61b 100644 Binary files a/Data/Map662.rxdata and b/Data/Map662.rxdata differ diff --git a/Data/Map663.rxdata b/Data/Map663.rxdata index 7cb940d1a..03dd17321 100644 Binary files a/Data/Map663.rxdata and b/Data/Map663.rxdata differ diff --git a/Data/Map665.rxdata b/Data/Map665.rxdata index b028af4db..bf4f162b2 100644 Binary files a/Data/Map665.rxdata and b/Data/Map665.rxdata differ diff --git a/Data/Map666.rxdata b/Data/Map666.rxdata index 05165c272..7b53bb520 100644 Binary files a/Data/Map666.rxdata and b/Data/Map666.rxdata differ diff --git a/Data/Map667.rxdata b/Data/Map667.rxdata index 5789cbeac..cc1b7a0e1 100644 Binary files a/Data/Map667.rxdata and b/Data/Map667.rxdata differ diff --git a/Data/Map668.rxdata b/Data/Map668.rxdata index a6bf85d68..68706c273 100644 Binary files a/Data/Map668.rxdata and b/Data/Map668.rxdata differ diff --git a/Data/Map755.rxdata b/Data/Map755.rxdata index 2fb23cdfd..7cfdc33e1 100644 Binary files a/Data/Map755.rxdata and b/Data/Map755.rxdata differ diff --git a/Data/Map757.rxdata b/Data/Map757.rxdata index 4eb69e32f..8a5fc3145 100644 Binary files a/Data/Map757.rxdata and b/Data/Map757.rxdata differ diff --git a/Data/Map758.rxdata b/Data/Map758.rxdata index ae2c529fc..4e75d5f5c 100644 Binary files a/Data/Map758.rxdata and b/Data/Map758.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index a3b66fb71..098e31b77 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb index 74969c220..8afdb791a 100644 --- a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb +++ b/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 diff --git a/Data/Scripts/048_Fusion/DoublePreviewScreen.rb b/Data/Scripts/048_Fusion/DoublePreviewScreen.rb index 06967e07a..62aedc334 100644 --- a/Data/Scripts/048_Fusion/DoublePreviewScreen.rb +++ b/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 diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb index 28f1494a8..956a3a161 100644 --- a/Data/Scripts/050_AddOns/GeneralUtils.rb +++ b/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) diff --git a/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb b/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb index 1525851ba..ce29df9ee 100644 --- a/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb +++ b/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 diff --git a/Data/System.rxdata b/Data/System.rxdata index 6a72f0216..de86ebe43 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index b60b3eb67..a7e9f4cf9 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ