diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
| commit | 04d158cfcd0f26b4dc4a00e23464a5fde201aa8e (patch) | |
| tree | 5722c829dbad65bbbeb573084291ba0621b89df5 /src/battle/anim/sonic.c | |
| parent | d23c1af73e98f3bd91b4551bf624638a33bbe236 (diff) | |
| parent | 103b63bd1a0a8a00733834de1f5094507e070de9 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby into modern_gcc
Diffstat (limited to 'src/battle/anim/sonic.c')
| -rw-r--r-- | src/battle/anim/sonic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index 9cdda992f..cef255eda 100644 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -9,7 +9,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern u16 gBattleTypeFlags; extern void sub_80D4CA4(struct Sprite *sprite); @@ -296,7 +296,7 @@ void sub_80CFB04(u8 taskId) } else { - if ((gBanksBySide[gBattleAnimTarget] & 1) == 0) + if ((gBattlerPositions[gBattleAnimTarget] & 1) == 0) { gTasks[taskId].data[4] = 1; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; |