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/fight.c | |
| parent | d23c1af73e98f3bd91b4551bf624638a33bbe236 (diff) | |
| parent | 103b63bd1a0a8a00733834de1f5094507e070de9 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby into modern_gcc
Diffstat (limited to 'src/battle/anim/fight.c')
| -rw-r--r-- | src/battle/anim/fight.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c index 8d045c42d..450844453 100644 --- a/src/battle/anim/fight.c +++ b/src/battle/anim/fight.c @@ -12,7 +12,7 @@ extern u8 gBattlerAttacker; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; extern u8 gBattlerSpriteIds[]; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG2_X; @@ -516,7 +516,7 @@ void sub_80D90F4(struct Sprite *sprite) if (Random() & 1) y *= -1; - if ((gBanksBySide[bank] & 1) == 0) + if ((gBattlerPositions[bank] & 1) == 0) y += 0xFFF0; sprite->pos1.x += x; |