diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 18:18:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 18:18:35 -0700 |
| commit | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (patch) | |
| tree | 137e905d499c0b3cabae75db88df52233604adc0 /src/battle/anim/shield.c | |
| parent | 18a6fb5c3fcdc852a8ee805ba02b2807938e1de8 (diff) | |
| parent | 3571cb1d142090b59a9161a6bada11f0caf53b8c (diff) | |
Merge pull request #590 from huderlem/battle_9
Decompile battle_9
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); |