diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-07 12:23:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-07 12:23:07 -0500 |
| commit | 807050a0480e93cfdea958c9331c1af0af1edf9d (patch) | |
| tree | a8a38ecb2e32303ff1cc63a5ae68bb6ca603017d /src/contest.c | |
| parent | 7a7aeed5e8a1f48c396b38584e24e787e4b9419e (diff) | |
| parent | dbb09aa4453d7afbc3b6f777554a32d39ad27e5e (diff) | |
Merge pull request #348 from DizzyEggg/anim_files
Decompile/Port battle_anim_80A5C6C
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); |