summaryrefslogtreecommitdiff
path: root/src/battle/anim/spin_finger.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-27 13:15:01 -0600
committerMarcus Huderle <huderlem@gmail.com>2017-12-27 13:15:01 -0600
commit16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (patch)
treeb92766b1ed1710c7d8ea0492c160e0a39a3dc539 /src/battle/anim/spin_finger.c
parent86a36767dba19e84297047addf1d1d776e2efdec (diff)
Port battle_anim changes from pokeemerald
Diffstat (limited to 'src/battle/anim/spin_finger.c')
-rwxr-xr-xsrc/battle/anim/spin_finger.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/spin_finger.c b/src/battle/anim/spin_finger.c
index adf41b261..8eb060358 100755
--- a/src/battle/anim/spin_finger.c
+++ b/src/battle/anim/spin_finger.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
extern void sub_80CF088(struct Sprite* sprite);
static void sub_80CF138(struct Sprite* sprite);
@@ -19,11 +19,11 @@ void sub_80CF0BC(struct Sprite* sprite)
{
u8 bank;
if (gBattleAnimArgs[0] == 0)
- bank = gBattleAnimBankAttacker;
+ bank = gAnimBankAttacker;
else
- bank = gBattleAnimBankTarget;
+ bank = gAnimBankTarget;
- sprite->pos1.x = sub_8077ABC(bank, 0);
+ sprite->pos1.x = GetBankPosition(bank, 0);
sprite->pos1.y = sub_807A100(bank, 2);
if (sprite->pos1.y <= 9)
sprite->pos1.y = 10;