diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-15 19:32:49 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-15 19:32:49 -0400 |
| commit | 81da6acff56cadc5e2b7b5572aba944bf0f1c8ad (patch) | |
| tree | 2c0a7bad392242f715c145cbd74f61dac265a18f /src/battle_anim_mons.c | |
| parent | c6563b78c0b922aa9674d4e12fc528f0098ba904 (diff) | |
battle_gfx_sfx_util sync emerald names to unnamed syms
Diffstat (limited to 'src/battle_anim_mons.c')
| -rw-r--r-- | src/battle_anim_mons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index d624b36fe..3bcb58fb6 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -1874,7 +1874,7 @@ u8 sub_80768D0(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority if (!isBackpic) { LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20); - if (a10 == 1 || sub_804455C(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0) + if (a10 == 1 || ShouldIgnoreDeoxysForm(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0) LoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species], gMonSpritesGfxPtr->field_17C, species, @@ -1890,7 +1890,7 @@ u8 sub_80768D0(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority else { LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20); - if (a10 == 1 || sub_804455C(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0) + if (a10 == 1 || ShouldIgnoreDeoxysForm(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0) LoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species], gMonSpritesGfxPtr->field_17C, species, |