diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
commit | ecee02816d475f012dd4eec8a59b9ad3ba9ab531 (patch) | |
tree | 5eb0cdad91aeba20866a731033d76add878c3ec4 /src/contest.c | |
parent | 7dcb614cca6d61c5e51960826dddc004858ed9f1 (diff) | |
parent | 6ef96717181dfa1cda548cbe405410aba065e41c (diff) |
Merge with master
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 95c8563ed..34662b490 100644 --- a/src/contest.c +++ b/src/contest.c @@ -2520,7 +2520,7 @@ u8 sub_80DB174(u16 species, u32 otId, u32 personality, u32 index) 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); + gSprites[spriteId].subpriority = GetBattlerSpriteSubpriority(2); gSprites[spriteId].callback = SpriteCallbackDummy; gSprites[spriteId].data[0] = gSprites[spriteId].oam.paletteNum; gSprites[spriteId].data[2] = species; |