diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
| commit | 07b800e593a3ac8dd1a9bcfb6cb2366cc5c27377 (patch) | |
| tree | c77edf7fdacf36172bd3b6af790ad86111aef1fe /src/battle/anim/shield.c | |
| parent | 4d3098e89b5aebf080547a99e68640138dc74599 (diff) | |
| parent | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff) | |
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/battle/anim/shield.c')
| -rw-r--r-- | src/battle/anim/shield.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c index 676318545..323df4ab2 100644 --- a/src/battle/anim/shield.c +++ b/src/battle/anim/shield.c @@ -23,7 +23,7 @@ void sub_80CCD24(struct Sprite* sprite) sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; - if (GetBankSide(gAnimBankAttacker) == 0 || IsContest()) + if (GetBattlerSide(gAnimBankAttacker) == 0 || IsContest()) sprite->oam.priority = sub_8079ED4(gAnimBankAttacker) + 1; else sprite->oam.priority = sub_8079ED4(gAnimBankAttacker); |