Merge branch 'master' into createsprite

1 files changed, 5 insertions, 5 deletions

diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c
index baf5d9b94..a1de45d15 100644
--- a/src/battle/anim/withdraw.c
+++ b/src/battle/anim/withdraw.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 
 extern u8 gBankSpriteIds[];
 
@@ -17,15 +17,15 @@ static void sub_80CF514(u8 taskId);
 
 void sub_80CF4D8(u8 taskId)
 {
-    sub_8078E70(gBankSpriteIds[gAnimBankAttacker], 0);
+    sub_8078E70(gBankSpriteIds[gBattleAnimAttacker], 0);
     gTasks[taskId].func = sub_80CF514;
 }
 
 void sub_80CF514(u8 taskId)
 {
-    u8 a = gBankSpriteIds[gAnimBankAttacker];
+    u8 a = gBankSpriteIds[gBattleAnimAttacker];
     s16 b;
-    if (GetBattlerSide(gAnimBankAttacker) == 0)
+    if (GetBattlerSide(gBattleAnimAttacker) == 0)
     {
         b = -gTasks[taskId].data[0];
     }