diff --git a/Data/.DS_Store b/Data/.DS_Store index 9ea6ed15c..e4ec92b15 100644 Binary files a/Data/.DS_Store and b/Data/.DS_Store differ 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}"