From b1b4ba213f809dae5e0d78fdac6efe4d6ae2c3f7 Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Mon, 16 Mar 2026 17:37:01 +0100 Subject: [PATCH] suggested change + restructure --- src/battle_gfx_sfx_util.c | 16 ++++++++-------- src/battle_util.c | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) 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); diff --git a/src/battle_util.c b/src/battle_util.c index e3fc5729b4..a608a56335 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8817,7 +8817,6 @@ bool32 TryBattleFormChange(enum BattlerId battler, enum FormChanges method, enum TryToSetBattleFormChangeMoves(mon, method); SetMonData(mon, MON_DATA_SPECIES, &targetSpecies); gBattleMons[battler].species = targetSpecies; - gBattleMons[battler].volatiles.isTransformedMonShiny = gBattleMons[battler].isShiny; RecalcBattlerStats(battler, mon, method == FORM_CHANGE_BATTLE_GIGANTAMAX); return TRUE; }