summaryrefslogtreecommitdiff
path: root/src/battle/anim/shield.c
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2019-04-07 14:19:02 -0700
committerhuderlem <huderlem@gmail.com>2019-04-07 16:36:15 -0500
commit0a16dd0df08213b58a804b0711a7fdeb79377ce6 (patch)
treee55162aca184cb88ed0e47e95a35a4b343e2c4ea /src/battle/anim/shield.c
parent963d165e06f4428605fca5c1369c9f417e8e7156 (diff)
Decompile/port rest of battle_anim plus fix 1 NONMATCHING.
Diffstat (limited to 'src/battle/anim/shield.c')
-rw-r--r--src/battle/anim/shield.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c
index 9500d66c9..6e601efa3 100644
--- a/src/battle/anim/shield.c
+++ b/src/battle/anim/shield.c
@@ -36,9 +36,9 @@ void sub_80CCD24(struct Sprite* sprite)
sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
if (GetBattlerSide(gBattleAnimAttacker) == 0 || IsContest())
- sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker) + 1;
+ sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker) + 1;
else
- sprite->oam.priority = sub_8079ED4(gBattleAnimAttacker);
+ sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[2] = (IndexOfSpritePaletteTag(0x2828) << 4) + 0x100;