diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-10-13 12:44:23 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-10-13 12:44:23 -0500 |
| commit | a26380663c5acc636fb8c163c014187129afae8f (patch) | |
| tree | 79eb899d0c0e3281a11f1d447879090dc208ef80 /src/contest.c | |
| parent | 35c69388140243c391b925fd8b9012d2d1703810 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/contest.c b/src/contest.c index 910637387..8eacc89c3 100644 --- a/src/contest.c +++ b/src/contest.c @@ -2535,7 +2535,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); |