diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-18 19:31:04 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-18 19:54:27 -0600 |
commit | 2592803460fcaeb2dd804080eb8770c85613773e (patch) | |
tree | ba53079591d9629dcf4672b544f13651f346d425 /src/contest.c | |
parent | cd994f4935b9de81383d8e0a17d790414652a4d6 (diff) | |
parent | b2ac3b6d6f06ed4a2d64af90e97796c66bcdeb5f (diff) |
Merge branch 'master' of github.com:pret/pokeemerald into trade
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 201a7472e..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 = GetBattlerSubpriority(2); + gSprites[spriteId].subpriority = GetBattlerSpriteSubpriority(2); gSprites[spriteId].callback = SpriteCallbackDummy; gSprites[spriteId].data[0] = gSprites[spriteId].oam.paletteNum; gSprites[spriteId].data[2] = species; |