diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index d74970dc2f..5abf9e8879 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -627,21 +627,21 @@ void BattleLoadMonSpriteGfx(struct Pokemon *mon, enum BattlerId battler) return; isShiny = GetMonData(mon, MON_DATA_IS_SHINY); + species = GetMonData(mon, MON_DATA_SPECIES); + personalityValue = GetMonData(mon, MON_DATA_PERSONALITY); - if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_NONE) - { - species = GetMonData(mon, MON_DATA_SPECIES); - personalityValue = GetMonData(mon, MON_DATA_PERSONALITY); - } - else + if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies != SPECIES_NONE) { species = gBattleSpritesDataPtr->battlerData[battler].transformSpecies; // If battler has Gigantamax factor, try convert gfx to G-Max version if (GetActiveGimmick(battler) == GIMMICK_DYNAMAX && GetMonData(mon, MON_DATA_GIGANTAMAX_FACTOR)) gBattleSpritesDataPtr->battlerData[battler].transformSpecies = species = GetGMaxTargetSpecies(species); - personalityValue = gTransformedPersonalities[battler]; - isShiny = gTransformedShininess[battler]; + if (gBattleMons[battler].volatiles.transformed) + { + personalityValue = gTransformedPersonalities[battler]; + isShiny = gTransformedShininess[battler]; + } } position = GetBattlerPosition(battler);