1 files changed, 37 insertions, 37 deletions

diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index fcbced40e..45ef7b831 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -12,8 +12,8 @@
 #include "constants/battle_constants.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
 extern u8 gBankSpriteIds[];
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
@@ -210,7 +210,7 @@ void sub_80DFC24(u8 taskId)
 {
     int bank;
     gTasks[taskId].data[0] = gBattleAnimArgs[0];
-    bank = gAnimBankAttacker;
+    bank = gBattleAnimAttacker;
     gTasks[taskId].data[1] = 16;
     REG_BLDALPHA = 16;
     if (GetBattlerPosition_permutated(bank) == 1)
@@ -233,7 +233,7 @@ static void sub_80DFC9C(u8 taskId)
         gTasks[taskId].data[2] = 0;
         if (r2 == 16)
         {
-            gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible = 1;
+            gSprites[gBankSpriteIds[gBattleAnimAttacker]].invisible = 1;
             DestroyAnimVisualTask(taskId);
         }
     }
@@ -276,7 +276,7 @@ void sub_80DFD58(u8 taskId)
 void sub_80DFDC0(u8 taskId)
 {
     REG_BLDALPHA = 0x1000;
-    if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1)
+    if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1)
         REG_BLDCNT = 0x3F42;
     else
         REG_BLDCNT = 0x3F44;
@@ -287,10 +287,10 @@ void sub_80DFDC0(u8 taskId)
 
 void sub_80DFE14(struct Sprite *sprite)
 {
-    sprite->data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
-    sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
-    sprite->data[3] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
-    sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->data[3] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = 0x7E;
     InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = -sprite->data[1];
@@ -366,9 +366,9 @@ void sub_80DFFD0(struct Sprite *sprite)
     s8 xOffset;
 
     if (gBattleAnimArgs[0] == 0)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     xOffset = 20;
     sprite->oam.tileNum += 4;
@@ -421,22 +421,22 @@ void sub_80E00EC(u8 taskId)
     int var0;
     struct Task *task = &gTasks[taskId];
 
-    task->data[7] = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 31;
-    task->data[6] = sub_807A100(gAnimBankAttacker, 2) - 7;
+    task->data[7] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 31;
+    task->data[6] = sub_807A100(gBattleAnimAttacker, 2) - 7;
     task->data[5] = task->data[7];
     task->data[4] = task->data[6];
     task->data[13] = (task->data[7] - task->data[6]) << 8;
 
-    pos = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+    pos = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
     task->data[14] = pos - 32;
     task->data[15] = pos + 32;
 
-    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
         task->data[8] = -12;
     else
         task->data[8] = -64;
 
-    task->data[3] = GetBattlerPosition_permutated(gAnimBankAttacker);
+    task->data[3] = GetBattlerPosition_permutated(gBattleAnimAttacker);
     if (task->data[3] == 1)
     {
         sub_8078914(&subStruct);
@@ -567,7 +567,7 @@ void sub_80E03BC(u8 taskId)
         }
         else
         {
-            task->data[3] = GetBattlerPosition_permutated(gAnimBankTarget);
+            task->data[3] = GetBattlerPosition_permutated(gBattleAnimTarget);
             if (task->data[3] == 1)
             {
                 REG_BLDCNT = 0x3F42;
@@ -599,14 +599,14 @@ void sub_80E03BC(u8 taskId)
         task->data[0]++;
         break;
     case 2:
-        task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 31;
-        task->data[6] = sub_807A100(gAnimBankTarget, 2) - 7;
+        task->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 31;
+        task->data[6] = sub_807A100(gBattleAnimTarget, 2) - 7;
         task->data[13] = (task->data[7] - task->data[6]) << 8;
-        pos = GetBattlerSpriteCoord(gAnimBankTarget, 0);
+        pos = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
         task->data[14] = pos - 4;
         task->data[15] = pos + 4;
 
-        if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
             task->data[8] = -12;
         else
             task->data[8] = -64;
@@ -955,14 +955,14 @@ static void sub_80E08CC(u8 priority)
 
 void sub_80E0918(u8 taskId)
 {
-    u8 toBG2 = GetBattlerPosition_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0;
-    MoveBattlerSpriteToBG(gAnimBankAttacker, toBG2);
-    gSprites[gBankSpriteIds[gAnimBankAttacker]].invisible = 0;
+    u8 toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker) ^ 1 ? 1 : 0;
+    MoveBattlerSpriteToBG(gBattleAnimAttacker, toBG2);
+    gSprites[gBankSpriteIds[gBattleAnimAttacker]].invisible = 0;
 
-    if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+    if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
     {
-        MoveBattlerSpriteToBG(gAnimBankAttacker ^ 2, toBG2 ^ 1);
-        gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].invisible = 0;
+        MoveBattlerSpriteToBG(gBattleAnimAttacker ^ 2, toBG2 ^ 1);
+        gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].invisible = 0;
     }
 
     DestroyAnimVisualTask(taskId);
@@ -970,10 +970,10 @@ void sub_80E0918(u8 taskId)
 
 void sub_80E09C4(u8 taskId)
 {
-    u8 toBG2 = GetBattlerPosition_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0;
+    u8 toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker) ^ 1 ? 1 : 0;
     sub_8076464(toBG2);
 
-    if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
+    if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
         sub_8076464(toBG2 ^ 1);
 
     DestroyAnimVisualTask(taskId);
@@ -1011,11 +1011,11 @@ void sub_80E0A4C(u8 taskId)
 
     if (IsDoubleBattle() && !IsContest())
     {
-        if (GetBattlerPosition(gAnimBankAttacker) == 3 || GetBattlerPosition(gAnimBankAttacker) == 0)
+        if (GetBattlerPosition(gBattleAnimAttacker) == 3 || GetBattlerPosition(gBattleAnimAttacker) == 0)
         {
-            if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2) == TRUE)
+            if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2) == TRUE)
             {
-                gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority--;
+                gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority--;
                 REG_BG1CNT_BITFIELD.priority = 1;
                 var0 = 1;
             }
@@ -1028,14 +1028,14 @@ void sub_80E0A4C(u8 taskId)
     }
     else
     {
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
-            species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
+            species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
         else
-            species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
+            species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
     }
 
     spriteId = GetAnimBattlerSpriteId(0);
-    newSpriteId = sub_807A4A0(gAnimBankAttacker, spriteId, species);
+    newSpriteId = sub_807A4A0(gBattleAnimAttacker, spriteId, species);
 
     sub_8078914(&subStruct);
     DmaClear32(3, subStruct.field_4, 0x1000);
@@ -1101,7 +1101,7 @@ static void sub_80E0CD0(u8 taskId)
 
             if (gTasks[taskIdCopy].data[6] == 1)
             {
-                gSprites[gBankSpriteIds[gAnimBankAttacker ^ 2]].oam.priority++;
+                gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority++;
             }
             
             DestroyAnimVisualTask(taskIdCopy);