diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-12-18 05:31:39 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-12-18 05:31:39 -0500 |
commit | c259ee46d3e0b0fc7e9a43e6448ef74247fedbf0 (patch) | |
tree | 7a4e53444248dd49aacbbf23a3af9f91cca8ef24 /src/contest.c | |
parent | 076d07f6fe24691d6d9d8872c049b18e2e16fa57 (diff) | |
parent | c74468fd11b551e1babf18a4d320e114fe495bd8 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
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 0c4397f30..3d74109cb 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; |