diff options
| author | garak <garakmon@gmail.com> | 2018-12-17 23:34:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 23:34:16 -0500 |
| commit | 2fb6c5bb7f81c285d973d602dbbe4bbf8fc8aba1 (patch) | |
| tree | 003c2daccebd740c288e537216afed0265bfbc59 /src/battle/anim/whip.c | |
| parent | 32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (diff) | |
| parent | 5f202c744b92dcde829c1d24ad323d824c769fec (diff) | |
Merge branch 'master' into createsprite
Diffstat (limited to 'src/battle/anim/whip.c')
| -rw-r--r-- | src/battle/anim/whip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c index 91a937d41..8cfebc0dd 100644 --- a/src/battle/anim/whip.c +++ b/src/battle/anim/whip.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CC82C(struct Sprite* sprite); void sub_80CC884(struct Sprite* sprite); @@ -105,7 +105,7 @@ static void sub_80CC810(struct Sprite* sprite) void sub_80CC82C(struct Sprite* sprite) { - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -122,7 +122,7 @@ void sub_80CC82C(struct Sprite* sprite) void sub_80CC884(struct Sprite* sprite) { - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) StartSpriteAnim(sprite, 1); sprite->callback = sub_80CC810; |