summaryrefslogtreecommitdiff
path: root/src/battle/anim/thrashing.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-03 16:45:53 -0700
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-03 16:45:53 -0700
commit4df728666e55b47480467fbea86f48dadcb81c97 (patch)
tree6a8413c90ec9d68c54389e1a54f6de9f12bb686c /src/battle/anim/thrashing.c
parent9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e (diff)
parent397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff)
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/battle/anim/thrashing.c')
-rwxr-xr-xsrc/battle/anim/thrashing.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c
index 9811c546a..3fde815ae 100755
--- a/src/battle/anim/thrashing.c
+++ b/src/battle/anim/thrashing.c
@@ -5,8 +5,8 @@
#include "sound.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
extern struct AffineAnimFrameCmd gUnknown_083D77B0;
@@ -48,7 +48,7 @@ void sub_80D0AB8(u8 taskId)
task->data[7] = 0;
task->data[8] = 0;
task->data[9] = 2;
- if (GetBankSide(gBattleAnimBankAttacker) == 1)
+ if (GetBankSide(gAnimBankAttacker) == 1)
task->data[2] *= -1;
task->func = sub_80D0B3C;