dna icons

Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb

@@ -137,6 +137,10 @@ module GameData
     end
 
     def self.icon_filename_from_pokemon(pkmn)
+      if pkmn.isFusion?
+        return  pbResolveBitmap(sprintf("Graphics/Icons/iconDNA"))
+      end
+
       return self.icon_filename(pkmn.species, pkmn.form, pkmn.gender, pkmn.shiny?, pkmn.shadowPokemon?, pkmn.egg?)
     end
 

Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb

@@ -161,7 +161,7 @@ class PokemonIconSprite < SpriteWrapper
     dexNum = getDexNumberForSpecies(species)
     return true if dexNum <= Settings::NB_POKEMON
     return false if $game_variables == nil
-    return true if $game_variables[220] != 0
+    return true if $game_variables[VAR_FUSION_ICON_STYLE] != 0
     bitmapFileName = sprintf("Graphics/Icons/icon%03d", dexNum)
     return true if pbResolveBitmap(bitmapFileName)
     return false

Data/Scripts/016_UI/015_UI_Options.rb

@@ -530,7 +530,14 @@ class PokemonOption_Scene
                               ["Enter text by selecting letters on the screen",
                                "Enter text by typing on the keyboard"]
       )
-      EnumOption.new(_INTL("Screen Size"), [_INTL("S"), _INTL("M"), _INTL("L"), _INTL("XL"), _INTL("Full")],
+    options << EnumOption.new(_INTL("Fusion icons"), [_INTL("Combined"), _INTL("DNA")],
+                              proc { $game_variables[VAR_FUSION_ICON_STYLE]},
+                              proc { |value| $game_variables[VAR_FUSION_ICON_STYLE]=value },
+                              ["Combines both Pokémon's party icons",
+                               "Uses the same party icon for all fusions"]
+    )
+
+    options << EnumOption.new(_INTL("Screen Size"), [_INTL("S"), _INTL("M"), _INTL("L"), _INTL("XL"), _INTL("Full")],
                      proc { [$PokemonSystem.screensize, 4].min },
                      proc { |value|
                        if $PokemonSystem.screensize != value

Data/Scripts/016_UI/017_UI_PokemonStorage.rb

@@ -18,7 +18,7 @@ class PokemonBoxIcon < IconSprite
     dexNum = getDexNumberForSpecies(species)
     return true if dexNum <= Settings::NB_POKEMON
     return false if $game_variables == nil
-    return true if $game_variables[220] != 0
+    return true if $game_variables[VAR_FUSION_ICON_STYLE] != 0
     bitmapFileName = sprintf("Graphics/Icons/icon%03d", dexNum)
     return true if pbResolveBitmap(bitmapFileName)
     return false

Data/Scripts/049_Compatibility/Constants.rb

@@ -92,6 +92,8 @@ VAR_STANDARD_WONDERTRADE_LEFT=248
 VAR_PREMIUM_WONDERTRADE_LEFT=111
 VAR_PREMIUM_WONDERTRADE_LEFT=111
 VAR_RIVAL_STARTER=250
+VAR_FUSION_ICON_STYLE=220
+
 #Randomizer
 VAR_RANDOMIZER_WILD_POKE_BST=197
 VAR_RANDOMIZER_TRAINER_BST=195