diff options
| author | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
| commit | 38fcc46abb36df72512f4b532d1379dab1c13af6 (patch) | |
| tree | df44258d7b5a65d2a75a146c7c01b6c683b023f9 /src/contest.c | |
| parent | 901f3ff55715ec6bdeda5c711e7e73b4c38ab55a (diff) | |
| parent | 95d8815721321f08714b97c59a97de3a59f1e0c7 (diff) | |
Merge remote-tracking branch 'upstream/master' into pan-constants
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/contest.c b/src/contest.c index 910637387..473f77f9c 100644 --- a/src/contest.c +++ b/src/contest.c @@ -10,7 +10,6 @@ #include "constants/flags.h" #include "battle.h" #include "battle_anim.h" -#include "blend_palette.h" #include "contest.h" #include "data2.h" #include "decompress.h" @@ -2535,7 +2534,7 @@ u8 sub_80DB174(u16 species, u32 otId, u32 personality, u32 index) LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x120, 0x20); SetMultiuseSpriteTemplateToPokemon(species, 0); - spriteId = CreateSprite(&gMultiuseSpriteTemplate, 0x70, sub_80A600C(2, species, 0), 30); + spriteId = CreateSprite(&gMultiuseSpriteTemplate, 0x70, GetBattlerSpriteFinal_Y(2, species, FALSE), 30); gSprites[spriteId].oam.paletteNum = 2; gSprites[spriteId].oam.priority = 2; gSprites[spriteId].subpriority = sub_80A82E4(2); |