diff options
| author | garak <garakmon@gmail.com> | 2019-07-29 13:06:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 13:06:45 -0400 |
| commit | 5b57c001f5fe653542b6289540e3b6c6b67a8cfe (patch) | |
| tree | 26a9ba631960bc56d01daca1777164801d4e0075 /src/battle_anim_mons.c | |
| parent | 54c635683c1d2573885987acc4e99728f38e5131 (diff) | |
| parent | 136da953d6888562e76b0694a98988888adcd6d8 (diff) | |
Merge branch 'master' into navdata
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 c6058204d..a667daecf 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -2037,7 +2037,7 @@ u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority gMonSpritesGfxPtr->field_17C = AllocZeroed(0x2000); if (!isBackpic) { - LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20); + LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20); if (a10 == 1 || sub_80688F8(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0) LoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species], gMonSpritesGfxPtr->field_17C, @@ -2053,7 +2053,7 @@ u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority } else { - LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20); + LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20); if (a10 == 1 || sub_80688F8(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0) LoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species], gMonSpritesGfxPtr->field_17C, |