Fix fusion icons

2025-12-06 06:01:46 +00:00 · 2023-07-03 18:41:46 -04:00
parent 6e1dd22df8
commit 45bb8d5946
16 changed files with 6 additions and 4 deletions
--- a/Data/Actors.rxdata
+++ b/Data/Actors.rxdata
--- a/Data/Animations.rxdata
+++ b/Data/Animations.rxdata
--- a/Data/Armors.rxdata
+++ b/Data/Armors.rxdata
--- a/Data/CommonEvents.rxdata
+++ b/Data/CommonEvents.rxdata
--- a/Data/Enemies.rxdata
+++ b/Data/Enemies.rxdata
--- a/Data/Items.rxdata
+++ b/Data/Items.rxdata
--- a/Data/Map600.rxdata
+++ b/Data/Map600.rxdata
--- a/Data/MapInfos.rxdata
+++ b/Data/MapInfos.rxdata
--- a/Data/Scripts/013_Items/004_1_PokeradarUI.rb
+++ b/Data/Scripts/013_Items/004_1_PokeradarUI.rb
@@ -111,8 +111,9 @@ class PokeRadar_UI

    bitmap1 = AnimatedBitmap.new(GameData::Species.icon_filename(headPoke))
    bitmap2 = AnimatedBitmap.new(GameData::Species.icon_filename(bodyPoke))
+    dexNum = getDexNumberForSpecies(@pokemon.species)
    ensureFusionIconExists()
-    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", headPoke_number)
+    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
    headPokeFileName = GameData::Species.icon_filename(headPoke)
    bitmapPath = sprintf("%s.png", bitmapFileName)
    IO.copy_stream(headPokeFileName, bitmapPath)
--- a/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb
@@ -186,9 +186,9 @@ class PokemonIconSprite < SpriteWrapper

    icon1 = AnimatedBitmap.new(GameData::Species.icon_filename(headPoke))
    icon2 = AnimatedBitmap.new(GameData::Species.icon_filename(bodyPoke))
-
+    dexNum = getDexNumberForSpecies(@pokemon.species)
    ensureFusionIconExists
-    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", headPoke_number)
+    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
    headPokeFileName = GameData::Species.icon_filename(headPoke)
    bitmapPath = sprintf("%s.png", bitmapFileName)
    IO.copy_stream(headPokeFileName, bitmapPath)
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -33,8 +33,9 @@ class PokemonBoxIcon < IconSprite

    icon1 = AnimatedBitmap.new(GameData::Species.icon_filename(headPoke))
    icon2 = AnimatedBitmap.new(GameData::Species.icon_filename(bodyPoke))
+    dexNum = getDexNumberForSpecies(species)
    ensureFusionIconExists
-    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", headPoke_number)
+    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
    headPokeFileName = GameData::Species.icon_filename(headPoke)
    bitmapPath = sprintf("%s.png", bitmapFileName)
    IO.copy_stream(headPokeFileName, bitmapPath)
--- a/Data/Skills.rxdata
+++ b/Data/Skills.rxdata
--- a/Data/States.rxdata
+++ b/Data/States.rxdata
--- a/Data/System.rxdata
+++ b/Data/System.rxdata
--- a/Data/Tilesets.rxdata
+++ b/Data/Tilesets.rxdata
--- a/Data/Weapons.rxdata
+++ b/Data/Weapons.rxdata