From fd3429c3b590af9f4e8372012310e3cdadfc9806 Mon Sep 17 00:00:00 2001 From: chardub Date: Sat, 7 Jun 2025 14:42:44 -0400 Subject: [PATCH] 6.6 release fixes --- Data/.DS_Store | Bin 61444 -> 61444 bytes .../004_PokeBattle_SceneElements.rb | 4 ++-- .../Scripts/052_InfiniteFusion/GameOptions.rb | 2 +- .../ImprovedShinies/Shinies_AnimatedBitmap.rb | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Data/.DS_Store b/Data/.DS_Store index 9ea6ed15cb8468b59391074ad8231b4adc40c926..e4ec92b153a2f1e6cfcb59207f5223896d6bf1c0 100644 GIT binary patch delta 93 zcmZp9z})hHd4n4JWbMcIco-NM7=aiFIJh?pa)_~PR^ws5GP&nQsj#krj)J*mt&T#q up}C>4j)JAR*<_KMrkh_sU}vBF_PY3HmKSeX7$YV>xT(Ea>FEU~kQe|Rk|2-( delta 107 zcmZp9z})hHd4n4JWW~q#co-NM7=aiFIJh?pa)_~PR^ws5!nkL0UqB(BOm(%cp^>?v zj)JbCf#qcGKpDoq$p;_EGxl$O_<)Cf^QY(kStieaXt-JS=>;aC{~!Q1N`xVRA%~%q F0RRU4BwYXi diff --git a/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb b/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb index e877b018d..8cb472098 100644 --- a/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb +++ b/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb @@ -245,10 +245,10 @@ class PokemonDataBox < SpriteWrapper pbDrawNumber(@battler.level,self.bitmap,@spriteBaseX+162,16) if !$game_switches[SWITCH_NO_LEVELS_MODE] # Draw shiny icon if @battler.shiny? - shinyX = (@battler.opposes?(0)) ? -6 : -6 # Foe's/player's + shinyX = (@battler.opposes?(0)) ? -8 : -6 # Foe's/player's pokeRadarShiny= !@battler.pokemon.debugShiny? && !@battler.pokemon.naturalShiny? - addShinyStarsToGraphicsArray(imagePos,@spriteBaseX+shinyX,35, @battler.pokemon.bodyShiny?,@battler.pokemon.headShiny?,@battler.pokemon.debugShiny?, pokeRadarShiny) + addShinyStarsToGraphicsArray(imagePos,@spriteBaseX+shinyX,15, @battler.pokemon.bodyShiny?,@battler.pokemon.headShiny?,@battler.pokemon.debugShiny?, pokeRadarShiny) end # Draw Mega Evolution/Primal Reversion icon if @battler.mega? diff --git a/Data/Scripts/052_InfiniteFusion/GameOptions.rb b/Data/Scripts/052_InfiniteFusion/GameOptions.rb index 494b29012..727369df2 100644 --- a/Data/Scripts/052_InfiniteFusion/GameOptions.rb +++ b/Data/Scripts/052_InfiniteFusion/GameOptions.rb @@ -132,7 +132,7 @@ class PokemonGameOption_Scene < PokemonOption_Scene }, [ "Auto-selected sprites follow standard Pokémon sprites rules.", - "Auto-selected sprites can be anything, including references, sprites, memes, and joke sprites." + "Auto-selected sprites can be anything, including references, memes, jokes, etc." ] ) ? 1 : 0 diff --git a/Data/Scripts/052_InfiniteFusion/ImprovedShinies/Shinies_AnimatedBitmap.rb b/Data/Scripts/052_InfiniteFusion/ImprovedShinies/Shinies_AnimatedBitmap.rb index dc3f0d2cd..7d71b84cb 100644 --- a/Data/Scripts/052_InfiniteFusion/ImprovedShinies/Shinies_AnimatedBitmap.rb +++ b/Data/Scripts/052_InfiniteFusion/ImprovedShinies/Shinies_AnimatedBitmap.rb @@ -7,6 +7,7 @@ class AnimatedBitmap def shiftAllColors(dex_number, bodyShiny, headShiny) # pratically the same as hue_changecolors but for the animated bitmap if isFusion(dex_number) + return if !bodyShiny && !headShiny body_id = getBodyID(dex_number) head_id = getHeadID(dex_number, body_id) shiny_directory = "Graphics/Battlers/Shiny/#{head_id}.#{body_id}"