From 8ff1cbed2a3784f1460c1e07fc4af33b23b88bf2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 13 Jun 2024 13:45:56 +0200 Subject: [PATCH] update shiny data for battle mons (#4788) --- src/battle_controllers.c | 1 + src/battle_gfx_sfx_util.c | 1 + src/pokemon.c | 1 + 3 files changed, 3 insertions(+) diff --git a/src/battle_controllers.c b/src/battle_controllers.c index b2ae3039df..c4acc1691a 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1601,6 +1601,7 @@ static u32 GetBattlerMonData(u32 battler, struct Pokemon *party, u32 monId, u8 * battleMon.abilityNum = GetMonData(&party[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&party[monId], MON_DATA_OT_ID); battleMon.metLevel = GetMonData(&party[monId], MON_DATA_MET_LEVEL); + battleMon.isShiny = GetMonData(&party[monId], MON_DATA_IS_SHINY); GetMonData(&party[monId], MON_DATA_NICKNAME, nickname); StringCopy_Nickname(battleMon.nickname, nickname); GetMonData(&party[monId], MON_DATA_OT_NAME, battleMon.otName); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 801e2f5fc5..9970be2e65 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -595,6 +595,7 @@ void BattleLoadMonSpriteGfx(struct Pokemon *mon, u32 battler) if (B_TRANSFORM_SHINY >= GEN_4) { currentPersonality = gTransformedPersonalities[battler]; + isShiny = gTransformedShininess[battler]; } else { diff --git a/src/pokemon.c b/src/pokemon.c index e33f55472a..240dab1322 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3394,6 +3394,7 @@ void PokemonToBattleMon(struct Pokemon *src, struct BattlePokemon *dst) dst->type1 = gSpeciesInfo[dst->species].types[0]; dst->type2 = gSpeciesInfo[dst->species].types[1]; dst->type3 = TYPE_MYSTERY; + dst->isShiny = IsMonShiny(src); dst->ability = GetAbilityBySpecies(dst->species, dst->abilityNum); GetMonData(src, MON_DATA_NICKNAME, nickname); StringCopy_Nickname(dst->nickname, nickname);