Start decompiling battle_9

18 files changed, 2856 insertions, 2829 deletions

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 73f9223e5..a6e01f6c8 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -84,7 +84,7 @@ extern u8 gStatStageRatios[][2];
 extern u8 gActionsByTurnOrder[4];
 extern struct UnknownPokemonStruct2 gUnknown_02023A00[];
 extern u8 gBattleBufferB[][0x200];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u32 gBattleExecBuffer;
 extern u8 gNoOfAllBanks;
 extern u16 gBattlePartyID[];
@@ -3558,12 +3558,12 @@ void sub_8010800(void)
 #if DEBUG
 void debug_sub_80138CC(void)
 {
-    if (GetBankSide(gActiveBank) == 0)
+    if (GetBankSide(gActiveBattler) == 0)
     {
         switch (gSharedMem[0x160FD])
         {
         case 0:
-            if (gBattleBankFunc[gActiveBank] == sub_802C098)
+            if (gBattleBankFunc[gActiveBattler] == sub_802C098)
                 gSharedMem[0x160FD]++;
             break;
         case 1:
@@ -3604,18 +3604,18 @@ void sub_8010824(void)
 #if DEBUG
     if (gUnknown_02023A14_50 & 0x80)
     {
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
             debug_sub_80138CC();
         gBattleMainFunc();
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
-            gBattleBankFunc[gActiveBank]();
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+            gBattleBankFunc[gActiveBattler]();
     }
     else
 #endif
     {
         gBattleMainFunc();
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
-            gBattleBankFunc[gActiveBank]();
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
+            gBattleBankFunc[gActiveBattler]();
     }
 }
 
@@ -3727,21 +3727,21 @@ void sub_8010874(void)
 
 void SwitchInClearSetData(void)
 {
-    struct DisableStruct sp0 = gDisableStructs[gActiveBank];
+    struct DisableStruct sp0 = gDisableStructs[gActiveBattler];
     s32 i;
     u8 *ptr;
 
     if (gBattleMoves[gCurrentMove].effect != EFFECT_BATON_PASS)
     {
         for (i = 0; i < 8; i++)
-            gBattleMons[gActiveBank].statStages[i] = 6;
+            gBattleMons[gActiveBattler].statStages[i] = 6;
         for (i = 0; i < gNoOfAllBanks; i++)
         {
             struct UnknownStruct12 *sp20 = &gUnknown_02024AD0[i];
 
-            if ((sp20->unk0 & 0x04000000) && gDisableStructs[i].bankPreventingEscape == gActiveBank)
+            if ((sp20->unk0 & 0x04000000) && gDisableStructs[i].bankPreventingEscape == gActiveBattler)
                 sp20->unk0 &= ~0x04000000;
-            if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].bankWithSureHit == gActiveBank)
+            if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].bankWithSureHit == gActiveBattler)
             {
                 gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
                 gDisableStructs[i].bankWithSureHit = 0;
@@ -3750,14 +3750,14 @@ void SwitchInClearSetData(void)
     }
     if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
     {
-        gBattleMons[gActiveBank].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED);
-        gStatuses3[gActiveBank] &= (STATUS3_LEECHSEED_BANK | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT);
+        gBattleMons[gActiveBattler].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED);
+        gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BANK | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT);
 
         for (i = 0; i < gNoOfAllBanks; i++)
         {
-            if (GetBankSide(gActiveBank) != GetBankSide(i)
+            if (GetBankSide(gActiveBattler) != GetBankSide(i)
              && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
-             && (gDisableStructs[i].bankWithSureHit == gActiveBank))
+             && (gDisableStructs[i].bankWithSureHit == gActiveBattler))
             {
                 gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
                 gStatuses3[i] |= 0x10;
@@ -3766,49 +3766,49 @@ void SwitchInClearSetData(void)
     }
     else
     {
-        gBattleMons[gActiveBank].status2 = 0;
-        gStatuses3[gActiveBank] = 0;
+        gBattleMons[gActiveBattler].status2 = 0;
+        gStatuses3[gActiveBattler] = 0;
     }
 
     for (i = 0; i < gNoOfAllBanks; i++)
     {
-        if (gUnknown_02024AD0[i].unk0 & (gBitTable[gActiveBank] << 16))
-            gUnknown_02024AD0[i].unk0 &= ~(gBitTable[gActiveBank] << 16);
-        if ((gUnknown_02024AD0[i].unk0 & 0xE000) && ewram16020arr(i) == gActiveBank)
+        if (gUnknown_02024AD0[i].unk0 & (gBitTable[gActiveBattler] << 16))
+            gUnknown_02024AD0[i].unk0 &= ~(gBitTable[gActiveBattler] << 16);
+        if ((gUnknown_02024AD0[i].unk0 & 0xE000) && ewram16020arr(i) == gActiveBattler)
             gUnknown_02024AD0[i].unk0 &= ~0xE000;
     }
 
-    gActionSelectionCursor[gActiveBank] = 0;
-    gMoveSelectionCursor[gActiveBank] = 0;
+    gActionSelectionCursor[gActiveBattler] = 0;
+    gMoveSelectionCursor[gActiveBattler] = 0;
 
-    MEMSET_ALT(&gDisableStructs[gActiveBank], 0, 0x1C, i, ptr);
+    MEMSET_ALT(&gDisableStructs[gActiveBattler], 0, 0x1C, i, ptr);
 
     if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
     {
-        gDisableStructs[gActiveBank].substituteHP = sp0.substituteHP;
-        gDisableStructs[gActiveBank].bankWithSureHit = sp0.bankWithSureHit;
-        gDisableStructs[gActiveBank].perishSong1 = sp0.perishSong1;
-        gDisableStructs[gActiveBank].perishSong2 = sp0.perishSong2;
+        gDisableStructs[gActiveBattler].substituteHP = sp0.substituteHP;
+        gDisableStructs[gActiveBattler].bankWithSureHit = sp0.bankWithSureHit;
+        gDisableStructs[gActiveBattler].perishSongTimer1 = sp0.perishSongTimer1;
+        gDisableStructs[gActiveBattler].perishSongTimer2 = sp0.perishSongTimer2;
     }
 
-    gDisableStructs[gActiveBank].isFirstTurn= 2;
-    gLastUsedMove[gActiveBank] = 0;
-    gLastLandedMoves[gActiveBank] = 0;
-    gLastHitByType[gActiveBank] = 0;
-    gUnknown_02024C4C[gActiveBank] = 0;
-    gUnknown_02024C2C[gActiveBank] = 0;
-    gUnknown_02024C5C[gActiveBank] = 0xFF;
+    gDisableStructs[gActiveBattler].isFirstTurn= 2;
+    gLastUsedMove[gActiveBattler] = 0;
+    gLastLandedMoves[gActiveBattler] = 0;
+    gLastHitByType[gActiveBattler] = 0;
+    gUnknown_02024C4C[gActiveBattler] = 0;
+    gUnknown_02024C2C[gActiveBattler] = 0;
+    gUnknown_02024C5C[gActiveBattler] = 0xFF;
 
-    ewram160ACarr2(0, gActiveBank) = 0;
-    ewram160ACarr2(1, gActiveBank) = 0;
-    ewram16100arr2(0, gActiveBank) = 0;
-    ewram16100arr2(1, gActiveBank) = 0;
-    ewram16100arr2(2, gActiveBank) = 0;
-    ewram16100arr2(3, gActiveBank) = 0;
-    ewram160E8arr2(0, gActiveBank) = 0;
-    ewram160E8arr2(1, gActiveBank) = 0;
+    ewram160ACarr2(0, gActiveBattler) = 0;
+    ewram160ACarr2(1, gActiveBattler) = 0;
+    ewram16100arr2(0, gActiveBattler) = 0;
+    ewram16100arr2(1, gActiveBattler) = 0;
+    ewram16100arr2(2, gActiveBattler) = 0;
+    ewram16100arr2(3, gActiveBattler) = 0;
+    ewram160E8arr2(0, gActiveBattler) = 0;
+    ewram160E8arr2(1, gActiveBattler) = 0;
 
-    eFlashFireArr.arr[gActiveBank] = 0;
+    eFlashFireArr.arr[gActiveBattler] = 0;
 
     gCurrentMove = 0;
 }
@@ -3819,63 +3819,63 @@ void UndoEffectsAfterFainting(void)
     u8 *ptr;
 
     for (i = 0; i < 8; i++)
-        gBattleMons[gActiveBank].statStages[i] = 6;
-    gBattleMons[gActiveBank].status2 = 0;
-    gStatuses3[gActiveBank] = 0;
+        gBattleMons[gActiveBattler].statStages[i] = 6;
+    gBattleMons[gActiveBattler].status2 = 0;
+    gStatuses3[gActiveBattler] = 0;
     for (i = 0; i < gNoOfAllBanks; i++)
     {
-        if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBank)
+        if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBattler)
             gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
-        if (gBattleMons[i].status2 & (gBitTable[gActiveBank] << 16))
-            gBattleMons[i].status2 &= ~(gBitTable[gActiveBank] << 16);
-        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && ewram16020arr(i) == gActiveBank)
+        if (gBattleMons[i].status2 & (gBitTable[gActiveBattler] << 16))
+            gBattleMons[i].status2 &= ~(gBitTable[gActiveBattler] << 16);
+        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && ewram16020arr(i) == gActiveBattler)
             gBattleMons[i].status2 &= ~STATUS2_WRAPPED;
     }
-    gActionSelectionCursor[gActiveBank] = 0;
-    gMoveSelectionCursor[gActiveBank] = 0;
-
-    MEMSET_ALT(&gDisableStructs[gActiveBank], 0, 0x1C, i, ptr);
-    gProtectStructs[gActiveBank].protected = 0;
-    gProtectStructs[gActiveBank].endured = 0;
-    gProtectStructs[gActiveBank].onlyStruggle = 0;
-    gProtectStructs[gActiveBank].helpingHand = 0;
-    gProtectStructs[gActiveBank].bounceMove = 0;
-    gProtectStructs[gActiveBank].stealMove = 0;
-    gProtectStructs[gActiveBank].flag0Unknown = 0;
-    gProtectStructs[gActiveBank].prlzImmobility = 0;
-    gProtectStructs[gActiveBank].confusionSelfDmg = 0;
-    gProtectStructs[gActiveBank].notEffective = 0;
-    gProtectStructs[gActiveBank].chargingTurn = 0;
-    gProtectStructs[gActiveBank].fleeFlag = 0;
-    gProtectStructs[gActiveBank].usedImprisionedMove = 0;
-    gProtectStructs[gActiveBank].loveImmobility = 0;
-    gProtectStructs[gActiveBank].usedDisabledMove = 0;
-    gProtectStructs[gActiveBank].usedTauntedMove = 0;
-    gProtectStructs[gActiveBank].flag2Unknown = 0;
-    gProtectStructs[gActiveBank].flinchImmobility = 0;
-    gProtectStructs[gActiveBank].notFirstStrike = 0;
-
-    gDisableStructs[gActiveBank].isFirstTurn= 2;
-    gLastUsedMove[gActiveBank] = 0;
-    gLastLandedMoves[gActiveBank] = 0;
-    gLastHitByType[gActiveBank] = 0;
-    gUnknown_02024C4C[gActiveBank] = 0;
-    gUnknown_02024C2C[gActiveBank] = 0;
-    gUnknown_02024C5C[gActiveBank] = 0xFF;
-
-    ewram160E8arr2(0, gActiveBank) = 0;
-    ewram160E8arr2(1, gActiveBank) = 0;
-    ewram160ACarr2(0, gActiveBank) = 0;
-    ewram160ACarr2(1, gActiveBank) = 0;
-    ewram16100arr2(0, gActiveBank) = 0;
-    ewram16100arr2(1, gActiveBank) = 0;
-    ewram16100arr2(2, gActiveBank) = 0;
-    ewram16100arr2(3, gActiveBank) = 0;
-
-    eFlashFireArr.arr[gActiveBank] = 0;
-
-    gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
-    gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
+    gActionSelectionCursor[gActiveBattler] = 0;
+    gMoveSelectionCursor[gActiveBattler] = 0;
+
+    MEMSET_ALT(&gDisableStructs[gActiveBattler], 0, 0x1C, i, ptr);
+    gProtectStructs[gActiveBattler].protected = 0;
+    gProtectStructs[gActiveBattler].endured = 0;
+    gProtectStructs[gActiveBattler].onlyStruggle = 0;
+    gProtectStructs[gActiveBattler].helpingHand = 0;
+    gProtectStructs[gActiveBattler].bounceMove = 0;
+    gProtectStructs[gActiveBattler].stealMove = 0;
+    gProtectStructs[gActiveBattler].flag0Unknown = 0;
+    gProtectStructs[gActiveBattler].prlzImmobility = 0;
+    gProtectStructs[gActiveBattler].confusionSelfDmg = 0;
+    gProtectStructs[gActiveBattler].notEffective = 0;
+    gProtectStructs[gActiveBattler].chargingTurn = 0;
+    gProtectStructs[gActiveBattler].fleeFlag = 0;
+    gProtectStructs[gActiveBattler].usedImprisionedMove = 0;
+    gProtectStructs[gActiveBattler].loveImmobility = 0;
+    gProtectStructs[gActiveBattler].usedDisabledMove = 0;
+    gProtectStructs[gActiveBattler].usedTauntedMove = 0;
+    gProtectStructs[gActiveBattler].flag2Unknown = 0;
+    gProtectStructs[gActiveBattler].flinchImmobility = 0;
+    gProtectStructs[gActiveBattler].notFirstStrike = 0;
+
+    gDisableStructs[gActiveBattler].isFirstTurn= 2;
+    gLastUsedMove[gActiveBattler] = 0;
+    gLastLandedMoves[gActiveBattler] = 0;
+    gLastHitByType[gActiveBattler] = 0;
+    gUnknown_02024C4C[gActiveBattler] = 0;
+    gUnknown_02024C2C[gActiveBattler] = 0;
+    gUnknown_02024C5C[gActiveBattler] = 0xFF;
+
+    ewram160E8arr2(0, gActiveBattler) = 0;
+    ewram160E8arr2(1, gActiveBattler) = 0;
+    ewram160ACarr2(0, gActiveBattler) = 0;
+    ewram160ACarr2(1, gActiveBattler) = 0;
+    ewram16100arr2(0, gActiveBattler) = 0;
+    ewram16100arr2(1, gActiveBattler) = 0;
+    ewram16100arr2(2, gActiveBattler) = 0;
+    ewram16100arr2(3, gActiveBattler) = 0;
+
+    eFlashFireArr.arr[gActiveBattler] = 0;
+
+    gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
+    gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
 }
 
 void bc_8012FAC(void)
@@ -3883,9 +3883,9 @@ void bc_8012FAC(void)
     switch (gBattleCommunication[0])
     {
     case 0:
-        gActiveBank = gBattleCommunication[1];
+        gActiveBattler = gBattleCommunication[1];
         EmitGetAttributes(0, 0, 0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattleCommunication[0]++;
         break;
     case 1:
@@ -3905,9 +3905,9 @@ static void BattlePrepIntroSlide(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBankByIdentity(0);
+        gActiveBattler = GetBankByIdentity(0);
         EmitIntroSlide(0, gBattleTerrain);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattleMainFunc = sub_8011384;
         gBattleCommunication[0] = 0;
         gBattleCommunication[1] = 0;
@@ -3921,63 +3921,63 @@ void sub_8011384(void)
 
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
         {
             if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-             && GetBankSide(gActiveBank) == 0)
+             && GetBankSide(gActiveBattler) == 0)
             {
-                MEMSET_ALT(&gBattleMons[gActiveBank], 0, 0x58, i, ptr);
+                MEMSET_ALT(&gBattleMons[gActiveBattler], 0, 0x58, i, ptr);
             }
             else
             {
                 u8 r0;
 
-                MEMSET_ALT(&gBattleMons[gActiveBank], gBattleBufferB[gActiveBank][4 + i], 0x58, i, ptr);
-                gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
-                gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
-                gBattleMons[gActiveBank].ability = GetAbilityBySpecies(gBattleMons[gActiveBank].species, gBattleMons[gActiveBank].altAbility);
-                r0 = GetBankSide(gActiveBank);
-                ewram160BC[r0] = gBattleMons[gActiveBank].hp;
+                MEMSET_ALT(&gBattleMons[gActiveBattler], gBattleBufferB[gActiveBattler][4 + i], 0x58, i, ptr);
+                gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
+                gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
+                gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].altAbility);
+                r0 = GetBankSide(gActiveBattler);
+                ewram160BC[r0] = gBattleMons[gActiveBattler].hp;
                 for (i = 0; i < 8; i++)
-                    gBattleMons[gActiveBank].statStages[i] = 6;
-                gBattleMons[gActiveBank].status2 = 0;
+                    gBattleMons[gActiveBattler].statStages[i] = 6;
+                gBattleMons[gActiveBattler].status2 = 0;
             }
 
-            if (GetBankIdentity(gActiveBank) == 0)
+            if (GetBankIdentity(gActiveBattler) == 0)
             {
                 EmitTrainerThrow(0);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
 
             if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             {
-                if (GetBankIdentity(gActiveBank) == 1)
+                if (GetBankIdentity(gActiveBattler) == 1)
                 {
                     EmitTrainerThrow(0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
-                if (GetBankSide(gActiveBank) == 1
+                if (GetBankSide(gActiveBattler) == 1
                  && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
-                    GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), 2);
+                    GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), 2);
             }
             else
             {
-                if (GetBankSide(gActiveBank) == 1
+                if (GetBankSide(gActiveBattler) == 1
                  && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
                 {
-                    GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), 2);
+                    GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), 2);
                     EmitLoadPokeSprite(0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
             }
 
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             {
-                if (GetBankIdentity(gActiveBank) == 2
-                 || GetBankIdentity(gActiveBank) == 3)
+                if (GetBankIdentity(gActiveBattler) == 2
+                 || GetBankIdentity(gActiveBattler) == 3)
                 {
                     EmitTrainerThrow(0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
             }
         }
@@ -4009,9 +4009,9 @@ void bc_801333C(void)
                     hpStatus[i].status = GetMonData(&gEnemyParty[i], MON_DATA_STATUS);
                 }
             }
-            gActiveBank = GetBankByIdentity(1);
+            gActiveBattler = GetBankByIdentity(1);
             EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
 
             for (i = 0; i < 6; i++)
             {
@@ -4027,9 +4027,9 @@ void bc_801333C(void)
                     hpStatus[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
                 }
             }
-            gActiveBank = GetBankByIdentity(0);
+            gActiveBattler = GetBankByIdentity(0);
             EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
 
             gBattleMainFunc = bc_battle_begin_message;
         }
@@ -4062,8 +4062,8 @@ void bc_battle_begin_message(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBankByIdentity(1);
-        PrepareStringBattle(0, gActiveBank);
+        gActiveBattler = GetBankByIdentity(1);
+        PrepareStringBattle(0, gActiveBattler);
         gBattleMainFunc = sub_8011800;
     }
 }
@@ -4090,18 +4090,18 @@ void sub_8011834(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
         {
-            if (GetBankIdentity(gActiveBank) == 1)
+            if (GetBankIdentity(gActiveBattler) == 1)
             {
                 EmitTrainerBallThrow(0);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             if ((gBattleTypeFlags & BATTLE_TYPE_MULTI)
-             && GetBankIdentity(gActiveBank) == 3)
+             && GetBankIdentity(gActiveBattler) == 3)
             {
                 EmitTrainerBallThrow(0);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
         }
         gBattleMainFunc = bc_801362C;
@@ -4112,11 +4112,11 @@ void bc_801362C(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
         {
-            if (GetBankSide(gActiveBank) == 1
+            if (GetBankSide(gActiveBattler) == 1
              && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
-                GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), 2);
+                GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), 2);
         }
         gBattleMainFunc = sub_8011970;
     }
@@ -4142,18 +4142,18 @@ void sub_80119B4(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
         {
-            if (GetBankIdentity(gActiveBank) == 0)
+            if (GetBankIdentity(gActiveBattler) == 0)
             {
                 EmitTrainerBallThrow(0);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             if ((gBattleTypeFlags & BATTLE_TYPE_MULTI)
-             && GetBankIdentity(gActiveBank) == 2)
+             && GetBankIdentity(gActiveBattler) == 2)
             {
                 EmitTrainerBallThrow(0);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
         }
         ewram16058 = 0;
@@ -4167,12 +4167,12 @@ void unref_sub_8011A68(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
         {
-            if (GetBankSide(gActiveBank) == 0)
+            if (GetBankSide(gActiveBattler) == 0)
             {
-                EmitSendOutPoke(0, gBattlePartyID[gActiveBank], 0);
-                MarkBufferBankForExecution(gActiveBank);
+                EmitSendOutPoke(0, gBattlePartyID[gActiveBattler], 0);
+                MarkBufferBankForExecution(gActiveBattler);
             }
         }
         ewram16058 = 0;
@@ -4337,18 +4337,18 @@ u8 CanRunFromBattle(void)
     u8 r6;
     s32 i;
 
-    if (gBattleMons[gActiveBank].item == ITEM_ENIGMA_BERRY)
-        r2 = gEnigmaBerries[gActiveBank].holdEffect;
+    if (gBattleMons[gActiveBattler].item == ITEM_ENIGMA_BERRY)
+        r2 = gEnigmaBerries[gActiveBattler].holdEffect;
     else
-        r2 = ItemId_GetHoldEffect(gBattleMons[gActiveBank].item);
-    gStringBank = gActiveBank;
+        r2 = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
+    gStringBank = gActiveBattler;
     if (r2 == HOLD_EFFECT_CAN_ALWAYS_RUN)
         return 0;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         return 0;
-    if (gBattleMons[gActiveBank].ability == ABILITY_RUN_AWAY)
+    if (gBattleMons[gActiveBattler].ability == ABILITY_RUN_AWAY)
         return 0;
-    r6 = GetBankSide(gActiveBank);
+    r6 = GetBankSide(gActiveBattler);
     for (i = 0; i < gNoOfAllBanks; i++)
     {
         if (r6 != GetBankSide(i)
@@ -4360,9 +4360,9 @@ u8 CanRunFromBattle(void)
             return 2;
         }
         if (r6 != GetBankSide(i)
-         && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE
-         && gBattleMons[gActiveBank].type1 != 2
-         && gBattleMons[gActiveBank].type2 != 2
+         && gBattleMons[gActiveBattler].ability != ABILITY_LEVITATE
+         && gBattleMons[gActiveBattler].type1 != 2
+         && gBattleMons[gActiveBattler].type2 != 2
          && gBattleMons[i].ability == ABILITY_ARENA_TRAP)
         {
             ewram16003 = i;
@@ -4371,15 +4371,15 @@ u8 CanRunFromBattle(void)
             return 2;
         }
     }
-    i = AbilityBattleEffects(15, gActiveBank, ABILITY_MAGNET_PULL, 0, 0);
-    if (i != 0 && (gBattleMons[gActiveBank].type1 == 8 || gBattleMons[gActiveBank].type2 == 8))
+    i = AbilityBattleEffects(15, gActiveBattler, ABILITY_MAGNET_PULL, 0, 0);
+    if (i != 0 && (gBattleMons[gActiveBattler].type1 == 8 || gBattleMons[gActiveBattler].type2 == 8))
     {
         ewram16003 = i - 1;
         gLastUsedAbility = gBattleMons[i - 1].ability;
         gBattleCommunication[5] = 2;
         return 2;
     }
-    if ((gBattleMons[gActiveBank].status2 & (STATUS2_ESCAPE_PREVENTION | STATUS2_WRAPPED)) || (gStatuses3[gActiveBank] & STATUS3_ROOTED))
+    if ((gBattleMons[gActiveBattler].status2 & (STATUS2_ESCAPE_PREVENTION | STATUS2_WRAPPED)) || (gStatuses3[gActiveBattler] & STATUS3_ROOTED))
     {
         gBattleCommunication[5] = 0;
         return 1;
@@ -4428,41 +4428,41 @@ void sub_8012324(void)
     gBattleCommunication[4] = 0;
     // inverted loop
     //_0801234C
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
     {
-        r5 = GetBankIdentity(gActiveBank);
-        switch (gBattleCommunication[gActiveBank])
+        r5 = GetBankIdentity(gActiveBattler);
+        switch (gBattleCommunication[gActiveBattler])
         {
         case 0:
-            ewram16068arr(gActiveBank) = 6;
+            ewram16068arr(gActiveBattler) = 6;
             if (!(gBattleTypeFlags & 0x40)
              && (r5 & 2)
              && !(ewram160A6 & gBitTable[GetBankByIdentity(r5 ^ 2)])
              && gBattleCommunication[GetBankByIdentity(r5)] != 4)
                 break;
             //_080123F8
-            if (ewram160A6 & gBitTable[gActiveBank])
+            if (ewram160A6 & gBitTable[gActiveBattler])
             {
-                gActionForBanks[gActiveBank] = 13;
+                gActionForBanks[gActiveBattler] = 13;
                 if (!(gBattleTypeFlags & 0x40))
-                    gBattleCommunication[gActiveBank] = 4;
+                    gBattleCommunication[gActiveBattler] = 4;
                 //_08012454
                 else
-                    gBattleCommunication[gActiveBank] = 3;
+                    gBattleCommunication[gActiveBattler] = 3;
                 break;
             }
             //_08012468
-            if ((gBattleMons[gActiveBank].status2 & 0x1000)
-             || (gBattleMons[gActiveBank].status2 & 0x10000000))
+            if ((gBattleMons[gActiveBattler].status2 & 0x1000)
+             || (gBattleMons[gActiveBattler].status2 & 0x10000000))
             {
-                gActionForBanks[gActiveBank] = 0;
-                gBattleCommunication[gActiveBank] = 3;
+                gActionForBanks[gActiveBattler] = 0;
+                gBattleCommunication[gActiveBattler] = 3;
             }
             else
             {
                 Emitcmd18(0, gActionForBanks[0], gBattleBufferB[0][1] | (gBattleBufferB[0][2] << 8));
-                MarkBufferBankForExecution(gActiveBank);
-                gBattleCommunication[gActiveBank]++;
+                MarkBufferBankForExecution(gActiveBattler);
+                gBattleCommunication[gActiveBattler]++;
             }
             break;
         case 1:
@@ -4483,16 +4483,16 @@ void sub_8012324(void)
     ldr r0, _08012340 @ =gBattleCommunication\n\
     movs r1, 0\n\
     strb r1, [r0, 0x4]\n\
-    ldr r0, _08012344 @ =gActiveBank\n\
+    ldr r0, _08012344 @ =gActiveBattler\n\
     strb r1, [r0]\n\
     ldr r0, _08012348 @ =gNoOfAllBanks\n\
     bl _08012F74\n\
     .align 2, 0\n\
 _08012340: .4byte gBattleCommunication\n\
-_08012344: .4byte gActiveBank\n\
+_08012344: .4byte gActiveBattler\n\
 _08012348: .4byte gNoOfAllBanks\n\
 _0801234C:\n\
-    ldr r4, _08012374 @ =gActiveBank\n\
+    ldr r4, _08012374 @ =gActiveBattler\n\
     ldrb r0, [r4]\n\
     bl GetBankIdentity\n\
     lsls r0, 24\n\
@@ -4511,7 +4511,7 @@ _08012368:\n\
     ldr r0, [r0]\n\
     mov pc, r0\n\
     .align 2, 0\n\
-_08012374: .4byte gActiveBank\n\
+_08012374: .4byte gActiveBattler\n\
 _08012378: .4byte gBattleCommunication\n\
 _0801237C: .4byte _08012380\n\
     .align 2, 0\n\
@@ -4525,7 +4525,7 @@ _08012380:\n\
     .4byte _08012F38\n\
 _0801239C:\n\
     ldr r4, _08012434 @ =gSharedMem\n\
-    ldr r0, _08012438 @ =gActiveBank\n\
+    ldr r0, _08012438 @ =gActiveBattler\n\
     ldrb r0, [r0]\n\
     ldr r1, _0801243C @ =0x00016068\n\
     adds r0, r1\n\
@@ -4573,7 +4573,7 @@ _080123F8:\n\
     adds r0, r3\n\
     ldrb r3, [r0]\n\
     ldr r1, _08012448 @ =gBitTable\n\
-    ldr r4, _08012438 @ =gActiveBank\n\
+    ldr r4, _08012438 @ =gActiveBattler\n\
     ldrb r2, [r4]\n\
     lsls r0, r2, 2\n\
     adds r0, r1\n\
@@ -4599,7 +4599,7 @@ _080123F8:\n\
     bl _08012F66\n\
     .align 2, 0\n\
 _08012434: .4byte gSharedMem\n\
-_08012438: .4byte gActiveBank\n\
+_08012438: .4byte gActiveBattler\n\
 _0801243C: .4byte 0x00016068\n\
 _08012440: .4byte gBattleTypeFlags\n\
 _08012444: .4byte 0x000160a6\n\
@@ -4663,7 +4663,7 @@ _080124C4: .4byte gBattleBufferB\n\
 _080124C8:\n\
     ldr r4, _08012520 @ =gBattleExecBuffer\n\
     ldr r1, _08012524 @ =gBitTable\n\
-    ldr r3, _08012528 @ =gActiveBank\n\
+    ldr r3, _08012528 @ =gActiveBattler\n\
     ldrb r5, [r3]\n\
     lsls r0, r5, 2\n\
     adds r0, r1\n\
@@ -4708,7 +4708,7 @@ _08012514:\n\
     .align 2, 0\n\
 _08012520: .4byte gBattleExecBuffer\n\
 _08012524: .4byte gBitTable\n\
-_08012528: .4byte gActiveBank\n\
+_08012528: .4byte gActiveBattler\n\
 _0801252C: .4byte gActionForBanks\n\
 _08012530: .4byte gBattleBufferB\n\
 _08012534: .4byte _08012538\n\
@@ -4733,7 +4733,7 @@ _0801256C:\n\
     cmp r0, 0\n\
     beq _080125D0\n\
     ldr r0, _080125B4 @ =gBattleCommunication\n\
-    ldr r2, _080125B8 @ =gActiveBank\n\
+    ldr r2, _080125B8 @ =gActiveBattler\n\
     ldrb r1, [r2]\n\
     adds r1, r0\n\
     movs r4, 0\n\
@@ -4764,7 +4764,7 @@ _0801256C:\n\
     bl _08012F90\n\
     .align 2, 0\n\
 _080125B4: .4byte gBattleCommunication\n\
-_080125B8: .4byte gActiveBank\n\
+_080125B8: .4byte gActiveBattler\n\
 _080125BC: .4byte gSharedMem\n\
 _080125C0: .4byte 0x00016060\n\
 _080125C4: .4byte 0x00016094\n\
@@ -4772,7 +4772,7 @@ _080125C8: .4byte 0x00016010\n\
 _080125CC: .4byte gBattleBufferB\n\
 _080125D0:\n\
     ldr r1, _080125FC @ =gDisableStructs\n\
-    ldr r5, _08012600 @ =gActiveBank\n\
+    ldr r5, _08012600 @ =gActiveBattler\n\
     ldrb r4, [r5]\n\
     lsls r0, r4, 3\n\
     subs r0, r4\n\
@@ -4793,7 +4793,7 @@ _080125D0:\n\
     bl _08012F90\n\
     .align 2, 0\n\
 _080125FC: .4byte gDisableStructs\n\
-_08012600: .4byte gActiveBank\n\
+_08012600: .4byte gActiveBattler\n\
 _08012604: .4byte gChosenMovesByBanks\n\
 _08012608: .4byte gBattleCommunication\n\
 _0801260C:\n\
@@ -4902,7 +4902,7 @@ _080126D8: .4byte gUnknown_02024C1C\n\
 _080126DC: .4byte BattleScript_ActionSelectionItemsCantBeUsed\n\
 _080126E0:\n\
     ldr r3, _08012738 @ =gSharedMem\n\
-    ldr r5, _0801273C @ =gActiveBank\n\
+    ldr r5, _0801273C @ =gActiveBattler\n\
     ldrb r0, [r5]\n\
     ldr r4, _08012740 @ =0x00016064\n\
     adds r1, r0, r4\n\
@@ -4947,7 +4947,7 @@ _08012722:\n\
     b _0801286C\n\
     .align 2, 0\n\
 _08012738: .4byte gSharedMem\n\
-_0801273C: .4byte gActiveBank\n\
+_0801273C: .4byte gActiveBattler\n\
 _08012740: .4byte 0x00016064\n\
 _08012744: .4byte gBattlePartyID\n\
 _08012748: .4byte gBattleMons\n\
@@ -4994,7 +4994,7 @@ _08012758:\n\
     cmp r0, 0x1A\n\
     bne _080127E0\n\
 _080127A8:\n\
-    ldr r5, _08012808 @ =gActiveBank\n\
+    ldr r5, _08012808 @ =gActiveBattler\n\
     ldrb r1, [r5]\n\
     movs r0, 0\n\
     str r0, [sp]\n\
@@ -5030,7 +5030,7 @@ _080127E0:\n\
     lsrs r1, 24\n\
     ldr r0, _08012810 @ =gLastUsedAbility\n\
     ldrb r3, [r0]\n\
-    ldr r0, _08012808 @ =gActiveBank\n\
+    ldr r0, _08012808 @ =gActiveBattler\n\
     ldrb r2, [r0]\n\
     lsls r0, r2, 1\n\
     adds r0, r2\n\
@@ -5042,12 +5042,12 @@ _080127E0:\n\
     bl EmitChoosePokemon\n\
     b _0801289E\n\
     .align 2, 0\n\
-_08012808: .4byte gActiveBank\n\
+_08012808: .4byte gActiveBattler\n\
 _0801280C: .4byte gBattleMons\n\
 _08012810: .4byte gLastUsedAbility\n\
 _08012814: .4byte gSharedMem + 0x1606C\n\
 _08012818:\n\
-    ldr r0, _08012830 @ =gActiveBank\n\
+    ldr r0, _08012830 @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     mov r8, r0\n\
     cmp r1, 0x2\n\
@@ -5060,7 +5060,7 @@ _08012818:\n\
     ldr r4, _0801283C @ =0x00016068\n\
     b _08012854\n\
     .align 2, 0\n\
-_08012830: .4byte gActiveBank\n\
+_08012830: .4byte gActiveBattler\n\
 _08012834: .4byte gActionForBanks\n\
 _08012838: .4byte gSharedMem\n\
 _0801283C: .4byte 0x00016068\n\
@@ -5098,7 +5098,7 @@ _08012878: .4byte gSharedMem\n\
 _0801287C: .4byte 0x00016069\n\
 _08012880: .4byte 0x0001606c\n\
 _08012884:\n\
-    ldr r0, _080128A8 @ =gActiveBank\n\
+    ldr r0, _080128A8 @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     lsls r0, r1, 1\n\
     adds r0, r1\n\
@@ -5111,12 +5111,12 @@ _08012884:\n\
     movs r3, 0\n\
     bl EmitChoosePokemon\n\
 _0801289E:\n\
-    ldr r0, _080128A8 @ =gActiveBank\n\
+    ldr r0, _080128A8 @ =gActiveBattler\n\
     ldrb r0, [r0]\n\
     bl MarkBufferBankForExecution\n\
     b _08012968\n\
     .align 2, 0\n\
-_080128A8: .4byte gActiveBank\n\
+_080128A8: .4byte gActiveBattler\n\
 _080128AC: .4byte gSharedMem + 0x1606C\n\
 _080128B0:\n\
     bl PlayerPartyAndPokemonStorageFull\n\
@@ -5124,7 +5124,7 @@ _080128B0:\n\
     cmp r0, 0\n\
     beq _08012968\n\
     ldr r1, _080128EC @ =gUnknown_02024C1C\n\
-    ldr r2, _080128F0 @ =gActiveBank\n\
+    ldr r2, _080128F0 @ =gActiveBattler\n\
     ldrb r0, [r2]\n\
     lsls r0, 2\n\
     adds r0, r1\n\
@@ -5150,14 +5150,14 @@ _080128B0:\n\
     b _08012F90\n\
     .align 2, 0\n\
 _080128EC: .4byte gUnknown_02024C1C\n\
-_080128F0: .4byte gActiveBank\n\
+_080128F0: .4byte gActiveBattler\n\
 _080128F4: .4byte BattleScript_PrintFullBox\n\
 _080128F8: .4byte gBattleCommunication\n\
 _080128FC: .4byte gSharedMem\n\
 _08012900: .4byte 0x00016060\n\
 _08012904: .4byte 0x00016094\n\
 _08012908:\n\
-    ldr r4, _08012924 @ =gActiveBank\n\
+    ldr r4, _08012924 @ =gActiveBattler\n\
     ldrb r0, [r4]\n\
     lsls r1, r0, 1\n\
     adds r1, r0\n\
@@ -5169,7 +5169,7 @@ _08012908:\n\
     bl MarkBufferBankForExecution\n\
     b _08012968\n\
     .align 2, 0\n\
-_08012924: .4byte gActiveBank\n\
+_08012924: .4byte gActiveBattler\n\
 _08012928: .4byte gSharedMem + 0x1606C\n\
 _0801292C:\n\
     ldr r4, _08012964 @ =gBattleCommunication\n\
@@ -5206,7 +5206,7 @@ _08012968:\n\
     cmp r0, 0x8\n\
     bne _080129A8\n\
     ldr r0, _08012998 @ =gBattleBufferB\n\
-    ldr r4, _0801299C @ =gActiveBank\n\
+    ldr r4, _0801299C @ =gActiveBattler\n\
     ldrb r1, [r4]\n\
     lsls r1, 9\n\
     adds r0, 0x1\n\
@@ -5223,7 +5223,7 @@ _08012968:\n\
     .align 2, 0\n\
 _08012994: .4byte gBattleTypeFlags\n\
 _08012998: .4byte gBattleBufferB\n\
-_0801299C: .4byte gActiveBank\n\
+_0801299C: .4byte gActiveBattler\n\
 _080129A0: .4byte BattleScript_PrintCantRunFromTrainer\n\
 _080129A4: .4byte gBattleCommunication\n\
 _080129A8:\n\
@@ -5232,7 +5232,7 @@ _080129A8:\n\
     cmp r0, 0\n\
     beq _08012A14\n\
     ldr r0, _080129F4 @ =gBattleBufferB\n\
-    ldr r3, _080129F8 @ =gActiveBank\n\
+    ldr r3, _080129F8 @ =gActiveBattler\n\
     ldrb r2, [r3]\n\
     lsls r1, r2, 9\n\
     adds r0, 0x1\n\
@@ -5266,7 +5266,7 @@ _080129CC:\n\
     b _08012F90\n\
     .align 2, 0\n\
 _080129F4: .4byte gBattleBufferB\n\
-_080129F8: .4byte gActiveBank\n\
+_080129F8: .4byte gActiveBattler\n\
 _080129FC: .4byte gUnknown_02024C1C\n\
 _08012A00: .4byte BattleScript_PrintCantEscapeFromBattle\n\
 _08012A04: .4byte gBattleCommunication\n\
@@ -5275,17 +5275,17 @@ _08012A0C: .4byte 0x00016060\n\
 _08012A10: .4byte 0x00016094\n\
 _08012A14:\n\
     ldr r2, _08012A20 @ =gBattleCommunication\n\
-    ldr r0, _08012A24 @ =gActiveBank\n\
+    ldr r0, _08012A24 @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     adds r1, r2\n\
     b _08012E3E\n\
     .align 2, 0\n\
 _08012A20: .4byte gBattleCommunication\n\
-_08012A24: .4byte gActiveBank\n\
+_08012A24: .4byte gActiveBattler\n\
 _08012A28:\n\
     ldr r4, _08012A6C @ =gBattleExecBuffer\n\
     ldr r1, _08012A70 @ =gBitTable\n\
-    ldr r3, _08012A74 @ =gActiveBank\n\
+    ldr r3, _08012A74 @ =gActiveBattler\n\
     ldrb r5, [r3]\n\
     lsls r0, r5, 2\n\
     adds r0, r1\n\
@@ -5322,7 +5322,7 @@ _08012A62:\n\
     .align 2, 0\n\
 _08012A6C: .4byte gBattleExecBuffer\n\
 _08012A70: .4byte gBitTable\n\
-_08012A74: .4byte gActiveBank\n\
+_08012A74: .4byte gActiveBattler\n\
 _08012A78: .4byte gActionForBanks\n\
 _08012A7C: .4byte _08012A80\n\
     .align 2, 0\n\
@@ -5462,7 +5462,7 @@ _08012BA8: .4byte 0x00016010\n\
 _08012BAC: .4byte gBattleCommunication\n\
 _08012BB0:\n\
     ldr r2, _08012BD8 @ =gBattleBufferB\n\
-    ldr r5, _08012BDC @ =gActiveBank\n\
+    ldr r5, _08012BDC @ =gActiveBattler\n\
     ldrb r4, [r5]\n\
     lsls r1, r4, 9\n\
     adds r0, r2, 0x1\n\
@@ -5484,12 +5484,12 @@ _08012BCE:\n\
     b _08012E3C\n\
     .align 2, 0\n\
 _08012BD8: .4byte gBattleBufferB\n\
-_08012BDC: .4byte gActiveBank\n\
+_08012BDC: .4byte gActiveBattler\n\
 _08012BE0: .4byte gLastUsedItem\n\
 _08012BE4: .4byte gBattleCommunication\n\
 _08012BE8:\n\
     ldr r4, _08012C04 @ =gBattleBufferB\n\
-    ldr r7, _08012C08 @ =gActiveBank\n\
+    ldr r7, _08012C08 @ =gActiveBattler\n\
     ldrb r2, [r7]\n\
     lsls r0, r2, 9\n\
     adds r1, r4, 0x1\n\
@@ -5505,7 +5505,7 @@ _08012BFE:\n\
     b _08012F66\n\
     .align 2, 0\n\
 _08012C04: .4byte gBattleBufferB\n\
-_08012C08: .4byte gActiveBank\n\
+_08012C08: .4byte gActiveBattler\n\
 _08012C0C: .4byte gBattleCommunication\n\
 _08012C10:\n\
     ldr r0, _08012CC4 @ =gSharedMem\n\
@@ -5615,35 +5615,35 @@ _08012CE0:\n\
     orrs r0, r1\n\
     str r0, [r2]\n\
     ldr r2, _08012CFC @ =gBattleCommunication\n\
-    ldr r0, _08012D00 @ =gActiveBank\n\
+    ldr r0, _08012D00 @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     adds r1, r2\n\
     b _08012E3E\n\
     .align 2, 0\n\
 _08012CF8: .4byte gHitMarker\n\
 _08012CFC: .4byte gBattleCommunication\n\
-_08012D00: .4byte gActiveBank\n\
+_08012D00: .4byte gActiveBattler\n\
 _08012D04:\n\
     ldr r2, _08012D10 @ =gBattleCommunication\n\
-    ldr r0, _08012D14 @ =gActiveBank\n\
+    ldr r0, _08012D14 @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     adds r1, r2\n\
     b _08012E3E\n\
     .align 2, 0\n\
 _08012D10: .4byte gBattleCommunication\n\
-_08012D14: .4byte gActiveBank\n\
+_08012D14: .4byte gActiveBattler\n\
 _08012D18:\n\
     ldr r2, _08012D24 @ =gBattleCommunication\n\
-    ldr r0, _08012D28 @ =gActiveBank\n\
+    ldr r0, _08012D28 @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     adds r1, r2\n\
     b _08012E3E\n\
     .align 2, 0\n\
 _08012D24: .4byte gBattleCommunication\n\
-_08012D28: .4byte gActiveBank\n\
+_08012D28: .4byte gActiveBattler\n\
 _08012D2C:\n\
     ldr r2, _08012D50 @ =gBattleBufferB\n\
-    ldr r0, _08012D54 @ =gActiveBank\n\
+    ldr r0, _08012D54 @ =gActiveBattler\n\
     ldrb r4, [r0]\n\
     lsls r1, r4, 9\n\
     adds r0, r2, 0x1\n\
@@ -5663,17 +5663,17 @@ _08012D4A:\n\
     b _08012E3E\n\
     .align 2, 0\n\
 _08012D50: .4byte gBattleBufferB\n\
-_08012D54: .4byte gActiveBank\n\
+_08012D54: .4byte gActiveBattler\n\
 _08012D58: .4byte gBattleCommunication\n\
 _08012D5C:\n\
     ldr r2, _08012D68 @ =gBattleCommunication\n\
-    ldr r0, _08012D6C @ =gActiveBank\n\
+    ldr r0, _08012D6C @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     adds r1, r2\n\
     b _08012E3E\n\
     .align 2, 0\n\
 _08012D68: .4byte gBattleCommunication\n\
-_08012D6C: .4byte gActiveBank\n\
+_08012D6C: .4byte gActiveBattler\n\
 _08012D70:\n\
     ldr r2, _08012D88 @ =gHitMarker\n\
     ldr r0, [r2]\n\
@@ -5682,27 +5682,27 @@ _08012D70:\n\
     orrs r0, r1\n\
     str r0, [r2]\n\
     ldr r2, _08012D8C @ =gBattleCommunication\n\
-    ldr r0, _08012D90 @ =gActiveBank\n\
+    ldr r0, _08012D90 @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     adds r1, r2\n\
     b _08012E3E\n\
     .align 2, 0\n\
 _08012D88: .4byte gHitMarker\n\
 _08012D8C: .4byte gBattleCommunication\n\
-_08012D90: .4byte gActiveBank\n\
+_08012D90: .4byte gActiveBattler\n\
 _08012D94:\n\
     ldr r2, _08012DA0 @ =gBattleCommunication\n\
-    ldr r0, _08012DA4 @ =gActiveBank\n\
+    ldr r0, _08012DA4 @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     adds r1, r2\n\
     b _08012E3E\n\
     .align 2, 0\n\
 _08012DA0: .4byte gBattleCommunication\n\
-_08012DA4: .4byte gActiveBank\n\
+_08012DA4: .4byte gActiveBattler\n\
 _08012DA8:\n\
     ldr r3, _08012E10 @ =gBattleExecBuffer\n\
     ldr r4, _08012E14 @ =gBitTable\n\
-    ldr r0, _08012E18 @ =gActiveBank\n\
+    ldr r0, _08012E18 @ =gActiveBattler\n\
     ldrb r0, [r0]\n\
     lsls r0, 2\n\
     adds r0, r4\n\
@@ -5755,7 +5755,7 @@ _08012E06:\n\
     .align 2, 0\n\
 _08012E10: .4byte gBattleExecBuffer\n\
 _08012E14: .4byte gBitTable\n\
-_08012E18: .4byte gActiveBank\n\
+_08012E18: .4byte gActiveBattler\n\
 _08012E1C: .4byte gBattleTypeFlags\n\
 _08012E20: .4byte gSharedMem\n\
 _08012E24: .4byte 0x000160a6\n\
@@ -5764,7 +5764,7 @@ _08012E28:\n\
     movs r1, 0x1\n\
     bl EmitLinkStandbyMsg\n\
 _08012E30:\n\
-    ldr r4, _08012E48 @ =gActiveBank\n\
+    ldr r4, _08012E48 @ =gActiveBattler\n\
 _08012E32:\n\
     ldrb r0, [r4]\n\
     bl MarkBufferBankForExecution\n\
@@ -5778,12 +5778,12 @@ _08012E3E:\n\
     strb r0, [r1]\n\
     b _08012F66\n\
     .align 2, 0\n\
-_08012E48: .4byte gActiveBank\n\
+_08012E48: .4byte gActiveBattler\n\
 _08012E4C: .4byte gBattleCommunication\n\
 _08012E50:\n\
     ldr r3, _08012E84 @ =gBattleExecBuffer\n\
     ldr r1, _08012E88 @ =gBitTable\n\
-    ldr r0, _08012E8C @ =gActiveBank\n\
+    ldr r0, _08012E8C @ =gActiveBattler\n\
     ldrb r0, [r0]\n\
     lsls r0, 2\n\
     adds r0, r1\n\
@@ -5809,11 +5809,11 @@ _08012E50:\n\
     .align 2, 0\n\
 _08012E84: .4byte gBattleExecBuffer\n\
 _08012E88: .4byte gBitTable\n\
-_08012E8C: .4byte gActiveBank\n\
+_08012E8C: .4byte gActiveBattler\n\
 _08012E90: .4byte gBattleCommunication\n\
 _08012E94:\n\
     ldr r2, _08012EB8 @ =gSharedMem\n\
-    ldr r5, _08012EBC @ =gActiveBank\n\
+    ldr r5, _08012EBC @ =gActiveBattler\n\
     ldrb r1, [r5]\n\
     ldr r3, _08012EC0 @ =0x00016060\n\
     adds r0, r1, r3\n\
@@ -5831,7 +5831,7 @@ _08012E94:\n\
     b _08012F66\n\
     .align 2, 0\n\
 _08012EB8: .4byte gSharedMem\n\
-_08012EBC: .4byte gActiveBank\n\
+_08012EBC: .4byte gActiveBattler\n\
 _08012EC0: .4byte 0x00016060\n\
 _08012EC4: .4byte gBattleCommunication\n\
 _08012EC8: .4byte 0x00016094\n\
@@ -5887,7 +5887,7 @@ _08012F34: .4byte gBattleScriptingCommandsTable\n\
 _08012F38:\n\
     ldr r3, _08012FA0 @ =gBattleExecBuffer\n\
     ldr r1, _08012FA4 @ =gBitTable\n\
-    ldr r0, _08012FA8 @ =gActiveBank\n\
+    ldr r0, _08012FA8 @ =gActiveBattler\n\
     ldrb r4, [r0]\n\
     lsls r0, r4, 2\n\
     adds r0, r1\n\
@@ -5910,7 +5910,7 @@ _08012F60:\n\
     adds r0, r4, r0\n\
     strb r3, [r0]\n\
 _08012F66:\n\
-    ldr r0, _08012FA8 @ =gActiveBank\n\
+    ldr r0, _08012FA8 @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     adds r1, 0x1\n\
     strb r1, [r0]\n\
@@ -5944,7 +5944,7 @@ _08012F90:\n\
     .align 2, 0\n\
 _08012FA0: .4byte gBattleExecBuffer\n\
 _08012FA4: .4byte gBitTable\n\
-_08012FA8: .4byte gActiveBank\n\
+_08012FA8: .4byte gActiveBattler\n\
 _08012FAC: .4byte gBattleCommunication\n\
 _08012FB0: .4byte gNoOfAllBanks\n\
 _08012FB4: .4byte gBattleMainFunc\n\
@@ -6117,10 +6117,10 @@ void SetActionsAndBanksTurnOrder(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
     {
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
         {
-            gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
-            gBanksByTurnOrder[var] = gActiveBank;
+            gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
+            gBanksByTurnOrder[var] = gActiveBattler;
             var++;
         }
     }
@@ -6128,9 +6128,9 @@ void SetActionsAndBanksTurnOrder(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
-            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
             {
-                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                if (gActionForBanks[gActiveBattler] == ACTION_RUN)
                 {
                     var = 5;
                     break;
@@ -6141,19 +6141,19 @@ void SetActionsAndBanksTurnOrder(void)
         {
             if (gActionForBanks[0] == ACTION_RUN)
             {
-                gActiveBank = 0;
+                gActiveBattler = 0;
                 var = 5;
             }
         }
 
         if (var == 5)
         {
-            gActionsByTurnOrder[0] = gActionForBanks[gActiveBank];
-            gBanksByTurnOrder[0] = gActiveBank;
+            gActionsByTurnOrder[0] = gActionForBanks[gActiveBattler];
+            gBanksByTurnOrder[0] = gActiveBattler;
             var = 1;
             for (i = 0; i < gNoOfAllBanks; i++)
             {
-                if (i != gActiveBank)
+                if (i != gActiveBattler)
                 {
                     gActionsByTurnOrder[var] = gActionForBanks[i];
                     gBanksByTurnOrder[var] = i;
@@ -6166,21 +6166,21 @@ void SetActionsAndBanksTurnOrder(void)
         }
         else
         {
-            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
             {
-                if (gActionForBanks[gActiveBank] == ACTION_USE_ITEM || gActionForBanks[gActiveBank] == ACTION_SWITCH)
+                if (gActionForBanks[gActiveBattler] == ACTION_USE_ITEM || gActionForBanks[gActiveBattler] == ACTION_SWITCH)
                 {
-                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
-                    gBanksByTurnOrder[var] = gActiveBank;
+                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
+                    gBanksByTurnOrder[var] = gActiveBattler;
                     var++;
                 }
             }
-            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
             {
-                if (gActionForBanks[gActiveBank] != ACTION_USE_ITEM && gActionForBanks[gActiveBank] != ACTION_SWITCH)
+                if (gActionForBanks[gActiveBattler] != ACTION_USE_ITEM && gActionForBanks[gActiveBattler] != ACTION_SWITCH)
                 {
-                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
-                    gBanksByTurnOrder[var] = gActiveBank;
+                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
+                    gBanksByTurnOrder[var] = gActiveBattler;
                     var++;
                 }
             }
@@ -6212,32 +6212,32 @@ static void TurnValuesCleanUp(bool8 var0)
     s32 i;
     u8 *dataPtr;
 
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
     {
         if (var0)
         {
-            gProtectStructs[gActiveBank].protected = 0;
-            gProtectStructs[gActiveBank].endured = 0;
+            gProtectStructs[gActiveBattler].protected = 0;
+            gProtectStructs[gActiveBattler].endured = 0;
         }
         else
         {
-            dataPtr = (u8*)(&gProtectStructs[gActiveBank]);
+            dataPtr = (u8*)(&gProtectStructs[gActiveBattler]);
             for (i = 0; i < sizeof(struct ProtectStruct); i++)
                 dataPtr[i] = 0;
 
-            if (gDisableStructs[gActiveBank].isFirstTurn)
-                gDisableStructs[gActiveBank].isFirstTurn--;
+            if (gDisableStructs[gActiveBattler].isFirstTurn)
+                gDisableStructs[gActiveBattler].isFirstTurn--;
 
-            if (gDisableStructs[gActiveBank].rechargeCounter)
+            if (gDisableStructs[gActiveBattler].rechargeCounter)
             {
-                gDisableStructs[gActiveBank].rechargeCounter--;
-                if (gDisableStructs[gActiveBank].rechargeCounter == 0)
-                    gBattleMons[gActiveBank].status2 &= ~(STATUS2_RECHARGE);
+                gDisableStructs[gActiveBattler].rechargeCounter--;
+                if (gDisableStructs[gActiveBattler].rechargeCounter == 0)
+                    gBattleMons[gActiveBattler].status2 &= ~(STATUS2_RECHARGE);
             }
         }
 
-        if (gDisableStructs[gActiveBank].substituteHP == 0)
-                gBattleMons[gActiveBank].status2 &= ~(STATUS2_SUBSTITUTE);
+        if (gDisableStructs[gActiveBattler].substituteHP == 0)
+                gBattleMons[gActiveBattler].status2 &= ~(STATUS2_SUBSTITUTE);
     }
 
     gSideTimers[0].followmeTimer = 0;
@@ -6246,10 +6246,10 @@ static void TurnValuesCleanUp(bool8 var0)
 
 void SpecialStatusesClear(void)
 {
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
     {
         s32 i;
-        u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBank]);
+        u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBattler]);
 
         for (i = 0; i < sizeof(struct SpecialStatus); i++)
             dataPtr[i] = 0;
@@ -6262,12 +6262,12 @@ void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
     {
         while (eFocusPunchBank < gNoOfAllBanks)
         {
-            gActiveBank = gBankAttacker = eFocusPunchBank;
+            gActiveBattler = gBankAttacker = eFocusPunchBank;
             eFocusPunchBank++;
-            if (gChosenMovesByBanks[gActiveBank] == MOVE_FOCUS_PUNCH
-                && !(gBattleMons[gActiveBank].status1 & STATUS_SLEEP)
+            if (gChosenMovesByBanks[gActiveBattler] == MOVE_FOCUS_PUNCH
+                && !(gBattleMons[gActiveBattler].status1 & STATUS_SLEEP)
                 && !(gDisableStructs[gBankAttacker].truantCounter)
-                && !(gProtectStructs[gActiveBank].onlyStruggle))
+                && !(gProtectStructs[gActiveBattler].onlyStruggle))
             {
                 BattleScriptExecute(BattleScript_FocusPunchSetUp);
                 return;
@@ -6425,19 +6425,19 @@ void HandleEndTurn_FinishBattle(void)
                                   | BATTLE_TYPE_WALLY_TUTORIAL
                                   | BATTLE_TYPE_BATTLE_TOWER)))
         {
-            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
             {
-                if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+                if (GetBankSide(gActiveBattler) == SIDE_PLAYER)
                 {
                     if (gBattleResults.poke1Species == SPECIES_NONE)
                     {
-                        gBattleResults.poke1Species = gBattleMons[gActiveBank].species;
-                        StringCopy(gBattleResults.pokeString1, gBattleMons[gActiveBank].nickname);
+                        gBattleResults.poke1Species = gBattleMons[gActiveBattler].species;
+                        StringCopy(gBattleResults.pokeString1, gBattleMons[gActiveBattler].nickname);
                     }
                     else
                     {
-                        gBattleResults.opponentSpecies = gBattleMons[gActiveBank].species;
-                        StringCopy(gBattleResults.pokeString2, gBattleMons[gActiveBank].nickname);
+                        gBattleResults.opponentSpecies = gBattleMons[gActiveBattler].species;
+                        StringCopy(gBattleResults.pokeString2, gBattleMons[gActiveBattler].nickname);
                     }
                 }
             }
@@ -6640,14 +6640,14 @@ void HandleAction_UseMove(void)
              && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
     {
         side = GetBankSide(gBankAttacker);
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
         {
-            if (side != GetBankSide(gActiveBank)
-                && ewram16010arr(gBankAttacker) != gActiveBank
-                && gBattleMons[gActiveBank].ability == ABILITY_LIGHTNING_ROD
-                && BankGetTurnOrder(gActiveBank) < var)
+            if (side != GetBankSide(gActiveBattler)
+                && ewram16010arr(gBankAttacker) != gActiveBattler
+                && gBattleMons[gActiveBattler].ability == ABILITY_LIGHTNING_ROD
+                && BankGetTurnOrder(gActiveBattler) < var)
             {
-                var = BankGetTurnOrder(gActiveBank);
+                var = BankGetTurnOrder(gActiveBattler);
             }
         }
         if (var == 4)
@@ -6690,10 +6690,10 @@ void HandleAction_UseMove(void)
         }
         else
         {
-            gActiveBank = gBanksByTurnOrder[var];
-            RecordAbilityBattle(gActiveBank, gBattleMons[gActiveBank].ability);
-            gSpecialStatuses[gActiveBank].lightningRodRedirected = 1;
-            gBankTarget = gActiveBank;
+            gActiveBattler = gBanksByTurnOrder[var];
+            RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability);
+            gSpecialStatuses[gActiveBattler].lightningRodRedirected = 1;
+            gBankTarget = gActiveBattler;
         }
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
@@ -7270,16 +7270,16 @@ void HandleAction_Run(void)
     {
         gCurrentTurnActionNumber = gNoOfAllBanks;
 
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
         {
-            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+            if (GetBankSide(gActiveBattler) == SIDE_PLAYER)
             {
-                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                if (gActionForBanks[gActiveBattler] == ACTION_RUN)
                     gBattleOutcome |= BATTLE_LOST;
             }
             else
             {
-                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                if (gActionForBanks[gActiveBattler] == ACTION_RUN)
                     gBattleOutcome |= BATTLE_WON;
             }
         }
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index f10cd2506..781478cb1 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -103,7 +103,7 @@ extern u16 gBattleTypeFlags;
 extern const struct BaseStats gBaseStats[];
 extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u32 gBattleExecBuffer;
 extern u8 gNoOfAllBanks;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
@@ -1421,7 +1421,7 @@ static void atk03_ppreduce(void)
         if (!(gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED)
             && !((gDisableStructs[gBankAttacker].unk18_b) & gBitTable[gCurrMovePos]))
         {
-            gActiveBank = gBankAttacker;
+            gActiveBattler = gBankAttacker;
             EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBankAttacker].pp[gCurrMovePos]);
             MarkBufferBankForExecution(gBankAttacker);
         }
@@ -1944,7 +1944,7 @@ static void atk09_attackanimation(void)
         }
         if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
         {
-            gActiveBank = gBankAttacker;
+            gActiveBattler = gBankAttacker;
 
             EmitMoveAnimation(0, gCurrentMove, gBattleStruct->animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBankAttacker].friendship, &gDisableStructs[gBankAttacker]);
             gBattleStruct->animTurn += 1;
@@ -1973,11 +1973,11 @@ static void atk0B_healthbarupdate(void)
 
     if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-        if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
+        if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
         {
-            PrepareStringBattle(0x80, gActiveBank);
+            PrepareStringBattle(0x80, gActiveBattler);
         }
         else
         {
@@ -1997,9 +1997,9 @@ static void atk0B_healthbarupdate(void)
             */
 
             EmitHealthBarUpdate(0, gBattleMoveDamage);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
 
-            if (GetBankSide(gActiveBank) == SIDE_PLAYER && gBattleMoveDamage > 0)
+            if (GetBankSide(gActiveBattler) == SIDE_PLAYER && gBattleMoveDamage > 0)
                 gBattleResults.unk5_0 = 1;
         }
     }
@@ -2023,25 +2023,25 @@ static void atk0C_datahpupdate(void)
 
     if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-        if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
         {
-            if (gDisableStructs[gActiveBank].substituteHP >= gBattleMoveDamage)
+            if (gDisableStructs[gActiveBattler].substituteHP >= gBattleMoveDamage)
             {
-                if (gSpecialStatuses[gActiveBank].moveturnLostHP == 0)
-                    gSpecialStatuses[gActiveBank].moveturnLostHP = gBattleMoveDamage;
-                gDisableStructs[gActiveBank].substituteHP -= gBattleMoveDamage;
+                if (gSpecialStatuses[gActiveBattler].moveturnLostHP == 0)
+                    gSpecialStatuses[gActiveBattler].moveturnLostHP = gBattleMoveDamage;
+                gDisableStructs[gActiveBattler].substituteHP -= gBattleMoveDamage;
                 gHpDealt = gBattleMoveDamage;
             }
             else
             {
-                if (gSpecialStatuses[gActiveBank].moveturnLostHP == 0)
-                    gSpecialStatuses[gActiveBank].moveturnLostHP = gDisableStructs[gActiveBank].substituteHP;
-                gHpDealt = gDisableStructs[gActiveBank].substituteHP;
-                gDisableStructs[gActiveBank].substituteHP = 0;
+                if (gSpecialStatuses[gActiveBattler].moveturnLostHP == 0)
+                    gSpecialStatuses[gActiveBattler].moveturnLostHP = gDisableStructs[gActiveBattler].substituteHP;
+                gHpDealt = gDisableStructs[gActiveBattler].substituteHP;
+                gDisableStructs[gActiveBattler].substituteHP = 0;
             }
             // check substitute fading
-            if (gDisableStructs[gActiveBank].substituteHP == 0)
+            if (gDisableStructs[gActiveBattler].substituteHP == 0)
             {
                 gBattlescriptCurrInstr += 2;
                 BattleScriptPushCursor();
@@ -2054,9 +2054,9 @@ static void atk0C_datahpupdate(void)
             gHitMarker &= ~(HITMARKER_IGNORE_SUBSTITUTE);
             if (gBattleMoveDamage < 0) // hp goes up
             {
-                gBattleMons[gActiveBank].hp -= gBattleMoveDamage;
-                if (gBattleMons[gActiveBank].hp > gBattleMons[gActiveBank].maxHP)
-                    gBattleMons[gActiveBank].hp = gBattleMons[gActiveBank].maxHP;
+                gBattleMons[gActiveBattler].hp -= gBattleMoveDamage;
+                if (gBattleMons[gActiveBattler].hp > gBattleMons[gActiveBattler].maxHP)
+                    gBattleMons[gActiveBattler].hp = gBattleMons[gActiveBattler].maxHP;
 
             }
             else // hp goes down
@@ -2067,68 +2067,68 @@ static void atk0C_datahpupdate(void)
                 }
                 else
                 {
-                    gTakenDmg[gActiveBank] += gBattleMoveDamage;
+                    gTakenDmg[gActiveBattler] += gBattleMoveDamage;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
-                        gTakenDmgBanks[gActiveBank] = gBankAttacker;
+                        gTakenDmgBanks[gActiveBattler] = gBankAttacker;
                     else
-                        gTakenDmgBanks[gActiveBank] = gBankTarget;
+                        gTakenDmgBanks[gActiveBattler] = gBankTarget;
                 }
 
-                if (gBattleMons[gActiveBank].hp > gBattleMoveDamage)
+                if (gBattleMons[gActiveBattler].hp > gBattleMoveDamage)
                 {
-                    gBattleMons[gActiveBank].hp -= gBattleMoveDamage;
+                    gBattleMons[gActiveBattler].hp -= gBattleMoveDamage;
                     gHpDealt = gBattleMoveDamage;
                 }
                 else
                 {
-                    gHpDealt = gBattleMons[gActiveBank].hp;
-                    gBattleMons[gActiveBank].hp = 0;
+                    gHpDealt = gBattleMons[gActiveBattler].hp;
+                    gBattleMons[gActiveBattler].hp = 0;
                 }
 
-                if (!gSpecialStatuses[gActiveBank].moveturnLostHP && !(gHitMarker & HITMARKER_x100000))
-                    gSpecialStatuses[gActiveBank].moveturnLostHP = gHpDealt;
+                if (!gSpecialStatuses[gActiveBattler].moveturnLostHP && !(gHitMarker & HITMARKER_x100000))
+                    gSpecialStatuses[gActiveBattler].moveturnLostHP = gHpDealt;
 
                 if (moveType <= 8 && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT)
                 {
-                    gProtectStructs[gActiveBank].physicalDmg = gHpDealt;
-                    gSpecialStatuses[gActiveBank].moveturnLostHP_physical = gHpDealt;
+                    gProtectStructs[gActiveBattler].physicalDmg = gHpDealt;
+                    gSpecialStatuses[gActiveBattler].moveturnLostHP_physical = gHpDealt;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                     {
-                        gProtectStructs[gActiveBank].physicalBank = gBankAttacker;
-                        gSpecialStatuses[gActiveBank].moveturnPhysicalBank = gBankAttacker;
+                        gProtectStructs[gActiveBattler].physicalBank = gBankAttacker;
+                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBankAttacker;
                     }
                     else
                     {
-                        gProtectStructs[gActiveBank].physicalBank = gBankTarget;
-                        gSpecialStatuses[gActiveBank].moveturnPhysicalBank = gBankTarget;
+                        gProtectStructs[gActiveBattler].physicalBank = gBankTarget;
+                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBankTarget;
                     }
                 }
                 else if (moveType > 8 && !(gHitMarker & HITMARKER_x100000))
                 {
-                    gProtectStructs[gActiveBank].specialDmg = gHpDealt;
-                    gSpecialStatuses[gActiveBank].moveturnLostHP_special = gHpDealt;
+                    gProtectStructs[gActiveBattler].specialDmg = gHpDealt;
+                    gSpecialStatuses[gActiveBattler].moveturnLostHP_special = gHpDealt;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                     {
-                        gProtectStructs[gActiveBank].specialBank = gBankAttacker;
-                        gSpecialStatuses[gActiveBank].moveturnSpecialBank = gBankAttacker;
+                        gProtectStructs[gActiveBattler].specialBank = gBankAttacker;
+                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBankAttacker;
                     }
                     else
                     {
-                        gProtectStructs[gActiveBank].specialBank = gBankTarget;
-                        gSpecialStatuses[gActiveBank].moveturnSpecialBank = gBankTarget;
+                        gProtectStructs[gActiveBattler].specialBank = gBankTarget;
+                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBankTarget;
                     }
                 }
             }
             gHitMarker &= ~(HITMARKER_x100000);
-            EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp);
-            MarkBufferBankForExecution(gActiveBank);
+            EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp);
+            MarkBufferBankForExecution(gActiveBattler);
         }
     }
     else
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-        if (gSpecialStatuses[gActiveBank].moveturnLostHP == 0)
-            gSpecialStatuses[gActiveBank].moveturnLostHP = 0xFFFF;
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        if (gSpecialStatuses[gActiveBattler].moveturnLostHP == 0)
+            gSpecialStatuses[gActiveBattler].moveturnLostHP = 0xFFFF;
     }
     gBattlescriptCurrInstr += 2;
 }
@@ -2151,7 +2151,7 @@ static void atk0E_effectivenesssound(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = gBankTarget;
+    gActiveBattler = gBankTarget;
     if (!(gBattleMoveFlags & MOVESTATUS_MISSED))
     {
         u8 flag = ~MOVESTATUS_MISSED;
@@ -2159,11 +2159,11 @@ static void atk0E_effectivenesssound(void)
         {
         case MOVESTATUS_SUPEREFFECTIVE:
             EmitEffectivenessSound(0, 14);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             break;
         case MOVESTATUS_NOTVERYEFFECTIVE:
             EmitEffectivenessSound(0, 12);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             break;
         case MOVESTATUS_NOTAFFECTED:
         case MOVESTATUS_FAILED:
@@ -2175,17 +2175,17 @@ static void atk0E_effectivenesssound(void)
             if (gBattleMoveFlags & MOVESTATUS_SUPEREFFECTIVE)
             {
                 EmitEffectivenessSound(0, 14);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             else if (gBattleMoveFlags & MOVESTATUS_NOTVERYEFFECTIVE)
             {
                 EmitEffectivenessSound(0, 12);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             else if (!(gBattleMoveFlags & (MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED)))
             {
                 EmitEffectivenessSound(0, 13);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             break;
         }
@@ -2295,9 +2295,9 @@ static void atk10_printstring(void)
 
 static void atk11_printselectionstring(void)
 {
-    gActiveBank = gBankAttacker;
+    gActiveBattler = gBankAttacker;
     EmitPrintStringPlayerOnly(0, T2_READ_16(gBattlescriptCurrInstr + 1));
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 3;
     gBattleCommunication[MSG_DISPLAY] = 1;
 }
@@ -2341,9 +2341,9 @@ static void atk14_printselectionstringfromtable(void)
     {
         u16 *ptr = (u16 *)T1_READ_PTR(gBattlescriptCurrInstr + 1); // FIXME
         ptr += gBattleCommunication[MULTISTRING_CHOOSER];
-        gActiveBank = gBankAttacker;
+        gActiveBattler = gBankAttacker;
         EmitPrintStringPlayerOnly(0, *(u16*)ptr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 5;
         gBattleCommunication[MSG_DISPLAY] = 1;
     }
@@ -2406,12 +2406,12 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             //check active uproar
             if (gBattleMons[gEffectBank].ability != ABILITY_SOUNDPROOF)
             {
-                for (gActiveBank = 0; gActiveBank < gNoOfAllBanks && !(gBattleMons[gActiveBank].status2 & STATUS2_UPROAR); gActiveBank++) {}
+                for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks && !(gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR); gActiveBattler++) {}
             }
             else
-                gActiveBank = gNoOfAllBanks;
+                gActiveBattler = gNoOfAllBanks;
             if (gBattleMons[gEffectBank].status1) {break;}
-            if (gActiveBank != gNoOfAllBanks) {break;} //nice way of checking uproar...
+            if (gActiveBattler != gNoOfAllBanks) {break;} //nice way of checking uproar...
             if (gBattleMons[gEffectBank].ability == ABILITY_VITAL_SPIRIT) {break;}
             if (gBattleMons[gEffectBank].ability == ABILITY_INSOMNIA) {break;}
 
@@ -2566,9 +2566,9 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             else
                 gBattleMons[gEffectBank].status1 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
             gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
-            gActiveBank = gEffectBank;
+            gActiveBattler = gEffectBank;
             EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBank].status1);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -2753,11 +2753,11 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
                 USED_HELD_ITEM(bank) = gLastUsedItem;
                 gBattleMons[gBankTarget].item = 0;
 
-                gActiveBank = gBankAttacker;
+                gActiveBattler = gBankAttacker;
                 EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem);
                 MarkBufferBankForExecution(gBankAttacker);
 
-                gActiveBank = gBankTarget;
+                gActiveBattler = gBankTarget;
                 EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankTarget].item);
                 MarkBufferBankForExecution(gBankTarget);
 
@@ -2788,9 +2788,9 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
             if (gBattleMons[gBankTarget].status1 & STATUS_PARALYSIS)
             {
                 gBattleMons[gBankTarget].status1 &= ~(STATUS_PARALYSIS);
-                gActiveBank = gBankTarget;
+                gActiveBattler = gBankTarget;
                 EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
                 BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_TargetPRLZHeal;
             }
@@ -3058,7 +3058,7 @@ _0801E57A:\n\
     ldrb r0, [r0]\n\
     cmp r0, 0x2B\n\
     beq _0801E5DC\n\
-    ldr r0, _0801E5D4 @ =gActiveBank\n\
+    ldr r0, _0801E5D4 @ =gActiveBattler\n\
     movs r1, 0\n\
     strb r1, [r0]\n\
     ldr r1, _0801E5D8 @ =gNoOfAllBanks\n\
@@ -3095,10 +3095,10 @@ _0801E5B4:\n\
     beq _0801E5B4\n\
     b _0801E5E8\n\
     .align 2, 0\n\
-_0801E5D4: .4byte gActiveBank\n\
+_0801E5D4: .4byte gActiveBattler\n\
 _0801E5D8: .4byte gNoOfAllBanks\n\
 _0801E5DC:\n\
-    ldr r0, _0801E628 @ =gActiveBank\n\
+    ldr r0, _0801E628 @ =gActiveBattler\n\
     ldr r2, _0801E62C @ =gNoOfAllBanks\n\
     ldrb r1, [r2]\n\
     strb r1, [r0]\n\
@@ -3141,7 +3141,7 @@ _0801E620:\n\
     bl CancelMultiTurnMoves\n\
     b _0801EA04\n\
     .align 2, 0\n\
-_0801E628: .4byte gActiveBank\n\
+_0801E628: .4byte gActiveBattler\n\
 _0801E62C: .4byte gNoOfAllBanks\n\
 _0801E630:\n\
     mov r2, r8\n\
@@ -3709,7 +3709,7 @@ _0801EA84:\n\
     adds r0, r1\n\
     ldr r0, [r0]\n\
     str r0, [r2]\n\
-    ldr r4, _0801EAE8 @ =gActiveBank\n\
+    ldr r4, _0801EAE8 @ =gActiveBattler\n\
     ldr r1, _0801EAD8 @ =gEffectBank\n\
     ldrb r0, [r1]\n\
     strb r0, [r4]\n\
@@ -3745,7 +3745,7 @@ _0801EAD8: .4byte gEffectBank\n\
 _0801EADC: .4byte gBattlescriptCurrInstr\n\
 _0801EAE0: .4byte gMoveEffectBS_Ptrs\n\
 _0801EAE4: .4byte gBattleCommunication\n\
-_0801EAE8: .4byte gActiveBank\n\
+_0801EAE8: .4byte gActiveBattler\n\
 _0801EAEC: .4byte gUnknown_02024ACC\n\
 _0801EAF0: .4byte gHitMarker\n\
 _0801EAF4: .4byte 0xffffdfff\n\
@@ -4638,7 +4638,7 @@ _0801F2B6:\n\
     add r0, r9\n\
     movs r6, 0\n\
     strh r3, [r0, 0x2E]\n\
-    ldr r4, _0801F34C @ =gActiveBank\n\
+    ldr r4, _0801F34C @ =gActiveBattler\n\
     mov r2, r10\n\
     ldrb r0, [r2]\n\
     strb r0, [r4]\n\
@@ -4693,7 +4693,7 @@ _0801F2B6:\n\
 _0801F340: .4byte gBankAttacker\n\
 _0801F344: .4byte gSharedMem + 0x160F0\n\
 _0801F348: .4byte gLastUsedItem\n\
-_0801F34C: .4byte gActiveBank\n\
+_0801F34C: .4byte gActiveBattler\n\
 _0801F350: .4byte gBattlescriptCurrInstr\n\
 _0801F354: .4byte BattleScript_ItemSteal\n\
 _0801F358: .4byte 0xfffe9f10\n\
@@ -4781,7 +4781,7 @@ _0801F406:\n\
     negs r0, r0\n\
     ands r4, r0\n\
     str r4, [r5]\n\
-    ldr r4, _0801F440 @ =gActiveBank\n\
+    ldr r4, _0801F440 @ =gActiveBattler\n\
     ldrb r0, [r6]\n\
     strb r0, [r4]\n\
     ldrb r0, [r4]\n\
@@ -4803,7 +4803,7 @@ _0801F406:\n\
     b _0801F5F8\n\
     .align 2, 0\n\
 _0801F43C: .4byte gBankTarget\n\
-_0801F440: .4byte gActiveBank\n\
+_0801F440: .4byte gActiveBattler\n\
 _0801F444: .4byte gBattlescriptCurrInstr\n\
 _0801F448: .4byte BattleScript_TargetPRLZHeal\n\
 _0801F44C:\n\
@@ -5066,11 +5066,11 @@ static void atk17_seteffectsecondary(void)
 
 static void atk18_clearstatusfromeffect(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     if (gBattleCommunication[MOVE_EFFECT_BYTE] <= 6)
-        gBattleMons[gActiveBank].status1 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
+        gBattleMons[gActiveBattler].status1 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
     else
-        gBattleMons[gActiveBank].status2 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
+        gBattleMons[gActiveBattler].status2 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
 
     gBattleCommunication[MOVE_EFFECT_BYTE] = 0;
     gBattlescriptCurrInstr += 2;
@@ -5083,14 +5083,14 @@ static void atk19_tryfaintmon(void)
 
     if (gBattlescriptCurrInstr[2] != 0)
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-        if (gHitMarker & HITMARKER_FAINTED(gActiveBank))
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        if (gHitMarker & HITMARKER_FAINTED(gActiveBattler))
         {
             r4 = T1_READ_PTR(gBattlescriptCurrInstr + 3);
 
             BattleScriptPop();
             gBattlescriptCurrInstr = r4;
-            gSideAffecting[GetBankSide(gActiveBank)] &= ~SIDE_STATUS_SPIKES_DAMAGED;
+            gSideAffecting[GetBankSide(gActiveBattler)] &= ~SIDE_STATUS_SPIKES_DAMAGED;
         }
         else
         {
@@ -5103,18 +5103,18 @@ static void atk19_tryfaintmon(void)
 
         if (gBattlescriptCurrInstr[1] == 1)
         {
-            gActiveBank = gBankAttacker;
+            gActiveBattler = gBankAttacker;
             bank = gBankTarget;
             r4 = BattleScript_FaintAttacker;
         }
         else
         {
-            gActiveBank = gBankTarget;
+            gActiveBattler = gBankTarget;
             bank = gBankAttacker;
             r4 = BattleScript_FaintTarget;
         }
-        if (!(gAbsentBankFlags & gBitTable[gActiveBank])
-         && gBattleMons[gActiveBank].hp == 0)
+        if (!(gAbsentBankFlags & gBitTable[gActiveBattler])
+         && gBattleMons[gActiveBattler].hp == 0)
         {
             ewram160ACarr2(0, bank) = 0;
             ewram160ACarr2(1, bank) = 0;
@@ -5123,27 +5123,27 @@ static void atk19_tryfaintmon(void)
             ewram16100arr2(2, bank) = 0;
             ewram16100arr2(3, bank) = 0;
 
-            gHitMarker |= HITMARKER_FAINTED(gActiveBank);
+            gHitMarker |= HITMARKER_FAINTED(gActiveBattler);
             BattleScriptPush(gBattlescriptCurrInstr + 7);
             gBattlescriptCurrInstr = r4;
-            if (GetBankSide(gActiveBank) == 0)
+            if (GetBankSide(gActiveBattler) == 0)
             {
                 gHitMarker |= HITMARKER_x400000;
                 if (gBattleResults.playerFaintCounter < 0xFF)
                     gBattleResults.playerFaintCounter++;
-                if (gBattleMons[bank].level > gBattleMons[gActiveBank].level)
+                if (gBattleMons[bank].level > gBattleMons[gActiveBattler].level)
                 {
-                    if (gBattleMons[bank].level - gBattleMons[gActiveBank].level > 0x1D)
-                        AdjustFriendship(&gPlayerParty[gBattlePartyID[gActiveBank]], 8);
+                    if (gBattleMons[bank].level - gBattleMons[gActiveBattler].level > 0x1D)
+                        AdjustFriendship(&gPlayerParty[gBattlePartyID[gActiveBattler]], 8);
                     else
-                        AdjustFriendship(&gPlayerParty[gBattlePartyID[gActiveBank]], 6);
+                        AdjustFriendship(&gPlayerParty[gBattlePartyID[gActiveBattler]], 6);
                 }
             }
             else
             {
                 if (gBattleResults.opponentFaintCounter < 0xFF)
                     gBattleResults.opponentFaintCounter++;
-                gBattleResults.lastOpponentSpecies = gBattleMons[gActiveBank].species;
+                gBattleResults.lastOpponentSpecies = gBattleMons[gActiveBattler].species;
             }
             if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBankAttacker].hp != 0)
             {
@@ -5162,9 +5162,9 @@ static void atk19_tryfaintmon(void)
                 gBattleMons[gBankAttacker].pp[moveIndex] = 0;
                 BattleScriptPush(gBattlescriptCurrInstr);
                 gBattlescriptCurrInstr = BattleScript_SelectingImprisionedMoveInPalace;
-                gActiveBank = gBankAttacker;
-                EmitSetMonData(0, moveIndex + 9, 0, 1, &gBattleMons[gActiveBank].pp[moveIndex]);
-                MarkBufferBankForExecution(gActiveBank);
+                gActiveBattler = gBankAttacker;
+                EmitSetMonData(0, moveIndex + 9, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]);
+                MarkBufferBankForExecution(gActiveBattler);
 
                 gBattleTextBuff1[0] = 0xFD;
                 gBattleTextBuff1[1] = 2;
@@ -5184,9 +5184,9 @@ static void atk1A_dofaintanimation(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+        gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
         Emitcmd10(0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 2;
     }
 }
@@ -5196,10 +5196,10 @@ static void atk1B_cleareffectsonfaint(void)
     //Clears things like attraction or trapping to other banks
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-        gBattleMons[gActiveBank].status1 = 0;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBank].status1);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+        gBattleMons[gActiveBattler].status1 = 0;
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBattler].status1);
+        MarkBufferBankForExecution(gActiveBattler);
         UndoEffectsAfterFainting();
         gBattlescriptCurrInstr += 2;
     }
@@ -5335,19 +5335,19 @@ static void atk21_jumpifstatus3condition(void)
     u32 flags;
     void* jump_loc;
 
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     flags = T2_READ_32(gBattlescriptCurrInstr + 2);
     jump_loc = T2_READ_PTR(gBattlescriptCurrInstr + 7);
     if (T2_READ_8(gBattlescriptCurrInstr + 6))
     {
-        if ((gStatuses3[gActiveBank] & flags) != 0)
+        if ((gStatuses3[gActiveBattler] & flags) != 0)
             gBattlescriptCurrInstr += 11;
         else
             gBattlescriptCurrInstr = jump_loc;
     }
     else
     {
-        if ((gStatuses3[gActiveBank] & flags) != 0)
+        if ((gStatuses3[gActiveBattler] & flags) != 0)
             gBattlescriptCurrInstr = jump_loc;
         else
             gBattlescriptCurrInstr += 11;
@@ -5544,9 +5544,9 @@ static void atk23_getexp(void)
                 gBattleResources_statsBeforeLvlUp->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPATK);
                 gBattleResources_statsBeforeLvlUp->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPDEF);
                 
-                gActiveBank = gBattleStruct->expGetterBank;
+                gActiveBattler = gBattleStruct->expGetterBank;
                 EmitExpBarUpdate(0, gBattleStruct->expGetterID, gBattleMoveDamage);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             gBattleStruct->getexpStateTracker++;
         }
@@ -5554,21 +5554,21 @@ static void atk23_getexp(void)
     case 4: // lvl up if necessary
         if (gBattleExecBuffer == 0)
         {
-            gActiveBank = gBattleStruct->expGetterBank;
-            if (gBattleBufferB[gActiveBank][0] == CONTROLLER_TWORETURNVALUES
-             && gBattleBufferB[gActiveBank][1] == RET_VALUE_LEVELLED_UP)
+            gActiveBattler = gBattleStruct->expGetterBank;
+            if (gBattleBufferB[gActiveBattler][0] == CONTROLLER_TWORETURNVALUES
+             && gBattleBufferB[gActiveBattler][1] == RET_VALUE_LEVELLED_UP)
             {
-                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlePartyID[gActiveBank] == gBattleStruct->expGetterID)
-                    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlePartyID[gActiveBattler] == gBattleStruct->expGetterID)
+                    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 
-                PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBank, gBattleStruct->expGetterID)
+                PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterID)
 
                 PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL))
 
                 BattleScriptPushCursor();
                 gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterID];
                 gBattlescriptCurrInstr = BattleScript_LevelUp;
-                gBattleMoveDamage = (gBattleBufferB[gActiveBank][2] | (gBattleBufferB[gActiveBank][3] << 8));
+                gBattleMoveDamage = (gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8));
                 AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterID], 0);
 
                 // update battle mon structure after level up
@@ -6230,12 +6230,12 @@ static void atk3A_waitstate(void)
 static void atk3B_healthbar_update(void)
 {
     if (!T2_READ_8(gBattlescriptCurrInstr + 1))
-        gActiveBank = gBankTarget;
+        gActiveBattler = gBankTarget;
     else
-        gActiveBank = gBankAttacker;
+        gActiveBattler = gBankAttacker;
 
     EmitHealthBarUpdate(0, gBattleMoveDamage);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
@@ -6247,14 +6247,14 @@ static void atk3C_return(void)
 static void atk3D_end(void)
 {
     gBattleMoveFlags = 0;
-    gActiveBank = 0;
+    gActiveBattler = 0;
     gCurrentActionFuncId = 0xB;
 }
 
 static void atk3E_end2(void)
 {
     //not much difference between this and 3D. It's more apparent in Emerald
-    gActiveBank = 0;
+    gActiveBattler = 0;
     gCurrentActionFuncId = 0xB;
 }
 
@@ -6299,7 +6299,7 @@ static void atk45_playanimation(void)
 {
     const u16* argumentPtr;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
     argumentPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 3);
 
     if (gBattlescriptCurrInstr[2] == B_ANIM_STATS_CHANGE
@@ -6307,7 +6307,7 @@ static void atk45_playanimation(void)
         || gBattlescriptCurrInstr[2] == B_ANIM_SUBSTITUTE_FADE)
     {
         EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 7;
     }
     else if (gHitMarker & HITMARKER_NO_ANIMATIONS)
@@ -6321,17 +6321,17 @@ static void atk45_playanimation(void)
              || gBattlescriptCurrInstr[2] == B_ANIM_HAIL_CONTINUES)
     {
         EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 7;
     }
-    else if (gStatuses3[gActiveBank] & STATUS3_SEMI_INVULNERABLE)
+    else if (gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
     {
         gBattlescriptCurrInstr += 7;
     }
     else
     {
         EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 7;
     }
 }
@@ -6341,7 +6341,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
     const u16* argumentPtr;
     const u8* animationIdPtr;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
     animationIdPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 2);
     argumentPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 6);
 
@@ -6350,7 +6350,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
         || *animationIdPtr == B_ANIM_SUBSTITUTE_FADE)
     {
         EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 10;
     }
     else if (gHitMarker & HITMARKER_NO_ANIMATIONS)
@@ -6363,17 +6363,17 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
              || *animationIdPtr == B_ANIM_HAIL_CONTINUES)
     {
         EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 10;
     }
-    else if (gStatuses3[gActiveBank] & STATUS3_SEMI_INVULNERABLE)
+    else if (gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
     {
         gBattlescriptCurrInstr += 10;
     }
     else
     {
         EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 10;
     }
 }
@@ -6410,7 +6410,7 @@ static void atk48_playstatchangeanimation(void)
     u32 stats_to_check;
     u8 arg3;
 
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     stats_to_check = T2_READ_8(gBattlescriptCurrInstr + 2);
     arg3 = T2_READ_8(gBattlescriptCurrInstr + 3);
     if (arg3 & 1)
@@ -6425,13 +6425,13 @@ static void atk48_playstatchangeanimation(void)
             if (!(T2_READ_8(gBattlescriptCurrInstr + 3)))
             {
                 u8 ability;
-                if (gSideTimers[GetBankIdentity(gActiveBank) & 1].mistTimer)
+                if (gSideTimers[GetBankIdentity(gActiveBattler) & 1].mistTimer)
                     continue;
-                ability = gBattleMons[gActiveBank].ability;
+                ability = gBattleMons[gActiveBattler].ability;
                 if (ability == ABILITY_CLEAR_BODY || ability == ABILITY_WHITE_SMOKE || (ability == ABILITY_KEEN_EYE && curr_stat == 6) || (ability == ABILITY_HYPER_CUTTER && curr_stat == 1))
                     continue;
             }
-            if (gBattleMons[gActiveBank].statStages[curr_stat] > 0)
+            if (gBattleMons[gActiveBattler].statStages[curr_stat] > 0)
             {
                 stat_animID = r1;
                 changeable_stats++;
@@ -6455,7 +6455,7 @@ static void atk48_playstatchangeanimation(void)
         {
             if (!(stats_to_check & 1))
                 continue;
-            if (gBattleMons[gActiveBank].statStages[curr_stat] < 0xB)
+            if (gBattleMons[gActiveBattler].statStages[curr_stat] < 0xB)
             {
                 stat_animID = r1;
                 changeable_stats++;
@@ -6476,7 +6476,7 @@ static void atk48_playstatchangeanimation(void)
     else
     {
         EmitBattleAnimation(0, 1, stat_animID);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         if ((T2_READ_8(gBattlescriptCurrInstr + 3) & 4) && changeable_stats > 1)
             gBattleStruct->filler2[0] = 1;
         gBattlescriptCurrInstr += 4;
@@ -6503,7 +6503,7 @@ push {r4-r7,lr}\n\
     ldrb r0, [r0, 0x1]\n\
     str r3, [sp]\n\
     bl GetBattleBank\n\
-    ldr r2, _08021674 @ =gActiveBank\n\
+    ldr r2, _08021674 @ =gActiveBattler\n\
     strb r0, [r2]\n\
     ldr r0, [r5]\n\
     ldrb r4, [r0, 0x2]\n\
@@ -6540,7 +6540,7 @@ _0802164A:\n\
     ands r0, r1\n\
     cmp r0, 0\n\
     beq _0802167C\n\
-    ldr r0, _08021674 @ =gActiveBank\n\
+    ldr r0, _08021674 @ =gActiveBattler\n\
     ldrb r1, [r0]\n\
     movs r0, 0x58\n\
     muls r0, r1\n\
@@ -6548,10 +6548,10 @@ _0802164A:\n\
     b _080216C4\n\
     .align 2, 0\n\
 _08021670: .4byte gBattlescriptCurrInstr\n\
-_08021674: .4byte gActiveBank\n\
+_08021674: .4byte gActiveBattler\n\
 _08021678: .4byte gUnknown_02024A98\n\
 _0802167C:\n\
-    ldr r6, _08021700 @ =gActiveBank\n\
+    ldr r6, _08021700 @ =gActiveBattler\n\
     ldrb r0, [r6]\n\
     str r3, [sp]\n\
     bl GetBankIdentity\n\
@@ -6622,7 +6622,7 @@ _080216E4:\n\
     movs r0, 0x3A\n\
     b _08021770\n\
     .align 2, 0\n\
-_08021700: .4byte gActiveBank\n\
+_08021700: .4byte gActiveBattler\n\
 _08021704: .4byte gSideTimers\n\
 _08021708: .4byte gBattleMons\n\
 _0802170C: .4byte gBattlescriptCurrInstr\n\
@@ -6710,7 +6710,7 @@ _08021790:\n\
     mov r2, r8\n\
     str r3, [sp]\n\
     bl EmitBattleAnimation\n\
-    ldr r0, _080217D8 @ =gActiveBank\n\
+    ldr r0, _080217D8 @ =gActiveBattler\n\
     ldrb r0, [r0]\n\
     bl MarkBufferBankForExecution\n\
     ldr r0, _080217DC @ =gBattlescriptCurrInstr\n\
@@ -6731,7 +6731,7 @@ _080217CC:\n\
     .align 2, 0\n\
 _080217D0: .4byte gSharedMem\n\
 _080217D4: .4byte 0x000160dc\n\
-_080217D8: .4byte gActiveBank\n\
+_080217D8: .4byte gActiveBattler\n\
 _080217DC: .4byte gBattlescriptCurrInstr\n\
 _080217E0:\n\
     mov r1, r9\n\
@@ -6801,9 +6801,9 @@ static void atk49_moveend(void)
                 && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT) && move_type == TYPE_FIRE)
             {
                 gBattleMons[gBankTarget].status1 &= ~(STATUS_FREEZE);
-                gActiveBank = gBankTarget;
+                gActiveBattler = gBankTarget;
                 EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove;
                 effect = 1;
@@ -6856,9 +6856,9 @@ static void atk49_moveend(void)
             if (gStatuses3[gBankAttacker] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER)
                 && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
             {
-                gActiveBank = gBankAttacker;
+                gActiveBattler = gBankAttacker;
                 EmitSpriteInvisibility(0, 1);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             gBattleStruct->cmd49StateTracker++;
             break;
@@ -6866,9 +6866,9 @@ static void atk49_moveend(void)
             if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) || !(gStatuses3[gBankAttacker] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
                 || WasUnableToUseMove(gBankAttacker))
                 {
-                    gActiveBank = gBankAttacker;
+                    gActiveBattler = gBankAttacker;
                     EmitSpriteInvisibility(0, 0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                     gStatuses3 &= ~(STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER);
                     gSpecialStatuses[gBankAttacker].restored_bank_sprite = 1;
                 }
@@ -6878,9 +6878,9 @@ static void atk49_moveend(void)
             if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) || !(gStatuses3[gBankTarget] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
                 || WasUnableToUseMove(gBankTarget))
                 {
-                    gActiveBank = gBankTarget;
+                    gActiveBattler = gBankTarget;
                     EmitSpriteInvisibility(0, 0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                     gStatuses3 &= ~(STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER);
                     gSpecialStatuses[gBankTarget].restored_bank_sprite = 1;
                 }
@@ -7202,7 +7202,7 @@ _08021A92:\n\
     negs r0, r0\n\
     ands r5, r0\n\
     str r5, [r6]\n\
-    ldr r4, _08021AE4 @ =gActiveBank\n\
+    ldr r4, _08021AE4 @ =gActiveBattler\n\
     ldr r5, _08021AD4 @ =gBankTarget\n\
     ldrb r0, [r5]\n\
     strb r0, [r4]\n\
@@ -7232,7 +7232,7 @@ _08021AD4: .4byte gBankTarget\n\
 _08021AD8: .4byte gBankAttacker\n\
 _08021ADC: .4byte gSpecialStatuses\n\
 _08021AE0: .4byte gBattleMoveFlags\n\
-_08021AE4: .4byte gActiveBank\n\
+_08021AE4: .4byte gActiveBattler\n\
 _08021AE8: .4byte gBattlescriptCurrInstr\n\
 _08021AEC: .4byte BattleScript_DefrostedViaFireMove\n\
 _08021AF0:\n\
@@ -7497,7 +7497,7 @@ _08021CE2:\n\
     bne _08021CF0\n\
     b _08021DFA\n\
 _08021CF0:\n\
-    ldr r4, _08021D14 @ =gActiveBank\n\
+    ldr r4, _08021D14 @ =gActiveBattler\n\
     strb r2, [r4]\n\
     movs r0, 0\n\
     movs r1, 0x1\n\
@@ -7510,7 +7510,7 @@ _08021D04: .4byte gStatuses3\n\
 _08021D08: .4byte gBankAttacker\n\
 _08021D0C: .4byte 0x000400c0\n\
 _08021D10: .4byte gHitMarker\n\
-_08021D14: .4byte gActiveBank\n\
+_08021D14: .4byte gActiveBattler\n\
 _08021D18:\n\
     ldr r0, _08021D88 @ =gBattleMoveFlags\n\
     ldrb r1, [r0]\n\
@@ -7534,7 +7534,7 @@ _08021D18:\n\
     cmp r0, 0\n\
     beq _08021D7E\n\
 _08021D44:\n\
-    ldr r4, _08021D98 @ =gActiveBank\n\
+    ldr r4, _08021D98 @ =gActiveBattler\n\
     ldr r5, _08021D90 @ =gBankAttacker\n\
     ldrb r0, [r5]\n\
     strb r0, [r4]\n\
@@ -7571,7 +7571,7 @@ _08021D88: .4byte gBattleMoveFlags\n\
 _08021D8C: .4byte gStatuses3\n\
 _08021D90: .4byte gBankAttacker\n\
 _08021D94: .4byte 0x000400c0\n\
-_08021D98: .4byte gActiveBank\n\
+_08021D98: .4byte gActiveBattler\n\
 _08021D9C: .4byte 0xfffbff3f\n\
 _08021DA0: .4byte gSpecialStatuses\n\
 _08021DA4: .4byte gSharedMem\n\
@@ -7599,7 +7599,7 @@ _08021DAC:\n\
     ands r0, r1\n\
     cmp r0, 0\n\
     bne _08021DFA\n\
-    ldr r4, _08021E20 @ =gActiveBank\n\
+    ldr r4, _08021E20 @ =gActiveBattler\n\
     strb r3, [r4]\n\
     movs r0, 0\n\
     movs r1, 0\n\
@@ -7630,7 +7630,7 @@ _08021E10: .4byte gBankTarget\n\
 _08021E14: .4byte gNoOfAllBanks\n\
 _08021E18: .4byte gStatuses3\n\
 _08021E1C: .4byte 0x000400c0\n\
-_08021E20: .4byte gActiveBank\n\
+_08021E20: .4byte gActiveBattler\n\
 _08021E24: .4byte 0xfffbff3f\n\
 _08021E28: .4byte gSharedMem\n\
 _08021E2C: .4byte 0x0001600c\n\
@@ -7677,7 +7677,7 @@ _08021E70:\n\
     adds r5, r1, 0\n\
     cmp r0, 0\n\
     beq _08021E9A\n\
-    ldr r0, _08021F34 @ =gActiveBank\n\
+    ldr r0, _08021F34 @ =gActiveBattler\n\
     ldrb r2, [r2]\n\
     strb r2, [r0]\n\
     ldr r1, _08021F38 @ =gBankTarget\n\
@@ -7769,7 +7769,7 @@ _08021F04:\n\
     .align 2, 0\n\
 _08021F2C: .4byte gHitMarker\n\
 _08021F30: .4byte gBankAttacker\n\
-_08021F34: .4byte gActiveBank\n\
+_08021F34: .4byte gActiveBattler\n\
 _08021F38: .4byte gBankTarget\n\
 _08021F3C: .4byte 0xffffefff\n\
 _08021F40: .4byte gBattleMoves\n\
@@ -8281,11 +8281,11 @@ static void atk4A_typecalc2(void)
 
 static void atk4B_returnatktoball(void)
 {
-    gActiveBank = gBankAttacker;
-    if (!(gHitMarker & HITMARKER_FAINTED(gActiveBank)))
+    gActiveBattler = gBankAttacker;
+    if (!(gHitMarker & HITMARKER_FAINTED(gActiveBattler)))
     {
         EmitReturnPokeToBall(0, 0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
     }
     gBattlescriptCurrInstr++;
 }
@@ -8295,12 +8295,12 @@ static void atk4C_getswitchedmondata(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
 
-    gBattlePartyID[gActiveBank] = ewram16068arr(gActiveBank);
+    gBattlePartyID[gActiveBattler] = ewram16068arr(gActiveBattler);
 
-    EmitGetAttributes(0, 0, gBitTable[gBattlePartyID[gActiveBank]]);
-    MarkBufferBankForExecution(gActiveBank);
+    EmitGetAttributes(0, 0, gBitTable[gBattlePartyID[gActiveBattler]]);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
@@ -8313,40 +8313,40 @@ static void atk4D_switchindataupdate(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-    oldData = gBattleMons[gActiveBank];
-    monData = (u8*)(&gBattleMons[gActiveBank]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    oldData = gBattleMons[gActiveBattler];
+    monData = (u8*)(&gBattleMons[gActiveBattler]);
 
     for (i = 0; i < sizeof(struct BattlePokemon); i++)
     {
-        monData[i] = gBattleBufferB[gActiveBank][4 + i];
+        monData[i] = gBattleBufferB[gActiveBattler][4 + i];
     }
 
-    gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
-    gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
-    gBattleMons[gActiveBank].ability = GetAbilityBySpecies(gBattleMons[gActiveBank].species, gBattleMons[gActiveBank].altAbility);
+    gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
+    gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
+    gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].altAbility);
 
     // check knocked off item
-    i = GetBankSide(gActiveBank);
-    if (gWishFutureKnock.knockedOffPokes[i] & gBitTable[gBattlePartyID[gActiveBank]])
+    i = GetBankSide(gActiveBattler);
+    if (gWishFutureKnock.knockedOffPokes[i] & gBitTable[gBattlePartyID[gActiveBattler]])
     {
-        gBattleMons[gActiveBank].item = 0;
+        gBattleMons[gActiveBattler].item = 0;
     }
 
     if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
     {
         for (i = 0; i < 8; i++)
         {
-            gBattleMons[gActiveBank].statStages[i] = oldData.statStages[i];
+            gBattleMons[gActiveBattler].statStages[i] = oldData.statStages[i];
         }
-        gBattleMons[gActiveBank].status2 = oldData.status2;
+        gBattleMons[gActiveBattler].status2 = oldData.status2;
     }
 
     SwitchInClearSetData();
 
-    gBattleStruct->scriptingActive = gActiveBank;
+    gBattleStruct->scriptingActive = gActiveBattler;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gActiveBank, gBattlePartyID[gActiveBank]);
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gActiveBattler, gBattlePartyID[gActiveBattler]);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -8356,14 +8356,14 @@ static void atk4E_switchinanim(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-    if (GetBankSide(gActiveBank) == 1 && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER)))
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    if (GetBankSide(gActiveBattler) == 1 && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER)))
     {
-        GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), 2);
+        GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), 2);
     }
-    gAbsentBankFlags &= ~(gBitTable[gActiveBank]);
-    EmitSendOutPoke(0, gBattlePartyID[gActiveBank], T2_READ_8(gBattlescriptCurrInstr + 2));
-    MarkBufferBankForExecution(gActiveBank);
+    gAbsentBankFlags &= ~(gBitTable[gActiveBattler]);
+    EmitSendOutPoke(0, gBattlePartyID[gActiveBattler], T2_READ_8(gBattlescriptCurrInstr + 2));
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 3;
 }
 
@@ -8373,29 +8373,29 @@ static void atk4F_jumpifcantswitch(void)
     register struct Pokemon *party;
     u8 r7;
     //0x80 byte is used as a way of telling the function whether to not check status2/status3
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1) & 0x7F);
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1) & 0x7F);
     if (!(T2_READ_8(gBattlescriptCurrInstr + 1) & 0x80)
-        && ((gBattleMons[gActiveBank].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
-            || (gStatuses3[gActiveBank] & STATUS3_ROOTED)))
+        && ((gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
+            || (gStatuses3[gActiveBattler] & STATUS3_ROOTED)))
     {
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2);
         return;
     }
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if (GetBankSide(gActiveBank) == 1)
+        if (GetBankSide(gActiveBattler) == 1)
             party = gEnemyParty;
         else
             party = gPlayerParty;
         val = 0;
-        if (sub_803FBFC(sub_803FC34(gActiveBank)) == 1)
+        if (sub_803FBFC(sub_803FC34(gActiveBattler)) == 1)
             val = 3;
         for (to_cmp = val + 3; val < to_cmp; val++)
         {
             if (GetMonData(&party[val], MON_DATA_SPECIES) != SPECIES_NONE
              && !GetMonData(&party[val], MON_DATA_IS_EGG)
              && GetMonData(&party[val], MON_DATA_HP) != 0
-             && gBattlePartyID[gActiveBank] != val)
+             && gBattlePartyID[gActiveBattler] != val)
                 break;
         }
         if (val == to_cmp)
@@ -8405,7 +8405,7 @@ static void atk4F_jumpifcantswitch(void)
     }
     else
     {
-        if (GetBankSide(gActiveBank) == 1)
+        if (GetBankSide(gActiveBattler) == 1)
         {
             r7 = GetBankByIdentity(1);
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -8440,9 +8440,9 @@ static void atk4F_jumpifcantswitch(void)
 
 void sub_8022A3C(u8 unkown)
 {
-    BATTLE_PARTY_ID(gActiveBank) = gBattlePartyID[gActiveBank];
-    EmitChoosePokemon(0, 1, unkown, 0, gBattleStruct->unk1606C[gActiveBank]);
-    MarkBufferBankForExecution(gActiveBank);
+    BATTLE_PARTY_ID(gActiveBattler) = gBattlePartyID[gActiveBattler];
+    EmitChoosePokemon(0, 1, unkown, 0, gBattleStruct->unk1606C[gActiveBattler]);
+    MarkBufferBankForExecution(gActiveBattler);
 }
 
 /*
@@ -8456,25 +8456,25 @@ static void atk50_openpartyscreen(void)
     {
         if ((gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_MULTI)) != BATTLE_TYPE_DOUBLE)
         {
-            for (gActiveBank = i; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            for (gActiveBattler = i; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
             {
-                if (!(gHitMarker & HITMARKER_FAINTED(gActiveBank)))
+                if (!(gHitMarker & HITMARKER_FAINTED(gActiveBattler)))
                 {
                     EmitLinkStandbyMsg(0, 2);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
-                else if (sub_8018018(gActiveBank, 6, 6) == 0
-                         && !gSpecialStatuses[gActiveBank].flag40)
+                else if (sub_8018018(gActiveBattler, 6, 6) == 0
+                         && !gSpecialStatuses[gActiveBattler].flag40)
                 {
                     sub_8022A3C(6);
-                    gSpecialStatuses[gActiveBank].flag40 = 1;
+                    gSpecialStatuses[gActiveBattler].flag40 = 1;
                 }
                 else
                 {
-                    gAbsentBankFlags |= gBitTable[gActiveBank];
-                    gHitMarker &= (~HITMARKER_FAINTED(gActiveBank));
+                    gAbsentBankFlags |= gBitTable[gActiveBattler];
+                    gHitMarker &= (~HITMARKER_FAINTED(gActiveBattler));
                     EmitLinkStandbyMsg(0, 2);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
             }
         }
@@ -8484,8 +8484,8 @@ static void atk50_openpartyscreen(void)
             {
 
             }
-            else if (sub_8018018(gActiveBank, 6, 6) == 0
-                     && !gSpecialStatuses[gActiveBank].flag40)
+            else if (sub_8018018(gActiveBattler, 6, 6) == 0
+                     && !gSpecialStatuses[gActiveBattler].flag40)
             {
 
             }
@@ -8536,7 +8536,7 @@ _08022ACE:\n\
     ands r1, r0\n\
     cmp r1, 0x1\n\
     beq _08022BBC\n\
-    ldr r1, _08022B4C @ =gActiveBank\n\
+    ldr r1, _08022B4C @ =gActiveBattler\n\
     strb r7, [r1]\n\
     ldr r0, _08022B50 @ =gNoOfAllBanks\n\
     ldrb r0, [r0]\n\
@@ -8591,7 +8591,7 @@ _08022AF2:\n\
     .align 2, 0\n\
 _08022B44: .4byte gBattlescriptCurrInstr\n\
 _08022B48: .4byte gBattleTypeFlags\n\
-_08022B4C: .4byte gActiveBank\n\
+_08022B4C: .4byte gActiveBattler\n\
 _08022B50: .4byte gNoOfAllBanks\n\
 _08022B54: .4byte gHitMarker\n\
 _08022B58: .4byte gBitTable\n\
@@ -8655,7 +8655,7 @@ _08022BC4:\n\
     ands r0, r5\n\
     cmp r0, 0\n\
     beq _08022C7E\n\
-    ldr r4, _08022C24 @ =gActiveBank\n\
+    ldr r4, _08022C24 @ =gActiveBattler\n\
     strb r7, [r4]\n\
     movs r0, 0\n\
     movs r1, 0x6\n\
@@ -8689,7 +8689,7 @@ _08022BC4:\n\
     .align 2, 0\n\
 _08022C1C: .4byte gHitMarker\n\
 _08022C20: .4byte gBitTable\n\
-_08022C24: .4byte gActiveBank\n\
+_08022C24: .4byte gActiveBattler\n\
 _08022C28: .4byte gAbsentBankFlags\n\
 _08022C2C:\n\
     ldr r6, _08022C60 @ =gSpecialStatuses\n\
@@ -8739,7 +8739,7 @@ _08022C7E:\n\
     ands r0, r5\n\
     cmp r0, 0\n\
     bne _08022D40\n\
-    ldr r4, _08022CDC @ =gActiveBank\n\
+    ldr r4, _08022CDC @ =gActiveBattler\n\
     movs r0, 0x2\n\
     strb r0, [r4]\n\
     movs r0, 0x2\n\
@@ -8773,7 +8773,7 @@ _08022C7E:\n\
     b _08022D40\n\
     .align 2, 0\n\
 _08022CD8: .4byte gBitTable\n\
-_08022CDC: .4byte gActiveBank\n\
+_08022CDC: .4byte gActiveBattler\n\
 _08022CE0: .4byte gAbsentBankFlags\n\
 _08022CE4: .4byte gHitMarker\n\
 _08022CE8:\n\
@@ -8823,7 +8823,7 @@ _08022D40:\n\
     ands r0, r5\n\
     cmp r0, 0\n\
     beq _08022DF6\n\
-    ldr r4, _08022D94 @ =gActiveBank\n\
+    ldr r4, _08022D94 @ =gActiveBattler\n\
     movs r0, 0x1\n\
     strb r0, [r4]\n\
     movs r0, 0x1\n\
@@ -8857,7 +8857,7 @@ _08022D40:\n\
     b _08022DF6\n\
     .align 2, 0\n\
 _08022D90: .4byte gBitTable\n\
-_08022D94: .4byte gActiveBank\n\
+_08022D94: .4byte gActiveBattler\n\
 _08022D98: .4byte gAbsentBankFlags\n\
 _08022D9C: .4byte gHitMarker\n\
 _08022DA0:\n\
@@ -8910,7 +8910,7 @@ _08022DF6:\n\
     ands r0, r5\n\
     cmp r0, 0\n\
     bne _08022EB8\n\
-    ldr r4, _08022E54 @ =gActiveBank\n\
+    ldr r4, _08022E54 @ =gActiveBattler\n\
     movs r0, 0x3\n\
     strb r0, [r4]\n\
     movs r0, 0x3\n\
@@ -8944,7 +8944,7 @@ _08022DF6:\n\
     b _08022EB8\n\
     .align 2, 0\n\
 _08022E50: .4byte gBitTable\n\
-_08022E54: .4byte gActiveBank\n\
+_08022E54: .4byte gActiveBattler\n\
 _08022E58: .4byte gAbsentBankFlags\n\
 _08022E5C: .4byte gHitMarker\n\
 _08022E60:\n\
@@ -9009,7 +9009,7 @@ _08022EB8:\n\
     ands r1, r0\n\
     cmp r1, 0\n\
     beq _08022EF8\n\
-    ldr r1, _08022EF4 @ =gActiveBank\n\
+    ldr r1, _08022EF4 @ =gActiveBattler\n\
     movs r0, 0x2\n\
     strb r0, [r1]\n\
     b _08022EFC\n\
@@ -9017,15 +9017,15 @@ _08022EB8:\n\
 _08022EE8: .4byte gSpecialStatuses\n\
 _08022EEC: .4byte gAbsentBankFlags\n\
 _08022EF0: .4byte gBitTable\n\
-_08022EF4: .4byte gActiveBank\n\
+_08022EF4: .4byte gActiveBattler\n\
 _08022EF8:\n\
-    ldr r0, _08022F3C @ =gActiveBank\n\
+    ldr r0, _08022F3C @ =gActiveBattler\n\
     strb r1, [r0]\n\
 _08022EFC:\n\
     movs r0, 0\n\
     movs r1, 0x2\n\
     bl EmitLinkStandbyMsg\n\
-    ldr r0, _08022F3C @ =gActiveBank\n\
+    ldr r0, _08022F3C @ =gActiveBattler\n\
     ldrb r0, [r0]\n\
     bl MarkBufferBankForExecution\n\
 _08022F0C:\n\
@@ -9049,23 +9049,23 @@ _08022F0C:\n\
     ands r0, r1\n\
     cmp r0, 0\n\
     beq _08022F4C\n\
-    ldr r1, _08022F3C @ =gActiveBank\n\
+    ldr r1, _08022F3C @ =gActiveBattler\n\
     movs r0, 0x3\n\
     b _08022F50\n\
     .align 2, 0\n\
-_08022F3C: .4byte gActiveBank\n\
+_08022F3C: .4byte gActiveBattler\n\
 _08022F40: .4byte gSpecialStatuses\n\
 _08022F44: .4byte gAbsentBankFlags\n\
 _08022F48: .4byte gBitTable\n\
 _08022F4C:\n\
-    ldr r1, _08022F6C @ =gActiveBank\n\
+    ldr r1, _08022F6C @ =gActiveBattler\n\
     movs r0, 0x1\n\
 _08022F50:\n\
     strb r0, [r1]\n\
     movs r0, 0\n\
     movs r1, 0x2\n\
     bl EmitLinkStandbyMsg\n\
-    ldr r0, _08022F6C @ =gActiveBank\n\
+    ldr r0, _08022F6C @ =gActiveBattler\n\
     ldrb r0, [r0]\n\
     bl MarkBufferBankForExecution\n\
 _08022F62:\n\
@@ -9075,7 +9075,7 @@ _08022F62:\n\
     str r0, [r1]\n\
     b _08023302\n\
     .align 2, 0\n\
-_08022F6C: .4byte gActiveBank\n\
+_08022F6C: .4byte gActiveBattler\n\
 _08022F70: .4byte gBattlescriptCurrInstr\n\
 _08022F74:\n\
     cmp r0, 0x6\n\
@@ -9108,7 +9108,7 @@ _08022F92:\n\
     ands r0, r5\n\
     cmp r0, 0\n\
     beq _0802303A\n\
-    ldr r6, _08022FFC @ =gActiveBank\n\
+    ldr r6, _08022FFC @ =gActiveBattler\n\
     movs r0, 0x2\n\
     strb r0, [r6]\n\
     ldr r0, _08023000 @ =gBattleBufferB\n\
@@ -9144,7 +9144,7 @@ _08022F92:\n\
 _08022FF0: .4byte gBattleTypeFlags\n\
 _08022FF4: .4byte gHitMarker\n\
 _08022FF8: .4byte gBitTable\n\
-_08022FFC: .4byte gActiveBank\n\
+_08022FFC: .4byte gActiveBattler\n\
 _08023000: .4byte gBattleBufferB\n\
 _08023004: .4byte gAbsentBankFlags\n\
 _08023008:\n\
@@ -9182,7 +9182,7 @@ _0802303A:\n\
     ands r5, r0\n\
     cmp r5, 0\n\
     beq _080230EE\n\
-    ldr r5, _080230A8 @ =gActiveBank\n\
+    ldr r5, _080230A8 @ =gActiveBattler\n\
     movs r0, 0x3\n\
     strb r0, [r5]\n\
     ldr r0, _080230AC @ =gBattleBufferB\n\
@@ -9222,7 +9222,7 @@ _08023098: .4byte gSpecialStatuses\n\
 _0802309C: .4byte gSharedMem\n\
 _080230A0: .4byte 0x00016068\n\
 _080230A4: .4byte gBitTable\n\
-_080230A8: .4byte gActiveBank\n\
+_080230A8: .4byte gActiveBattler\n\
 _080230AC: .4byte gBattleBufferB\n\
 _080230B0: .4byte 0x00000201\n\
 _080230B4: .4byte gAbsentBankFlags\n\
@@ -9351,7 +9351,7 @@ _080231A8:\n\
     lsls r0, 24\n\
     cmp r0, 0\n\
     beq _080231F8\n\
-    ldr r2, _080231E8 @ =gActiveBank\n\
+    ldr r2, _080231E8 @ =gActiveBattler\n\
     strb r7, [r2]\n\
     ldr r3, _080231EC @ =gAbsentBankFlags\n\
     ldr r4, _080231F0 @ =gBitTable\n\
@@ -9375,12 +9375,12 @@ _080231A8:\n\
     str r0, [r6]\n\
     b _08023302\n\
     .align 2, 0\n\
-_080231E8: .4byte gActiveBank\n\
+_080231E8: .4byte gActiveBattler\n\
 _080231EC: .4byte gAbsentBankFlags\n\
 _080231F0: .4byte gBitTable\n\
 _080231F4: .4byte gHitMarker\n\
 _080231F8:\n\
-    ldr r4, _080232A0 @ =gActiveBank\n\
+    ldr r4, _080232A0 @ =gActiveBattler\n\
     strb r7, [r4]\n\
     ldr r3, _080232A4 @ =gSharedMem\n\
     ldrb r0, [r4]\n\
@@ -9433,7 +9433,7 @@ _0802325A:\n\
     ands r0, r1\n\
     cmp r0, 0\n\
     beq _080232C4\n\
-    ldr r1, _080232A0 @ =gActiveBank\n\
+    ldr r1, _080232A0 @ =gActiveBattler\n\
     movs r0, 0\n\
     strb r0, [r1]\n\
     ldr r0, _080232C0 @ =gNoOfAllBanks\n\
@@ -9462,7 +9462,7 @@ _0802328A:\n\
     bcc _08023276\n\
     b _08023302\n\
     .align 2, 0\n\
-_080232A0: .4byte gActiveBank\n\
+_080232A0: .4byte gActiveBattler\n\
 _080232A4: .4byte gSharedMem\n\
 _080232A8: .4byte 0x00016064\n\
 _080232AC: .4byte gBattlePartyID\n\
@@ -9479,7 +9479,7 @@ _080232C4:\n\
     lsls r0, 24\n\
     lsrs r0, 24\n\
     bl GetBankByIdentity\n\
-    ldr r4, _08023310 @ =gActiveBank\n\
+    ldr r4, _08023310 @ =gActiveBattler\n\
     strb r0, [r4]\n\
     ldr r0, _08023314 @ =gAbsentBankFlags\n\
     ldrb r1, [r0]\n\
@@ -9509,7 +9509,7 @@ _08023302:\n\
     pop {r0}\n\
     bx r0\n\
     .align 2, 0\n\
-_08023310: .4byte gActiveBank\n\
+_08023310: .4byte gActiveBattler\n\
 _08023314: .4byte gAbsentBankFlags\n\
 _08023318: .4byte gBitTable\n\
         .syntax divided");
@@ -9521,7 +9521,7 @@ static void atk51_switchhandleorder(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     switch (T2_READ_8(gBattlescriptCurrInstr + 2))
     {
     case 0:
@@ -9533,22 +9533,22 @@ static void atk51_switchhandleorder(void)
         break;
     case 1:
         if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
-            sub_8012258(gActiveBank);
+            sub_8012258(gActiveBattler);
         break;
     case 2:
-        gBattleCommunication[0] = gBattleBufferB[gActiveBank][1];
-        ewram16068arr(gActiveBank) = gBattleBufferB[gActiveBank][1];
+        gBattleCommunication[0] = gBattleBufferB[gActiveBattler][1];
+        ewram16068arr(gActiveBattler) = gBattleBufferB[gActiveBattler][1];
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
-            ewram1606Carr(0, gActiveBank) &= 0xF;
-            ewram1606Carr(0, gActiveBank) |= (gBattleBufferB[gActiveBank][2] & 0xF0);
-            ewram1606Carr(1, gActiveBank) = gBattleBufferB[gActiveBank][3];
-            ewram1606Carr(0, (gActiveBank ^ 2)) &= (0xF0);
-            ewram1606Carr(0, (gActiveBank ^ 2)) |= (gBattleBufferB[gActiveBank][2] & 0xF0) >> 4;
-            ewram1606Carr(2, (gActiveBank ^ 2)) = gBattleBufferB[gActiveBank][3];
+            ewram1606Carr(0, gActiveBattler) &= 0xF;
+            ewram1606Carr(0, gActiveBattler) |= (gBattleBufferB[gActiveBattler][2] & 0xF0);
+            ewram1606Carr(1, gActiveBattler) = gBattleBufferB[gActiveBattler][3];
+            ewram1606Carr(0, (gActiveBattler ^ 2)) &= (0xF0);
+            ewram1606Carr(0, (gActiveBattler ^ 2)) |= (gBattleBufferB[gActiveBattler][2] & 0xF0) >> 4;
+            ewram1606Carr(2, (gActiveBattler ^ 2)) = gBattleBufferB[gActiveBattler][3];
         }
         else
-            sub_8012258(gActiveBank);
+            sub_8012258(gActiveBattler);
 
         gBattleTextBuff1[0] = 0xFD;
         gBattleTextBuff1[1] = 6;
@@ -9558,8 +9558,8 @@ static void atk51_switchhandleorder(void)
 
         gBattleTextBuff2[0] = 0xFD;
         gBattleTextBuff2[1] = 7;
-        gBattleTextBuff2[2] = gActiveBank;
-        gBattleTextBuff2[3] = gBattleBufferB[gActiveBank][1];
+        gBattleTextBuff2[2] = gActiveBattler;
+        gBattleTextBuff2[3] = gBattleBufferB[gActiveBattler][1];
         gBattleTextBuff2[4] = 0xFF;
         break;
     }
@@ -9570,24 +9570,24 @@ static void atk52_switchineffects(void)
 {
     int i;
 
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-    sub_80157C4(gActiveBank);
-    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
-    gSpecialStatuses[gActiveBank].flag40 = 0;
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    sub_80157C4(gActiveBattler);
+    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+    gSpecialStatuses[gActiveBattler].flag40 = 0;
 
-    if (!(gSideAffecting[GetBankSide(gActiveBank)] & SIDE_STATUS_SPIKES_DAMAGED) && (gSideAffecting[GetBankSide(gActiveBank)] & SIDE_STATUS_SPIKES)
-        && gBattleMons[gActiveBank].type1 != TYPE_FLYING && gBattleMons[gActiveBank].type2 != TYPE_FLYING && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE)
+    if (!(gSideAffecting[GetBankSide(gActiveBattler)] & SIDE_STATUS_SPIKES_DAMAGED) && (gSideAffecting[GetBankSide(gActiveBattler)] & SIDE_STATUS_SPIKES)
+        && gBattleMons[gActiveBattler].type1 != TYPE_FLYING && gBattleMons[gActiveBattler].type2 != TYPE_FLYING && gBattleMons[gActiveBattler].ability != ABILITY_LEVITATE)
     {
         u8 spikesDmg;
 
-        gSideAffecting[GetBankSide(gActiveBank)] |= SIDE_STATUS_SPIKES_DAMAGED;
+        gSideAffecting[GetBankSide(gActiveBattler)] |= SIDE_STATUS_SPIKES_DAMAGED;
 
-        spikesDmg = (5 - gSideTimers[GetBankSide(gActiveBank)].spikesAmount) * 2;
-        gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / (spikesDmg);
+        spikesDmg = (5 - gSideTimers[GetBankSide(gActiveBattler)].spikesAmount) * 2;
+        gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / (spikesDmg);
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
-        gBattleStruct->scriptingActive = gActiveBank;
+        gBattleStruct->scriptingActive = gActiveBattler;
         BattleScriptPushCursor();
 
         if (T2_READ_8(gBattlescriptCurrInstr + 1) == 0)
@@ -9599,18 +9599,18 @@ static void atk52_switchineffects(void)
     }
     else
     {
-        if (gBattleMons[gActiveBank].ability == ABILITY_TRUANT)
+        if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT)
         {
-            gDisableStructs[gActiveBank].truantCounter = 1;
+            gDisableStructs[gActiveBattler].truantCounter = 1;
         }
 
-        if (AbilityBattleEffects(0, gActiveBank, 0, 0, 0) == 0 && ItemBattleEffects(0, gActiveBank, 0) == 0)
+        if (AbilityBattleEffects(0, gActiveBattler, 0, 0, 0) == 0 && ItemBattleEffects(0, gActiveBattler, 0) == 0)
         {
-            gSideAffecting[GetBankSide(gActiveBank)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
+            gSideAffecting[GetBankSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
 
             for (i = 0; i < gNoOfAllBanks; i++)
             {
-                if (gBanksByTurnOrder[i] == gActiveBank)
+                if (gBanksByTurnOrder[i] == gActiveBattler)
                     gActionsByTurnOrder[i] = 0xC;
             }
 
@@ -9640,52 +9640,52 @@ static void atk52_switchineffects(void)
 static void atk53_trainerslidein(void)
 {
     if (!T2_READ_8(gBattlescriptCurrInstr + 1))
-        gActiveBank = GetBankByIdentity(0);
+        gActiveBattler = GetBankByIdentity(0);
     else
-        gActiveBank = GetBankByIdentity(1);
+        gActiveBattler = GetBankByIdentity(1);
 
     EmitTrainerSlide(0);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk54_playse(void)
 {
-    gActiveBank = gBankAttacker;
+    gActiveBattler = gBankAttacker;
     EmitEffectivenessSound(0, T2_READ_16(gBattlescriptCurrInstr + 1));
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 3;
 }
 
 static void atk55_fanfare(void)
 {
-    gActiveBank = gBankAttacker;
+    gActiveBattler = gBankAttacker;
     Emitcmd44(0, T2_READ_16(gBattlescriptCurrInstr + 1));
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 3;
 }
 
 static void atk56_playfaintcry(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     EmitFaintingCry(0);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk57(void)
 {
-    gActiveBank = GetBankByIdentity(0);
+    gActiveBattler = GetBankByIdentity(0);
     Emitcmd55(0, gBattleOutcome);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 1;
 }
 
 static void atk58_returntoball(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     EmitReturnPokeToBall(0, 1);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
@@ -9708,14 +9708,14 @@ void atk59_handlelearnnewmove(void)
     }
     else
     {
-        gActiveBank = GetBankByIdentity(0);
-        if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterID && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
-            GiveMoveToBattleMon(&gBattleMons[gActiveBank], ret);
+        gActiveBattler = GetBankByIdentity(0);
+        if (gBattlePartyID[gActiveBattler] == gBattleStruct->expGetterID && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
+            GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) //what is else if
         {
-            gActiveBank = GetBankByIdentity(2);
-            if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterID && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
-                GiveMoveToBattleMon(&gBattleMons[gActiveBank], ret);
+            gActiveBattler = GetBankByIdentity(2);
+            if (gBattlePartyID[gActiveBattler] == gBattleStruct->expGetterID && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
+                GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret);
         }
         gBattlescriptCurrInstr = loc1;
     }
@@ -9737,7 +9737,7 @@ void sub_8023AD8(void)
 
 static void atk5A_yesnoboxlearnmove(void)
 {
-    gActiveBank = 0;
+    gActiveBattler = 0;
     switch (gBattleStruct->atk5A_StateTracker)
     {
     case 0:
@@ -9800,7 +9800,7 @@ static void atk5A_yesnoboxlearnmove(void)
                 u16 move = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_MOVE1 + move_pos);
                 if (IsHMMove2(move))
                 {
-                    PrepareStringBattle(0x13F, gActiveBank);
+                    PrepareStringBattle(0x13F, gActiveBattler);
                     gBattleStruct->atk5A_StateTracker = 5;
                 }
                 else
@@ -9893,13 +9893,13 @@ static void atk5B_yesnoboxstoplearningmove(void)
 
 static void atk5C_hitanimation(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
         gBattlescriptCurrInstr += 2;
-    else if (!(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE) || !(gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE) || gDisableStructs[gActiveBank].substituteHP == 0)
+    else if (!(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE) || !(gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE) || gDisableStructs[gActiveBattler].substituteHP == 0)
     {
         EmitHitAnimation(0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 2;
     }
     else
@@ -10236,23 +10236,23 @@ static void atk5D_getmoneyreward(void)
 
 static void atk5E_8025A70(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     switch (gBattleCommunication[0])
     {
     case 0:
         EmitGetAttributes(0, REQUEST_ALL_BATTLE, 0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattleCommunication[0]++;
         break;
     case 1:
          if (gBattleExecBuffer == 0)
          {
             int i;
-            struct BattlePokemon* bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBank][4];
+            struct BattlePokemon* bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBattler][4];
             for (i = 0; i < 4; i++)
             {
-                gBattleMons[gActiveBank].moves[i] = bufferPoke->moves[i];
-                gBattleMons[gActiveBank].pp[i] = bufferPoke->pp[i];
+                gBattleMons[gActiveBattler].moves[i] = bufferPoke->moves[i];
+                gBattleMons[gActiveBattler].pp[i] = bufferPoke->pp[i];
             }
             gBattlescriptCurrInstr += 2;
          }
@@ -10262,9 +10262,9 @@ static void atk5E_8025A70(void)
 
 static void atk5F_8025B24(void)
 {
-    gActiveBank = gBankAttacker;
+    gActiveBattler = gBankAttacker;
     gBankAttacker = gBankTarget;
-    gBankTarget = gActiveBank;
+    gBankTarget = gActiveBattler;
     //what is xor...
     if (gHitMarker & HITMARKER_PURSUIT_TRAP)
         gHitMarker &= ~(HITMARKER_PURSUIT_TRAP);
@@ -10290,8 +10290,8 @@ static void atk61_drawpartystatussummary(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-    if (GetBankSide(gActiveBank) == 0)
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    if (GetBankSide(gActiveBattler) == 0)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -10310,15 +10310,15 @@ static void atk61_drawpartystatussummary(void)
         }
     }
     EmitDrawPartyStatusSummary(0, hpStatus, 1);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk62_08025C6C(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     Emitcmd49(0);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
@@ -10335,11 +10335,11 @@ static void atk64_statusanimation(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-        if (!(gStatuses3[gActiveBank] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[gActiveBank].substituteHP == 0 && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
+        gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+        if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[gActiveBattler].substituteHP == 0 && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
         {
-            EmitStatusAnimation(0, 0, gBattleMons[gActiveBank].status1);
-            MarkBufferBankForExecution(gActiveBank);
+            EmitStatusAnimation(0, 0, gBattleMons[gActiveBattler].status1);
+            MarkBufferBankForExecution(gActiveBattler);
         }
         gBattlescriptCurrInstr += 2;
     }
@@ -10350,12 +10350,12 @@ static void atk65_status2animation(void)
     if (gBattleExecBuffer == 0)
     {
         u32 possible_to_anim;
-        gActiveBank = GetBattleBank(T1_READ_8(gBattlescriptCurrInstr + 1));
+        gActiveBattler = GetBattleBank(T1_READ_8(gBattlescriptCurrInstr + 1));
         possible_to_anim = T1_READ_32(gBattlescriptCurrInstr + 2);
-        if (!(gStatuses3[gActiveBank] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[gActiveBank].substituteHP == 0 && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
+        if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[gActiveBattler].substituteHP == 0 && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
         {
-            EmitStatusAnimation(0, 1, gBattleMons[gActiveBank].status2 & possible_to_anim);
-            MarkBufferBankForExecution(gActiveBank);
+            EmitStatusAnimation(0, 1, gBattleMons[gActiveBattler].status2 & possible_to_anim);
+            MarkBufferBankForExecution(gActiveBattler);
         }
         gBattlescriptCurrInstr += 6;
     }
@@ -10366,12 +10366,12 @@ static void atk66_chosenstatusanimation(void)
     if (gBattleExecBuffer == 0)
     {
         u32 status;
-        gActiveBank = GetBattleBank(T1_READ_8(gBattlescriptCurrInstr + 1));
+        gActiveBattler = GetBattleBank(T1_READ_8(gBattlescriptCurrInstr + 1));
         status = T1_READ_32(gBattlescriptCurrInstr + 3);
-        if (!(gStatuses3[gActiveBank] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[gActiveBank].substituteHP == 0 && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
+        if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[gActiveBattler].substituteHP == 0 && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
         {
             EmitStatusAnimation(0, T1_READ_8(gBattlescriptCurrInstr + 2), status);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
         }
         gBattlescriptCurrInstr += 7;
     }
@@ -10474,12 +10474,12 @@ static void atk69_adjustsetdamage(void) //literally a copy of atk07 except there
 
 void atk6A_removeitem(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-    USED_HELD_ITEMS(gActiveBank) = gBattleMons[gActiveBank].item;
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    USED_HELD_ITEMS(gActiveBattler) = gBattleMons[gActiveBattler].item;
 
-    gBattleMons[gActiveBank].item = 0;
-    EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item);
-    MarkBufferBankForExecution(gActiveBank);
+    gBattleMons[gActiveBattler].item = 0;
+    EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
@@ -10933,16 +10933,16 @@ static void atk6E_setatktoplayer0(void)
 
 static void atk6F_makevisible(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     EmitSpriteInvisibility(0, 0);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk70_recordlastability(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-    RecordAbilityBattle(gActiveBank, gLastUsedAbility);
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
     gBattlescriptCurrInstr += 1; //buggy, should be += 2, one byte for command, one byte for argument...
 }
 
@@ -10975,8 +10975,8 @@ static void atk73_hpthresholds(void)
     s32 result;
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
     {
-        gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-        opposing_bank = gActiveBank ^ 1;
+        gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+        opposing_bank = gActiveBattler ^ 1;
 
         result = gBattleMons[opposing_bank].hp * 100 / gBattleMons[opposing_bank].maxHP;
         if (result == 0)
@@ -11002,8 +11002,8 @@ static void atk74_hpthresholds2(void)
     s32 result;
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
     {
-        gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-        opposing_bank = gActiveBank ^ 1;
+        gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+        opposing_bank = gActiveBattler ^ 1;
         hp_switchout = ewram160BCarr(GetBankSide(opposing_bank)); //gBattleStruct->HP_OnSwitchout[GetBankSide(opposing_bank)];
         result = (hp_switchout - gBattleMons[opposing_bank].hp) * 100 / hp_switchout;
 
@@ -11029,11 +11029,11 @@ static void atk75_useitemonopponent(void)
 
 static void atk76_various(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
     switch (T2_READ_8(gBattlescriptCurrInstr + 2))
     {
     case 0:
-        CancelMultiTurnMoves(gActiveBank);
+        CancelMultiTurnMoves(gActiveBattler);
         break;
     case 1:
         {
@@ -11043,7 +11043,7 @@ static void atk76_various(void)
             if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
                 gBankTarget = gSideTimers[side].followmeTarget;
             else
-                gBankTarget = gActiveBank;
+                gBankTarget = gActiveBattler;
         }
         break;
     case 2:
@@ -11053,14 +11053,14 @@ static void atk76_various(void)
         gBankTarget = GetMoveTarget(gCurrentMove, 0);
         break;
     case 4:
-        if (gHitMarker & HITMARKER_FAINTED(gActiveBank))
+        if (gHitMarker & HITMARKER_FAINTED(gActiveBattler))
             gBattleCommunication[0] = 1;
         else
             gBattleCommunication[0] = 0;
         break;
     case 5:
-        gSpecialStatuses[gActiveBank].intimidatedPoke = 0;
-        gSpecialStatuses[gActiveBank].traced = 0;
+        gSpecialStatuses[gActiveBattler].intimidatedPoke = 0;
+        gSpecialStatuses[gActiveBattler].traced = 0;
         break;
     case 6:
         {
@@ -11073,15 +11073,15 @@ static void atk76_various(void)
             if (gBattlePartyID[0] == gBattlePartyID[2])
             {
                 ACTIVE_0:
-                    gActiveBank = 0;
+                    gActiveBattler = 0;
             }
             else
-                gActiveBank = 2;
+                gActiveBattler = 2;
 
-            choiced_move = CHOICED_MOVE(gActiveBank);
+            choiced_move = CHOICED_MOVE(gActiveBattler);
             for (i = 0; i < 4; i++)
             {
-                if (gBattleMons[gActiveBank].moves[i] == *choiced_move)
+                if (gBattleMons[gActiveBattler].moves[i] == *choiced_move)
                     break;
             }
             if (i == 4)
@@ -11140,10 +11140,10 @@ static void atk78_faintifabilitynotdamp(void)
 
     if (gBankTarget == gNoOfAllBanks)
     {
-        gActiveBank = gBankAttacker;
-        gBattleMoveDamage = gBattleMons[gActiveBank].hp;
+        gActiveBattler = gBankAttacker;
+        gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
         EmitHealthBarUpdate(0, 0x7FFF);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr++;
 
         for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
@@ -11167,10 +11167,10 @@ static void atk79_setatkhptozero(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = gBankAttacker;
-    gBattleMons[gActiveBank].hp = 0;
-    EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp);
-    MarkBufferBankForExecution(gActiveBank);
+    gActiveBattler = gBankAttacker;
+    gBattleMons[gActiveBattler].hp = 0;
+    EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr++;
 }
@@ -11342,7 +11342,7 @@ static void atk80_manipulatedamage(void)
 static void atk81_trysetrest(void)
 {
     u8* fail_loc = T1_READ_PTR(gBattlescriptCurrInstr + 1);
-    gActiveBank = gBankTarget = gBankAttacker;
+    gActiveBattler = gBankTarget = gBankAttacker;
     gBattleMoveDamage = gBattleMons[gBankTarget].maxHP * (-1);
     if (gBattleMons[gBankTarget].hp == gBattleMons[gBankTarget].maxHP)
         gBattlescriptCurrInstr = fail_loc;
@@ -11354,8 +11354,8 @@ static void atk81_trysetrest(void)
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
 
         gBattleMons[gBankTarget].status1 = 3;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-        MarkBufferBankForExecution(gActiveBank);
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -11504,9 +11504,9 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
     u32 index;
 
     if (flags & MOVE_EFFECT_AFFECTS_USER)
-        gActiveBank = gBankAttacker;
+        gActiveBattler = gBankAttacker;
     else
-        gActiveBank = gBankTarget;
+        gActiveBattler = gBankTarget;
 
     flags &= ~(MOVE_EFFECT_AFFECTS_USER);
 
@@ -11522,21 +11522,21 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
 
     if ((statValue << 0x18) < 0) // stat decrease
     {
-        if (gSideTimers[GET_BANK_SIDE(gActiveBank)].mistTimer
+        if (gSideTimers[GET_BANK_SIDE(gActiveBattler)].mistTimer
             && !certain && gCurrentMove != MOVE_CURSE)
         {
             if (flags == STAT_CHANGE_BS_PTR)
             {
-                if (gSpecialStatuses[gActiveBank].statLowered)
+                if (gSpecialStatuses[gActiveBattler].statLowered)
                 {
                     gBattlescriptCurrInstr = BS_ptr;
                 }
                 else
                 {
                     BattleScriptPush(BS_ptr);
-                    gBattleStruct->scriptingActive = gActiveBank;
+                    gBattleStruct->scriptingActive = gActiveBattler;
                     gBattlescriptCurrInstr = BattleScript_MistProtected;
-                    gSpecialStatuses[gActiveBank].statLowered = 1;
+                    gSpecialStatuses[gActiveBattler].statLowered = 1;
                 }
             }
             return STAT_CHANGE_DIDNT_WORK;
@@ -11547,55 +11547,55 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
             gBattlescriptCurrInstr = BattleScript_ButItFailed;
             return STAT_CHANGE_DIDNT_WORK;
         }
-        else if ((gBattleMons[gActiveBank].ability == ABILITY_CLEAR_BODY
-                  || gBattleMons[gActiveBank].ability == ABILITY_WHITE_SMOKE)
+        else if ((gBattleMons[gActiveBattler].ability == ABILITY_CLEAR_BODY
+                  || gBattleMons[gActiveBattler].ability == ABILITY_WHITE_SMOKE)
                  && !certain && gCurrentMove != MOVE_CURSE)
         {
             if (flags == STAT_CHANGE_BS_PTR)
             {
-                if (gSpecialStatuses[gActiveBank].statLowered)
+                if (gSpecialStatuses[gActiveBattler].statLowered)
                 {
                     gBattlescriptCurrInstr = BS_ptr;
                 }
                 else
                 {
                     BattleScriptPush(BS_ptr);
-                    gBattleStruct->scriptingActive = gActiveBank;
+                    gBattleStruct->scriptingActive = gActiveBattler;
                     gBattlescriptCurrInstr = BattleScript_AbilityNoStatLoss;
-                    gLastUsedAbility = gBattleMons[gActiveBank].ability;
-                    RecordAbilityBattle(gActiveBank, gLastUsedAbility);
-                    gSpecialStatuses[gActiveBank].statLowered = 1;
+                    gLastUsedAbility = gBattleMons[gActiveBattler].ability;
+                    RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
+                    gSpecialStatuses[gActiveBattler].statLowered = 1;
                 }
             }
             return STAT_CHANGE_DIDNT_WORK;
         }
-        else if (gBattleMons[gActiveBank].ability == ABILITY_KEEN_EYE
+        else if (gBattleMons[gActiveBattler].ability == ABILITY_KEEN_EYE
                  && !certain && statId == STAT_STAGE_ACC)
         {
             if (flags == STAT_CHANGE_BS_PTR)
             {
                 BattleScriptPush(BS_ptr);
-                gBattleStruct->scriptingActive = gActiveBank;
+                gBattleStruct->scriptingActive = gActiveBattler;
                 gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss;
-                gLastUsedAbility = gBattleMons[gActiveBank].ability;
-                RecordAbilityBattle(gActiveBank, gLastUsedAbility);
+                gLastUsedAbility = gBattleMons[gActiveBattler].ability;
+                RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
             }
             return STAT_CHANGE_DIDNT_WORK;
         }
-        else if (gBattleMons[gActiveBank].ability == ABILITY_HYPER_CUTTER
+        else if (gBattleMons[gActiveBattler].ability == ABILITY_HYPER_CUTTER
                  && !certain && statId == STAT_STAGE_ATK)
         {
             if (flags == STAT_CHANGE_BS_PTR)
             {
                 BattleScriptPush(BS_ptr);
-                gBattleStruct->scriptingActive = gActiveBank;
+                gBattleStruct->scriptingActive = gActiveBattler;
                 gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss;
-                gLastUsedAbility = gBattleMons[gActiveBank].ability;
-                RecordAbilityBattle(gActiveBank, gLastUsedAbility);
+                gLastUsedAbility = gBattleMons[gActiveBattler].ability;
+                RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
             }
             return STAT_CHANGE_DIDNT_WORK;
         }
-        else if (gBattleMons[gActiveBank].ability == ABILITY_SHIELD_DUST && flags == 0)
+        else if (gBattleMons[gActiveBattler].ability == ABILITY_SHIELD_DUST && flags == 0)
         {
             return STAT_CHANGE_DIDNT_WORK;
         }
@@ -11619,10 +11619,10 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
             index++;
             gBattleTextBuff2[index] = B_BUFF_EOS;
 
-            if (gBattleMons[gActiveBank].statStages[statId] == 0)
+            if (gBattleMons[gActiveBattler].statStages[statId] == 0)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
             else
-                gBattleCommunication[MULTISTRING_CHOOSER] = (gBankTarget == gActiveBank);
+                gBattleCommunication[MULTISTRING_CHOOSER] = (gBankTarget == gActiveBattler);
 
         }
     }
@@ -11646,17 +11646,17 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
         index++;
         gBattleTextBuff2[index] = B_BUFF_EOS;
 
-        if (gBattleMons[gActiveBank].statStages[statId] == 0xC)
+        if (gBattleMons[gActiveBattler].statStages[statId] == 0xC)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         else
-            gBattleCommunication[MULTISTRING_CHOOSER] = (gBankTarget == gActiveBank);
+            gBattleCommunication[MULTISTRING_CHOOSER] = (gBankTarget == gActiveBattler);
     }
 
-    gBattleMons[gActiveBank].statStages[statId] += statValue;
-    if (gBattleMons[gActiveBank].statStages[statId] < 0)
-        gBattleMons[gActiveBank].statStages[statId] = 0;
-    if (gBattleMons[gActiveBank].statStages[statId] > 0xC)
-        gBattleMons[gActiveBank].statStages[statId] = 0xC;
+    gBattleMons[gActiveBattler].statStages[statId] += statValue;
+    if (gBattleMons[gActiveBattler].statStages[statId] < 0)
+        gBattleMons[gActiveBattler].statStages[statId] = 0;
+    if (gBattleMons[gActiveBattler].statStages[statId] > 0xC)
+        gBattleMons[gActiveBattler].statStages[statId] = 0xC;
 
     if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_CHANGE_BS_PTR)
         gBattleMoveFlags |= MOVESTATUS_MISSED;
@@ -12458,26 +12458,26 @@ static void atk98_updatestatusicon(void)
 
     if (T2_READ_8(gBattlescriptCurrInstr + 1) != 4)
     {
-        gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-        EmitStatusIconUpdate(0, gBattleMons[gActiveBank].status1, gBattleMons[gActiveBank].status2);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+        EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 2;
     }
     else
     {
-        gActiveBank = gBankAttacker;
-        if (!(gAbsentBankFlags & gBitTable[gActiveBank]))
+        gActiveBattler = gBankAttacker;
+        if (!(gAbsentBankFlags & gBitTable[gActiveBattler]))
         {
-            EmitStatusIconUpdate(0, gBattleMons[gActiveBank].status1, gBattleMons[gActiveBank].status2);
-            MarkBufferBankForExecution(gActiveBank);
+            EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
+            MarkBufferBankForExecution(gActiveBattler);
         }
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         {
-            gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
-            if (!(gAbsentBankFlags & gBitTable[gActiveBank]))
+            gActiveBattler = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
+            if (!(gAbsentBankFlags & gBitTable[gActiveBattler]))
             {
-                EmitStatusIconUpdate(0, gBattleMons[gActiveBank].status1, gBattleMons[gActiveBank].status2);
-                MarkBufferBankForExecution(gActiveBank);
+                EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
+                MarkBufferBankForExecution(gActiveBattler);
             }
         }
         gBattlescriptCurrInstr += 2;
@@ -12554,9 +12554,9 @@ static void atk9B_transformdataexecution(void)
                 gBattleMons[gBankAttacker].pp[j] = 5;
         }
 
-        gActiveBank = gBankAttacker;
+        gActiveBattler = gBankAttacker;
         EmitResetActionMoveSelection(0, 2);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
 }
@@ -13387,7 +13387,7 @@ static void atkA8_copymovepermanently(void)
             struct move_pp moves_data;
             gBattleMons[gBankAttacker].moves[gCurrMovePos] = gUnknown_02024C2C[gBankTarget];
             gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gUnknown_02024C2C[gBankTarget]].pp;
-            gActiveBank = gBankAttacker;
+            gActiveBattler = gBankAttacker;
             for (i = 0; i < 4; i++)
             {
                 moves_data.move[i] = gBattleMons[gBankAttacker].moves[i];
@@ -13395,7 +13395,7 @@ static void atkA8_copymovepermanently(void)
             }
             moves_data.ppBonuses = gBattleMons[gBankAttacker].ppBonuses;
             EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct move_pp), &moves_data);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             gBattleTextBuff1[0] = 0xFD;
             gBattleTextBuff1[1] = 2;
             gBattleTextBuff1[2] = gUnknown_02024C2C[gBankTarget];
@@ -13533,12 +13533,12 @@ static void atkAD_tryspiteppreduce(void)
             gBattleTextBuff2[5] = 0xFF;
 
             gBattleMons[gBankTarget].pp[i] -= lost_pp;
-            gActiveBank = gBankTarget;
-            if (!(gDisableStructs[gActiveBank].unk18_b & gBitTable[i])
-                && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
+            gActiveBattler = gBankTarget;
+            if (!(gDisableStructs[gActiveBattler].unk18_b & gBitTable[i])
+                && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
             {
-                EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]);
-                MarkBufferBankForExecution(gActiveBank);
+                EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             gBattlescriptCurrInstr += 5;
             if (gBattleMons[gBankTarget].pp[i] == 0)
@@ -13575,16 +13575,16 @@ static void atkAE_healpartystatus(void)
             gBattleCommunication[MULTISTRING_CHOOSER] |= 1;
         }
 
-        gActiveBank = gBattleStruct->scriptingActive = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
-        if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank]))
+        gActiveBattler = gBattleStruct->scriptingActive = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
+        if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBattler]))
         {
-            if (gBattleMons[gActiveBank].ability != ABILITY_SOUNDPROOF)
+            if (gBattleMons[gActiveBattler].ability != ABILITY_SOUNDPROOF)
             {
-                gBattleMons[gActiveBank].status1 = 0;
+                gBattleMons[gActiveBattler].status1 = 0;
             }
             else
             {
-                RecordAbilityBattle(gActiveBank, gBattleMons[gActiveBank].ability);
+                RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability);
                 gBattleCommunication[MULTISTRING_CHOOSER] |= 2;
             }
         }
@@ -13598,8 +13598,8 @@ static void atkAE_healpartystatus(void)
                 u8 ability;
                 if (gBattlePartyID[gBankAttacker] == i)
                     ability = gBattleMons[gBankAttacker].ability;
-                else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlePartyID[gActiveBank] == i && !(gAbsentBankFlags & gBitTable[gActiveBank]))
-                    ability = gBattleMons[gActiveBank].ability;
+                else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlePartyID[gActiveBattler] == i && !(gAbsentBankFlags & gBitTable[gActiveBattler]))
+                    ability = gBattleMons[gActiveBattler].ability;
                 else
                     ability = GetAbilityBySpecies(species, abilityBit);
                 if (ability != ABILITY_SOUNDPROOF)
@@ -13613,15 +13613,15 @@ static void atkAE_healpartystatus(void)
         to_heal = 0x3F;
         gBattleMons[gBankAttacker].status1 = zero2;
 
-        gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
-        if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank]))
-            gBattleMons[gActiveBank].status1 = 0;
+        gActiveBattler = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
+        if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBattler]))
+            gBattleMons[gActiveBattler].status1 = 0;
 
     }
     //missing check?
-    gActiveBank = gBankAttacker;
+    gActiveBattler = gBankAttacker;
     EmitSetMonData(0, REQUEST_STATUS_BATTLE, to_heal, 4, &zero);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr++;
 }
@@ -13675,8 +13675,8 @@ static void atkB2_trysetperishsong(void)
         else
         {
             gStatuses3[i] |= STATUS3_PERISH_SONG;
-            gDisableStructs[i].perishSong1 = 3;
-            gDisableStructs[i].perishSong2 = 3;
+            gDisableStructs[i].perishSongTimer1 = 3;
+            gDisableStructs[i].perishSongTimer2 = 3;
         }
     }
 
@@ -14552,10 +14552,10 @@ static void atkC9_jumpifattackandspecialattackcannotfall(void) //memento
             gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     else
     {
-        gActiveBank = gBankAttacker;
-        gBattleMoveDamage = gBattleMons[gActiveBank].hp;
+        gActiveBattler = gBankAttacker;
+        gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
         EmitHealthBarUpdate(0, 0x7FFF);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -14590,9 +14590,9 @@ static void atkCD_cureifburnedparalysedorpoisoned(void) //refresh
     {
         gBattleMons[gBankAttacker].status1 = 0;
         gBattlescriptCurrInstr += 5;
-        gActiveBank = gBankAttacker;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = gBankAttacker;
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBufferBankForExecution(gActiveBattler);
     }
     else
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -14841,7 +14841,7 @@ _0802A36C:\n\
     add r0, r9\n\
     mov r3, r10\n\
     strh r3, [r0, 0x2E]\n\
-    ldr r5, _0802A460 @ =gActiveBank\n\
+    ldr r5, _0802A460 @ =gActiveBattler\n\
     ldr r1, _0802A45C @ =gBankAttacker\n\
     ldrb r0, [r1]\n\
     strb r0, [r5]\n\
@@ -14937,7 +14937,7 @@ _0802A36C:\n\
     .align 2, 0\n\
 _0802A458: .4byte gSharedMem + 0x160F0\n\
 _0802A45C: .4byte gBankAttacker\n\
-_0802A460: .4byte gActiveBank\n\
+_0802A460: .4byte gActiveBattler\n\
 _0802A464: .4byte 0xfffe9f10\n\
 _0802A468: .4byte 0x000160e8\n\
 _0802A46C: .4byte 0x000160e9\n\
@@ -15449,13 +15449,13 @@ static void atkE1_trygetintimidatetarget(void)
 
 static void atkE2_switchoutabilities(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-    switch (gBattleMons[gActiveBank].ability)
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    switch (gBattleMons[gActiveBattler].ability)
     {
     case ABILITY_NATURAL_CURE:
-        gBattleMons[gActiveBank].status1 = 0;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[ewram16064arr(gActiveBank)], 4, &gBattleMons[gActiveBank].status1);
-        MarkBufferBankForExecution(gActiveBank);
+        gBattleMons[gActiveBattler].status1 = 0;
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[ewram16064arr(gActiveBattler)], 4, &gBattleMons[gActiveBattler].status1);
+        MarkBufferBankForExecution(gActiveBattler);
         break;
     }
     gBattlescriptCurrInstr += 2;
@@ -15463,8 +15463,8 @@ static void atkE2_switchoutabilities(void)
 
 static void atkE3_jumpifhasnohp(void)
 {
-    gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
-    if (gBattleMons[gActiveBank].hp == 0)
+    gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
+    if (gBattleMons[gActiveBattler].hp == 0)
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2);
     else
         gBattlescriptCurrInstr += 6;
@@ -15535,11 +15535,11 @@ static void atkE5_pickup(void)
 
 static void atkE6_docastformchangeanimation(void)
 {
-    gActiveBank = gBattleStruct->scriptingActive;
-    if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE)
+    gActiveBattler = gBattleStruct->scriptingActive;
+    if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE)
         gBattleStruct->castformToChangeInto |= 0x80;
     EmitBattleAnimation(0, B_ANIM_CASTFORM_CHANGE, gBattleStruct->castformToChangeInto);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr++;
 }
 
@@ -15605,15 +15605,15 @@ static void atkE9_setweatherballtype(void)
 static void atkEA_tryrecycleitem(void)
 {
     u16* used_item;
-    gActiveBank = gBankAttacker;
-    used_item = USED_HELD_ITEM(gActiveBank);
-    if (*used_item && gBattleMons[gActiveBank].item == 0)
+    gActiveBattler = gBankAttacker;
+    used_item = USED_HELD_ITEM(gActiveBattler);
+    if (*used_item && gBattleMons[gActiveBattler].item == 0)
     {
         gLastUsedItem = *used_item;
         *used_item = 0;
-        gBattleMons[gActiveBank].item = gLastUsedItem;
-        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item);
-        MarkBufferBankForExecution(gActiveBank);
+        gBattleMons[gActiveBattler].item = gLastUsedItem;
+        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -15638,15 +15638,15 @@ static void atkEB_settypetoterrain(void)
 
 static void atkEC_pursuitrelated(void)
 {
-    gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
-    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank]) && gActionForBanks[gActiveBank] == 0 && gChosenMovesByBanks[gActiveBank] == MOVE_PURSUIT)
+    gActiveBattler = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
+    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBattler]) && gActionForBanks[gActiveBattler] == 0 && gChosenMovesByBanks[gActiveBattler] == MOVE_PURSUIT)
     {
-        gActionsByTurnOrder[gActiveBank] = 11;
+        gActionsByTurnOrder[gActiveBattler] = 11;
         gCurrentMove = MOVE_PURSUIT;
         gBattlescriptCurrInstr += 5;
         gBattleStruct->animTurn = 1;
         gBattleStruct->unk160A7 = gBankAttacker;
-        gBankAttacker = gActiveBank;
+        gBankAttacker = gActiveBattler;
     }
     else
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -15689,18 +15689,18 @@ void atkEF_handleballthrow(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = gBankAttacker;
+    gActiveBattler = gBankAttacker;
     gBankTarget = gBankAttacker ^ 1;
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
         EmitBallThrow(0, 5);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr = BattleScript_TrainerBallBlock;
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL)
     {
         EmitBallThrow(0, 4);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr = BattleScript_WallyBallThrow;
     }
     else
@@ -15778,7 +15778,7 @@ void atkEF_handleballthrow(void)
         if (odds > 254) //poke caught
         {
             EmitBallThrow(0, 4);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
             SetMonData(&gEnemyParty[gBattlePartyID[gBankTarget]], MON_DATA_POKEBALL, (const void*) &gLastUsedItem);
             if (CalculatePlayerPartyCount() == 6)
@@ -15795,7 +15795,7 @@ void atkEF_handleballthrow(void)
             if (gLastUsedItem == ITEM_MASTER_BALL)
                 shakes = 4; //why calculate the shakes before that check?
             EmitBallThrow(0, shakes);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             if (shakes == 4) //poke caught, copy of the code above
             {
                 gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 564d8b518..0e27c0a8c 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -23,7 +23,7 @@
 #include "graphics.h"
 
 extern u8 gBattleBufferA[][0x200];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u8 gNoOfAllBanks;
 extern u16 gBattlePartyID[];
 extern u8 gBanksBySide[];
@@ -154,36 +154,36 @@ void sub_80313A0(struct Sprite *sprite)
 
 void move_anim_start_t2_for_situation(u8 a, u32 b)
 {
-    ewram17810[gActiveBank].unk0_4 = 1;
+    ewram17810[gActiveBattler].unk0_4 = 1;
     if (a == 0)
     {
         if (b == 0x20)
-            move_anim_start_t2(gActiveBank, 6);
+            move_anim_start_t2(gActiveBattler, 6);
         else if (b == 8 || (b & 0x80))
-            move_anim_start_t2(gActiveBank, 0);
+            move_anim_start_t2(gActiveBattler, 0);
         else if (b == 0x10)
-            move_anim_start_t2(gActiveBank, 2);
+            move_anim_start_t2(gActiveBattler, 2);
         else if (b & 7)
-            move_anim_start_t2(gActiveBank, 4);
+            move_anim_start_t2(gActiveBattler, 4);
         else if (b == 0x40)
-            move_anim_start_t2(gActiveBank, 5);
+            move_anim_start_t2(gActiveBattler, 5);
         else
-            ewram17810[gActiveBank].unk0_4 = 0;
+            ewram17810[gActiveBattler].unk0_4 = 0;
     }
     else
     {
         if (b & 0x000F0000)
-            move_anim_start_t2(gActiveBank, 3);
+            move_anim_start_t2(gActiveBattler, 3);
         else if (b & 7)
-            move_anim_start_t2(gActiveBank, 1);
+            move_anim_start_t2(gActiveBattler, 1);
         else if (b & 0x10000000)
-            move_anim_start_t2(gActiveBank, 7);
+            move_anim_start_t2(gActiveBattler, 7);
         else if (b & 0x08000000)
-            move_anim_start_t2(gActiveBank, 8);
+            move_anim_start_t2(gActiveBattler, 8);
         else if (b & 0x0000E000)
-            move_anim_start_t2(gActiveBank, 9);
+            move_anim_start_t2(gActiveBattler, 9);
         else
-            ewram17810[gActiveBank].unk0_4 = 0;
+            ewram17810[gActiveBattler].unk0_4 = 0;
     }
 }
 
@@ -274,7 +274,7 @@ bool8 mplay_80342A4(u8 a)
     if (IsSEPlaying())
     {
         ewram17810[a].unk8++;
-        if (ewram17810[gActiveBank].unk8 < 30)
+        if (ewram17810[gActiveBattler].unk8 < 30)
             return TRUE;
         m4aMPlayStop(&gMPlay_SE1);
         m4aMPlayStop(&gMPlay_SE2);
diff --git a/src/battle/battle_9.c b/src/battle/battle_9.c
new file mode 100755
index 000000000..d9a1ee97e
--- /dev/null
+++ b/src/battle/battle_9.c
@@ -0,0 +1,27 @@
+#include "global.h"
+#include "battle.h"
+#include "ewram.h"
+#include "pokemon.h"
+#include "random.h"
+#include "rom_8077ABC.h"
+#include "rom3.h"
+#include "constants/abilities.h"
+#include "constants/items.h"
+#include "constants/moves.h"
+#include "constants/species.h"
+
+extern u8 gActiveBattler;
+extern u32 gStatuses3[BATTLE_BANKS_COUNT];
+
+/*static*/ bool8 ShouldSwitchIfPerishSong(void)
+{
+    if (gStatuses3[gActiveBattler] & STATUS3_PERISH_SONG
+        && gDisableStructs[gActiveBattler].perishSongTimer1 == 0)
+    {
+        ewram160C8arr(GetBankIdentity(gActiveBattler)) = 6; // gBattleStruct->AI_monToSwitchIntoId[GetBankIdentity(gActiveBattler)] = 6;
+        Emitcmd33(1, 2, 0);
+        return TRUE;
+    }
+
+    return FALSE;
+}
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index 629a57d25..f285d2644 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -17,7 +17,7 @@ extern u8 gUnknown_02023A14_50;
 extern u32 gUnknown_02023A14_4C;
 extern u16 gBattleTypeFlags;
 extern u16 gBattleWeather;
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u16 gBattlePartyID[MAX_BANKS_BATTLE];
 extern u16 gCurrentMove;
 extern int gBattleMoveDamage;
@@ -303,7 +303,7 @@ void BattleAI_SetupAIData(void)
     for (i = 0; i < MAX_MON_MOVES; i++)
         AI_THINKING_STRUCT->score[i] = 100;
 
-    limitations = CheckMoveLimitations(gActiveBank, 0, 0xFF);
+    limitations = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
 
     // do not consider moves the AI cannot select
     // also, roll simulated RNG for moves that have a degree of
@@ -318,7 +318,7 @@ void BattleAI_SetupAIData(void)
 
     // clear AI stack.
     AI_STACK->size = 0;
-    gBankAttacker = gActiveBank;
+    gBankAttacker = gActiveBattler;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
@@ -328,7 +328,7 @@ void BattleAI_SetupAIData(void)
             gBankTarget ^= 2;
     }
     else
-        gBankTarget = gActiveBank ^ 1;
+        gBankTarget = gActiveBattler ^ 1;
 
     // special AI flag cases.
     if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
@@ -1885,7 +1885,7 @@ static void BattleAICmd_if_encored(void)
     switch (gAIScriptPtr[1])
     {
     case 0: // _08109348
-        if (gDisableStructs[gActiveBank].disabledMove == AI_THINKING_STRUCT->moveConsidered)
+        if (gDisableStructs[gActiveBattler].disabledMove == AI_THINKING_STRUCT->moveConsidered)
         {
             gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
             return;
@@ -1893,7 +1893,7 @@ static void BattleAICmd_if_encored(void)
         gAIScriptPtr += 6;
         return;
     case 1: // _08109370
-        if (gDisableStructs[gActiveBank].encoredMove == AI_THINKING_STRUCT->moveConsidered)
+        if (gDisableStructs[gActiveBattler].encoredMove == AI_THINKING_STRUCT->moveConsidered)
         {
             gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
             return;
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 21ac62401..f1cb34bdf 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -25,7 +25,7 @@ struct MovePpInfo
     u8 ppBonuses;
 };
 
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u8 gBattleBufferA[][0x200];
 extern u8 gBankSpriteIds[];
 extern u16 gBattlePartyID[];
@@ -250,15 +250,15 @@ void nullsub_47(void)
 
 void SetBankFuncToLinkOpponentBufferRunCommand(void)
 {
-    gBattleBankFunc[gActiveBank] = sub_803752C;
+    gBattleBankFunc[gActiveBattler] = sub_803752C;
 }
 
 void sub_803752C(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] <= 0x38)
-            gLinkOpponentBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] <= 0x38)
+            gLinkOpponentBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             LinkOpponentBufferExecCompleted();
     }
@@ -266,27 +266,27 @@ void sub_803752C(void)
 
 void sub_803757C(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         LinkOpponentBufferExecCompleted();
 }
 
 void sub_80375B4(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        sub_8031B74(gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam);
-        gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum = gSprites[gBankSpriteIds[gActiveBank]].data[5];
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        sub_8031B74(gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam);
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.tileNum = gSprites[gBankSpriteIds[gActiveBattler]].data[5];
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         LinkOpponentBufferExecCompleted();
     }
 }
 
 void sub_8037644(void)
 {
-    if ((--ewram17810[gActiveBank].unk9) == 0xFF)
+    if ((--ewram17810[gActiveBattler].unk9) == 0xFF)
     {
-        ewram17810[gActiveBank].unk9 = 0;
+        ewram17810[gActiveBattler].unk9 = 0;
         LinkOpponentBufferExecCompleted();
     }
 }
@@ -297,13 +297,13 @@ void sub_8037680(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     else
     {
-        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy
-         && gSprites[gHealthboxIDs[gActiveBank ^ 2]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy
+         && gSprites[gHealthboxIDs[gActiveBattler ^ 2]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     if (IsCryPlayingOrClearCrySongs())
@@ -311,88 +311,88 @@ void sub_8037680(void)
 
     if (r6)
     {
-        if (GetBankIdentity(gActiveBank) == 1)
+        if (GetBankIdentity(gActiveBattler) == 1)
         {
-            if (!ewram17810[gActiveBank].unk1_0 || !ewram17810[gActiveBank ^ 2].unk1_0)
+            if (!ewram17810[gActiveBattler].unk1_0 || !ewram17810[gActiveBattler ^ 2].unk1_0)
                 return;
-            ewram17810[gActiveBank].unk0_7 = 0;
-            ewram17810[gActiveBank].unk1_0 = 0;
-            ewram17810[gActiveBank ^ 2].unk0_7 = 0;
-            ewram17810[gActiveBank ^ 2].unk1_0 = 0;
+            ewram17810[gActiveBattler].unk0_7 = 0;
+            ewram17810[gActiveBattler].unk1_0 = 0;
+            ewram17810[gActiveBattler ^ 2].unk0_7 = 0;
+            ewram17810[gActiveBattler ^ 2].unk1_0 = 0;
             FreeSpriteTilesByTag(0x27F9);
             FreeSpritePaletteByTag(0x27F9);
         }
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
-            if (GetBankIdentity(gActiveBank) == 1)
+            if (GetBankIdentity(gActiveBattler) == 1)
                 m4aMPlayContinue(&gMPlay_BGM);
         }
         else
         {
             m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
         }
-        ewram17810[gActiveBank].unk9 = 3;
-        gBattleBankFunc[gActiveBank] = sub_8037644;
+        ewram17810[gActiveBattler].unk9 = 3;
+        gBattleBankFunc[gActiveBattler] = sub_8037644;
     }
 }
 
 void sub_8037840(void)
 {
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
-        sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
-    if (!ewram17810[gActiveBank ^ 2].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_7)
-        sub_8141828(gActiveBank ^ 2, &gEnemyParty[gBattlePartyID[gActiveBank ^ 2]]);
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_3)
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler].unk0_7)
+        sub_8141828(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+    if (!ewram17810[gActiveBattler ^ 2].unk0_3 && !ewram17810[gActiveBattler ^ 2].unk0_7)
+        sub_8141828(gActiveBattler ^ 2, &gEnemyParty[gBattlePartyID[gActiveBattler ^ 2]]);
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler ^ 2].unk0_3)
     {
-        if ((gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBankIdentity(gActiveBank) == 3)
+        if ((gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBankIdentity(gActiveBattler) == 3)
         {
-            if (++ewram17810[gActiveBank].unk9 == 1)
+            if (++ewram17810[gActiveBattler].unk9 == 1)
                 return;
-            ewram17810[gActiveBank].unk9 = 0;
+            ewram17810[gActiveBattler].unk9 = 0;
         }
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank ^ 2]]);
+            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler ^ 2]]);
             sub_8045A5C(
-              gHealthboxIDs[gActiveBank ^ 2],
-              &gEnemyParty[gBattlePartyID[gActiveBank ^ 2]],
+              gHealthboxIDs[gActiveBattler ^ 2],
+              &gEnemyParty[gBattlePartyID[gActiveBattler ^ 2]],
               0);
-            sub_804777C(gActiveBank ^ 2);
-            sub_8043DFC(gHealthboxIDs[gActiveBank ^ 2]);
+            sub_804777C(gActiveBattler ^ 2);
+            sub_8043DFC(gHealthboxIDs[gActiveBattler ^ 2]);
             sub_8032984(
-              gActiveBank ^ 2,
-              GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank ^ 2]], MON_DATA_SPECIES));
+              gActiveBattler ^ 2,
+              GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler ^ 2]], MON_DATA_SPECIES));
         }
-        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler]]);
         sub_8045A5C(
-          gHealthboxIDs[gActiveBank],
-          &gEnemyParty[gBattlePartyID[gActiveBank]],
+          gHealthboxIDs[gActiveBattler],
+          &gEnemyParty[gBattlePartyID[gActiveBattler]],
           0);
-        sub_804777C(gActiveBank);
-        sub_8043DFC(gHealthboxIDs[gActiveBank]);
+        sub_804777C(gActiveBattler);
+        sub_8043DFC(gHealthboxIDs[gActiveBattler]);
         sub_8032984(
-          gActiveBank,
-          GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+          gActiveBattler,
+          GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
 
         ewram17840.unk9_0 = 0;
-        gBattleBankFunc[gActiveBank] = sub_8037680;
+        gBattleBankFunc[gActiveBattler] = sub_8037680;
     }
 }
 
 void sub_8037A74(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].animEnded == TRUE
-     && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].animEnded == TRUE
+     && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
     {
-        if (!ewram17810[gActiveBank].unk0_7)
+        if (!ewram17810[gActiveBattler].unk0_7)
         {
-            sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+            sub_8141828(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
             return;
         }
-        if (ewram17810[gActiveBank].unk1_0)
+        if (ewram17810[gActiveBattler].unk1_0)
         {
-            ewram17810[gActiveBank].unk0_7 = 0;
-            ewram17810[gActiveBank].unk1_0 = 0;
+            ewram17810[gActiveBattler].unk0_7 = 0;
+            ewram17810[gActiveBattler].unk1_0 = 0;
             FreeSpriteTilesByTag(0x27F9);
             FreeSpritePaletteByTag(0x27F9);
             LinkOpponentBufferExecCompleted();
@@ -403,32 +403,32 @@ void sub_8037A74(void)
 
 void sub_8037B24(void)
 {
-    s16 r4 = sub_8045C78(gActiveBank, gHealthboxIDs[gActiveBank], 0, 0);
+    s16 r4 = sub_8045C78(gActiveBattler, gHealthboxIDs[gActiveBattler], 0, 0);
 
-    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    sub_8043DFC(gHealthboxIDs[gActiveBattler]);
     if (r4 != -1)
-        sub_80440EC(gHealthboxIDs[gActiveBank], r4, 0);
+        sub_80440EC(gHealthboxIDs[gActiveBattler], r4, 0);
     else
         LinkOpponentBufferExecCompleted();
 }
 
 void sub_8037B78(void)
 {
-    if (!gSprites[gBankSpriteIds[gActiveBank]].inUse)
+    if (!gSprites[gBankSpriteIds[gActiveBattler]].inUse)
     {
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         LinkOpponentBufferExecCompleted();
     }
 }
 
 void sub_8037BBC(void)
 {
-    if (!ewram17810[gActiveBank].unk0_6)
+    if (!ewram17810[gActiveBattler].unk0_6)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8032A08(gActiveBank);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8032A08(gActiveBattler);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         LinkOpponentBufferExecCompleted();
     }
 }
@@ -441,7 +441,7 @@ void sub_8037C2C(void)
 
 void dp01t_0F_4_move_anim(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -460,17 +460,17 @@ void dp01t_0F_4_move_anim(void)
 
 void sub_8037CC0(void)
 {
-    if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
-        gBattleBankFunc[gActiveBank] = sub_8037D2C;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 6);
+        gBattleBankFunc[gActiveBattler] = sub_8037D2C;
     }
 }
 
 void sub_8037D2C(void)
 {
-    if (!ewram17810[gActiveBank].unk0_6)
+    if (!ewram17810[gActiveBattler].unk0_6)
     {
         CreateTask(c3_0802FDF4, 10);
         LinkOpponentBufferExecCompleted();
@@ -479,34 +479,34 @@ void sub_8037D2C(void)
 
 void sub_8037D64(void)
 {
-    if (ewram17810[gActiveBank].unk1_0)
+    if (ewram17810[gActiveBattler].unk1_0)
     {
-        ewram17810[gActiveBank].unk0_7 = 0;
-        ewram17810[gActiveBank].unk1_0 = 0;
+        ewram17810[gActiveBattler].unk0_7 = 0;
+        ewram17810[gActiveBattler].unk1_0 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
+        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
         sub_8045A5C(
-          gHealthboxIDs[gActiveBank],
-          &gEnemyParty[gBattlePartyID[gActiveBank]],
+          gHealthboxIDs[gActiveBattler],
+          &gEnemyParty[gBattlePartyID[gActiveBattler]],
           0);
-        sub_804777C(gActiveBank);
-        sub_8043DFC(gHealthboxIDs[gActiveBank]);
-        sub_8031F88(gActiveBank);
-        gBattleBankFunc[gActiveBank] = sub_8037CC0;
+        sub_804777C(gActiveBattler);
+        sub_8043DFC(gHealthboxIDs[gActiveBattler]);
+        sub_8031F88(gActiveBattler);
+        gBattleBankFunc[gActiveBattler] = sub_8037CC0;
     }
 }
 
 void sub_8037E30(void)
 {
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
-        sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
-    if (gSprites[gUnknown_0300434C[gActiveBank]].callback == SpriteCallbackDummy
-     && !ewram17810[gActiveBank].unk0_3)
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler].unk0_7)
+        sub_8141828(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+    if (gSprites[gUnknown_0300434C[gActiveBattler]].callback == SpriteCallbackDummy
+     && !ewram17810[gActiveBattler].unk0_3)
     {
-        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
-        sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
-        gBattleBankFunc[gActiveBank] = sub_8037D64;
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler]]);
+        sub_8032984(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+        gBattleBankFunc[gActiveBattler] = sub_8037D64;
     }
 }
 
@@ -528,7 +528,7 @@ void sub_8037F34(void)
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
             sub_800832C();
-            gBattleBankFunc[gActiveBank] = sub_8037EF0;
+            gBattleBankFunc[gActiveBattler] = sub_8037EF0;
         }
         else
         {
@@ -542,29 +542,29 @@ void sub_8037F34(void)
 
 void sub_8037FAC(void)
 {
-    if (!ewram17810[gActiveBank].unk0_4)
+    if (!ewram17810[gActiveBattler].unk0_4)
         LinkOpponentBufferExecCompleted();
 }
 
 void sub_8037FD8(void)
 {
-    if (!ewram17810[gActiveBank].unk0_5)
+    if (!ewram17810[gActiveBattler].unk0_5)
         LinkOpponentBufferExecCompleted();
 }
 
 void LinkOpponentBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = sub_803752C;
+    gBattleBankFunc[gActiveBattler] = sub_803752C;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = 0x38;
+        gBattleBufferA[gActiveBattler][0] = 0x38;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -575,13 +575,13 @@ void LinkOpponentHandleGetAttributes(void)
     u8 r4;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        r6 = dp01_getattr_by_ch1_for_player_pokemon__(gBattlePartyID[gActiveBank], buffer);
+        r6 = dp01_getattr_by_ch1_for_player_pokemon__(gBattlePartyID[gActiveBattler], buffer);
     }
     else
     {
-        r4 = gBattleBufferA[gActiveBank][2];
+        r4 = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (r4 & 1)
@@ -603,7 +603,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         battlePokemon.species = GetMonData(&gEnemyParty[a], MON_DATA_SPECIES);
@@ -666,7 +666,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer)
     case 5:
     case 6:
     case 7:
-        data16 = GetMonData(&gEnemyParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4);
+        data16 = GetMonData(&gEnemyParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - 4);
         buffer[0] = data16;
         buffer[1] = data16 >> 8;
         size = 2;
@@ -681,7 +681,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer)
     case 10:
     case 11:
     case 12:
-        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9);
+        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - 9);
         size = 1;
         break;
     case 17:
@@ -905,13 +905,13 @@ void LinkOpponentHandleSetAttributes(void)
     u8 i;
     u8 r4;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        sub_8038900(gBattlePartyID[gActiveBank]);
+        sub_8038900(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        r4 = gBattleBufferA[gActiveBank][2];
+        r4 = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (r4 & 1)
@@ -924,11 +924,11 @@ void LinkOpponentHandleSetAttributes(void)
 
 void sub_8038900(u8 a)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         {
@@ -969,10 +969,10 @@ void sub_8038900(u8 a)
         }
         break;
     case 1:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 2:
-        SetMonData(&gEnemyParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 3:
         for (i = 0; i < 4; i++)
@@ -986,154 +986,154 @@ void sub_8038900(u8 a)
     case 5:
     case 6:
     case 7:
-        SetMonData(&gEnemyParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - 4, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 8:
-        SetMonData(&gEnemyParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gEnemyParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gEnemyParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gEnemyParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gEnemyParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case 9:
     case 10:
     case 11:
     case 12:
-        SetMonData(&gEnemyParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - 9, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 17:
-        SetMonData(&gEnemyParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 18:
-        SetMonData(&gEnemyParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 19:
-        SetMonData(&gEnemyParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 20:
-        SetMonData(&gEnemyParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 21:
-        SetMonData(&gEnemyParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 22:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 23:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 24:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 25:
-        SetMonData(&gEnemyParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 26:
-        SetMonData(&gEnemyParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 27:
-        SetMonData(&gEnemyParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 28:
-        SetMonData(&gEnemyParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 29:
-        SetMonData(&gEnemyParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 30:
-        SetMonData(&gEnemyParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 31:
-        SetMonData(&gEnemyParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gEnemyParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gEnemyParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gEnemyParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gEnemyParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case 32:
-        SetMonData(&gEnemyParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 33:
-        SetMonData(&gEnemyParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 34:
-        SetMonData(&gEnemyParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 35:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 36:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 37:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 38:
-        SetMonData(&gEnemyParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 39:
-        SetMonData(&gEnemyParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 40:
-        SetMonData(&gEnemyParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 41:
-        SetMonData(&gEnemyParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 42:
-        SetMonData(&gEnemyParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 43:
-        SetMonData(&gEnemyParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 44:
-        SetMonData(&gEnemyParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 45:
-        SetMonData(&gEnemyParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 46:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 47:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 48:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 49:
-        SetMonData(&gEnemyParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 50:
-        SetMonData(&gEnemyParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 51:
-        SetMonData(&gEnemyParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 52:
-        SetMonData(&gEnemyParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 53:
-        SetMonData(&gEnemyParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 54:
-        SetMonData(&gEnemyParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 55:
-        SetMonData(&gEnemyParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 56:
-        SetMonData(&gEnemyParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 57:
-        SetMonData(&gEnemyParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 58:
-        SetMonData(&gEnemyParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 59:
-        SetMonData(&gEnemyParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
 }
@@ -1143,36 +1143,36 @@ void LinkOpponentHandlecmd3(void)
     u8 *dst;
     u8 i;
 
-    MEMSET_ALT(&gEnemyParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1], 
-        gBattleBufferA[gActiveBank][3 + i], gBattleBufferA[gActiveBank][2], i, dst);
+    MEMSET_ALT(&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1], 
+        gBattleBufferA[gActiveBattler][3 + i], gBattleBufferA[gActiveBattler][2], i, dst);
 
     LinkOpponentBufferExecCompleted();
 }
 
 void LinkOpponentHandleLoadPokeSprite(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
-    BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(gActiveBank, 2),
-      sub_8077F68(gActiveBank),
-      sub_8079E90(gActiveBank));
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
-    sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
-    gBattleBankFunc[gActiveBank] = sub_8037A74;
+      GetBankPosition(gActiveBattler, 2),
+      sub_8077F68(gActiveBattler),
+      sub_8079E90(gActiveBattler));
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    sub_8032984(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+    gBattleBankFunc[gActiveBattler] = sub_8037A74;
 }
 
 void LinkOpponentHandleSendOutPoke(void)
 {
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    sub_8039430(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_8037E30;
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    sub_8039430(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattleBankFunc[gActiveBattler] = sub_8037E30;
 }
 
 void sub_8039430(u8 a, u8 b)
@@ -1202,36 +1202,36 @@ void sub_8039430(u8 a, u8 b)
 
 void LinkOpponentHandleReturnPokeToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        ewram17810[gActiveBank].unk4 = 0;
-        gBattleBankFunc[gActiveBank] = sub_8039648;
+        ewram17810[gActiveBattler].unk4 = 0;
+        gBattleBankFunc[gActiveBattler] = sub_8039648;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8032A08(gActiveBank);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8032A08(gActiveBattler);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         LinkOpponentBufferExecCompleted();
     }
 }
 
 void sub_8039648(void)
 {
-    switch (ewram17810[gActiveBank].unk4)
+    switch (ewram17810[gActiveBattler].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
-        ewram17810[gActiveBank].unk4 = 1;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
+        ewram17810[gActiveBattler].unk4 = 1;
         break;
     case 1:
-        if (!ewram17810[gActiveBank].unk0_6)
+        if (!ewram17810[gActiveBattler].unk0_6)
         {
-            ewram17810[gActiveBank].unk4 = 0;
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 2);
-            gBattleBankFunc[gActiveBank] = sub_8037BBC;
+            ewram17810[gActiveBattler].unk4 = 0;
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 2);
+            gBattleBankFunc[gActiveBattler] = sub_8037BBC;
         }
         break;
     }
@@ -1244,31 +1244,31 @@ void LinkOpponentHandleTrainerThrow(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if (GetBankIdentity(gActiveBank) & 2)
+        if (GetBankIdentity(gActiveBattler) & 2)
             xOffset = -16;
         else
             xOffset = 16;
-        gender = gLinkPlayers[sub_803FC34(gActiveBank)].gender;
+        gender = gLinkPlayers[sub_803FC34(gActiveBattler)].gender;
     }
     else
     {
         xOffset = 0;
         gender = gLinkPlayers[GetMultiplayerId() ^ 1].gender;
     }
-    sub_8031A6C(gender, gActiveBank);
-    GetMonSpriteTemplate_803C5A0(gender, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    sub_8031A6C(gender, gActiveBattler);
+    GetMonSpriteTemplate_803C5A0(gender, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       176 + xOffset, 40 + 4 * (8 - gTrainerFrontPicCoords[gender].coords),
-      sub_8079E90(gActiveBank));
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[gender].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[gender].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = gender;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
-    gBattleBankFunc[gActiveBank] = sub_803757C;
+      sub_8079E90(gActiveBattler));
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[gender].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gSprites[gBankSpriteIds[gActiveBattler]].oam.tileNum;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[gender].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = gender;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBattler] = sub_803757C;
 }
 
 void LinkOpponentHandleTrainerSlide(void)
@@ -1278,29 +1278,29 @@ void LinkOpponentHandleTrainerSlide(void)
 
 void LinkOpponentHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
-    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    gBattleBankFunc[gActiveBank] = sub_80375B4;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas;
+    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattleBankFunc[gActiveBattler] = sub_80375B4;
 }
 
 void LinkOpponentHandlecmd10(void)
 {
-    if (ewram17810[gActiveBank].unk4 == 0)
+    if (ewram17810[gActiveBattler].unk4 == 0)
     {
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
-        ewram17810[gActiveBank].unk4++;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
+        ewram17810[gActiveBattler].unk4++;
     }
-    else if (!ewram17810[gActiveBank].unk0_6)
+    else if (!ewram17810[gActiveBattler].unk0_6)
     {
-        ewram17810[gActiveBank].unk4 = 0;
+        ewram17810[gActiveBattler].unk4 = 0;
         PlaySE12WithPanning(SE_POKE_DEAD, 63);
-        gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8010384;
-        gBattleBankFunc[gActiveBank] = sub_8037B78;
+        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8010384;
+        gBattleBankFunc[gActiveBattler] = sub_8037B78;
     }
 }
 
@@ -1326,23 +1326,23 @@ void LinkOpponentHandlePuase(void)
 
 void LinkOpponentHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u32 r0 = gBattleBufferA[gActiveBank][1]
-               | (gBattleBufferA[gActiveBank][2] << 8);
-
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4]
-                          | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6]
-                          | (gBattleBufferA[gActiveBank][7] << 8)
-                          | (gBattleBufferA[gActiveBank][8] << 16)
-                          | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12]
-                          | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        u32 r0 = gBattleBufferA[gActiveBattler][1]
+               | (gBattleBufferA[gActiveBattler][2] << 8);
+
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4]
+                          | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6]
+                          | (gBattleBufferA[gActiveBattler][7] << 8)
+                          | (gBattleBufferA[gActiveBattler][8] << 16)
+                          | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12]
+                          | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
 
         // Dead code. sub_8031720 always returns 0.
         if (sub_8031720(r0, gAnimMoveTurn) != 0)
@@ -1351,34 +1351,34 @@ void LinkOpponentHandleMoveAnimation(void)
         }
         else
         {
-            ewram17810[gActiveBank].unk4 = 0;
-            gBattleBankFunc[gActiveBank] = sub_8039B64;
+            ewram17810[gActiveBattler].unk4 = 0;
+            gBattleBankFunc[gActiveBattler] = sub_8039B64;
         }
     }
 }
 
 void sub_8039B64(void)
 {
-    u16 r4 = gBattleBufferA[gActiveBank][1]
-           | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 r7 = gBattleBufferA[gActiveBank][11];
+    u16 r4 = gBattleBufferA[gActiveBattler][1]
+           | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 r7 = gBattleBufferA[gActiveBattler][11];
 
-    switch (ewram17810[gActiveBank].unk4)
+    switch (ewram17810[gActiveBattler].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].substituteSprite && !ewram17800[gActiveBank].unk0_3)
+        if (ewram17800[gActiveBattler].substituteSprite && !ewram17800[gActiveBattler].unk0_3)
         {
-            ewram17800[gActiveBank].unk0_3 = 1;
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
+            ewram17800[gActiveBattler].unk0_3 = 1;
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
         }
-        ewram17810[gActiveBank].unk4 = 1;
+        ewram17810[gActiveBattler].unk4 = 1;
         break;
     case 1:
-        if (!ewram17810[gActiveBank].unk0_6)
+        if (!ewram17810[gActiveBattler].unk0_6)
         {
             sub_80326EC(0);
             DoMoveAnim(r4);
-            ewram17810[gActiveBank].unk4 = 2;
+            ewram17810[gActiveBattler].unk4 = 2;
         }
         break;
     case 2:
@@ -1386,22 +1386,22 @@ void sub_8039B64(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if ((ewram17800[gActiveBank].substituteSprite) && r7 <= 1)
+            if ((ewram17800[gActiveBattler].substituteSprite) && r7 <= 1)
             {
-                move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
-                ewram17800[gActiveBank].unk0_3 = 0;
+                move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 6);
+                ewram17800[gActiveBattler].unk0_3 = 0;
             }
-            ewram17810[gActiveBank].unk4 = 3;
+            ewram17810[gActiveBattler].unk4 = 3;
         }
         break;
     case 3:
-        if (!ewram17810[gActiveBank].unk0_6)
+        if (!ewram17810[gActiveBattler].unk0_6)
         {
             sub_8031F24();
             sub_80324BC(
-              gActiveBank,
-              gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            ewram17810[gActiveBank].unk4 = 0;
+              gActiveBattler,
+              gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            ewram17810[gActiveBattler].unk4 = 0;
             LinkOpponentBufferExecCompleted();
         }
         break;
@@ -1412,9 +1412,9 @@ void LinkOpponentHandlePrintString(void)
 {
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
+    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBattler][2]);
     Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
-    gBattleBankFunc[gActiveBank] = sub_8037C2C;
+    gBattleBankFunc[gActiveBattler] = sub_8037C2C;
 }
 
 void LinkOpponentHandlePrintStringPlayerOnly(void)
@@ -1457,21 +1457,21 @@ void LinkOpponentHandleHealthBarUpdate(void)
     s16 r7;
 
     load_gfxc_health_bar(0);
-    r7 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    r7 = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
     if (r7 != 0x7FFF)
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 hp = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 hp = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, hp, r7);
+        sub_8043D84(gActiveBattler, gHealthboxIDs[gActiveBattler], maxHP, hp, r7);
     }
     else
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, 0, r7);
+        sub_8043D84(gActiveBattler, gHealthboxIDs[gActiveBattler], maxHP, 0, r7);
     }
-    gBattleBankFunc[gActiveBank] = sub_8037B24;
+    gBattleBankFunc[gActiveBattler] = sub_8037B24;
 }
 
 void LinkOpponentHandleExpBarUpdate(void)
@@ -1481,25 +1481,25 @@ void LinkOpponentHandleExpBarUpdate(void)
 
 void LinkOpponentHandleStatusIconUpdate(void)
 {
-    if (mplay_80342A4(gActiveBank) == 0)
+    if (mplay_80342A4(gActiveBattler) == 0)
     {
-        sub_8045A5C(gHealthboxIDs[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], 9);
-        ewram17810[gActiveBank].unk0_4 = 0;
-        gBattleBankFunc[gActiveBank] = sub_8037FAC;
+        sub_8045A5C(gHealthboxIDs[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], 9);
+        ewram17810[gActiveBattler].unk0_4 = 0;
+        gBattleBankFunc[gActiveBattler] = sub_8037FAC;
     }
 }
 
 void LinkOpponentHandleStatusAnimation(void)
 {
-    if (mplay_80342A4(gActiveBank) == 0)
+    if (mplay_80342A4(gActiveBattler) == 0)
     {
         move_anim_start_t2_for_situation(
-          gBattleBufferA[gActiveBank][1],
-          gBattleBufferA[gActiveBank][2]
-          | (gBattleBufferA[gActiveBank][3] << 8)
-          | (gBattleBufferA[gActiveBank][4] << 16)
-          | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = sub_8037FAC;
+          gBattleBufferA[gActiveBattler][1],
+          gBattleBufferA[gActiveBattler][2]
+          | (gBattleBufferA[gActiveBattler][3] << 8)
+          | (gBattleBufferA[gActiveBattler][4] << 16)
+          | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattleBankFunc[gActiveBattler] = sub_8037FAC;
     }
 }
 
@@ -1556,7 +1556,7 @@ void LinkOpponentHandlecmd37(void)
 
 void LinkOpponentHandlecmd38(void)
 {
-    gUnknown_020238C8.unk0_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_020238C8.unk0_0 = gBattleBufferA[gActiveBattler][1];
     LinkOpponentBufferExecCompleted();
 }
 
@@ -1574,16 +1574,16 @@ void LinkOpponentHandlecmd40(void)
 
 void LinkOpponentHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         LinkOpponentBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        sub_8047858(gActiveBank);
-        gBattleBankFunc[gActiveBank] = dp01t_0F_4_move_anim;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        sub_8047858(gActiveBattler);
+        gBattleBankFunc[gActiveBattler] = dp01t_0F_4_move_anim;
     }
 }
 
@@ -1596,31 +1596,31 @@ void LinkOpponentHandleEffectivenessSound(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == 0)
+    if (GetBankSide(gActiveBattler) == 0)
         pan = -64;
     else
         pan = 63;
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     LinkOpponentBufferExecCompleted();
 }
 
 void LinkOpponentHandlecmd44(void)
 {
-    PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     LinkOpponentBufferExecCompleted();
 }
 
 void LinkOpponentHandleFaintingCry(void)
 {
     PlayCry3(
-      GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES),
+      GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES),
       25, 5);
     LinkOpponentBufferExecCompleted();
 }
 
 void LinkOpponentHandleIntroSlide(void)
 {
-    StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]);
+    StartBattleIntroAnim(gBattleBufferA[gActiveBattler][1]);
     gUnknown_02024DE8 |= 1;
     LinkOpponentBufferExecCompleted();
 }
@@ -1629,42 +1629,42 @@ void LinkOpponentHandleTrainerBallThrow(void)
 {
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
-    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_803A3A8);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas;
+    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_803A3A8);
     taskId = CreateTask(sub_803A2C4, 5);
-    gTasks[taskId].data[0] = gActiveBank;
-    if (ewram17810[gActiveBank].unk0_0)
-        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    gTasks[taskId].data[0] = gActiveBattler;
+    if (ewram17810[gActiveBattler].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBattler]].func = sub_8044CA0;
     ewram17840.unk9_0 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_47;
+    gBattleBankFunc[gActiveBattler] = nullsub_47;
 }
 
 void sub_803A2C4(u8 taskId)
 {
     u8 r9;
 
-    r9 = gActiveBank;
-    gActiveBank = gTasks[taskId].data[0];
+    r9 = gActiveBattler;
+    gActiveBattler = gTasks[taskId].data[0];
     if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_8039430(gActiveBank, 0);
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_8039430(gActiveBattler, 0);
     }
     else
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_8039430(gActiveBank, 0);
-        gActiveBank ^= 2;
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_8039430(gActiveBank, 0);
-        gActiveBank ^= 2;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_8039430(gActiveBattler, 0);
+        gActiveBattler ^= 2;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_8039430(gActiveBattler, 0);
+        gActiveBattler ^= 2;
     }
-    gBattleBankFunc[gActiveBank] = sub_8037840;
-    gActiveBank = r9;
+    gBattleBankFunc[gActiveBattler] = sub_8037840;
+    gActiveBattler = r9;
     DestroyTask(taskId);
 }
 
@@ -1678,49 +1678,49 @@ void sub_803A3A8(struct Sprite *sprite)
 
 void LinkOpponentHandlecmd48(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == 0)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBankSide(gActiveBattler) == 0)
     {
         LinkOpponentBufferExecCompleted();
         return;
     }
 
-    ewram17810[gActiveBank].unk0_0 = 1;
-    if (gBattleBufferA[gActiveBank][2] != 0)
+    ewram17810[gActiveBattler].unk0_0 = 1;
+    if (gBattleBufferA[gActiveBattler][2] != 0)
     {
-        if (ewram17810[gActiveBank].unk1_1 < 2)
+        if (ewram17810[gActiveBattler].unk1_1 < 2)
         {
-            ewram17810[gActiveBank].unk1_1++;
+            ewram17810[gActiveBattler].unk1_1++;
             return;
         }
         else
         {
-            ewram17810[gActiveBank].unk1_1 = 0;
+            ewram17810[gActiveBattler].unk1_1 = 0;
         }
     }
-    gUnknown_02024E68[gActiveBank] = sub_8044804(
-      gActiveBank,
-      (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBank][4],
-      gBattleBufferA[gActiveBank][1],
-      gBattleBufferA[gActiveBank][2]);
-    ewram17810[gActiveBank].unk5 = 0;
-    if (gBattleBufferA[gActiveBank][2] != 0)
-        ewram17810[gActiveBank].unk5 = 0x5D;
-    gBattleBankFunc[gActiveBank] = sub_803A4E0;
+    gUnknown_02024E68[gActiveBattler] = sub_8044804(
+      gActiveBattler,
+      (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4],
+      gBattleBufferA[gActiveBattler][1],
+      gBattleBufferA[gActiveBattler][2]);
+    ewram17810[gActiveBattler].unk5 = 0;
+    if (gBattleBufferA[gActiveBattler][2] != 0)
+        ewram17810[gActiveBattler].unk5 = 0x5D;
+    gBattleBankFunc[gActiveBattler] = sub_803A4E0;
 }
 
 void sub_803A4E0(void)
 {
-    if (ewram17810[gActiveBank].unk5++ >= 93)
+    if (ewram17810[gActiveBattler].unk5++ >= 93)
     {
-        ewram17810[gActiveBank].unk5 = 0;
+        ewram17810[gActiveBattler].unk5 = 0;
         LinkOpponentBufferExecCompleted();
     }
 }
 
 void LinkOpponentHandlecmd49(void)
 {
-    if (ewram17810[gActiveBank].unk0_0)
-        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    if (ewram17810[gActiveBattler].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBattler]].func = sub_8044CA0;
     LinkOpponentBufferExecCompleted();
 }
 
@@ -1731,25 +1731,25 @@ void LinkOpponentHandlecmd50(void)
 
 void LinkOpponentHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank) != 0)
+    if (IsBankSpritePresent(gActiveBattler) != 0)
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        sub_8031F88(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        sub_8031F88(gActiveBattler);
     }
     LinkOpponentBufferExecCompleted();
 }
 
 void LinkOpponentHandleBattleAnimation(void)
 {
-    if (mplay_80342A4(gActiveBank) == 0)
+    if (mplay_80342A4(gActiveBattler) == 0)
     {
-        u8 r3 = gBattleBufferA[gActiveBank][1];
-        u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 r3 = gBattleBufferA[gActiveBattler][1];
+        u16 r4 = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, r3, r4) != 0)
+        if (move_anim_start_t3(gActiveBattler, gActiveBattler, gActiveBattler, r3, r4) != 0)
             LinkOpponentBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = sub_8037FD8;
+            gBattleBankFunc[gActiveBattler] = sub_8037FD8;
     }
 }
 
@@ -1765,14 +1765,14 @@ void LinkOpponentHandleResetActionMoveSelection(void)
 
 void LinkOpponentHandlecmd55(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 3)
-        gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    if (gBattleBufferA[gActiveBattler][1] == 3)
+        gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     else
-        gBattleOutcome = gBattleBufferA[gActiveBank][1] ^ 3;
+        gBattleOutcome = gBattleBufferA[gActiveBattler][1] ^ 3;
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     LinkOpponentBufferExecCompleted();
-    gBattleBankFunc[gActiveBank] = sub_8037F34;
+    gBattleBankFunc[gActiveBattler] = sub_8037F34;
 }
 
 void LinkOpponentHandlecmd56(void)
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 1d42f56c3..29c1b7235 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -32,7 +32,7 @@ struct MovePpInfo
 extern u16 gBattleTypeFlags;
 extern u8 gDisplayedStringBattle[];
 extern u8 gBattleBufferA[][0x200];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u32 gBattleExecBuffer;
 extern u16 gBattlePartyID[];
 extern u8 gBankSpriteIds[];
@@ -244,15 +244,15 @@ void nullsub_74(void)
 
 void SetBankFuncToLinkPartnerBufferRunCommand(void)
 {
-    gBattleBankFunc[gActiveBank] = LinkPartnerBufferRunCommand;
+    gBattleBankFunc[gActiveBattler] = LinkPartnerBufferRunCommand;
 }
 
 void LinkPartnerBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] <= 0x38)
-            gLinkPartnerBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] <= 0x38)
+            gLinkPartnerBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             LinkPartnerBufferExecCompleted();
     }
@@ -260,26 +260,26 @@ void LinkPartnerBufferRunCommand(void)
 
 void sub_811DAE4(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         LinkPartnerBufferExecCompleted();
 }
 
 void sub_811DB1C(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         nullsub_10(0);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         LinkPartnerBufferExecCompleted();
     }
 }
 
 void sub_811DB84(void)
 {
-    if ((--ewram17810[gActiveBank].unk9) == 0xFF)
+    if ((--ewram17810[gActiveBattler].unk9) == 0xFF)
     {
-        ewram17810[gActiveBank].unk9 = 0;
+        ewram17810[gActiveBattler].unk9 = 0;
         LinkPartnerBufferExecCompleted();
     }
 }
@@ -290,21 +290,21 @@ void sub_811DBC0(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & 0x40)))
     {
-        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     else
     {
-        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy
-         && gSprites[gHealthboxIDs[gActiveBank ^ 2]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy
+         && gSprites[gHealthboxIDs[gActiveBattler ^ 2]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     if (IsCryPlayingOrClearCrySongs())
         r6 = FALSE;
     if (r6)
     {
-        ewram17810[gActiveBank].unk9 = 3;
-        gBattleBankFunc[gActiveBank] = sub_811DB84;
+        ewram17810[gActiveBattler].unk9 = 3;
+        gBattleBankFunc[gActiveBattler] = sub_811DB84;
     }
 }
 
@@ -312,34 +312,34 @@ void sub_811DCA0(void)
 {
     u8 r2;
 
-    if (!ewram17810[gActiveBank].unk0_3)
+    if (!ewram17810[gActiveBattler].unk0_3)
     {
         // I couldn't get it to work as a bitfield here
-        r2 = *((u8 *)&ewram17810[gActiveBank ^ 2]) & 8;
-        if (!r2 && (++ewram17810[gActiveBank].unk9) != 1)
+        r2 = *((u8 *)&ewram17810[gActiveBattler ^ 2]) & 8;
+        if (!r2 && (++ewram17810[gActiveBattler].unk9) != 1)
         {
-            ewram17810[gActiveBank].unk9 = r2;
+            ewram17810[gActiveBattler].unk9 = r2;
             if (IsDoubleBattle() && !(gBattleTypeFlags & 0x40))
             {
-                DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank ^ 2]]);
-                sub_8045A5C(gHealthboxIDs[gActiveBank ^ 2], &gPlayerParty[gBattlePartyID[gActiveBank ^ 2]], 0);
-                sub_804777C(gActiveBank ^ 2);
-                sub_8043DFC(gHealthboxIDs[gActiveBank ^ 2]);
+                DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler ^ 2]]);
+                sub_8045A5C(gHealthboxIDs[gActiveBattler ^ 2], &gPlayerParty[gBattlePartyID[gActiveBattler ^ 2]], 0);
+                sub_804777C(gActiveBattler ^ 2);
+                sub_8043DFC(gHealthboxIDs[gActiveBattler ^ 2]);
             }
-            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
-            sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 0);
-            sub_804777C(gActiveBank);
-            sub_8043DFC(gHealthboxIDs[gActiveBank]);
+            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler]]);
+            sub_8045A5C(gHealthboxIDs[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], 0);
+            sub_804777C(gActiveBattler);
+            sub_8043DFC(gHealthboxIDs[gActiveBattler]);
             (s8)ewram17810[4].unk9 &= ~1;
-            gBattleBankFunc[gActiveBank] = sub_811DBC0;
+            gBattleBankFunc[gActiveBattler] = sub_811DBC0;
         }
     }
 }
 
 void sub_811DDE8(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].animEnded
-     && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].animEnded
+     && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
         LinkPartnerBufferExecCompleted();
 }
 
@@ -347,38 +347,38 @@ void bx_t3_healthbar_update(void)
 {
     s16 r4;
 
-    r4 = sub_8045C78(gActiveBank, gHealthboxIDs[gActiveBank], 0, 0);
-    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    r4 = sub_8045C78(gActiveBattler, gHealthboxIDs[gActiveBattler], 0, 0);
+    sub_8043DFC(gHealthboxIDs[gActiveBattler]);
     if (r4 != -1)
     {
-        sub_80440EC(gHealthboxIDs[gActiveBank], r4, 0);
+        sub_80440EC(gHealthboxIDs[gActiveBattler], r4, 0);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         LinkPartnerBufferExecCompleted();
     }
 }
 
 void sub_811DE98(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].pos1.y + gSprites[gBankSpriteIds[gActiveBank]].pos2.y > 160)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].pos1.y + gSprites[gBankSpriteIds[gActiveBattler]].pos2.y > 160)
     {
-        nullsub_9(GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
-        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBank]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        nullsub_9(GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBattler]].oam.matrixNum);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         LinkPartnerBufferExecCompleted();
     }
 }
 
 void sub_811DF34(void)
 {
-    if (!ewram17810[gActiveBank].unk0_6)
+    if (!ewram17810[gActiveBattler].unk0_6)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         LinkPartnerBufferExecCompleted();
     }
 }
@@ -391,7 +391,7 @@ void sub_811DFA0(void)
 
 void bx_blink_t3(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
     if (gSprites[spriteId].data[1] == 32)
     {
         gSprites[spriteId].data[1] = 0;
@@ -411,48 +411,48 @@ void bx_blink_t3(void)
 
 void sub_811E034(void)
 {
-    if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
-        gBattleBankFunc[gActiveBank] = sub_811E0A0;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 6);
+        gBattleBankFunc[gActiveBattler] = sub_811E0A0;
     }
 }
 
 void sub_811E0A0(void)
 {
-    if (!ewram17810[gActiveBank].unk0_6)
+    if (!ewram17810[gActiveBattler].unk0_6)
         LinkPartnerBufferExecCompleted();
 }
 
 void sub_811E0CC(void)
 {
-    if (ewram17810[gActiveBank].unk1_0)
+    if (ewram17810[gActiveBattler].unk1_0)
     {
-        ewram17810[gActiveBank].unk0_7 = 0;
-        ewram17810[gActiveBank].unk1_0 = 0;
+        ewram17810[gActiveBattler].unk0_7 = 0;
+        ewram17810[gActiveBattler].unk1_0 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
         CreateTask(c3_0802FDF4, 10);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
-        sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 0);
-        sub_804777C(gActiveBank);
-        sub_8043DFC(gHealthboxIDs[gActiveBank]);
-        sub_8031F88(gActiveBank);
-        gBattleBankFunc[gActiveBank] = sub_811E034;
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
+        sub_8045A5C(gHealthboxIDs[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], 0);
+        sub_804777C(gActiveBattler);
+        sub_8043DFC(gHealthboxIDs[gActiveBattler]);
+        sub_8031F88(gActiveBattler);
+        gBattleBankFunc[gActiveBattler] = sub_811E034;
     }
 }
 
 void sub_811E1BC(void)
 {
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
-        sub_8141828(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
-    if (gSprites[gUnknown_0300434C[gActiveBank]].callback == SpriteCallbackDummy
-     && !ewram17810[gActiveBank].unk0_3)
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler].unk0_7)
+        sub_8141828(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+    if (gSprites[gUnknown_0300434C[gActiveBattler]].callback == SpriteCallbackDummy
+     && !ewram17810[gActiveBattler].unk0_3)
     {
-        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
-        gBattleBankFunc[gActiveBank] = sub_811E0CC;
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler]]);
+        gBattleBankFunc[gActiveBattler] = sub_811E0CC;
     }
 }
 
@@ -474,7 +474,7 @@ void sub_811E29C(void)
         if (gBattleTypeFlags & 2)
         {
             sub_800832C();
-            gBattleBankFunc[gActiveBank] = sub_811E258;
+            gBattleBankFunc[gActiveBattler] = sub_811E258;
         }
         else
         {
@@ -490,28 +490,28 @@ void LinkPartnerBufferExecCompleted(void)
 {
     u8 multiplayerId;
 
-    gBattleBankFunc[gActiveBank] = LinkPartnerBufferRunCommand;
+    gBattleBankFunc[gActiveBattler] = LinkPartnerBufferRunCommand;
     if (gBattleTypeFlags & 2)
     {
         multiplayerId = GetMultiplayerId();
         PrepareBufferDataTransferLink(2, 4, &multiplayerId);
-        gBattleBufferA[gActiveBank][0] = 0x38;
+        gBattleBufferA[gActiveBattler][0] = 0x38;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
 void sub_811E38C(void)
 {
-    if (!ewram17810[gActiveBank].unk0_4)
+    if (!ewram17810[gActiveBattler].unk0_4)
         LinkPartnerBufferExecCompleted();
 }
 
 void sub_811E3B8(void)
 {
-    if (!ewram17810[gActiveBank].unk0_5)
+    if (!ewram17810[gActiveBattler].unk0_5)
         LinkPartnerBufferExecCompleted();
 }
 
@@ -521,13 +521,13 @@ void LinkPartnerHandleGetAttributes(void)
     int r6 = 0;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        r6 = dp01_getattr_by_ch1_for_player_pokemon(gBattlePartyID[gActiveBank], unk);
+        r6 = dp01_getattr_by_ch1_for_player_pokemon(gBattlePartyID[gActiveBattler], unk);
     }
     else
     {
-        u8 r4 = gBattleBufferA[gActiveBank][2];
+        u8 r4 = gBattleBufferA[gActiveBattler][2];
 
         for (i = 0; i < 6; i++)
         {
@@ -551,7 +551,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         battlePokemon.species = GetMonData(&gPlayerParty[a], MON_DATA_SPECIES);
@@ -613,7 +613,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer)
     case 5:
     case 6:
     case 7:
-        data16 = GetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4);
+        data16 = GetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - 4);
         buffer[0] = data16;
         buffer[1] = data16 >> 8;
         size = 2;
@@ -628,7 +628,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer)
     case 10:
     case 11:
     case 12:
-        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9);
+        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - 9);
         size = 1;
         break;
     case 17:
@@ -852,13 +852,13 @@ void LinkPartnerHandleSetAttributes(void)
     u8 i;
     u8 r4;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        sub_811EC68(gBattlePartyID[gActiveBank]);
+        sub_811EC68(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        r4 = gBattleBufferA[gActiveBank][2];
+        r4 = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (r4 & 1)
@@ -872,11 +872,11 @@ void LinkPartnerHandleSetAttributes(void)
 // Duplicate of dp01_setattr_by_ch1_for_player_pokemon
 void sub_811EC68(u8 a)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         {
@@ -917,10 +917,10 @@ void sub_811EC68(u8 a)
         }
         break;
     case 1:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 2:
-        SetMonData(&gPlayerParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 3:
         for (i = 0; i < 4; i++)
@@ -934,157 +934,157 @@ void sub_811EC68(u8 a)
     case 5:
     case 6:
     case 7:
-        SetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - 4, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 8:
-        SetMonData(&gPlayerParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case 9:
     case 10:
     case 11:
     case 12:
-        SetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - 9, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 17:
-        SetMonData(&gPlayerParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 18:
-        SetMonData(&gPlayerParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 19:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 20:
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 21:
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 22:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 23:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 24:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 25:
-        SetMonData(&gPlayerParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 26:
-        SetMonData(&gPlayerParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 27:
-        SetMonData(&gPlayerParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 28:
-        SetMonData(&gPlayerParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 29:
-        SetMonData(&gPlayerParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 30:
-        SetMonData(&gPlayerParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 31:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case 32:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 33:
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 34:
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 35:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 36:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 37:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 38:
-        SetMonData(&gPlayerParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 39:
-        SetMonData(&gPlayerParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 40:
-        SetMonData(&gPlayerParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 41:
-        SetMonData(&gPlayerParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 42:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 43:
-        SetMonData(&gPlayerParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 44:
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 45:
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 46:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 47:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 48:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 49:
-        SetMonData(&gPlayerParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 50:
-        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 51:
-        SetMonData(&gPlayerParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 52:
-        SetMonData(&gPlayerParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 53:
-        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 54:
-        SetMonData(&gPlayerParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 55:
-        SetMonData(&gPlayerParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 56:
-        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 57:
-        SetMonData(&gPlayerParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 58:
-        SetMonData(&gPlayerParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 59:
-        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 }
 
 void LinkPartnerHandlecmd3(void)
@@ -1092,37 +1092,37 @@ void LinkPartnerHandlecmd3(void)
     u8 *dst;
     u8 i;
 
-    MEMSET_ALT(&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1], 
-        gBattleBufferA[gActiveBank][3 + i], gBattleBufferA[gActiveBank][2], i, dst);
+    MEMSET_ALT(&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1], 
+        gBattleBufferA[gActiveBattler][3 + i], gBattleBufferA[gActiveBattler][2], i, dst);
 
     LinkPartnerBufferExecCompleted();
 }
 
 void LinkPartnerHandleLoadPokeSprite(void)
 {
-    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
     GetMonSpriteTemplate_803C56C(
-      GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES),
-      GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+      GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES),
+      GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(gActiveBank, 2),
-      sub_8077F68(gActiveBank),
-      sub_8079E90(gActiveBank));
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
-    gBattleBankFunc[gActiveBank] = sub_811DDE8;
+      GetBankPosition(gActiveBattler, 2),
+      sub_8077F68(gActiveBattler),
+      sub_8079E90(gActiveBattler));
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    gBattleBankFunc[gActiveBattler] = sub_811DDE8;
 }
 
 void LinkPartnerHandleSendOutPoke(void)
 {
-    sub_8032AA8(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    sub_811F864(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_811E1BC;
+    sub_8032AA8(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    sub_811F864(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattleBankFunc[gActiveBattler] = sub_811E1BC;
 }
 
 void sub_811F864(u8 a, u8 b)
@@ -1151,35 +1151,35 @@ void sub_811F864(u8 a, u8 b)
 
 void LinkPartnerHandleReturnPokeToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        ewram17810[gActiveBank].unk4 = 0;
-        gBattleBankFunc[gActiveBank] = sub_811FA5C;
+        ewram17810[gActiveBattler].unk4 = 0;
+        gBattleBankFunc[gActiveBattler] = sub_811FA5C;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         LinkPartnerBufferExecCompleted();
     }
 }
 
 void sub_811FA5C(void)
 {
-    switch (ewram17810[gActiveBank].unk4)
+    switch (ewram17810[gActiveBattler].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
-        ewram17810[gActiveBank].unk4 = 1;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
+        ewram17810[gActiveBattler].unk4 = 1;
         break;
     case 1:
-        if (!ewram17810[gActiveBank].unk0_6)
+        if (!ewram17810[gActiveBattler].unk0_6)
         {
-            ewram17810[gActiveBank].unk4 = 0;
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 1);
-            gBattleBankFunc[gActiveBank] = sub_811DF34;
+            ewram17810[gActiveBattler].unk4 = 0;
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 1);
+            gBattleBankFunc[gActiveBattler] = sub_811DF34;
         }
         break;
     }
@@ -1192,28 +1192,28 @@ void LinkPartnerHandleTrainerThrow(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if (GetBankIdentity(gActiveBank) & 2)
+        if (GetBankIdentity(gActiveBattler) & 2)
             xOffset = 16;
         else
             xOffset = -16;
-        gender = gLinkPlayers[sub_803FC34(gActiveBank)].gender;
+        gender = gLinkPlayers[sub_803FC34(gActiveBattler)].gender;
     }
     else
     {
         xOffset = 0;
         gender = gLinkPlayers[GetMultiplayerId() ^ 1].gender;
     }
-    LoadPlayerTrainerBankSprite(gender, gActiveBank);
-    GetMonSpriteTemplate_803C5A0(gender, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    LoadPlayerTrainerBankSprite(gender, gActiveBattler);
+    GetMonSpriteTemplate_803C5A0(gender, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       80 + xOffset, 80 + 4 * (8 - gTrainerBackPicCoords[gender].coords),
-      sub_8079E90(gActiveBank));
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
-    gBattleBankFunc[gActiveBank] = sub_811DAE4;
+      sub_8079E90(gActiveBattler));
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBattler] = sub_811DAE4;
 }
 
 void LinkPartnerHandleTrainerSlide(void)
@@ -1223,32 +1223,32 @@ void LinkPartnerHandleTrainerSlide(void)
 
 void LinkPartnerHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
-    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    gBattleBankFunc[gActiveBank] = sub_811DB1C;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas;
+    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattleBankFunc[gActiveBattler] = sub_811DB1C;
 }
 
 void LinkPartnerHandlecmd10(void)
 {
-    if (ewram17810[gActiveBank].unk4 == 0)
+    if (ewram17810[gActiveBattler].unk4 == 0)
     {
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
-        ewram17810[gActiveBank].unk4++;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
+        ewram17810[gActiveBattler].unk4++;
     }
-    else if (!ewram17810[gActiveBank].unk0_6)
+    else if (!ewram17810[gActiveBattler].unk0_6)
     {
-        ewram17810[gActiveBank].unk4 = 0;
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        ewram17810[gActiveBattler].unk4 = 0;
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         PlaySE12WithPanning(SE_POKE_DEAD, -64);
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
-        gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80105EC;
-        gBattleBankFunc[gActiveBank] = sub_811DE98;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 5;
+        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80105EC;
+        gBattleBankFunc[gActiveBattler] = sub_811DE98;
     }
 }
 
@@ -1274,56 +1274,56 @@ void LinkPartnerHandlePuase(void)
 
 void LinkPartnerHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u32 r0 = gBattleBufferA[gActiveBank][1]
-               | (gBattleBufferA[gActiveBank][2] << 8);
-
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4]
-                          | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6]
-                          | (gBattleBufferA[gActiveBank][7] << 8)
-                          | (gBattleBufferA[gActiveBank][8] << 16)
-                          | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12]
-                          | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        u32 r0 = gBattleBufferA[gActiveBattler][1]
+               | (gBattleBufferA[gActiveBattler][2] << 8);
+
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4]
+                          | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6]
+                          | (gBattleBufferA[gActiveBattler][7] << 8)
+                          | (gBattleBufferA[gActiveBattler][8] << 16)
+                          | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12]
+                          | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
 
         if (sub_8031720(r0, gAnimMoveTurn) != 0)
             LinkPartnerBufferExecCompleted();
         else
         {
-            ewram17810[gActiveBank].unk4 = 0;
-            gBattleBankFunc[gActiveBank] = sub_811FF30;
+            ewram17810[gActiveBattler].unk4 = 0;
+            gBattleBankFunc[gActiveBattler] = sub_811FF30;
         }
     }
 }
 
 void sub_811FF30(void)
 {
-    u16 r4 = gBattleBufferA[gActiveBank][1]
-           | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 r7 = gBattleBufferA[gActiveBank][11];
+    u16 r4 = gBattleBufferA[gActiveBattler][1]
+           | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 r7 = gBattleBufferA[gActiveBattler][11];
 
-    switch (ewram17810[gActiveBank].unk4)
+    switch (ewram17810[gActiveBattler].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].substituteSprite && !ewram17800[gActiveBank].unk0_3)
+        if (ewram17800[gActiveBattler].substituteSprite && !ewram17800[gActiveBattler].unk0_3)
         {
-            ewram17800[gActiveBank].unk0_3 = 1;
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
+            ewram17800[gActiveBattler].unk0_3 = 1;
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
         }
-        ewram17810[gActiveBank].unk4 = 1;
+        ewram17810[gActiveBattler].unk4 = 1;
         break;
     case 1:
-        if (!ewram17810[gActiveBank].unk0_6)
+        if (!ewram17810[gActiveBattler].unk0_6)
         {
             sub_80326EC(0);
             DoMoveAnim(r4);
-            ewram17810[gActiveBank].unk4 = 2;
+            ewram17810[gActiveBattler].unk4 = 2;
         }
         break;
     case 2:
@@ -1331,22 +1331,22 @@ void sub_811FF30(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if ((ewram17800[gActiveBank].substituteSprite) && r7 <= 1)
+            if ((ewram17800[gActiveBattler].substituteSprite) && r7 <= 1)
             {
-                move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
-                ewram17800[gActiveBank].unk0_3 = 0;
+                move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 6);
+                ewram17800[gActiveBattler].unk0_3 = 0;
             }
-            ewram17810[gActiveBank].unk4 = 3;
+            ewram17810[gActiveBattler].unk4 = 3;
         }
         break;
     case 3:
-        if (!ewram17810[gActiveBank].unk0_6)
+        if (!ewram17810[gActiveBattler].unk0_6)
         {
             sub_8031F24();
             sub_80324BC(
-              gActiveBank,
-              gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            ewram17810[gActiveBank].unk4 = 0;
+              gActiveBattler,
+              gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            ewram17810[gActiveBattler].unk4 = 0;
             LinkPartnerBufferExecCompleted();
         }
         break;
@@ -1357,9 +1357,9 @@ void LinkPartnerHandlePrintString(void)
 {
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
+    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBattler][2]);
     Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
-    gBattleBankFunc[gActiveBank] = sub_811DFA0;
+    gBattleBankFunc[gActiveBattler] = sub_811DFA0;
 }
 
 void LinkPartnerHandlePrintStringPlayerOnly(void)
@@ -1402,21 +1402,21 @@ void LinkPartnerHandleHealthBarUpdate(void)
     s16 r7;
 
     load_gfxc_health_bar(0);
-    r7 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    r7 = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
     if (r7 != 0x7FFF)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 hp = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 hp = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, hp, r7);
+        sub_8043D84(gActiveBattler, gHealthboxIDs[gActiveBattler], maxHP, hp, r7);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, 0, r7);
+        sub_8043D84(gActiveBattler, gHealthboxIDs[gActiveBattler], maxHP, 0, r7);
     }
-    gBattleBankFunc[gActiveBank] = bx_t3_healthbar_update;
+    gBattleBankFunc[gActiveBattler] = bx_t3_healthbar_update;
 }
 
 void LinkPartnerHandleExpBarUpdate(void)
@@ -1426,25 +1426,25 @@ void LinkPartnerHandleExpBarUpdate(void)
 
 void LinkPartnerHandleStatusIconUpdate(void)
 {
-    if (mplay_80342A4(gActiveBank) == 0)
+    if (mplay_80342A4(gActiveBattler) == 0)
     {
-        sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 9);
-        ewram17810[gActiveBank].unk0_4 = 0;
-        gBattleBankFunc[gActiveBank] = sub_811E38C;
+        sub_8045A5C(gHealthboxIDs[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], 9);
+        ewram17810[gActiveBattler].unk0_4 = 0;
+        gBattleBankFunc[gActiveBattler] = sub_811E38C;
     }
 }
 
 void LinkPartnerHandleStatusAnimation(void)
 {
-    if (mplay_80342A4(gActiveBank) == 0)
+    if (mplay_80342A4(gActiveBattler) == 0)
     {
         move_anim_start_t2_for_situation(
-          gBattleBufferA[gActiveBank][1],
-          gBattleBufferA[gActiveBank][2]
-          | (gBattleBufferA[gActiveBank][3] << 8)
-          | (gBattleBufferA[gActiveBank][4] << 16)
-          | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = sub_811E38C;
+          gBattleBufferA[gActiveBattler][1],
+          gBattleBufferA[gActiveBattler][2]
+          | (gBattleBufferA[gActiveBattler][3] << 8)
+          | (gBattleBufferA[gActiveBattler][4] << 16)
+          | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattleBankFunc[gActiveBattler] = sub_811E38C;
     }
 }
 
@@ -1501,7 +1501,7 @@ void LinkPartnerHandlecmd37(void)
 
 void LinkPartnerHandlecmd38(void)
 {
-    gUnknown_020238C8.unk0_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_020238C8.unk0_0 = gBattleBufferA[gActiveBattler][1];
     LinkPartnerBufferExecCompleted();
 }
 
@@ -1519,16 +1519,16 @@ void LinkPartnerHandlecmd40(void)
 
 void LinkPartnerHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         LinkPartnerBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        sub_8047858(gActiveBank);
-        gBattleBankFunc[gActiveBank] = bx_blink_t3;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        sub_8047858(gActiveBattler);
+        gBattleBankFunc[gActiveBattler] = bx_blink_t3;
     }
 }
 
@@ -1541,31 +1541,31 @@ void LinkPartnerHandleEffectivenessSound(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == 0)
+    if (GetBankSide(gActiveBattler) == 0)
         pan = -64;
     else
         pan = 63;
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     LinkPartnerBufferExecCompleted();
 }
 
 void LinkPartnerHandlecmd44(void)
 {
-    PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     LinkPartnerBufferExecCompleted();
 }
 
 void LinkPartnerHandleFaintingCry(void)
 {
     PlayCry3(
-      GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES),
+      GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES),
       -25, 5);
     LinkPartnerBufferExecCompleted();
 }
 
 void LinkPartnerHandleIntroSlide(void)
 {
-    StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]);
+    StartBattleIntroAnim(gBattleBufferA[gActiveBattler][1]);
     gUnknown_02024DE8 |= 1;
     LinkPartnerBufferExecCompleted();
 }
@@ -1575,25 +1575,25 @@ void LinkPartnerHandleTrainerBallThrow(void)
     u8 r4;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
-    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8030E38);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
+    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_8030E38);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
     r4 = AllocSpritePalette(0xD6F9);
     LoadCompressedPalette(
-      gTrainerBackPicPaletteTable[gLinkPlayers[sub_803FC34(gActiveBank)].gender].data,
+      gTrainerBackPicPaletteTable[gLinkPlayers[sub_803FC34(gActiveBattler)].gender].data,
       0x100 + r4 * 16, 0x20);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = r4;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = r4;
     taskId = CreateTask(sub_812071C, 5);
-    gTasks[taskId].data[0] = gActiveBank;
-    if (ewram17810[gActiveBank].unk0_0)
-        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    gTasks[taskId].data[0] = gActiveBattler;
+    if (ewram17810[gActiveBattler].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBattler]].func = sub_8044CA0;
     ewram17840.unk9_0 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_74;
+    gBattleBankFunc[gActiveBattler] = nullsub_74;
 }
 
 void sub_812071C(u8 taskId)
@@ -1606,61 +1606,61 @@ void sub_812071C(u8 taskId)
         return;
     }
 
-    r9 = gActiveBank;
-    gActiveBank = gTasks[taskId].data[0];
+    r9 = gActiveBattler;
+    gActiveBattler = gTasks[taskId].data[0];
     if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_811F864(gActiveBank, 0);
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_811F864(gActiveBattler, 0);
     }
     else
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_811F864(gActiveBank, 0);
-        gActiveBank ^= 2;
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-        sub_811F864(gActiveBank, 0);
-        gActiveBank ^= 2;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_811F864(gActiveBattler, 0);
+        gActiveBattler ^= 2;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        sub_811F864(gActiveBattler, 0);
+        gActiveBattler ^= 2;
     }
-    gBattleBankFunc[gActiveBank] = sub_811DCA0;
-    gActiveBank = r9;
+    gBattleBankFunc[gActiveBattler] = sub_811DCA0;
+    gActiveBattler = r9;
     DestroyTask(taskId);
 }
 
 void LinkPartnerHandlecmd48(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == 0)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBankSide(gActiveBattler) == 0)
     {
         LinkPartnerBufferExecCompleted();
         return;
     }
 
-    ewram17810[gActiveBank].unk0_0 = 1;
-    gUnknown_02024E68[gActiveBank] = sub_8044804(
-      gActiveBank,
-      (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBank][4],
-      gBattleBufferA[gActiveBank][1],
-      gBattleBufferA[gActiveBank][2]);
-    ewram17810[gActiveBank].unk5 = 0;
-    if (gBattleBufferA[gActiveBank][2] != 0)
-        ewram17810[gActiveBank].unk5 = 0x5D;
-    gBattleBankFunc[gActiveBank] = sub_81208E0;
+    ewram17810[gActiveBattler].unk0_0 = 1;
+    gUnknown_02024E68[gActiveBattler] = sub_8044804(
+      gActiveBattler,
+      (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4],
+      gBattleBufferA[gActiveBattler][1],
+      gBattleBufferA[gActiveBattler][2]);
+    ewram17810[gActiveBattler].unk5 = 0;
+    if (gBattleBufferA[gActiveBattler][2] != 0)
+        ewram17810[gActiveBattler].unk5 = 0x5D;
+    gBattleBankFunc[gActiveBattler] = sub_81208E0;
 }
 
 void sub_81208E0(void)
 {
-    if (ewram17810[gActiveBank].unk5++ >= 93)
+    if (ewram17810[gActiveBattler].unk5++ >= 93)
     {
-        ewram17810[gActiveBank].unk5 = 0;
+        ewram17810[gActiveBattler].unk5 = 0;
         LinkPartnerBufferExecCompleted();
     }
 }
 
 void LinkPartnerHandlecmd49(void)
 {
-    if (ewram17810[gActiveBank].unk0_0)
-        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    if (ewram17810[gActiveBattler].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBattler]].func = sub_8044CA0;
     LinkPartnerBufferExecCompleted();
 }
 
@@ -1671,25 +1671,25 @@ void LinkPartnerHandlecmd50(void)
 
 void LinkPartnerHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank) != 0)
+    if (IsBankSpritePresent(gActiveBattler) != 0)
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        sub_8031F88(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        sub_8031F88(gActiveBattler);
     }
     LinkPartnerBufferExecCompleted();
 }
 
 void LinkPartnerHandleBattleAnimation(void)
 {
-    if (mplay_80342A4(gActiveBank) == 0)
+    if (mplay_80342A4(gActiveBattler) == 0)
     {
-        u8 r3 = gBattleBufferA[gActiveBank][1];
-        u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 r3 = gBattleBufferA[gActiveBattler][1];
+        u16 r4 = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, r3, r4) != 0)
+        if (move_anim_start_t3(gActiveBattler, gActiveBattler, gActiveBattler, r3, r4) != 0)
             LinkPartnerBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = sub_811E3B8;
+            gBattleBankFunc[gActiveBattler] = sub_811E3B8;
     }
 }
 
@@ -1705,11 +1705,11 @@ void LinkPartnerHandleResetActionMoveSelection(void)
 
 void LinkPartnerHandlecmd55(void)
 {
-    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     LinkPartnerBufferExecCompleted();
-    gBattleBankFunc[gActiveBank] = sub_811E29C;
+    gBattleBankFunc[gActiveBattler] = sub_811E29C;
 }
 
 void LinkPartnerHandlecmd56(void)
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index e986eb38d..16b324f01 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -31,7 +31,7 @@ struct MovePpInfo
 };
 
 extern u8 gUnknown_02023A14_50;
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u8 gBattleBufferA[][0x200];
 extern u16 gBattlePartyID[];
 extern u8 gBankSpriteIds[];
@@ -264,15 +264,15 @@ void nullsub_45(void)
 
 void SetBankFuncToOpponentBufferRunCommand(void)
 {
-    gBattleBankFunc[gActiveBank] = OpponentBufferRunCommand;
+    gBattleBankFunc[gActiveBattler] = OpponentBufferRunCommand;
 }
 
 void OpponentBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] <= 0x38)
-            gOpponentBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] <= 0x38)
+            gOpponentBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             OpponentBufferExecCompleted();
     }
@@ -280,34 +280,34 @@ void OpponentBufferRunCommand(void)
 
 void sub_8032B4C(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         OpponentBufferExecCompleted();
 }
 
 // Duplicate of sub_8032B4C
 void sub_8032B84(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         OpponentBufferExecCompleted();
 }
 
 void sub_8032BBC(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        sub_8031B74(gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam);
-        gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum = gSprites[gBankSpriteIds[gActiveBank]].data[5];
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        sub_8031B74(gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam);
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.tileNum = gSprites[gBankSpriteIds[gActiveBattler]].data[5];
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         OpponentBufferExecCompleted();
     }
 }
 
 void sub_8032C4C(void)
 {
-    if ((--ewram17810[gActiveBank].unk9) == 0xFF)
+    if ((--ewram17810[gActiveBattler].unk9) == 0xFF)
     {
-        ewram17810[gActiveBank].unk9 = 0;
+        ewram17810[gActiveBattler].unk9 = 0;
         OpponentBufferExecCompleted();
     }
 }
@@ -318,86 +318,86 @@ void sub_8032C88(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     else
     {
-        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy
-         && gSprites[gHealthboxIDs[gActiveBank ^ 2]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy
+         && gSprites[gHealthboxIDs[gActiveBattler ^ 2]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     if (IsCryPlayingOrClearCrySongs())
         r6 = FALSE;
 
-    if (r6 && ewram17810[gActiveBank].unk1_0 && ewram17810[gActiveBank ^ 2].unk1_0)
+    if (r6 && ewram17810[gActiveBattler].unk1_0 && ewram17810[gActiveBattler ^ 2].unk1_0)
     {
-        ewram17810[gActiveBank].unk0_7 = 0;
-        ewram17810[gActiveBank].unk1_0 = 0;
-        ewram17810[gActiveBank ^ 2].unk0_7 = 0;
-        ewram17810[gActiveBank ^ 2].unk1_0 = 0;
+        ewram17810[gActiveBattler].unk0_7 = 0;
+        ewram17810[gActiveBattler].unk1_0 = 0;
+        ewram17810[gActiveBattler ^ 2].unk0_7 = 0;
+        ewram17810[gActiveBattler ^ 2].unk1_0 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             m4aMPlayContinue(&gMPlay_BGM);
         else
             m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
-        ewram17810[gActiveBank].unk9 = 3;
-        gBattleBankFunc[gActiveBank] = sub_8032C4C;
+        ewram17810[gActiveBattler].unk9 = 3;
+        gBattleBankFunc[gActiveBattler] = sub_8032C4C;
     }
 }
 
 void sub_8032E2C(void)
 {
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
-        sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
-    if (!ewram17810[gActiveBank ^ 2].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_7)
-        sub_8141828(gActiveBank ^ 2, &gEnemyParty[gBattlePartyID[gActiveBank ^ 2]]);
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_3)
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler].unk0_7)
+        sub_8141828(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+    if (!ewram17810[gActiveBattler ^ 2].unk0_3 && !ewram17810[gActiveBattler ^ 2].unk0_7)
+        sub_8141828(gActiveBattler ^ 2, &gEnemyParty[gBattlePartyID[gActiveBattler ^ 2]]);
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler ^ 2].unk0_3)
     {
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank ^ 2]]);
+            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler ^ 2]]);
             sub_8045A5C(
-              gHealthboxIDs[gActiveBank ^ 2],
-              &gEnemyParty[gBattlePartyID[gActiveBank ^ 2]],
+              gHealthboxIDs[gActiveBattler ^ 2],
+              &gEnemyParty[gBattlePartyID[gActiveBattler ^ 2]],
               0);
-            sub_804777C(gActiveBank ^ 2);
-            sub_8043DFC(gHealthboxIDs[gActiveBank ^ 2]);
+            sub_804777C(gActiveBattler ^ 2);
+            sub_8043DFC(gHealthboxIDs[gActiveBattler ^ 2]);
             sub_8032984(
-              gActiveBank ^ 2,
-              GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank ^ 2]], MON_DATA_SPECIES));
+              gActiveBattler ^ 2,
+              GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler ^ 2]], MON_DATA_SPECIES));
         }
-        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler]]);
         sub_8045A5C(
-          gHealthboxIDs[gActiveBank],
-          &gEnemyParty[gBattlePartyID[gActiveBank]],
+          gHealthboxIDs[gActiveBattler],
+          &gEnemyParty[gBattlePartyID[gActiveBattler]],
           0);
-        sub_804777C(gActiveBank);
-        sub_8043DFC(gHealthboxIDs[gActiveBank]);
+        sub_804777C(gActiveBattler);
+        sub_8043DFC(gHealthboxIDs[gActiveBattler]);
         sub_8032984(
-          gActiveBank,
-          GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+          gActiveBattler,
+          GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
 
         ewram17840.unk9_0 = 0;
-        gBattleBankFunc[gActiveBank] = sub_8032C88;
+        gBattleBankFunc[gActiveBattler] = sub_8032C88;
     }
 }
 
 void sub_8033018(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].animEnded == TRUE
-     && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].animEnded == TRUE
+     && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
     {
-        if (!ewram17810[gActiveBank].unk0_7)
+        if (!ewram17810[gActiveBattler].unk0_7)
         {
-            sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+            sub_8141828(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
             return;
         }
-        if (ewram17810[gActiveBank].unk1_0)
+        if (ewram17810[gActiveBattler].unk1_0)
         {
-            ewram17810[gActiveBank].unk0_7 = 0;
-            ewram17810[gActiveBank].unk1_0 = 0;
+            ewram17810[gActiveBattler].unk0_7 = 0;
+            ewram17810[gActiveBattler].unk1_0 = 0;
             FreeSpriteTilesByTag(0x27F9);
             FreeSpritePaletteByTag(0x27F9);
             OpponentBufferExecCompleted();
@@ -408,32 +408,32 @@ void sub_8033018(void)
 
 void sub_80330C8(void)
 {
-    s16 r4 = sub_8045C78(gActiveBank, gHealthboxIDs[gActiveBank], 0, 0);
+    s16 r4 = sub_8045C78(gActiveBattler, gHealthboxIDs[gActiveBattler], 0, 0);
 
-    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    sub_8043DFC(gHealthboxIDs[gActiveBattler]);
     if (r4 != -1)
-        sub_80440EC(gHealthboxIDs[gActiveBank], r4, 0);
+        sub_80440EC(gHealthboxIDs[gActiveBattler], r4, 0);
     else
         OpponentBufferExecCompleted();
 }
 
 void sub_803311C(void)
 {
-    if (!gSprites[gBankSpriteIds[gActiveBank]].inUse)
+    if (!gSprites[gBankSpriteIds[gActiveBattler]].inUse)
     {
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         OpponentBufferExecCompleted();
     }
 }
 
 void sub_8033160(void)
 {
-    if (!ewram17810[gActiveBank].unk0_6)
+    if (!ewram17810[gActiveBattler].unk0_6)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8032A08(gActiveBank);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8032A08(gActiveBattler);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         OpponentBufferExecCompleted();
     }
 }
@@ -446,7 +446,7 @@ void sub_80331D0(void)
 
 void bx_blink_t7(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -465,17 +465,17 @@ void bx_blink_t7(void)
 
 void sub_8033264(void)
 {
-    if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
-        gBattleBankFunc[gActiveBank] = sub_80332D0;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 6);
+        gBattleBankFunc[gActiveBattler] = sub_80332D0;
     }
 }
 
 void sub_80332D0(void)
 {
-    if (!ewram17810[gActiveBank].unk0_6)
+    if (!ewram17810[gActiveBattler].unk0_6)
     {
         CreateTask(c3_0802FDF4, 10);
         OpponentBufferExecCompleted();
@@ -484,53 +484,53 @@ void sub_80332D0(void)
 
 void sub_8033308(void)
 {
-    if (ewram17810[gActiveBank].unk1_0)
+    if (ewram17810[gActiveBattler].unk1_0)
     {
-        ewram17810[gActiveBank].unk0_7 = 0;
-        ewram17810[gActiveBank].unk1_0 = 0;
+        ewram17810[gActiveBattler].unk0_7 = 0;
+        ewram17810[gActiveBattler].unk1_0 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
+        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
         sub_8045A5C(
-          gHealthboxIDs[gActiveBank],
-          &gEnemyParty[gBattlePartyID[gActiveBank]],
+          gHealthboxIDs[gActiveBattler],
+          &gEnemyParty[gBattlePartyID[gActiveBattler]],
           0);
-        sub_804777C(gActiveBank);
-        sub_8043DFC(gHealthboxIDs[gActiveBank]);
-        sub_8031F88(gActiveBank);
-        gBattleBankFunc[gActiveBank] = sub_8033264;
+        sub_804777C(gActiveBattler);
+        sub_8043DFC(gHealthboxIDs[gActiveBattler]);
+        sub_8031F88(gActiveBattler);
+        gBattleBankFunc[gActiveBattler] = sub_8033264;
     }
 }
 
 void sub_80333D4(void)
 {
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
-        sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
-    if (gSprites[gUnknown_0300434C[gActiveBank]].callback == SpriteCallbackDummy
-     && !ewram17810[gActiveBank].unk0_3)
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler].unk0_7)
+        sub_8141828(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+    if (gSprites[gUnknown_0300434C[gActiveBattler]].callback == SpriteCallbackDummy
+     && !ewram17810[gActiveBattler].unk0_3)
     {
-        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
-        sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
-        gBattleBankFunc[gActiveBank] = sub_8033308;
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler]]);
+        sub_8032984(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+        gBattleBankFunc[gActiveBattler] = sub_8033308;
     }
 }
 
 void sub_8033494(void)
 {
-    if (!ewram17810[gActiveBank].unk0_4)
+    if (!ewram17810[gActiveBattler].unk0_4)
         OpponentBufferExecCompleted();
 }
 
 void sub_80334C0(void)
 {
-    if (!ewram17810[gActiveBank].unk0_5)
+    if (!ewram17810[gActiveBattler].unk0_5)
         OpponentBufferExecCompleted();
 }
 
 void OpponentBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = OpponentBufferRunCommand;
-    gBattleExecBuffer &= ~gBitTable[gActiveBank];
+    gBattleBankFunc[gActiveBattler] = OpponentBufferRunCommand;
+    gBattleExecBuffer &= ~gBitTable[gActiveBattler];
 }
 
 void OpponentHandleGetAttributes(void)
@@ -539,13 +539,13 @@ void OpponentHandleGetAttributes(void)
     int r6 = 0;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        r6 = sub_8033598(gBattlePartyID[gActiveBank], buffer);
+        r6 = sub_8033598(gBattlePartyID[gActiveBattler], buffer);
     }
     else
     {
-        u8 r4 = gBattleBufferA[gActiveBank][2];
+        u8 r4 = gBattleBufferA[gActiveBattler][2];
 
         for (i = 0; i < 6; i++)
         {
@@ -568,7 +568,7 @@ u32 sub_8033598(u8 a, u8 *buffer)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         battlePokemon.species = GetMonData(&gEnemyParty[a], MON_DATA_SPECIES);
@@ -630,7 +630,7 @@ u32 sub_8033598(u8 a, u8 *buffer)
     case 5:
     case 6:
     case 7:
-        data16 = GetMonData(&gEnemyParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4);
+        data16 = GetMonData(&gEnemyParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - 4);
         buffer[0] = data16;
         buffer[1] = data16 >> 8;
         size = 2;
@@ -645,7 +645,7 @@ u32 sub_8033598(u8 a, u8 *buffer)
     case 10:
     case 11:
     case 12:
-        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9);
+        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - 9);
         size = 1;
         break;
     case 17:
@@ -864,11 +864,11 @@ void OpponentHandlecmd1(void)
     struct BattlePokemon buffer;
     u8 i;
     // TODO: Maybe fix this. Integrating this into MEMSET_ALT is too hard.
-    u8 *src = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
+    u8 *src = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 *dst;
 
-    MEMSET_ALT(&buffer + gBattleBufferA[gActiveBank][1], src[i], gBattleBufferA[gActiveBank][2], i, dst);
-    Emitcmd29(1, gBattleBufferA[gActiveBank][2], dst);
+    MEMSET_ALT(&buffer + gBattleBufferA[gActiveBattler][1], src[i], gBattleBufferA[gActiveBattler][2], i, dst);
+    Emitcmd29(1, gBattleBufferA[gActiveBattler][2], dst);
     OpponentBufferExecCompleted();
 }
 
@@ -877,13 +877,13 @@ void OpponentHandleSetAttributes(void)
     u8 i;
     u8 r4;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        sub_8033E24(gBattlePartyID[gActiveBank]);
+        sub_8033E24(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        r4 = gBattleBufferA[gActiveBank][2];
+        r4 = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (r4 & 1)
@@ -896,11 +896,11 @@ void OpponentHandleSetAttributes(void)
 
 void sub_8033E24(u8 a)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         {
@@ -941,10 +941,10 @@ void sub_8033E24(u8 a)
         }
         break;
     case 1:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 2:
-        SetMonData(&gEnemyParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 3:
         for (i = 0; i < 4; i++)
@@ -958,154 +958,154 @@ void sub_8033E24(u8 a)
     case 5:
     case 6:
     case 7:
-        SetMonData(&gEnemyParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - 4, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 8:
-        SetMonData(&gEnemyParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gEnemyParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gEnemyParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gEnemyParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gEnemyParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case 9:
     case 10:
     case 11:
     case 12:
-        SetMonData(&gEnemyParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - 9, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 17:
-        SetMonData(&gEnemyParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 18:
-        SetMonData(&gEnemyParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 19:
-        SetMonData(&gEnemyParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 20:
-        SetMonData(&gEnemyParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 21:
-        SetMonData(&gEnemyParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 22:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 23:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 24:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 25:
-        SetMonData(&gEnemyParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 26:
-        SetMonData(&gEnemyParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 27:
-        SetMonData(&gEnemyParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 28:
-        SetMonData(&gEnemyParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 29:
-        SetMonData(&gEnemyParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 30:
-        SetMonData(&gEnemyParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 31:
-        SetMonData(&gEnemyParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gEnemyParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gEnemyParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gEnemyParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gEnemyParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case 32:
-        SetMonData(&gEnemyParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 33:
-        SetMonData(&gEnemyParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 34:
-        SetMonData(&gEnemyParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 35:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 36:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 37:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 38:
-        SetMonData(&gEnemyParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 39:
-        SetMonData(&gEnemyParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 40:
-        SetMonData(&gEnemyParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 41:
-        SetMonData(&gEnemyParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 42:
-        SetMonData(&gEnemyParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 43:
-        SetMonData(&gEnemyParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 44:
-        SetMonData(&gEnemyParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 45:
-        SetMonData(&gEnemyParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 46:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 47:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 48:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 49:
-        SetMonData(&gEnemyParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 50:
-        SetMonData(&gEnemyParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 51:
-        SetMonData(&gEnemyParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 52:
-        SetMonData(&gEnemyParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 53:
-        SetMonData(&gEnemyParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 54:
-        SetMonData(&gEnemyParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 55:
-        SetMonData(&gEnemyParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 56:
-        SetMonData(&gEnemyParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 57:
-        SetMonData(&gEnemyParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 58:
-        SetMonData(&gEnemyParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 59:
-        SetMonData(&gEnemyParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
 }
@@ -1115,37 +1115,37 @@ void OpponentHandlecmd3(void)
     u8 *dst;
     u8 i;
 
-    MEMSET_ALT(&gEnemyParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][3 + i], 
-        gBattleBufferA[gActiveBank][2], i, dst);
+    MEMSET_ALT(&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][3 + i], 
+        gBattleBufferA[gActiveBattler][2], i, dst);
     OpponentBufferExecCompleted();
 }
 
 void OpponentHandleLoadPokeSprite(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
-    BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
-      GetBankPosition(gActiveBank, 2),
-      sub_8077F68(gActiveBank),
-      sub_8079E90(gActiveBank));
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = species;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
-    sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
-    gBattleBankFunc[gActiveBank] = sub_8033018;
+      GetBankPosition(gActiveBattler, 2),
+      sub_8077F68(gActiveBattler),
+      sub_8079E90(gActiveBattler));
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = species;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    sub_8032984(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+    gBattleBankFunc[gActiveBattler] = sub_8033018;
 }
 
 void OpponentHandleSendOutPoke(void)
 {
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
 
-    sub_803495C(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_80333D4;
+    sub_803495C(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattleBankFunc[gActiveBattler] = sub_80333D4;
 }
 
 void sub_803495C(u8 a, u8 b)
@@ -1175,36 +1175,36 @@ void sub_803495C(u8 a, u8 b)
 
 void OpponentHandleReturnPokeToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        ewram17810[gActiveBank].unk4 = 0;
-        gBattleBankFunc[gActiveBank] = sub_8034B74;
+        ewram17810[gActiveBattler].unk4 = 0;
+        gBattleBankFunc[gActiveBattler] = sub_8034B74;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8032A08(gActiveBank);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8032A08(gActiveBattler);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         OpponentBufferExecCompleted();
     }
 }
 
 void sub_8034B74(void)
 {
-    switch (ewram17810[gActiveBank].unk4)
+    switch (ewram17810[gActiveBattler].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
-        ewram17810[gActiveBank].unk4 = 1;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
+        ewram17810[gActiveBattler].unk4 = 1;
         break;
     case 1:
-        if (!ewram17810[gActiveBank].unk0_6)
+        if (!ewram17810[gActiveBattler].unk0_6)
         {
-            ewram17810[gActiveBank].unk4 = 0;
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 2);
-            gBattleBankFunc[gActiveBank] = sub_8033160;
+            ewram17810[gActiveBattler].unk4 = 0;
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 2);
+            gBattleBankFunc[gActiveBattler] = sub_8033160;
         }
         break;
     }
@@ -1232,21 +1232,21 @@ void OpponentHandleTrainerThrow(void)
             trainerPicIndex = gTrainers[gTrainerBattleOpponent].trainerPic;
     }
 
-    sub_8031A6C(trainerPicIndex, gActiveBank);
-    GetMonSpriteTemplate_803C5A0(trainerPicIndex, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    sub_8031A6C(trainerPicIndex, gActiveBattler);
+    GetMonSpriteTemplate_803C5A0(trainerPicIndex, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       0xB0,
       40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicIndex].coords),
-      sub_8079E90(gActiveBank));
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[trainerPicIndex].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicIndex;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
-    gBattleBankFunc[gActiveBank] = sub_8032B4C;
+      sub_8079E90(gActiveBattler));
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gSprites[gBankSpriteIds[gActiveBattler]].oam.tileNum;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[trainerPicIndex].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicIndex;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBattler] = sub_8032B4C;
 }
 
 void OpponentHandleTrainerSlide(void)
@@ -1262,49 +1262,49 @@ void OpponentHandleTrainerSlide(void)
     else
         trainerPicIndex = gTrainers[gTrainerBattleOpponent].trainerPic;
 
-    sub_8031A6C(trainerPicIndex, gActiveBank);
-    GetMonSpriteTemplate_803C5A0(trainerPicIndex, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    sub_8031A6C(trainerPicIndex, gActiveBattler);
+    GetMonSpriteTemplate_803C5A0(trainerPicIndex, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       0xB0,
       40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicIndex].coords),
       0x1E);
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 96;
-    gSprites[gBankSpriteIds[gActiveBank]].pos1.x += 32;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[trainerPicIndex].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicIndex;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
-    gBattleBankFunc[gActiveBank] = sub_8032B84;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 96;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos1.x += 32;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gSprites[gBankSpriteIds[gActiveBattler]].oam.tileNum;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[trainerPicIndex].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicIndex;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBattler] = sub_8032B84;
 }
 
 void OpponentHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
-    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    gBattleBankFunc[gActiveBank] = sub_8032BBC;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas;
+    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattleBankFunc[gActiveBattler] = sub_8032BBC;
 }
 
 void OpponentHandlecmd10(void)
 {
-    if (ewram17810[gActiveBank].unk4 == 0)
+    if (ewram17810[gActiveBattler].unk4 == 0)
     {
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
-        ewram17810[gActiveBank].unk4++;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
+        ewram17810[gActiveBattler].unk4++;
     }
-    else if (!ewram17810[gActiveBank].unk0_6)
+    else if (!ewram17810[gActiveBattler].unk0_6)
     {
-        ewram17810[gActiveBank].unk4 = 0;
+        ewram17810[gActiveBattler].unk4 = 0;
         PlaySE12WithPanning(SE_POKE_DEAD, 63);
-        gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8010384;
-        gBattleBankFunc[gActiveBank] = sub_803311C;
+        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8010384;
+        gBattleBankFunc[gActiveBattler] = sub_803311C;
     }
 }
 
@@ -1330,23 +1330,23 @@ void OpponentHandlePuase(void)
 
 void OpponentHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u32 r0 = gBattleBufferA[gActiveBank][1]
-               | (gBattleBufferA[gActiveBank][2] << 8);
-
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4]
-                          | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6]
-                          | (gBattleBufferA[gActiveBank][7] << 8)
-                          | (gBattleBufferA[gActiveBank][8] << 16)
-                          | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12]
-                          | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        u32 r0 = gBattleBufferA[gActiveBattler][1]
+               | (gBattleBufferA[gActiveBattler][2] << 8);
+
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4]
+                          | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6]
+                          | (gBattleBufferA[gActiveBattler][7] << 8)
+                          | (gBattleBufferA[gActiveBattler][8] << 16)
+                          | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12]
+                          | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
 
         // Dead code. sub_8031720 always returns 0.
         if (sub_8031720(r0, gAnimMoveTurn) != 0)
@@ -1355,34 +1355,34 @@ void OpponentHandleMoveAnimation(void)
         }
         else
         {
-            ewram17810[gActiveBank].unk4 = 0;
-            gBattleBankFunc[gActiveBank] = sub_8035238;
+            ewram17810[gActiveBattler].unk4 = 0;
+            gBattleBankFunc[gActiveBattler] = sub_8035238;
         }
     }
 }
 
 void sub_8035238(void)
 {
-    u16 r4 = gBattleBufferA[gActiveBank][1]
-           | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 r7 = gBattleBufferA[gActiveBank][11];
+    u16 r4 = gBattleBufferA[gActiveBattler][1]
+           | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 r7 = gBattleBufferA[gActiveBattler][11];
 
-    switch (ewram17810[gActiveBank].unk4)
+    switch (ewram17810[gActiveBattler].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].substituteSprite && !ewram17800[gActiveBank].unk0_3)
+        if (ewram17800[gActiveBattler].substituteSprite && !ewram17800[gActiveBattler].unk0_3)
         {
-            ewram17800[gActiveBank].unk0_3 = 1;
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
+            ewram17800[gActiveBattler].unk0_3 = 1;
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
         }
-        ewram17810[gActiveBank].unk4 = 1;
+        ewram17810[gActiveBattler].unk4 = 1;
         break;
     case 1:
-        if (!ewram17810[gActiveBank].unk0_6)
+        if (!ewram17810[gActiveBattler].unk0_6)
         {
             sub_80326EC(0);
             DoMoveAnim(r4);
-            ewram17810[gActiveBank].unk4 = 2;
+            ewram17810[gActiveBattler].unk4 = 2;
         }
         break;
     case 2:
@@ -1390,22 +1390,22 @@ void sub_8035238(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if ((ewram17800[gActiveBank].substituteSprite) && r7 <= 1)
+            if ((ewram17800[gActiveBattler].substituteSprite) && r7 <= 1)
             {
-                move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
-                ewram17800[gActiveBank].unk0_3 = 0;
+                move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 6);
+                ewram17800[gActiveBattler].unk0_3 = 0;
             }
-            ewram17810[gActiveBank].unk4 = 3;
+            ewram17810[gActiveBattler].unk4 = 3;
         }
         break;
     case 3:
-        if (!ewram17810[gActiveBank].unk0_6)
+        if (!ewram17810[gActiveBattler].unk0_6)
         {
             sub_8031F24();
             sub_80324BC(
-              gActiveBank,
-              gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            ewram17810[gActiveBank].unk4 = 0;
+              gActiveBattler,
+              gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            ewram17810[gActiveBattler].unk4 = 0;
             OpponentBufferExecCompleted();
         }
         break;
@@ -1416,9 +1416,9 @@ void OpponentHandlePrintString(void)
 {
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
+    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBattler][2]);
     Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
-    gBattleBankFunc[gActiveBank] = sub_80331D0;
+    gBattleBankFunc[gActiveBattler] = sub_80331D0;
 }
 
 void OpponentHandlePrintStringPlayerOnly(void)
@@ -1447,7 +1447,7 @@ void OpponentHandlecmd20(void)
     mov r6, r9\n\
     mov r5, r8\n\
     push    {r5, r6, r7}\n\
-    ldr r6, ._549       @ gActiveBank\n\
+    ldr r6, ._549       @ gActiveBattler\n\
     ldrb    r0, [r6]\n\
     lsl r0, r0, #0x9\n\
     ldr r1, ._549 + 4   @ gBattleBufferA\n\
@@ -1489,7 +1489,7 @@ void OpponentHandlecmd20(void)
 ._550:\n\
     .align  2, 0\n\
 ._549:\n\
-    .word   gActiveBank\n\
+    .word   gActiveBattler\n\
     .word   gBattleBufferA+4\n\
     .word   gUnknown_02023A14_50\n\
     .word   gBattleMoves\n\
@@ -1688,7 +1688,7 @@ void OpponentHandlecmd20(void)
     and r0, r0, r1\n\
     cmp r0, #0\n\
     beq ._577   @cond_branch\n\
-    ldr r0, ._579 + 4   @ gActiveBank\n\
+    ldr r0, ._579 + 4   @ gActiveBattler\n\
     ldrb    r2, [r0]\n\
     lsl r2, r2, #0x8\n\
     b   ._578\n\
@@ -1696,7 +1696,7 @@ void OpponentHandlecmd20(void)
     .align  2, 0\n\
 ._579:\n\
     .word   gBattleMoves\n\
-    .word   gActiveBank\n\
+    .word   gActiveBattler\n\
 ._577:\n\
     ldr r0, ._583       @ gBattleTypeFlags\n\
     ldrh    r1, [r0]\n\
@@ -1751,7 +1751,7 @@ void OpponentHandlecmd20(void)
 {
     u16 r4;
     // Needed to match closer
-    struct {u16 moves[4];} *r5 = (void *)&gBattleBufferA[gActiveBank][4];
+    struct {u16 moves[4];} *r5 = (void *)&gBattleBufferA[gActiveBattler][4];
 
     if (gBattleTypeFlags & 0x498)
     {
@@ -1767,7 +1767,7 @@ void OpponentHandlecmd20(void)
             break;
         default:
             if (gBattleMoves[r5->moves[r4]].target & 0x12)
-                gBankTarget = gActiveBank;
+                gBankTarget = gActiveBattler;
             if (gBattleMoves[r5->moves[r4]].target & 8)
             {
                 gBankTarget = GetBankByIdentity(0);
@@ -1793,7 +1793,7 @@ void OpponentHandlecmd20(void)
 
         if (gBattleMoves[r2].target & 0x12)
         {
-            r4 |= gActiveBank << 8;
+            r4 |= gActiveBattler << 8;
             Emitcmd33(1, 10, r4);
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -1817,7 +1817,7 @@ void OpponentHandlecmd20(void)
 {
     asm(".syntax unified\n\
     push {r4-r6,lr}\n\
-    ldr r6, _0803545C @ =gActiveBank\n\
+    ldr r6, _0803545C @ =gActiveBattler\n\
     ldrb r0, [r6]\n\
     lsls r0, 9\n\
     ldr r1, _08035460 @ =gBattleBufferA+4\n\
@@ -1841,7 +1841,7 @@ void OpponentHandlecmd20(void)
     movs r1, 0x4\n\
     b _0803546C\n\
     .align 2, 0\n\
-_0803545C: .4byte gActiveBank\n\
+_0803545C: .4byte gActiveBattler\n\
 _08035460: .4byte gBattleBufferA+4\n\
 _08035464: .4byte gBattleTypeFlags\n\
 _08035468:\n\
@@ -1934,7 +1934,7 @@ _080354FA:\n\
     ands r0, r1\n\
     cmp r0, 0\n\
     beq _0803553C\n\
-    ldr r0, _08035538 @ =gActiveBank\n\
+    ldr r0, _08035538 @ =gActiveBattler\n\
     ldrb r0, [r0]\n\
     lsls r0, 8\n\
     orrs r4, r0\n\
@@ -1945,7 +1945,7 @@ _080354FA:\n\
     b _08035586\n\
     .align 2, 0\n\
 _08035534: .4byte gBattleMoves\n\
-_08035538: .4byte gActiveBank\n\
+_08035538: .4byte gActiveBattler\n\
 _0803553C:\n\
     ldr r0, _0803556C @ =gBattleTypeFlags\n\
     ldrh r1, [r0]\n\
@@ -1994,7 +1994,7 @@ _0803558A:\n\
 void OpponentHandleOpenBag(void)
 {
     // What is this?
-    Emitcmd35(1, ewram160D4(gActiveBank));
+    Emitcmd35(1, ewram160D4(gActiveBattler));
     OpponentBufferExecCompleted();
 }
 
@@ -2002,7 +2002,7 @@ void OpponentHandlecmd22(void)
 {
     s32 r4;
 
-    if (ewram160C8arr(GetBankIdentity(gActiveBank)) == 6)
+    if (ewram160C8arr(GetBankIdentity(gActiveBattler)) == 6)
     {
         u8 r6;
         u8 r5;
@@ -2031,10 +2031,10 @@ void OpponentHandlecmd22(void)
     }
     else
     {
-        r4 = ewram160C8arr(GetBankIdentity(gActiveBank));
-        ewram160C8arr(GetBankIdentity(gActiveBank)) = 6;
+        r4 = ewram160C8arr(GetBankIdentity(gActiveBattler));
+        ewram160C8arr(GetBankIdentity(gActiveBattler)) = 6;
     }
-    ewram16068arr(gActiveBank) = r4;
+    ewram16068arr(gActiveBattler) = r4;
     Emitcmd34(1, r4, 0);
     OpponentBufferExecCompleted();
 }
@@ -2049,21 +2049,21 @@ void OpponentHandleHealthBarUpdate(void)
     s16 r7;
 
     load_gfxc_health_bar(0);
-    r7 = (gBattleBufferA[gActiveBank][3] << 8) | gBattleBufferA[gActiveBank][2];
+    r7 = (gBattleBufferA[gActiveBattler][3] << 8) | gBattleBufferA[gActiveBattler][2];
     if (r7 != 0x7FFF)
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 hp = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 hp = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, hp, r7);
+        sub_8043D84(gActiveBattler, gHealthboxIDs[gActiveBattler], maxHP, hp, r7);
     }
     else
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, 0, r7);
+        sub_8043D84(gActiveBattler, gHealthboxIDs[gActiveBattler], maxHP, 0, r7);
     }
-    gBattleBankFunc[gActiveBank] = sub_80330C8;
+    gBattleBankFunc[gActiveBattler] = sub_80330C8;
 }
 
 void OpponentHandleExpBarUpdate(void)
@@ -2073,25 +2073,25 @@ void OpponentHandleExpBarUpdate(void)
 
 void OpponentHandleStatusIconUpdate(void)
 {
-    if (mplay_80342A4(gActiveBank) == 0)
+    if (mplay_80342A4(gActiveBattler) == 0)
     {
-        sub_8045A5C(gHealthboxIDs[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], 9);
-        ewram17810[gActiveBank].unk0_4 = 0;
-        gBattleBankFunc[gActiveBank] = sub_8033494;
+        sub_8045A5C(gHealthboxIDs[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], 9);
+        ewram17810[gActiveBattler].unk0_4 = 0;
+        gBattleBankFunc[gActiveBattler] = sub_8033494;
     }
 }
 
 void OpponentHandleStatusAnimation(void)
 {
-    if (mplay_80342A4(gActiveBank) == 0)
+    if (mplay_80342A4(gActiveBattler) == 0)
     {
         move_anim_start_t2_for_situation(
-          gBattleBufferA[gActiveBank][1],
-          gBattleBufferA[gActiveBank][2]
-          | (gBattleBufferA[gActiveBank][3] << 8)
-          | (gBattleBufferA[gActiveBank][4] << 16)
-          | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = sub_8033494;
+          gBattleBufferA[gActiveBattler][1],
+          gBattleBufferA[gActiveBattler][2]
+          | (gBattleBufferA[gActiveBattler][3] << 8)
+          | (gBattleBufferA[gActiveBattler][4] << 16)
+          | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattleBankFunc[gActiveBattler] = sub_8033494;
     }
 }
 
@@ -2148,7 +2148,7 @@ void OpponentHandlecmd37(void)
 
 void OpponentHandlecmd38(void)
 {
-    gUnknown_020238C8.unk0_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_020238C8.unk0_0 = gBattleBufferA[gActiveBattler][1];
     OpponentBufferExecCompleted();
 }
 
@@ -2166,16 +2166,16 @@ void OpponentHandlecmd40(void)
 
 void OpponentHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         OpponentBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        sub_8047858(gActiveBank);
-        gBattleBankFunc[gActiveBank] = bx_blink_t7;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        sub_8047858(gActiveBattler);
+        gBattleBankFunc[gActiveBattler] = bx_blink_t7;
     }
 }
 
@@ -2188,31 +2188,31 @@ void OpponentHandleEffectivenessSound(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == 0)
+    if (GetBankSide(gActiveBattler) == 0)
         pan = -64;
     else
         pan = 63;
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     OpponentBufferExecCompleted();
 }
 
 void OpponentHandlecmd44(void)
 {
-    PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     OpponentBufferExecCompleted();
 }
 
 void OpponentHandleFaintingCry(void)
 {
     PlayCry3(
-      GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES),
+      GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES),
       25, 5);
     OpponentBufferExecCompleted();
 }
 
 void OpponentHandleIntroSlide(void)
 {
-    StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]);
+    StartBattleIntroAnim(gBattleBufferA[gActiveBattler][1]);
     gUnknown_02024DE8 |= 1;
     OpponentBufferExecCompleted();
 }
@@ -2221,18 +2221,18 @@ void OpponentHandleTrainerBallThrow(void)
 {
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
-    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8035C10);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas;
+    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_8035C10);
     taskId = CreateTask(sub_8035C44, 5);
-    gTasks[taskId].data[0] = gActiveBank;
-    if (ewram17810[gActiveBank].unk0_0)
-        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    gTasks[taskId].data[0] = gActiveBattler;
+    if (ewram17810[gActiveBattler].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBattler]].func = sub_8044CA0;
     ewram17840.unk9_0 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_45;
+    gBattleBankFunc[gActiveBattler] = nullsub_45;
 }
 
 void sub_8035C10(struct Sprite *sprite)
@@ -2247,72 +2247,72 @@ void sub_8035C44(u8 taskId)
 {
     u8 r9;
 
-    r9 = gActiveBank;
-    gActiveBank = gTasks[taskId].data[0];
+    r9 = gActiveBattler;
+    gActiveBattler = gTasks[taskId].data[0];
     if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_803495C(gActiveBank, 0);
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_803495C(gActiveBattler, 0);
     }
     else
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_803495C(gActiveBank, 0);
-        gActiveBank ^= 2;
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_803495C(gActiveBank, 0);
-        gActiveBank ^= 2;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_803495C(gActiveBattler, 0);
+        gActiveBattler ^= 2;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_803495C(gActiveBattler, 0);
+        gActiveBattler ^= 2;
     }
-    gBattleBankFunc[gActiveBank] = sub_8032E2C;
-    gActiveBank = r9;
+    gBattleBankFunc[gActiveBattler] = sub_8032E2C;
+    gActiveBattler = r9;
     DestroyTask(taskId);
 }
 
 void OpponentHandlecmd48(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == 0)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBankSide(gActiveBattler) == 0)
     {
         OpponentBufferExecCompleted();
         return;
     }
 
-    ewram17810[gActiveBank].unk0_0 = 1;
-    if (gBattleBufferA[gActiveBank][2] != 0)
+    ewram17810[gActiveBattler].unk0_0 = 1;
+    if (gBattleBufferA[gActiveBattler][2] != 0)
     {
-        if (ewram17810[gActiveBank].unk1_1 < 2)
+        if (ewram17810[gActiveBattler].unk1_1 < 2)
         {
-            ewram17810[gActiveBank].unk1_1++;
+            ewram17810[gActiveBattler].unk1_1++;
             return;
         }
         else
         {
-            ewram17810[gActiveBank].unk1_1 = 0;
+            ewram17810[gActiveBattler].unk1_1 = 0;
         }
     }
-    gUnknown_02024E68[gActiveBank] = sub_8044804(
-      gActiveBank,
-      (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBank][4],
-      gBattleBufferA[gActiveBank][1],
-      gBattleBufferA[gActiveBank][2]);
-    ewram17810[gActiveBank].unk5 = 0;
-    if (gBattleBufferA[gActiveBank][2] != 0)
-        ewram17810[gActiveBank].unk5 = 0x5D;
-    gBattleBankFunc[gActiveBank] = sub_8035E2C;
+    gUnknown_02024E68[gActiveBattler] = sub_8044804(
+      gActiveBattler,
+      (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4],
+      gBattleBufferA[gActiveBattler][1],
+      gBattleBufferA[gActiveBattler][2]);
+    ewram17810[gActiveBattler].unk5 = 0;
+    if (gBattleBufferA[gActiveBattler][2] != 0)
+        ewram17810[gActiveBattler].unk5 = 0x5D;
+    gBattleBankFunc[gActiveBattler] = sub_8035E2C;
 }
 
 void sub_8035E2C(void)
 {
-    if (ewram17810[gActiveBank].unk5++ >= 93)
+    if (ewram17810[gActiveBattler].unk5++ >= 93)
     {
-        ewram17810[gActiveBank].unk5 = 0;
+        ewram17810[gActiveBattler].unk5 = 0;
         OpponentBufferExecCompleted();
     }
 }
 
 void OpponentHandlecmd49(void)
 {
-    if (ewram17810[gActiveBank].unk0_0)
-        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    if (ewram17810[gActiveBattler].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBattler]].func = sub_8044CA0;
     OpponentBufferExecCompleted();
 }
 
@@ -2323,25 +2323,25 @@ void OpponentHandlecmd50(void)
 
 void OpponentHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank) != 0)
+    if (IsBankSpritePresent(gActiveBattler) != 0)
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        sub_8031F88(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        sub_8031F88(gActiveBattler);
     }
     OpponentBufferExecCompleted();
 }
 
 void OpponentHandleBattleAnimation(void)
 {
-    if (mplay_80342A4(gActiveBank) == 0)
+    if (mplay_80342A4(gActiveBattler) == 0)
     {
-        u8 r3 = gBattleBufferA[gActiveBank][1];
-        u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 r3 = gBattleBufferA[gActiveBattler][1];
+        u16 r4 = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, r3, r4) != 0)
+        if (move_anim_start_t3(gActiveBattler, gActiveBattler, gActiveBattler, r3, r4) != 0)
             OpponentBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = sub_80334C0;
+            gBattleBankFunc[gActiveBattler] = sub_80334C0;
     }
 }
 
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index f9190eb39..d2d87bcce 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -46,7 +46,7 @@ extern u8 gBankAttacker;
 extern u8 gBankTarget;
 extern u32 gOamMatrixAllocBitmap;
 extern u8 gUnknown_020297ED;
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u8 gActionSelectionCursor[];
 extern u8 gDisplayedStringBattle[];
 extern u8 gMoveSelectionCursor[];
@@ -138,7 +138,7 @@ extern u8 sub_8077F68();
 extern u8 sub_8046400();
 extern void sub_802D798(void);
 extern void bx_0802E404(void);
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern void (*gBattleBankFunc[])(void);
 extern bool8 gDoingBattleAnim;
 extern u16 gBattleTypeFlags;
@@ -338,32 +338,32 @@ void nullsub_91(void)
 
 void SetBankFuncToPlayerBufferRunCommand(void)
 {
-    gBattleBankFunc[gActiveBank] = PlayerBufferRunCommand;
+    gBattleBankFunc[gActiveBattler] = PlayerBufferRunCommand;
     gDoingBattleAnim = FALSE;
 }
 
 void PlayerBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = PlayerBufferRunCommand;
+    gBattleBankFunc[gActiveBattler] = PlayerBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = 0x38;
+        gBattleBufferA[gActiveBattler][0] = 0x38;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
 void PlayerBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < 0x39)
-            gPlayerBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < 0x39)
+            gPlayerBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             PlayerBufferExecCompleted();
     }
@@ -371,23 +371,23 @@ void PlayerBufferRunCommand(void)
 
 void bx_0802E404(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
         PlayerBufferExecCompleted();
 }
 
 void sub_802C098(void)
 {
-    u16 itemId = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    u16 itemId = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-    dp11b_obj_instanciate(gActiveBank, 1, 7, 1);
-    dp11b_obj_instanciate(gActiveBank, 0, 7, 1);
+    dp11b_obj_instanciate(gActiveBattler, 1, 7, 1);
+    dp11b_obj_instanciate(gActiveBattler, 0, 7, 1);
     if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
         DestroyMenuCursor();
 
         // Useless switch statement.
-        switch (gActionSelectionCursor[gActiveBank])
+        switch (gActionSelectionCursor[gActiveBattler])
         {
         case 0:
             Emitcmd33(1, 0, 0);
@@ -406,52 +406,52 @@ void sub_802C098(void)
     }
     else if (gMain.newKeys & DPAD_LEFT)
     {
-        if (gActionSelectionCursor[gActiveBank] & 1)
+        if (gActionSelectionCursor[gActiveBattler] & 1)
         {
             PlaySE(SE_SELECT);
-            nullsub_8(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 1;
-            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+            nullsub_8(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 1;
+            sub_802E3E4(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (!(gActionSelectionCursor[gActiveBank] & 1))
+        if (!(gActionSelectionCursor[gActiveBattler] & 1))
         {
             PlaySE(SE_SELECT);
-            nullsub_8(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 1;
-            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+            nullsub_8(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 1;
+            sub_802E3E4(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_UP)
     {
-        if (gActionSelectionCursor[gActiveBank] & 2)
+        if (gActionSelectionCursor[gActiveBattler] & 2)
         {
             PlaySE(SE_SELECT);
-            nullsub_8(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 2;
-            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+            nullsub_8(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 2;
+            sub_802E3E4(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
-        if (!(gActionSelectionCursor[gActiveBank] & 2))
+        if (!(gActionSelectionCursor[gActiveBattler] & 2))
         {
             PlaySE(SE_SELECT);
-            nullsub_8(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 2;
-            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+            nullsub_8(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 2;
+            sub_802E3E4(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & B_BUTTON)
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-         && GetBankIdentity(gActiveBank) == 2
+         && GetBankIdentity(gActiveBattler) == 2
          && !(gAbsentBankFlags & gBitTable[GetBankByIdentity(0)])
          && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            if (gBattleBufferA[gActiveBank][1] == 1)
+            if (gBattleBufferA[gActiveBattler][1] == 1)
             {
                 // Add item to bag if it is a ball
                 if (itemId <= ITEM_PREMIER_BALL)
@@ -473,9 +473,9 @@ void sub_802C098(void)
 
 void unref_sub_802C2B8(void)
 {
-    dp11b_obj_free(gActiveBank, 1);
-    dp11b_obj_free(gActiveBank, 0);
-    gBattleBankFunc[gActiveBank] = sub_802C2EC;
+    dp11b_obj_free(gActiveBattler, 1);
+    dp11b_obj_free(gActiveBattler, 0);
+    gBattleBankFunc[gActiveBattler] = sub_802C2EC;
 }
 
 // TODO: fix this function
@@ -500,7 +500,7 @@ void sub_802C2EC(void)
         DestroyMenuCursor();
         PlaySE(SE_SELECT);
         gSprites[gBankSpriteIds[gUnknown_03004344]].callback = sub_8010574;
-        Emitcmd33(1, 10, gMoveSelectionCursor[gActiveBank] | (gUnknown_03004344 << 8));
+        Emitcmd33(1, 10, gMoveSelectionCursor[gActiveBattler] | (gUnknown_03004344 << 8));
         dp11b_obj_free(gUnknown_03004344, 1);
         PlayerBufferExecCompleted();
     }
@@ -509,9 +509,9 @@ void sub_802C2EC(void)
     {
         PlaySE(SE_SELECT);
         gSprites[gBankSpriteIds[gUnknown_03004344]].callback = sub_8010574;
-        gBattleBankFunc[gActiveBank] = sub_802C68C;
-        dp11b_obj_instanciate(gActiveBank, 1, 7, 1);
-        dp11b_obj_instanciate(gActiveBank, 0, 7, 1);
+        gBattleBankFunc[gActiveBattler] = sub_802C68C;
+        dp11b_obj_instanciate(gActiveBattler, 1, 7, 1);
+        dp11b_obj_instanciate(gActiveBattler, 0, 7, 1);
         dp11b_obj_free(gUnknown_03004344, 1);
     }
     else if (gMain.newKeys & 0x60)
@@ -539,12 +539,12 @@ void sub_802C2EC(void)
             {
             case 0:
             case 2:
-                if (gActiveBank == gUnknown_03004344)
+                if (gActiveBattler == gUnknown_03004344)
                 {
                     u32 moveId;
 
                     asm("":::"memory");
-                    moveId = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBank]);
+                    moveId = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler]);
                     if (!(gBattleMoves[moveId].target & 2))
                         break;
                 }
@@ -586,12 +586,12 @@ void sub_802C2EC(void)
             {
             case 0:
             case 2:
-                if (gActiveBank == gUnknown_03004344)
+                if (gActiveBattler == gUnknown_03004344)
                 {
                     u32 moveId;
 
                     asm("":::"memory");
-                    moveId = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBank]);
+                    moveId = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler]);
                     if (!(gBattleMoves[moveId].target & 2))
                         break;
                 }
@@ -628,7 +628,7 @@ void sub_802C68C(void)
 #if DEBUG
     u8 count = 0;
 #endif
-    struct ChooseMoveStruct *r6 = (struct ChooseMoveStruct *)(gBattleBufferA[gActiveBank] + 4);
+    struct ChooseMoveStruct *r6 = (struct ChooseMoveStruct *)(gBattleBufferA[gActiveBattler] + 4);
 
     if (gMain.newKeys & A_BUTTON)
     {
@@ -636,46 +636,46 @@ void sub_802C68C(void)
 
         PlaySE(SE_SELECT);
 
-        if (r6->moves[gMoveSelectionCursor[gActiveBank]] == MOVE_CURSE)
+        if (r6->moves[gMoveSelectionCursor[gActiveBattler]] == MOVE_CURSE)
             r4 = (r6->unk12 != TYPE_GHOST && (r6->effectStringId ^ 7)) ? 0x10 : 0;
         else
-            r4 = gBattleMoves[r6->moves[gMoveSelectionCursor[gActiveBank]]].target;
+            r4 = gBattleMoves[r6->moves[gMoveSelectionCursor[gActiveBattler]]].target;
 
         if (r4 & 0x10)
-            gUnknown_03004344 = gActiveBank;
+            gUnknown_03004344 = gActiveBattler;
         else
-            gUnknown_03004344 = GetBankByIdentity((GetBankIdentity(gActiveBank) & 1) ^ 1);
+            gUnknown_03004344 = GetBankByIdentity((GetBankIdentity(gActiveBattler) & 1) ^ 1);
 
-        if (gBattleBufferA[gActiveBank][1] == 0)
+        if (gBattleBufferA[gActiveBattler][1] == 0)
         {
-            if ((r4 & 2) && gBattleBufferA[gActiveBank][2] == 0)
+            if ((r4 & 2) && gBattleBufferA[gActiveBattler][2] == 0)
                 r8++;
         }
         else
         {
             if (!(r4 & 0x7D))
                 r8++;
-            if (r6->pp[gMoveSelectionCursor[gActiveBank]] == 0)
+            if (r6->pp[gMoveSelectionCursor[gActiveBattler]] == 0)
             {
                 r8 = 0;
             }
             else if (!(r4 & 0x12) && CountAliveMons(0) <= 1)
             {
-                gUnknown_03004344 = sub_803C434(gActiveBank);
+                gUnknown_03004344 = sub_803C434(gActiveBattler);
                 r8 = 0;
             }
         }
         if (r8 == 0)
         {
             DestroyMenuCursor();
-            Emitcmd33(1, 10, gMoveSelectionCursor[gActiveBank] | (gUnknown_03004344 << 8));
+            Emitcmd33(1, 10, gMoveSelectionCursor[gActiveBattler] | (gUnknown_03004344 << 8));
             PlayerBufferExecCompleted();
         }
         else
         {
-            gBattleBankFunc[gActiveBank] = sub_802C2EC;
+            gBattleBankFunc[gActiveBattler] = sub_802C2EC;
             if (r4 & 0x12)
-                gUnknown_03004344 = gActiveBank;
+                gUnknown_03004344 = gActiveBattler;
             else if (gAbsentBankFlags & gBitTable[GetBankByIdentity(1)])
                 gUnknown_03004344 = GetBankByIdentity(3);
             else
@@ -694,50 +694,50 @@ void sub_802C68C(void)
     }
     else if (gMain.newKeys & DPAD_LEFT)
     {
-        if (gMoveSelectionCursor[gActiveBank] & 1)
+        if (gMoveSelectionCursor[gActiveBattler] & 1)
         {
-            nullsub_7(gMoveSelectionCursor[gActiveBank]);
-            gMoveSelectionCursor[gActiveBank] ^= 1;
+            nullsub_7(gMoveSelectionCursor[gActiveBattler]);
+            gMoveSelectionCursor[gActiveBattler] ^= 1;
             PlaySE(SE_SELECT);
-            sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
+            sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0);
             sub_802E220();
             sub_802E2D4();
         }
     }
     else if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (!(gMoveSelectionCursor[gActiveBank] & 1)
-         && (gMoveSelectionCursor[gActiveBank] ^ 1) < gUnknown_03004348)
+        if (!(gMoveSelectionCursor[gActiveBattler] & 1)
+         && (gMoveSelectionCursor[gActiveBattler] ^ 1) < gUnknown_03004348)
         {
-            nullsub_7(gMoveSelectionCursor[gActiveBank]);
-            gMoveSelectionCursor[gActiveBank] ^= 1;
+            nullsub_7(gMoveSelectionCursor[gActiveBattler]);
+            gMoveSelectionCursor[gActiveBattler] ^= 1;
             PlaySE(SE_SELECT);
-            sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
+            sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0);
             sub_802E220();
             sub_802E2D4();
         }
     }
     else if (gMain.newKeys & DPAD_UP)
     {
-        if (gMoveSelectionCursor[gActiveBank] & 2)
+        if (gMoveSelectionCursor[gActiveBattler] & 2)
         {
-            nullsub_7(gMoveSelectionCursor[gActiveBank]);
-            gMoveSelectionCursor[gActiveBank] ^= 2;
+            nullsub_7(gMoveSelectionCursor[gActiveBattler]);
+            gMoveSelectionCursor[gActiveBattler] ^= 2;
             PlaySE(SE_SELECT);
-            sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
+            sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0);
             sub_802E220();
             sub_802E2D4();
         }
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
-        if (!(gMoveSelectionCursor[gActiveBank] & 2)
-         && (gMoveSelectionCursor[gActiveBank] ^ 2) < gUnknown_03004348)
+        if (!(gMoveSelectionCursor[gActiveBattler] & 2)
+         && (gMoveSelectionCursor[gActiveBattler] ^ 2) < gUnknown_03004348)
         {
-            nullsub_7(gMoveSelectionCursor[gActiveBank]);
-            gMoveSelectionCursor[gActiveBank] ^= 2;
+            nullsub_7(gMoveSelectionCursor[gActiveBattler]);
+            gMoveSelectionCursor[gActiveBattler] ^= 2;
             PlaySE(SE_SELECT);
-            sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
+            sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0);
             sub_802E220();
             sub_802E2D4();
         }
@@ -746,16 +746,16 @@ void sub_802C68C(void)
     {
         if (gUnknown_03004348 > 1 && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
         {
-            sub_802E12C(gMoveSelectionCursor[gActiveBank], gUnknown_081FAE80);
-            if (gMoveSelectionCursor[gActiveBank] != 0)
+            sub_802E12C(gMoveSelectionCursor[gActiveBattler], gUnknown_081FAE80);
+            if (gMoveSelectionCursor[gActiveBattler] != 0)
                 gUnknown_03004344 = 0;
             else
-                gUnknown_03004344 = gMoveSelectionCursor[gActiveBank] + 1;
+                gUnknown_03004344 = gMoveSelectionCursor[gActiveBattler] + 1;
             sub_802E3B4(gUnknown_03004344, 27);
             Text_FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A);
             Text_InitWindow(&gUnknown_03004210, BattleText_SwitchWhich, 0x290, 0x17, 0x37);
             Text_PrintWindow8002F44(&gUnknown_03004210);
-            gBattleBankFunc[gActiveBank] = sub_802CA60;
+            gBattleBankFunc[gActiveBattler] = sub_802CA60;
         }
     }
 #if DEBUG
@@ -765,11 +765,11 @@ void sub_802C68C(void)
         s32 i;
 
         Text_FillWindowRect(&gUnknown_03004210, 0x1016, 1, 0x37, 16, 0x3A);
-        moveName = gMoveNames[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1)];
+        moveName = gMoveNames[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1)];
         Text_InitWindowAndPrintText(&gUnknown_03004210, moveName, 0x100, 2, 0x37);
         ConvertIntToDecimalStringN(
             gDisplayedStringBattle,
-            GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1),
+            GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1),
             2, 3);
         Text_InitWindowAndPrintText(&gUnknown_03004210, gDisplayedStringBattle, 0x110, 10, 0x37);
         Text_InitWindowAndPrintText(&gUnknown_03004210, gString_TurnJP, 0x116, 1, 0x39);
@@ -792,7 +792,7 @@ void sub_802C68C(void)
         }
         ConvertIntToDecimalStringN(gDisplayedStringBattle, count, 2, 2);
         Text_InitWindowAndPrintText(&gUnknown_03004210, gDisplayedStringBattle, 0x12A, 14, 0x39);
-        gBattleBankFunc[gActiveBank] = debug_sub_8030C24;
+        gBattleBankFunc[gActiveBattler] = debug_sub_8030C24;
     }
 #endif
 }
@@ -814,69 +814,69 @@ void sub_802CA60(void)
     if (gMain.newKeys & (A_BUTTON | SELECT_BUTTON))
     {
         PlaySE(SE_SELECT);
-        if (gMoveSelectionCursor[gActiveBank] != gUnknown_03004344)
+        if (gMoveSelectionCursor[gActiveBattler] != gUnknown_03004344)
         {
-            struct ChooseMoveStruct *r9 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4];
+            struct ChooseMoveStruct *r9 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBattler][4];
             s32 i;
 
-            i = r9->moves[gMoveSelectionCursor[gActiveBank]];
-            r9->moves[gMoveSelectionCursor[gActiveBank]] = r9->moves[gUnknown_03004344];
+            i = r9->moves[gMoveSelectionCursor[gActiveBattler]];
+            r9->moves[gMoveSelectionCursor[gActiveBattler]] = r9->moves[gUnknown_03004344];
             r9->moves[gUnknown_03004344] = i;
 
-            i = r9->pp[gMoveSelectionCursor[gActiveBank]];
-            r9->pp[gMoveSelectionCursor[gActiveBank]] = r9->pp[gUnknown_03004344];
+            i = r9->pp[gMoveSelectionCursor[gActiveBattler]];
+            r9->pp[gMoveSelectionCursor[gActiveBattler]] = r9->pp[gUnknown_03004344];
             r9->pp[gUnknown_03004344] = i;
 
-            i = r9->unkC[gMoveSelectionCursor[gActiveBank]];
-            r9->unkC[gMoveSelectionCursor[gActiveBank]] = r9->unkC[gUnknown_03004344];
+            i = r9->unkC[gMoveSelectionCursor[gActiveBattler]];
+            r9->unkC[gMoveSelectionCursor[gActiveBattler]] = r9->unkC[gUnknown_03004344];
             r9->unkC[gUnknown_03004344] = i;
 
-            if (gDisableStructs[gActiveBank].unk18_b & gBitTable[gMoveSelectionCursor[gActiveBank]])
+            if (gDisableStructs[gActiveBattler].unk18_b & gBitTable[gMoveSelectionCursor[gActiveBattler]])
             {
-                gDisableStructs[gActiveBank].unk18_b &= ~gBitTable[gMoveSelectionCursor[gActiveBank]];
-                gDisableStructs[gActiveBank].unk18_b |= gBitTable[gUnknown_03004344];
+                gDisableStructs[gActiveBattler].unk18_b &= ~gBitTable[gMoveSelectionCursor[gActiveBattler]];
+                gDisableStructs[gActiveBattler].unk18_b |= gBitTable[gUnknown_03004344];
             }
 
             sub_802E1B0();
 
             for (i = 0; i < 4; i++)
-                perMovePPBonuses[i] = (gBattleMons[gActiveBank].ppBonuses & (3 << (i * 2))) >> (i * 2);
-            totalPPBonuses = perMovePPBonuses[gMoveSelectionCursor[gActiveBank]];
-            perMovePPBonuses[gMoveSelectionCursor[gActiveBank]] = perMovePPBonuses[gUnknown_03004344];
+                perMovePPBonuses[i] = (gBattleMons[gActiveBattler].ppBonuses & (3 << (i * 2))) >> (i * 2);
+            totalPPBonuses = perMovePPBonuses[gMoveSelectionCursor[gActiveBattler]];
+            perMovePPBonuses[gMoveSelectionCursor[gActiveBattler]] = perMovePPBonuses[gUnknown_03004344];
             perMovePPBonuses[gUnknown_03004344] = totalPPBonuses;
 
             totalPPBonuses = 0;
             for (i = 0; i < 4; i++)
                 totalPPBonuses |= perMovePPBonuses[i] << (i * 2);
-            gBattleMons[gActiveBank].ppBonuses = totalPPBonuses;
+            gBattleMons[gActiveBattler].ppBonuses = totalPPBonuses;
 
             for (i = 0; i < 4; i++)
             {
-                gBattleMons[gActiveBank].moves[i] = r9->moves[i];
-                gBattleMons[gActiveBank].pp[i] = r9->pp[i];
+                gBattleMons[gActiveBattler].moves[i] = r9->moves[i];
+                gBattleMons[gActiveBattler].pp[i] = r9->pp[i];
             }
-            if (!(gBattleMons[gActiveBank].status2 & 0x200000))
+            if (!(gBattleMons[gActiveBattler].status2 & 0x200000))
             {
                 for (i = 0; i < 4; i++)
                 {
-                    sp0.moves[i] = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + i);
-                    sp0.pp[i] = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_PP1 + i);
+                    sp0.moves[i] = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + i);
+                    sp0.pp[i] = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP1 + i);
                 }
 
-                totalPPBonuses = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_PP_BONUSES);
+                totalPPBonuses = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP_BONUSES);
                 for (i = 0; i < 4; i++)
                     perMovePPBonuses[i] = (totalPPBonuses & (3 << (i * 2))) >> (i * 2);
 
-                i = sp0.moves[gMoveSelectionCursor[gActiveBank]];
-                sp0.moves[gMoveSelectionCursor[gActiveBank]] = sp0.moves[gUnknown_03004344];
+                i = sp0.moves[gMoveSelectionCursor[gActiveBattler]];
+                sp0.moves[gMoveSelectionCursor[gActiveBattler]] = sp0.moves[gUnknown_03004344];
                 sp0.moves[gUnknown_03004344] = i;
 
-                i = sp0.pp[gMoveSelectionCursor[gActiveBank]];
-                sp0.pp[gMoveSelectionCursor[gActiveBank]] = sp0.pp[gUnknown_03004344];
+                i = sp0.pp[gMoveSelectionCursor[gActiveBattler]];
+                sp0.pp[gMoveSelectionCursor[gActiveBattler]] = sp0.pp[gUnknown_03004344];
                 sp0.pp[gUnknown_03004344] = i;
 
-                totalPPBonuses = perMovePPBonuses[gMoveSelectionCursor[gActiveBank]];
-                perMovePPBonuses[gMoveSelectionCursor[gActiveBank]] = perMovePPBonuses[gUnknown_03004344];
+                totalPPBonuses = perMovePPBonuses[gMoveSelectionCursor[gActiveBattler]];
+                perMovePPBonuses[gMoveSelectionCursor[gActiveBattler]] = perMovePPBonuses[gUnknown_03004344];
                 perMovePPBonuses[gUnknown_03004344] = totalPPBonuses;
 
                 totalPPBonuses = 0;
@@ -885,19 +885,19 @@ void sub_802CA60(void)
 
                 for (i = 0; i < 4; i++)
                 {
-                    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + i, &sp0.moves[i]);
-                    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_PP1 + i, &sp0.pp[i]);
+                    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + i, &sp0.moves[i]);
+                    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP1 + i, &sp0.pp[i]);
                 }
-                SetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_PP_BONUSES, &totalPPBonuses);
+                SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP_BONUSES, &totalPPBonuses);
             }
         }
         else
         {
             sub_802E12C(gUnknown_03004344, BattleText_Format);
         }
-        gBattleBankFunc[gActiveBank] = sub_802C68C;
-        gMoveSelectionCursor[gActiveBank] = gUnknown_03004344;
-        sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
+        gBattleBankFunc[gActiveBattler] = sub_802C68C;
+        gMoveSelectionCursor[gActiveBattler] = gUnknown_03004344;
+        sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0);
         Text_FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A);
         Text_InitWindow(&gUnknown_03004210, BattleText_PP, 0x290, 0x17, 0x37);
         Text_PrintWindow8002F44(&gUnknown_03004210);
@@ -908,9 +908,9 @@ void sub_802CA60(void)
     {
         PlaySE(SE_SELECT);
         nullsub_7(gUnknown_03004344);
-        sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
-        sub_802E12C(gMoveSelectionCursor[gActiveBank], BattleText_Format);
-        gBattleBankFunc[gActiveBank] = sub_802C68C;
+        sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0);
+        sub_802E12C(gMoveSelectionCursor[gActiveBattler], BattleText_Format);
+        gBattleBankFunc[gActiveBattler] = sub_802C68C;
         Text_FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A);
         Text_InitWindow(&gUnknown_03004210, BattleText_PP, 0x290, 0x17, 0x37);
         Text_PrintWindow8002F44(&gUnknown_03004210);
@@ -919,52 +919,52 @@ void sub_802CA60(void)
     }
     if ((gMain.newKeys & DPAD_LEFT) && (gUnknown_03004344 & 1))
     {
-        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBank])
-            sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0x1D);
+        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBattler])
+            sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0x1D);
         else
             nullsub_7(gUnknown_03004344);
         gUnknown_03004344 ^= 1;
         PlaySE(SE_SELECT);
-        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBank])
+        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBattler])
             sub_802E3B4(gUnknown_03004344, 0);
         else
             sub_802E3B4(gUnknown_03004344, 0x1B);
     }
     if ((gMain.newKeys & DPAD_RIGHT) && !(gUnknown_03004344 & 1) && (gUnknown_03004344 ^ 1) < gUnknown_03004348)
     {
-        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBank])
-            sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0x1D);
+        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBattler])
+            sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0x1D);
         else
             nullsub_7(gUnknown_03004344);
         gUnknown_03004344 ^= 1;
         PlaySE(SE_SELECT);
-        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBank])
+        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBattler])
             sub_802E3B4(gUnknown_03004344, 0);
         else
             sub_802E3B4(gUnknown_03004344, 0x1B);
     }
     if ((gMain.newKeys & DPAD_UP) && (gUnknown_03004344 & 2))
     {
-        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBank])
-            sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0x1D);
+        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBattler])
+            sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0x1D);
         else
             nullsub_7(gUnknown_03004344);
         gUnknown_03004344 ^= 2;
         PlaySE(SE_SELECT);
-        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBank])
+        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBattler])
             sub_802E3B4(gUnknown_03004344, 0);
         else
             sub_802E3B4(gUnknown_03004344, 0x1B);
     }
     if ((gMain.newKeys & DPAD_DOWN) && !(gUnknown_03004344 & 2) && (gUnknown_03004344 ^ 2) < gUnknown_03004348)
     {
-        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBank])
-            sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0x1D);
+        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBattler])
+            sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0x1D);
         else
             nullsub_7(gUnknown_03004344);
         gUnknown_03004344 ^= 2;
         PlaySE(SE_SELECT);
-        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBank])
+        if (gUnknown_03004344 == gMoveSelectionCursor[gActiveBattler])
             sub_802E3B4(gUnknown_03004344, 0);
         else
             sub_802E3B4(gUnknown_03004344, 0x1B);
@@ -989,7 +989,7 @@ void sub_802D18C(void)
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
             sub_800832C();
-            gBattleBankFunc[gActiveBank] = sub_802D148;
+            gBattleBankFunc[gActiveBattler] = sub_802D148;
         }
         else
         {
@@ -1007,14 +1007,14 @@ void debug_sub_803107C(void);
 
 void debug_sub_8030C24(void)
 {
-    s16 move = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1);
+    s16 move = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1);
 
     switch (gMain.newAndRepeatedKeys)
     {
     case START_BUTTON:
-        dp11b_obj_free(gActiveBank, 1);
-        dp11b_obj_free(gActiveBank, 0);
-        gBankAttacker = gActiveBank;
+        dp11b_obj_free(gActiveBattler, 1);
+        dp11b_obj_free(gActiveBattler, 0);
+        gBankAttacker = gActiveBattler;
         if ((gMain.heldKeysRaw & B_BUTTON) && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
             gBankTarget = gBankAttacker ^ 2;
         else if ((gMain.heldKeysRaw & A_BUTTON) && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
@@ -1023,12 +1023,12 @@ void debug_sub_8030C24(void)
             gBankTarget = GetBankByIdentity(1);
         sub_80326EC(0);
         DoMoveAnim(move);
-        gBattleBankFunc[gActiveBank] = debug_sub_803107C;
+        gBattleBankFunc[gActiveBattler] = debug_sub_803107C;
         break;
     case SELECT_BUTTON:
-        dp11b_obj_free(gActiveBank, 1);
-        dp11b_obj_free(gActiveBank, 0);
-        gBankTarget = gActiveBank;
+        dp11b_obj_free(gActiveBattler, 1);
+        dp11b_obj_free(gActiveBattler, 0);
+        gBankTarget = gActiveBattler;
         if ((gMain.heldKeysRaw & B_BUTTON) && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
             gBankAttacker = gBankTarget ^ 2;
         else if ((gMain.heldKeysRaw & A_BUTTON) && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
@@ -1037,18 +1037,18 @@ void debug_sub_8030C24(void)
             gBankAttacker = GetBankByIdentity(1);
         sub_80326EC(0);
         DoMoveAnim(move);
-        gBattleBankFunc[gActiveBank] = debug_sub_803107C;
+        gBattleBankFunc[gActiveBattler] = debug_sub_803107C;
         break;
     case R_BUTTON:
         if ((gMain.heldKeysRaw & B_BUTTON) && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         {
-            dp11b_obj_free(gActiveBank, 1);
-            dp11b_obj_free(gActiveBank, 0);
+            dp11b_obj_free(gActiveBattler, 1);
+            dp11b_obj_free(gActiveBattler, 0);
             gBankAttacker = GetBankByIdentity(3);
             gBankTarget = GetBankByIdentity(1);
             sub_80326EC(0);
             DoMoveAnim(move);
-            gBattleBankFunc[gActiveBank] = debug_sub_803107C;
+            gBattleBankFunc[gActiveBattler] = debug_sub_803107C;
         }
         else
         {
@@ -1056,8 +1056,8 @@ void debug_sub_8030C24(void)
     case DPAD_RIGHT:
             if (++move > 354)
                 move = 1;
-            SetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1, &move);
-            gBattleMons[gActiveBank].moves[0] = move;
+            SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1, &move);
+            gBattleMons[gActiveBattler].moves[0] = move;
             Text_FillWindowRect(&gUnknown_03004210, 0x1016, 1, 0x37, 16, 0x38);
             Text_InitWindowAndPrintText(&gUnknown_03004210, gMoveNames[move], 0x100, 2, 0x37);
             ConvertIntToDecimalStringN(gDisplayedStringBattle, move, 2, 3);
@@ -1067,13 +1067,13 @@ void debug_sub_8030C24(void)
     case L_BUTTON:
         if ((gMain.heldKeysRaw & B_BUTTON) && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         {
-            dp11b_obj_free(gActiveBank, 1);
-            dp11b_obj_free(gActiveBank, 0);
+            dp11b_obj_free(gActiveBattler, 1);
+            dp11b_obj_free(gActiveBattler, 0);
             gBankAttacker = GetBankByIdentity(1);
             gBankTarget = GetBankByIdentity(3);
             sub_80326EC(0);
             DoMoveAnim(move);
-            gBattleBankFunc[gActiveBank] = debug_sub_803107C;
+            gBattleBankFunc[gActiveBattler] = debug_sub_803107C;
         }
         else
         {
@@ -1081,8 +1081,8 @@ void debug_sub_8030C24(void)
     case DPAD_LEFT:
             if (--move <= 0)
                 move = 354;
-            SetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1, &move);
-            gBattleMons[gActiveBank].moves[0] = move;
+            SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1, &move);
+            gBattleMons[gActiveBattler].moves[0] = move;
             Text_FillWindowRect(&gUnknown_03004210, 0x1016, 1, 0x37, 16, 0x38);
             Text_InitWindowAndPrintText(&gUnknown_03004210, gMoveNames[move], 0x100, 2, 0x37);
             ConvertIntToDecimalStringN(gDisplayedStringBattle, move, 2, 3);
@@ -1108,7 +1108,7 @@ void debug_sub_8030C24(void)
         for (i = 0; i < 4; i++)
         {
             StringCopy(gDisplayedStringBattle, BattleText_Format);
-            move = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + i);
+            move = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + i);
             StringAppend(gDisplayedStringBattle, gMoveNames[move]);
             Text_InitWindow(
                 &gUnknown_03004210,
@@ -1118,7 +1118,7 @@ void debug_sub_8030C24(void)
                 (i < 2) ? 0x37 : 0x39);
             Text_PrintWindow8002F44(&gUnknown_03004210);
         }
-        gBattleBankFunc[gActiveBank] = sub_802C68C;
+        gBattleBankFunc[gActiveBattler] = sub_802C68C;
     }
 }
 
@@ -1132,8 +1132,8 @@ void debug_sub_803107C(void)
         s32 i;
 
         sub_80326EC(1);
-        dp11b_obj_instanciate(gActiveBank, 1, 7, 1);
-        dp11b_obj_instanciate(gActiveBank, 0, 7, 1);
+        dp11b_obj_instanciate(gActiveBattler, 1, 7, 1);
+        dp11b_obj_instanciate(gActiveBattler, 0, 7, 1);
 
         for (i = 0, count = 0; i < MAX_SPRITES; i++)
         {
@@ -1155,7 +1155,7 @@ void debug_sub_803107C(void)
         ConvertIntToDecimalStringN(gDisplayedStringBattle, count, 2, 2);
         Text_InitWindowAndPrintText(&gUnknown_03004210, gDisplayedStringBattle, 298, 14, 0x39);
 
-        gBattleBankFunc[gActiveBank] = debug_sub_8030C24;
+        gBattleBankFunc[gActiveBattler] = debug_sub_8030C24;
     }
 }
 
@@ -1163,33 +1163,33 @@ void debug_sub_803107C(void)
 
 void sub_802D204(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         PlayerBufferExecCompleted();
 }
 
 // duplicate of sub_802D204
 void sub_802D23C(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         PlayerBufferExecCompleted();
 }
 
 void sub_802D274(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         nullsub_10(gSaveBlock2.playerGender);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         PlayerBufferExecCompleted();
     }
 }
 
 void sub_802D2E0(void)
 {
-    if (--ewram17810[gActiveBank].unk9 == 0xFF)
+    if (--ewram17810[gActiveBattler].unk9 == 0xFF)
     {
-        ewram17810[gActiveBank].unk9 = 0;
+        ewram17810[gActiveBattler].unk9 = 0;
         PlayerBufferExecCompleted();
     }
 }
@@ -1200,106 +1200,106 @@ void sub_802D31C(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     else
     {
-        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy
-         && gSprites[gHealthboxIDs[gActiveBank ^ 2]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy
+         && gSprites[gHealthboxIDs[gActiveBattler ^ 2]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     if (IsCryPlayingOrClearCrySongs())
         r6 = FALSE;
 
-    if (r6 && ewram17810[gActiveBank].unk1_0 && ewram17810[gActiveBank ^ 2].unk1_0)
+    if (r6 && ewram17810[gActiveBattler].unk1_0 && ewram17810[gActiveBattler ^ 2].unk1_0)
     {
-        ewram17810[gActiveBank].unk0_7 = 0;
-        ewram17810[gActiveBank].unk1_0 = 0;
-        ewram17810[gActiveBank ^ 2].unk0_7 = 0;
-        ewram17810[gActiveBank ^ 2].unk1_0 = 0;
+        ewram17810[gActiveBattler].unk0_7 = 0;
+        ewram17810[gActiveBattler].unk1_0 = 0;
+        ewram17810[gActiveBattler ^ 2].unk0_7 = 0;
+        ewram17810[gActiveBattler ^ 2].unk1_0 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             m4aMPlayContinue(&gMPlay_BGM);
         else
             m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         if (IsDoubleBattle())
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank ^ 2]], gActiveBank ^ 2);
-        ewram17810[gActiveBank].unk9 = 3;
-        gBattleBankFunc[gActiveBank] = sub_802D2E0;
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler ^ 2]], gActiveBattler ^ 2);
+        ewram17810[gActiveBattler].unk9 = 3;
+        gBattleBankFunc[gActiveBattler] = sub_802D2E0;
     }
 }
 
 void sub_802D500(void)
 {
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
-        sub_8141828(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
-    if (!ewram17810[gActiveBank ^ 2].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_7)
-        sub_8141828(gActiveBank ^ 2, &gPlayerParty[gBattlePartyID[gActiveBank ^ 2]]);
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_3)
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler].unk0_7)
+        sub_8141828(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+    if (!ewram17810[gActiveBattler ^ 2].unk0_3 && !ewram17810[gActiveBattler ^ 2].unk0_7)
+        sub_8141828(gActiveBattler ^ 2, &gPlayerParty[gBattlePartyID[gActiveBattler ^ 2]]);
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler ^ 2].unk0_3)
     {
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank ^ 2]]);
+            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler ^ 2]]);
             sub_8045A5C(
-              gHealthboxIDs[gActiveBank ^ 2],
-              &gPlayerParty[gBattlePartyID[gActiveBank ^ 2]],
+              gHealthboxIDs[gActiveBattler ^ 2],
+              &gPlayerParty[gBattlePartyID[gActiveBattler ^ 2]],
               0);
-            sub_804777C(gActiveBank ^ 2);
-            sub_8043DFC(gHealthboxIDs[gActiveBank ^ 2]);
+            sub_804777C(gActiveBattler ^ 2);
+            sub_8043DFC(gHealthboxIDs[gActiveBattler ^ 2]);
         }
-        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler]]);
         sub_8045A5C(
-          gHealthboxIDs[gActiveBank],
-          &gPlayerParty[gBattlePartyID[gActiveBank]],
+          gHealthboxIDs[gActiveBattler],
+          &gPlayerParty[gBattlePartyID[gActiveBattler]],
           0);
-        sub_804777C(gActiveBank);
-        sub_8043DFC(gHealthboxIDs[gActiveBank]);
+        sub_804777C(gActiveBattler);
+        sub_8043DFC(gHealthboxIDs[gActiveBattler]);
         ewram17840.unk9_0 = 0;
-        gBattleBankFunc[gActiveBank] = sub_802D31C;
+        gBattleBankFunc[gActiveBattler] = sub_802D31C;
     }
 }
 
 void sub_802D680(void)
 {
-    if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy
-     && ewram17810[gActiveBank].unk1_0)
+    if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy
+     && ewram17810[gActiveBattler].unk1_0)
     {
-        ewram17810[gActiveBank].unk0_7 = 0;
-        ewram17810[gActiveBank].unk1_0 = 0;
+        ewram17810[gActiveBattler].unk0_7 = 0;
+        ewram17810[gActiveBattler].unk1_0 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
-        gBattleBankFunc[gActiveBank] = sub_802D730;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 6);
+        gBattleBankFunc[gActiveBattler] = sub_802D730;
     }
 }
 
 void sub_802D730(void)
 {
-    if (!ewram17810[gActiveBank].unk0_6 && !IsCryPlayingOrClearCrySongs())
+    if (!ewram17810[gActiveBattler].unk0_6 && !IsCryPlayingOrClearCrySongs())
     {
         m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         PlayerBufferExecCompleted();
     }
 }
 
 void sub_802D798(void)
 {
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
-        sub_8141828(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
-    if (gSprites[gUnknown_0300434C[gActiveBank]].callback == SpriteCallbackDummy
-     && !ewram17810[gActiveBank].unk0_3)
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler].unk0_7)
+        sub_8141828(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+    if (gSprites[gUnknown_0300434C[gActiveBattler]].callback == SpriteCallbackDummy
+     && !ewram17810[gActiveBattler].unk0_3)
     {
-        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
-        sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 0);
-        sub_804777C(gActiveBank);
-        sub_8043DFC(gHealthboxIDs[gActiveBank]);
-        sub_8031F88(gActiveBank);
-        gBattleBankFunc[gActiveBank] = sub_802D680;
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler]]);
+        sub_8045A5C(gHealthboxIDs[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], 0);
+        sub_804777C(gActiveBattler);
+        sub_8043DFC(gHealthboxIDs[gActiveBattler]);
+        sub_8031F88(gActiveBattler);
+        gBattleBankFunc[gActiveBattler] = sub_802D680;
     }
 }
 
@@ -1314,16 +1314,16 @@ void c3_0802FDF4(u8 taskId)
 
 void bx_t1_healthbar_update(void)
 {
-    s16 r4 = sub_8045C78(gActiveBank, gHealthboxIDs[gActiveBank], 0, 0);
+    s16 r4 = sub_8045C78(gActiveBattler, gHealthboxIDs[gActiveBattler], 0, 0);
 
-    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    sub_8043DFC(gHealthboxIDs[gActiveBattler]);
     if (r4 != -1)
     {
-        sub_80440EC(gHealthboxIDs[gActiveBank], r4, 0);
+        sub_80440EC(gHealthboxIDs[gActiveBattler], r4, 0);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         PlayerBufferExecCompleted();
     }
 }
@@ -1356,10 +1356,10 @@ void sub_802D924(u8 taskId)
             SetMonData(pkmn, MON_DATA_EXP, &nextLvlExp);
             CalculateMonStats(pkmn);
             gainedExp -= nextLvlExp - currExp;
-            savedActiveBank = gActiveBank;
-            gActiveBank = bank;
+            savedActiveBank = gActiveBattler;
+            gActiveBattler = bank;
             Emitcmd33(1, 11, gainedExp);
-            gActiveBank = savedActiveBank;
+            gActiveBattler = savedActiveBank;
 
             if (IsDoubleBattle() == TRUE
              && ((u16)pkmnIndex == gBattlePartyID[bank] || (u16)pkmnIndex == gBattlePartyID[bank ^ 2]))
@@ -1441,10 +1441,10 @@ void sub_802DB6C(u8 taskId)
                 asdf = sp0 - sp4;
                 //asdf = r10 - (sp0 - sp4);
                 r10 -= asdf;
-                r5 = gActiveBank;
-                gActiveBank = r7;
+                r5 = gActiveBattler;
+                gActiveBattler = r7;
                 Emitcmd33(1, 11, r10);
-                gActiveBank = r5;
+                gActiveBattler = r5;
                 gTasks[taskId].func = sub_802DCB0;
             }
             else
@@ -1566,7 +1566,7 @@ _0802DB9C:\n\
     ldrh r0, [r0]\n\
     subs r2, r0\n\
     subs r2, r4, r2\n\
-    ldr r4, _0802DC74 @ =gActiveBank\n\
+    ldr r4, _0802DC74 @ =gActiveBattler\n\
     ldrb r5, [r4]\n\
     strb r7, [r4]\n\
     lsls r2, 16\n\
@@ -1583,7 +1583,7 @@ _0802DC64: .4byte gHealthboxIDs\n\
 _0802DC68: .4byte gPlayerParty\n\
 _0802DC6C: .4byte gExperienceTables\n\
 _0802DC70: .4byte gBaseStats\n\
-_0802DC74: .4byte gActiveBank\n\
+_0802DC74: .4byte gActiveBattler\n\
 _0802DC78: .4byte sub_802DCB0\n\
 _0802DC7C:\n\
     str r0, [sp, 0x4]\n\
@@ -1655,25 +1655,25 @@ void sub_802DDC4(u8 taskId)
 
 void sub_802DE10(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].pos1.y + gSprites[gBankSpriteIds[gActiveBank]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].pos1.y + gSprites[gBankSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
     {
-        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
         nullsub_9(species);
-        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBank]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBattler]].oam.matrixNum);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         PlayerBufferExecCompleted();
     }
 }
 
 void sub_802DEAC(void)
 {
-    if (!ewram17810[gActiveBank].unk0_6)
+    if (!ewram17810[gActiveBattler].unk0_6)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         PlayerBufferExecCompleted();
     }
 }
@@ -1691,9 +1691,9 @@ void sub_802DF30(void)
     {
         u8 r4;
 
-        gBattleBankFunc[gActiveBank] = sub_802DF88;
-        r4 = gTasks[gUnknown_0300434C[gActiveBank]].data[0];
-        DestroyTask(gUnknown_0300434C[gActiveBank]);
+        gBattleBankFunc[gActiveBattler] = sub_802DF88;
+        r4 = gTasks[gUnknown_0300434C[gActiveBattler]].data[0];
+        DestroyTask(gUnknown_0300434C[gActiveBattler]);
         sub_8094E20(r4);
     }
 }
@@ -1706,7 +1706,7 @@ void sub_802DF88(void)
             Emitcmd34(1, gUnknown_0202E8F5, gUnknown_02038470);
         else
             Emitcmd34(1, 6, NULL);
-        if ((gBattleBufferA[gActiveBank][1] & 0xF) == 1)
+        if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1)
             b_link_standby_message();
         PlayerBufferExecCompleted();
     }
@@ -1716,7 +1716,7 @@ void sub_802E004(void)
 {
     if (!gPaletteFade.active)
     {
-        gBattleBankFunc[gActiveBank] = sub_802E03C;
+        gBattleBankFunc[gActiveBattler] = sub_802E03C;
         nullsub_14();
         sub_80A6DCC();
     }
@@ -1733,13 +1733,13 @@ void sub_802E03C(void)
 
 void bx_wait_t1(void)
 {
-    if (!gDoingBattleAnim || !ewram17810[gActiveBank].unk0_6)
+    if (!gDoingBattleAnim || !ewram17810[gActiveBattler].unk0_6)
         PlayerBufferExecCompleted();
 }
 
 void bx_blink_t1(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -1758,7 +1758,7 @@ void bx_blink_t1(void)
 
 void sub_802E12C(s32 a, const u8 *b)
 {
-    struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4];
+    struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBattler][4];
 
     StringCopy(gDisplayedStringBattle, b);
     StringAppend(gDisplayedStringBattle, gMoveNames[r4->moves[a]]);
@@ -1773,7 +1773,7 @@ void sub_802E12C(s32 a, const u8 *b)
 
 void sub_802E1B0(void)
 {
-    struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4];
+    struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBattler][4];
     s32 i;
 
     gUnknown_03004348 = 0;
@@ -1789,9 +1789,9 @@ void sub_802E1B0(void)
 
 void sub_802E220(void)
 {
-    if (gBattleBufferA[gActiveBank][2] != 1)
+    if (gBattleBufferA[gActiveBattler][2] != 1)
     {
-        struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4];
+        struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBattler][4];
         u8 *str = gDisplayedStringBattle;
 
         str = StringCopy(str, BattleText_Format);
@@ -1803,9 +1803,9 @@ void sub_802E220(void)
         str[1] = 0x14;
         str[2] = 6;
         str += 3;
-        str = ConvertIntToDecimalStringN(str, r4->pp[gMoveSelectionCursor[gActiveBank]], 1, 2);
+        str = ConvertIntToDecimalStringN(str, r4->pp[gMoveSelectionCursor[gActiveBattler]], 1, 2);
         *str++ = CHAR_SLASH;
-        ConvertIntToDecimalStringN(str, r4->unkC[gMoveSelectionCursor[gActiveBank]], 1, 2);
+        ConvertIntToDecimalStringN(str, r4->unkC[gMoveSelectionCursor[gActiveBattler]], 1, 2);
         Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 0x2A2, 0x19, 0x37);
         Text_PrintWindow8002F44(&gUnknown_03004210);
     }
@@ -1816,18 +1816,18 @@ extern const u8 gTypeNames[][7];
 
 void sub_802E2D4(void)
 {
-    if (gBattleBufferA[gActiveBank][2] == 1)
+    if (gBattleBufferA[gActiveBattler][2] == 1)
     {
         Text_FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A);
         Text_InitWindow(&gUnknown_03004210, BattleText_ForgetMove, 0x290, 0x13, 0x37);
     }
     else
     {
-        struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4];
+        struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBattler][4];
         u8 *str = gDisplayedStringBattle;
 
         str = StringCopy(str, BattleText_Format);
-        StringCopy(str, gTypeNames[gBattleMoves[r4->moves[gMoveSelectionCursor[gActiveBank]]].type]);
+        StringCopy(str, gTypeNames[gBattleMoves[r4->moves[gMoveSelectionCursor[gActiveBattler]]].type]);
         Text_FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x39, 0x1C, 0x3A);
         Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 0x2C0, 0x17, 0x39);
     }
@@ -1886,13 +1886,13 @@ void sub_802E424(void)
 
 void sub_802E434(void)
 {
-    if (!ewram17810[gActiveBank].unk0_4)
+    if (!ewram17810[gActiveBattler].unk0_4)
         PlayerBufferExecCompleted();
 }
 
 void sub_802E460(void)
 {
-    if (!ewram17810[gActiveBank].unk0_5)
+    if (!ewram17810[gActiveBattler].unk0_5)
         PlayerBufferExecCompleted();
 }
 
@@ -1913,13 +1913,13 @@ void PlayerHandleGetAttributes(void)
     u8 r4;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        offset += dp01_getattr_by_ch1_for_player_pokemon_(gBattlePartyID[gActiveBank], unkData);
+        offset += dp01_getattr_by_ch1_for_player_pokemon_(gBattlePartyID[gActiveBattler], unkData);
     }
     else
     {
-        r4 = gBattleBufferA[gActiveBank][2];
+        r4 = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (r4 & 1)
@@ -1942,7 +1942,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         battlePokemon.species = GetMonData(&gPlayerParty[a], MON_DATA_SPECIES);
@@ -2004,7 +2004,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer)
     case 5:
     case 6:
     case 7:
-        data16 = GetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4);
+        data16 = GetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - 4);
         buffer[0] = data16;
         buffer[1] = data16 >> 8;
         size = 2;
@@ -2019,7 +2019,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer)
     case 10:
     case 11:
     case 12:
-        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9);
+        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - 9);
         size = 1;
         break;
     case 17:
@@ -2238,11 +2238,11 @@ void PlayerHandlecmd1(void)
     struct BattlePokemon battleMon;
     u8 i;
     // TODO: Maybe fix this. Integrating this into MEMSET_ALT is too hard.
-    u8 *src = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
+    u8 *src = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 *dst;
 
-    MEMSET_ALT(&battleMon + gBattleBufferA[gActiveBank][1], src[i], gBattleBufferA[gActiveBank][2], i, dst);
-    Emitcmd29(1, gBattleBufferA[gActiveBank][2], dst);
+    MEMSET_ALT(&battleMon + gBattleBufferA[gActiveBattler][1], src[i], gBattleBufferA[gActiveBattler][2], i, dst);
+    Emitcmd29(1, gBattleBufferA[gActiveBattler][2], dst);
     PlayerBufferExecCompleted();
 }
 
@@ -2251,13 +2251,13 @@ void PlayerHandleSetAttributes(void)
     u8 r4;
     u8 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        dp01_setattr_by_ch1_for_player_pokemon(gBattlePartyID[gActiveBank]);
+        dp01_setattr_by_ch1_for_player_pokemon(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        r4 = gBattleBufferA[gActiveBank][2];
+        r4 = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (r4 & 1)
@@ -2271,11 +2271,11 @@ void PlayerHandleSetAttributes(void)
 // Duplicate of sub_811EC68
 void dp01_setattr_by_ch1_for_player_pokemon(u8 a)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         {
@@ -2316,10 +2316,10 @@ void dp01_setattr_by_ch1_for_player_pokemon(u8 a)
         }
         break;
     case 1:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 2:
-        SetMonData(&gPlayerParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 3:
         for (i = 0; i < 4; i++)
@@ -2333,157 +2333,157 @@ void dp01_setattr_by_ch1_for_player_pokemon(u8 a)
     case 5:
     case 6:
     case 7:
-        SetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - 4, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 8:
-        SetMonData(&gPlayerParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case 9:
     case 10:
     case 11:
     case 12:
-        SetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - 9, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 17:
-        SetMonData(&gPlayerParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 18:
-        SetMonData(&gPlayerParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 19:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 20:
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 21:
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 22:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 23:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 24:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 25:
-        SetMonData(&gPlayerParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 26:
-        SetMonData(&gPlayerParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 27:
-        SetMonData(&gPlayerParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 28:
-        SetMonData(&gPlayerParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 29:
-        SetMonData(&gPlayerParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 30:
-        SetMonData(&gPlayerParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 31:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case 32:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 33:
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 34:
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 35:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 36:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 37:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 38:
-        SetMonData(&gPlayerParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 39:
-        SetMonData(&gPlayerParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 40:
-        SetMonData(&gPlayerParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 41:
-        SetMonData(&gPlayerParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 42:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 43:
-        SetMonData(&gPlayerParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 44:
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 45:
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 46:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 47:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 48:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 49:
-        SetMonData(&gPlayerParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 50:
-        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 51:
-        SetMonData(&gPlayerParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 52:
-        SetMonData(&gPlayerParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 53:
-        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 54:
-        SetMonData(&gPlayerParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 55:
-        SetMonData(&gPlayerParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 56:
-        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 57:
-        SetMonData(&gPlayerParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 58:
-        SetMonData(&gPlayerParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 59:
-        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 }
 
 void PlayerHandlecmd3(void)
@@ -2491,27 +2491,27 @@ void PlayerHandlecmd3(void)
     u8 i;
     u8 *dst;
 
-    MEMSET_ALT(&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][3 + i],
-        gBattleBufferA[gActiveBank][2], i, dst);
+    MEMSET_ALT(&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][3 + i],
+        gBattleBufferA[gActiveBattler][2], i, dst);
     PlayerBufferExecCompleted();
 }
 
 void PlayerHandleLoadPokeSprite(void)
 {
-    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gBattleBankFunc[gActiveBank] = bx_0802E404;
+    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gBattleBankFunc[gActiveBattler] = bx_0802E404;
 }
 
 void PlayerHandleSendOutPoke(void)
 {
-    sub_8032AA8(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    gActionSelectionCursor[gActiveBank] = 0;
-    gMoveSelectionCursor[gActiveBank] = 0;
-    sub_802F934(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_802D798;
+    sub_8032AA8(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    gActionSelectionCursor[gActiveBattler] = 0;
+    gMoveSelectionCursor[gActiveBattler] = 0;
+    sub_802F934(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattleBankFunc[gActiveBattler] = sub_802D798;
 }
 
 void sub_802F934(u8 bank, u8 b)
@@ -2540,35 +2540,35 @@ void sub_802F934(u8 bank, u8 b)
 
 void PlayerHandleReturnPokeToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        ewram17810[gActiveBank].unk4 = 0;
-        gBattleBankFunc[gActiveBank] = sub_802FB2C;
+        ewram17810[gActiveBattler].unk4 = 0;
+        gBattleBankFunc[gActiveBattler] = sub_802FB2C;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         PlayerBufferExecCompleted();
     }
 }
 
 void sub_802FB2C(void)
 {
-    switch (ewram17810[gActiveBank].unk4)
+    switch (ewram17810[gActiveBattler].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
-        ewram17810[gActiveBank].unk4 = 1;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
+        ewram17810[gActiveBattler].unk4 = 1;
         break;
     case 1:
-        if (!ewram17810[gActiveBank].unk0_6)
+        if (!ewram17810[gActiveBattler].unk0_6)
         {
-            ewram17810[gActiveBank].unk4 = 0;
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 1);
-            gBattleBankFunc[gActiveBank] = sub_802DEAC;
+            ewram17810[gActiveBattler].unk4 = 0;
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 1);
+            gBattleBankFunc[gActiveBattler] = sub_802DEAC;
         }
     }
 }
@@ -2579,7 +2579,7 @@ void PlayerHandleTrainerThrow(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if (GetBankIdentity(gActiveBank) & 2)
+        if (GetBankIdentity(gActiveBattler) & 2)
             r7 = 16;
         else
             r7 = -16;
@@ -2588,67 +2588,67 @@ void PlayerHandleTrainerThrow(void)
     {
         r7 = 0;
     }
-    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
-    GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBattler);
+    GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       r7 + 80,
       (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
-      sub_8079E90(gActiveBank));
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
-    gBattleBankFunc[gActiveBank] = sub_802D204;
+      sub_8079E90(gActiveBattler));
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBattler] = sub_802D204;
 }
 
 void PlayerHandleTrainerSlide(void)
 {
-    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
-    GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBattler);
+    GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       80,
       (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
       30);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -96;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
-    gBattleBankFunc[gActiveBank] = sub_802D23C;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -96;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBattler] = sub_802D23C;
 }
 
 void PlayerHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
-    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
-    gBattleBankFunc[gActiveBank] = sub_802D274;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas;
+    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
+    gBattleBankFunc[gActiveBattler] = sub_802D274;
 }
 
 void PlayerHandlecmd10(void)
 {
-    if (ewram17810[gActiveBank].unk4 == 0)
+    if (ewram17810[gActiveBattler].unk4 == 0)
     {
-        if (ewram17800[gActiveBank].substituteSprite)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
-        ewram17810[gActiveBank].unk4++;
+        if (ewram17800[gActiveBattler].substituteSprite)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
+        ewram17810[gActiveBattler].unk4++;
     }
     else
     {
-        if (ewram17810[gActiveBank].unk0_6 == 0)
+        if (ewram17810[gActiveBattler].unk0_6 == 0)
         {
-            ewram17810[gActiveBank].unk4 = 0;
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            ewram17810[gActiveBattler].unk4 = 0;
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
             PlaySE12WithPanning(SE_POKE_DEAD, -64);
-            gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-            gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
-            gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80105EC;
-            gBattleBankFunc[gActiveBank] = sub_802DE10;
+            gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+            gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 5;
+            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80105EC;
+            gBattleBankFunc[gActiveBattler] = sub_802DE10;
         }
     }
 }
@@ -2663,23 +2663,23 @@ void PlayerHandlecmd12(void)
 {
     ewram17840.unk8 = 4;
     gDoingBattleAnim = 1;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 3);
-    gBattleBankFunc[gActiveBank] = bx_wait_t1;
+    move_anim_start_t4(gActiveBattler, gActiveBattler, GetBankByIdentity(1), 3);
+    gBattleBankFunc[gActiveBattler] = bx_wait_t1;
 }
 
 void PlayerHandleBallThrow(void)
 {
-    u8 var = gBattleBufferA[gActiveBank][1];
+    u8 var = gBattleBufferA[gActiveBattler][1];
 
     ewram17840.unk8 = var;
     gDoingBattleAnim = 1;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 3);
-    gBattleBankFunc[gActiveBank] = bx_wait_t1;
+    move_anim_start_t4(gActiveBattler, gActiveBattler, GetBankByIdentity(1), 3);
+    gBattleBankFunc[gActiveBattler] = bx_wait_t1;
 }
 
 void PlayerHandlePuase(void)
 {
-    u8 var = gBattleBufferA[gActiveBank][1];
+    u8 var = gBattleBufferA[gActiveBattler][1];
 
     // WTF is this??
     while (var != 0)
@@ -2690,17 +2690,17 @@ void PlayerHandlePuase(void)
 
 void PlayerHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u16 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
+        u16 r0 = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
 
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4] | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6] | (gBattleBufferA[gActiveBattler][7] << 8) | (gBattleBufferA[gActiveBattler][8] << 16) | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
         if (sub_8031720(r0, gAnimMoveTurn) != 0)
         {
             // Dead code. sub_8031720 always returns 0.
@@ -2708,33 +2708,33 @@ void PlayerHandleMoveAnimation(void)
         }
         else
         {
-            ewram17810[gActiveBank].unk4 = 0;
-            gBattleBankFunc[gActiveBank] = sub_8030190;
+            ewram17810[gActiveBattler].unk4 = 0;
+            gBattleBankFunc[gActiveBattler] = sub_8030190;
         }
     }
 }
 
 void sub_8030190(void)
 {
-    u16 r4 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 r7 = gBattleBufferA[gActiveBank][11];
+    u16 r4 = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 r7 = gBattleBufferA[gActiveBattler][11];
 
-    switch (ewram17810[gActiveBank].unk4)
+    switch (ewram17810[gActiveBattler].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].substituteSprite == 1 && ewram17800[gActiveBank].unk0_3 == 0)
+        if (ewram17800[gActiveBattler].substituteSprite == 1 && ewram17800[gActiveBattler].unk0_3 == 0)
         {
-            ewram17800[gActiveBank].unk0_3 = 1;
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
+            ewram17800[gActiveBattler].unk0_3 = 1;
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
         }
-        ewram17810[gActiveBank].unk4 = 1;
+        ewram17810[gActiveBattler].unk4 = 1;
         break;
     case 1:
-        if (ewram17810[gActiveBank].unk0_6 == 0)
+        if (ewram17810[gActiveBattler].unk0_6 == 0)
         {
             sub_80326EC(0);
             DoMoveAnim(r4);
-            ewram17810[gActiveBank].unk4 = 2;
+            ewram17810[gActiveBattler].unk4 = 2;
         }
         break;
     case 2:
@@ -2742,20 +2742,20 @@ void sub_8030190(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if (ewram17800[gActiveBank].substituteSprite == 1 && r7 < 2)
+            if (ewram17800[gActiveBattler].substituteSprite == 1 && r7 < 2)
             {
-                move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
-                ewram17800[gActiveBank].unk0_3 = 0;
+                move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 6);
+                ewram17800[gActiveBattler].unk0_3 = 0;
             }
-            ewram17810[gActiveBank].unk4 = 3;
+            ewram17810[gActiveBattler].unk4 = 3;
         }
         break;
     case 3:
-        if (ewram17810[gActiveBank].unk0_6 == 0)
+        if (ewram17810[gActiveBattler].unk0_6 == 0)
         {
             sub_8031F24();
-            sub_80324BC(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            ewram17810[gActiveBank].unk4 = 0;
+            sub_80324BC(gActiveBattler, gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            ewram17810[gActiveBattler].unk4 = 0;
             PlayerBufferExecCompleted();
         }
         break;
@@ -2766,14 +2766,14 @@ void PlayerHandlePrintString(void)
 {
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
+    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBattler][2]);
     Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 0x90, 2, 15);
-    gBattleBankFunc[gActiveBank] = sub_802DF18;
+    gBattleBankFunc[gActiveBattler] = sub_802DF18;
 }
 
 void PlayerHandlePrintStringPlayerOnly(void)
 {
-    if (GetBankSide(gActiveBank) == 0)
+    if (GetBankSide(gActiveBattler) == 0)
         PlayerHandlePrintString();
     else
         PlayerBufferExecCompleted();
@@ -2788,7 +2788,7 @@ void PlayerHandlecmd18(void)
     Text_FillWindowRect(&gUnknown_03004210, 10, 2, 15, 27, 18);
     Text_FillWindowRect(&gUnknown_03004210, 10, 2, 35, 16, 38);
 
-    gBattleBankFunc[gActiveBank] = sub_802C098;
+    gBattleBankFunc[gActiveBattler] = sub_802C098;
 
     Text_InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35);
     Text_PrintWindow8002F44(&gUnknown_03004210);
@@ -2797,7 +2797,7 @@ void PlayerHandlecmd18(void)
     for (r4 = 0; r4 < 4; r4++)
         nullsub_8(r4);
 
-    sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+    sub_802E3E4(gActionSelectionCursor[gActiveBattler], 0);
 
     StrCpyDecodeToDisplayedStringBattle(BattleText_OtherMenu);
     Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_803037C_TILE_DATA_OFFSET, 2, 35);
@@ -2812,7 +2812,7 @@ void PlayerHandlecmd20(void)
 {
     MenuCursor_Create814A5C0(0, 0xFFFF, 12, 0x2D9F, 0);
     sub_80304A8();
-    gBattleBankFunc[gActiveBank] = sub_802C68C;
+    gBattleBankFunc[gActiveBattler] = sub_802C68C;
 }
 
 void sub_80304A8(void)
@@ -2821,8 +2821,8 @@ void sub_80304A8(void)
     gBattle_BG0_Y = 320;
     sub_802E1B0();
     gUnknown_03004344 = 0xFF;
-    sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0);
-    if (gBattleBufferA[gActiveBank][2] != 1)
+    sub_802E3B4(gMoveSelectionCursor[gActiveBattler], 0);
+    if (gBattleBufferA[gActiveBattler][2] != 1)
     {
         Text_InitWindow(&gUnknown_03004210, BattleText_PP, 656, 23, 55);
         Text_PrintWindow8002F44(&gUnknown_03004210);
@@ -2836,26 +2836,26 @@ void PlayerHandleOpenBag(void)
     s32 i;
 
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-    gBattleBankFunc[gActiveBank] = sub_802E004;
-    gBankInMenu = gActiveBank;
+    gBattleBankFunc[gActiveBattler] = sub_802E004;
+    gBankInMenu = gActiveBattler;
     for (i = 0; i < 3; i++)
-        gUnknown_02038470[i] = gBattleBufferA[gActiveBank][1 + i];
+        gUnknown_02038470[i] = gBattleBufferA[gActiveBattler][1 + i];
 }
 
 void PlayerHandlecmd22(void)
 {
     s32 i;
 
-    gUnknown_0300434C[gActiveBank] = CreateTask(TaskDummy, 0xFF);
-    gTasks[gUnknown_0300434C[gActiveBank]].data[0] = gBattleBufferA[gActiveBank][1] & 0xF;
-    ewram16054 = gBattleBufferA[gActiveBank][1] >> 4;
-    EWRAM_1609D = gBattleBufferA[gActiveBank][2];
-    ewram160C0 = gBattleBufferA[gActiveBank][3];
+    gUnknown_0300434C[gActiveBattler] = CreateTask(TaskDummy, 0xFF);
+    gTasks[gUnknown_0300434C[gActiveBattler]].data[0] = gBattleBufferA[gActiveBattler][1] & 0xF;
+    ewram16054 = gBattleBufferA[gActiveBattler][1] >> 4;
+    EWRAM_1609D = gBattleBufferA[gActiveBattler][2];
+    ewram160C0 = gBattleBufferA[gActiveBattler][3];
     for (i = 0; i < 3; i++)
-        gUnknown_02038470[i] = gBattleBufferA[gActiveBank][4 + i];
+        gUnknown_02038470[i] = gBattleBufferA[gActiveBattler][4 + i];
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-    gBattleBankFunc[gActiveBank] = sub_802DF30;
-    gBankInMenu = gActiveBank;
+    gBattleBankFunc[gActiveBattler] = sub_802DF30;
+    gBankInMenu = gActiveBattler;
 }
 
 void PlayerHandlecmd23(void)
@@ -2870,27 +2870,27 @@ void PlayerHandleHealthBarUpdate(void)
     s16 r7;
 
     load_gfxc_health_bar(0);
-    r7 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    r7 = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
     if (r7 != 0x7FFF)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, curHP, r7);
+        sub_8043D84(gActiveBattler, gHealthboxIDs[gActiveBattler], maxHP, curHP, r7);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, 0, r7);
-        sub_80440EC(gHealthboxIDs[gActiveBank], 0, 0);
+        sub_8043D84(gActiveBattler, gHealthboxIDs[gActiveBattler], maxHP, 0, r7);
+        sub_80440EC(gHealthboxIDs[gActiveBattler], 0, 0);
     }
-    gBattleBankFunc[gActiveBank] = bx_t1_healthbar_update;
+    gBattleBankFunc[gActiveBattler] = bx_t1_healthbar_update;
 }
 
 void PlayerHandleExpBarUpdate(void)
 {
-    u8 r7 = gBattleBufferA[gActiveBank][1];
+    u8 r7 = gBattleBufferA[gActiveBattler][1];
 
     if (GetMonData(&gPlayerParty[r7], MON_DATA_LEVEL) >= 100)
     {
@@ -2903,41 +2903,41 @@ void PlayerHandleExpBarUpdate(void)
 
         load_gfxc_health_bar(1);
         GetMonData(&gPlayerParty[r7], MON_DATA_SPECIES);  // unused return value
-        r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        r4 = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
         taskId = CreateTask(sub_802D924, 10);
         gTasks[taskId].data[0] = r7;
         gTasks[taskId].data[1] = r4;
-        gTasks[taskId].data[2] = gActiveBank;
-        gBattleBankFunc[gActiveBank] = nullsub_91;
+        gTasks[taskId].data[2] = gActiveBattler;
+        gBattleBankFunc[gActiveBattler] = nullsub_91;
     }
 }
 
 void PlayerHandleStatusIconUpdate(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 9);
-        ewram17810[gActiveBank].unk0_4 = 0;
-        gBattleBankFunc[gActiveBank] = sub_802E434;
+        sub_8045A5C(gHealthboxIDs[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], 9);
+        ewram17810[gActiveBattler].unk0_4 = 0;
+        gBattleBankFunc[gActiveBattler] = sub_802E434;
     }
 }
 
 void PlayerHandleStatusAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
         move_anim_start_t2_for_situation(
-          gBattleBufferA[gActiveBank][1],
-          gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = sub_802E434;
+          gBattleBufferA[gActiveBattler][1],
+          gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattleBankFunc[gActiveBattler] = sub_802E434;
     }
 }
 
 void PlayerHandleStatusXor(void)
 {
-    u8 val = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_STATUS) ^ gBattleBufferA[gActiveBank][1];
+    u8 val = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_STATUS) ^ gBattleBufferA[gActiveBattler][1];
 
-    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_STATUS, &val);
+    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_STATUS, &val);
     PlayerBufferExecCompleted();
 }
 
@@ -2948,19 +2948,19 @@ void PlayerHandlecmd29(void)
 
 void PlayerHandleDMATransfer(void)
 {
-    u32 val1 = gBattleBufferA[gActiveBank][1]
-            | (gBattleBufferA[gActiveBank][2] << 8)
-            | (gBattleBufferA[gActiveBank][3] << 16)
-            | (gBattleBufferA[gActiveBank][4] << 24);
-    u16 val2 = gBattleBufferA[gActiveBank][5] | (gBattleBufferA[gActiveBank][6] << 8);
+    u32 val1 = gBattleBufferA[gActiveBattler][1]
+            | (gBattleBufferA[gActiveBattler][2] << 8)
+            | (gBattleBufferA[gActiveBattler][3] << 16)
+            | (gBattleBufferA[gActiveBattler][4] << 24);
+    u16 val2 = gBattleBufferA[gActiveBattler][5] | (gBattleBufferA[gActiveBattler][6] << 8);
 
-    Dma3CopyLarge16_(&gBattleBufferA[gActiveBank][7], (u8 *)val1, val2);
+    Dma3CopyLarge16_(&gBattleBufferA[gActiveBattler][7], (u8 *)val1, val2);
     PlayerBufferExecCompleted();
 }
 
 void PlayerHandlecmd31(void)
 {
-    PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     PlayerBufferExecCompleted();
 }
 
@@ -3001,7 +3001,7 @@ void PlayerHandlecmd37(void)
 
 void PlayerHandlecmd38(void)
 {
-    gUnknown_020238C8.unk0_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_020238C8.unk0_0 = gBattleBufferA[gActiveBattler][1];
     PlayerBufferExecCompleted();
 }
 
@@ -3019,16 +3019,16 @@ void PlayerHandlecmd40(void)
 
 void PlayerHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         PlayerBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = 1;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        sub_8047858(gActiveBank);
-        gBattleBankFunc[gActiveBank] = bx_blink_t1;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        sub_8047858(gActiveBattler);
+        gBattleBankFunc[gActiveBattler] = bx_blink_t1;
     }
 }
 
@@ -3041,23 +3041,23 @@ void PlayerHandleEffectivenessSound(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == 0)
+    if (GetBankSide(gActiveBattler) == 0)
         pan = -64;
     else
         pan = 63;
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     PlayerBufferExecCompleted();
 }
 
 void PlayerHandlecmd44(void)
 {
-    PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     PlayerBufferExecCompleted();
 }
 
 void PlayerHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, -25, 5);
     PlayerBufferExecCompleted();
@@ -3065,7 +3065,7 @@ void PlayerHandleFaintingCry(void)
 
 void PlayerHandleIntroSlide(void)
 {
-    StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]);
+    StartBattleIntroAnim(gBattleBufferA[gActiveBattler][1]);
     gUnknown_02024DE8 |= 1;
     PlayerBufferExecCompleted();
 }
@@ -3075,23 +3075,23 @@ void PlayerHandleTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
-    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8030E38);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
+    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_8030E38);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
     paletteNum = AllocSpritePalette(0xD6F8);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[gSaveBlock2.playerGender].data, 0x100 + paletteNum * 16, 32);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = paletteNum;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
     taskId = CreateTask(task05_08033660, 5);
-    gTasks[taskId].data[0] = gActiveBank;
-    if (ewram17810[gActiveBank].unk0_0)
-        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    gTasks[taskId].data[0] = gActiveBattler;
+    if (ewram17810[gActiveBattler].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBattler]].func = sub_8044CA0;
     ewram17810[4].unk9 |= 1;
-    gBattleBankFunc[gActiveBank] = nullsub_91;
+    gBattleBankFunc[gActiveBattler] = nullsub_91;
 }
 
 void sub_8030E38(struct Sprite *sprite)
@@ -3113,104 +3113,104 @@ void task05_08033660(u8 taskId)
     }
     else
     {
-        u8 savedActiveBank = gActiveBank;
+        u8 savedActiveBank = gActiveBattler;
 
-        gActiveBank = gTasks[taskId].data[0];
+        gActiveBattler = gTasks[taskId].data[0];
         if (!IsDoubleBattle() || (gBattleTypeFlags & 0x40))
         {
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_802F934(gActiveBank, 0);
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            sub_802F934(gActiveBattler, 0);
         }
         else
         {
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_802F934(gActiveBank, 0);
-            gActiveBank ^= 2;
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-            sub_802F934(gActiveBank, 0);
-            gActiveBank ^= 2;
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            sub_802F934(gActiveBattler, 0);
+            gActiveBattler ^= 2;
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            sub_802F934(gActiveBattler, 0);
+            gActiveBattler ^= 2;
         }
-        gBattleBankFunc[gActiveBank] = sub_802D500;
-        gActiveBank = savedActiveBank;
+        gBattleBankFunc[gActiveBattler] = sub_802D500;
+        gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
 }
 
 void PlayerHandlecmd48(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == 0)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBankSide(gActiveBattler) == 0)
     {
         PlayerBufferExecCompleted();
     }
     else
     {
-        ewram17810[gActiveBank].unk0_0 = 1;
-        gUnknown_02024E68[gActiveBank] = sub_8044804(gActiveBank, (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBank][4], gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][2]);
-        ewram17810[gActiveBank].unk5 = 0;
-        if (gBattleBufferA[gActiveBank][2] != 0)
-            ewram17810[gActiveBank].unk5 = 0x5D;
-        gBattleBankFunc[gActiveBank] = sub_8031064;
+        ewram17810[gActiveBattler].unk0_0 = 1;
+        gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        ewram17810[gActiveBattler].unk5 = 0;
+        if (gBattleBufferA[gActiveBattler][2] != 0)
+            ewram17810[gActiveBattler].unk5 = 0x5D;
+        gBattleBankFunc[gActiveBattler] = sub_8031064;
     }
 }
 
 void sub_8031064(void)
 {
-    if (ewram17810[gActiveBank].unk5++ > 0x5C)
+    if (ewram17810[gActiveBattler].unk5++ > 0x5C)
     {
-        ewram17810[gActiveBank].unk5 = 0;
+        ewram17810[gActiveBattler].unk5 = 0;
         PlayerBufferExecCompleted();
     }
 }
 
 void PlayerHandlecmd49(void)
 {
-    if (ewram17810[gActiveBank].unk0_0)
-        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    if (ewram17810[gActiveBattler].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBattler]].func = sub_8044CA0;
     PlayerBufferExecCompleted();
 }
 
 void PlayerHandlecmd50(void)
 {
-    dp11b_obj_free(gActiveBank, 1);
-    dp11b_obj_free(gActiveBank, 0);
+    dp11b_obj_free(gActiveBattler, 1);
+    dp11b_obj_free(gActiveBattler, 0);
     PlayerBufferExecCompleted();
 }
 
 void PlayerHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank))
+    if (IsBankSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        sub_8031F88(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        sub_8031F88(gActiveBattler);
     }
     PlayerBufferExecCompleted();
 }
 
 void PlayerHandleBattleAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u8 val2 = gBattleBufferA[gActiveBank][1];
-        u16 val = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 val2 = gBattleBufferA[gActiveBattler][1];
+        u16 val = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, val2, val))
+        if (move_anim_start_t3(gActiveBattler, gActiveBattler, gActiveBattler, val2, val))
             PlayerBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = sub_802E460;
+            gBattleBankFunc[gActiveBattler] = sub_802E460;
     }
 }
 
 void PlayerHandleLinkStandbyMsg(void)
 {
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         b_link_standby_message();
         // fall through
     case 1:
-        dp11b_obj_free(gActiveBank, 1);
-        dp11b_obj_free(gActiveBank, 0);
+        dp11b_obj_free(gActiveBattler, 1);
+        dp11b_obj_free(gActiveBattler, 0);
         break;
     case 2:
         b_link_standby_message();
@@ -3221,17 +3221,17 @@ void PlayerHandleLinkStandbyMsg(void)
 
 void PlayerHandleResetActionMoveSelection(void)
 {
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
-        gActionSelectionCursor[gActiveBank] = 0;
-        gMoveSelectionCursor[gActiveBank] = 0;
+        gActionSelectionCursor[gActiveBattler] = 0;
+        gMoveSelectionCursor[gActiveBattler] = 0;
         break;
     case 1:
-        gActionSelectionCursor[gActiveBank] = 0;
+        gActionSelectionCursor[gActiveBattler] = 0;
         break;
     case 2:
-        gMoveSelectionCursor[gActiveBank] = 0;
+        gMoveSelectionCursor[gActiveBattler] = 0;
         break;
     }
     PlayerBufferExecCompleted();
@@ -3239,11 +3239,11 @@ void PlayerHandleResetActionMoveSelection(void)
 
 void PlayerHandlecmd55(void)
 {
-    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     PlayerBufferExecCompleted();
-    gBattleBankFunc[gActiveBank] = sub_802D18C;
+    gBattleBankFunc[gActiveBattler] = sub_802D18C;
 }
 
 void PlayerHandlecmd56(void)
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index 03cf8759d..40b9f7aaa 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -20,7 +20,7 @@ extern u8 gDisplayedStringBattle[];
 extern u8 gActionSelectionCursor[];
 
 extern const u8 BattleText_PlayerMenu[];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern const u8 BattleText_MenuOptionsSafari[];
 
 extern void *gBattleBankFunc[];
@@ -194,15 +194,15 @@ void unref_sub_812B464(void)
 
 void SetBankFuncToSafariBufferRunCommand(void)
 {
-    gBattleBankFunc[gActiveBank] = SafariBufferRunCommand;
+    gBattleBankFunc[gActiveBattler] = SafariBufferRunCommand;
 }
 
 void SafariBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < 0x39)
-            gSafariBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < 0x39)
+            gSafariBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             SafariBufferExecCompleted();
     }
@@ -216,7 +216,7 @@ void bx_battle_menu_t6_2(void)
         DestroyMenuCursor();
 
         // Useless switch statement.
-        switch (gActionSelectionCursor[gActiveBank])
+        switch (gActionSelectionCursor[gActiveBattler])
         {
         case 0:
             Emitcmd33(1, 5, 0);
@@ -235,49 +235,49 @@ void bx_battle_menu_t6_2(void)
     }
     else if (gMain.newKeys & DPAD_LEFT)
     {
-        if (gActionSelectionCursor[gActiveBank] & 1)
+        if (gActionSelectionCursor[gActiveBattler] & 1)
         {
             PlaySE(SE_SELECT);
-            nullsub_8(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 1;
-            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+            nullsub_8(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 1;
+            sub_802E3E4(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (!(gActionSelectionCursor[gActiveBank] & 1))
+        if (!(gActionSelectionCursor[gActiveBattler] & 1))
         {
             PlaySE(SE_SELECT);
-            nullsub_8(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 1;
-            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+            nullsub_8(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 1;
+            sub_802E3E4(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_UP)
     {
-        if (gActionSelectionCursor[gActiveBank] & 2)
+        if (gActionSelectionCursor[gActiveBattler] & 2)
         {
             PlaySE(SE_SELECT);
-            nullsub_8(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 2;
-            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+            nullsub_8(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 2;
+            sub_802E3E4(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
-        if (!(gActionSelectionCursor[gActiveBank] & 2))
+        if (!(gActionSelectionCursor[gActiveBattler] & 2))
         {
             PlaySE(SE_SELECT);
-            nullsub_8(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 2;
-            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+            nullsub_8(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 2;
+            sub_802E3E4(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
 #if DEBUG
     else if (gMain.newKeys & R_BUTTON)
     {
-        if (!ewram17810[gActiveBank].unk0_5)
-            move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, 4, 0);
+        if (!ewram17810[gActiveBattler].unk0_5)
+            move_anim_start_t3(gActiveBattler, gActiveBattler, gActiveBattler, 4, 0);
     }
     else if (gMain.newKeys & START_BUTTON)
     {
@@ -288,7 +288,7 @@ void bx_battle_menu_t6_2(void)
 
 void sub_812B65C(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         SafariBufferExecCompleted();
 }
 
@@ -310,7 +310,7 @@ void sub_812B6AC(void)
 
 void bx_wait_t6(void)
 {
-    if (!gDoingBattleAnim || !ewram17810[gActiveBank].unk0_6)
+    if (!gDoingBattleAnim || !ewram17810[gActiveBattler].unk0_6)
         SafariBufferExecCompleted();
 }
 
@@ -318,7 +318,7 @@ void sub_812B724(void)
 {
     if (!gPaletteFade.active)
     {
-        gBattleBankFunc[gActiveBank] = sub_812B758;
+        gBattleBankFunc[gActiveBattler] = sub_812B758;
         sub_810BADC();
     }
 }
@@ -334,29 +334,29 @@ void sub_812B758(void)
 
 void sub_812B794(void)
 {
-    if (!ewram17810[gActiveBank].unk0_5)
+    if (!ewram17810[gActiveBattler].unk0_5)
         SafariBufferExecCompleted();
 }
 
 void SafariBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = SafariBufferRunCommand;
+    gBattleBankFunc[gActiveBattler] = SafariBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = 0x38;
+        gBattleBufferA[gActiveBattler][0] = 0x38;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
 void unref_sub_812B838(void)
 {
-    if (!ewram17810[gActiveBank].unk0_4)
+    if (!ewram17810[gActiveBattler].unk0_4)
         SafariBufferExecCompleted();
 }
 
@@ -397,18 +397,18 @@ void SafariHandleReturnPokeToBall(void)
 
 void SafariHandleTrainerThrow(void)
 {
-    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
-    GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBattler);
+    GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       80,
       (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
       30);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
-    gBattleBankFunc[gActiveBank] = sub_812B65C;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBattler] = sub_812B65C;
 }
 
 void SafariHandleTrainerSlide(void)
@@ -435,18 +435,18 @@ void SafariHandlecmd12(void)
 {
     ewram17840.unk8 = 4;
     gDoingBattleAnim = 1;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4);
-    gBattleBankFunc[gActiveBank] = bx_wait_t6;
+    move_anim_start_t4(gActiveBattler, gActiveBattler, GetBankByIdentity(1), 4);
+    gBattleBankFunc[gActiveBattler] = bx_wait_t6;
 }
 
 void SafariHandleBallThrow(void)
 {
-    u8 var = gBattleBufferA[gActiveBank][1];
+    u8 var = gBattleBufferA[gActiveBattler][1];
 
     ewram17840.unk8 = var;
     gDoingBattleAnim = 1;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4);
-    gBattleBankFunc[gActiveBank] = bx_wait_t6;
+    move_anim_start_t4(gActiveBattler, gActiveBattler, GetBankByIdentity(1), 4);
+    gBattleBankFunc[gActiveBattler] = bx_wait_t6;
 }
 
 // TODO: spell Pause correctly
@@ -464,14 +464,14 @@ void SafariHandlePrintString(void)
 {
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
+    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBattler][2]);
     Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
-    gBattleBankFunc[gActiveBank] = sub_812B694;
+    gBattleBankFunc[gActiveBattler] = sub_812B694;
 }
 
 void SafariHandlePrintStringPlayerOnly(void)
 {
-    if (GetBankSide(gActiveBank) == 0)
+    if (GetBankSide(gActiveBattler) == 0)
         SafariHandlePrintString();
     else
         SafariBufferExecCompleted();
@@ -486,7 +486,7 @@ void SafariHandlecmd18(void)
     gUnknown_03004210.paletteNum = 0;
     Text_FillWindowRectDefPalette(&gUnknown_03004210, 10, 2, 15, 27, 18);
     Text_FillWindowRectDefPalette(&gUnknown_03004210, 10, 2, 35, 16, 36);
-    gBattleBankFunc[gActiveBank] = bx_battle_menu_t6_2;
+    gBattleBankFunc[gActiveBattler] = bx_battle_menu_t6_2;
 
     Text_InitWindow(&gUnknown_03004210, BattleText_MenuOptionsSafari, 400, 18, 35);
     Text_PrintWindow8002F44(&gUnknown_03004210);
@@ -495,7 +495,7 @@ void SafariHandlecmd18(void)
     for (i = 0; i < 4; i++)
         nullsub_8(i);
 
-    sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+    sub_802E3E4(gActionSelectionCursor[gActiveBattler], 0);
     StrCpyDecodeToDisplayedStringBattle(BattleText_PlayerMenu);
 
     Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35);
@@ -515,8 +515,8 @@ void SafariHandlecmd20(void)
 void SafariHandleOpenBag(void)
 {
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-    gBattleBankFunc[gActiveBank] = sub_812B724;
-    gBankInMenu = gActiveBank;
+    gBattleBankFunc[gActiveBattler] = sub_812B724;
+    gBankInMenu = gActiveBattler;
 }
 
 void SafariHandlecmd22(void)
@@ -541,7 +541,7 @@ void SafariHandleExpBarUpdate(void)
 
 void SafariHandleStatusIconUpdate(void)
 {
-    sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 11);
+    sub_8045A5C(gHealthboxIDs[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], 11);
     SafariBufferExecCompleted();
 }
 
@@ -629,23 +629,23 @@ void SafariHandleEffectivenessSound(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == 0)
+    if (GetBankSide(gActiveBattler) == 0)
         pan = -64;
     else
         pan = 63;
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     SafariBufferExecCompleted();
 }
 
 void SafariHandlecmd44(void)
 {
-    PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     SafariBufferExecCompleted();
 }
 
 void SafariHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry1(species, 25);
     SafariBufferExecCompleted();
@@ -653,16 +653,16 @@ void SafariHandleFaintingCry(void)
 
 void SafariHandleIntroSlide(void)
 {
-    StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]);
+    StartBattleIntroAnim(gBattleBufferA[gActiveBattler][1]);
     gUnknown_02024DE8 |= 1;
     SafariBufferExecCompleted();
 }
 
 void SafariHandleTrainerBallThrow(void)
 {
-    sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 10);
-    sub_804777C(gActiveBank);
-    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    sub_8045A5C(gHealthboxIDs[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], 10);
+    sub_804777C(gActiveBattler);
+    sub_8043DFC(gHealthboxIDs[gActiveBattler]);
     SafariBufferExecCompleted();
 }
 
@@ -688,13 +688,13 @@ void SafariHandleSpriteInvisibility(void)
 
 void SafariHandleBattleAnimation(void)
 {
-    u8 r3 = gBattleBufferA[gActiveBank][1];
-    u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    u8 r3 = gBattleBufferA[gActiveBattler][1];
+    u16 r4 = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-    if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, r3, r4) != 0)
+    if (move_anim_start_t3(gActiveBattler, gActiveBattler, gActiveBattler, r3, r4) != 0)
         SafariBufferExecCompleted();
     else
-        gBattleBankFunc[gActiveBank] = sub_812B794;
+        gBattleBankFunc[gActiveBattler] = sub_812B794;
 }
 
 void SafariHandleLinkStandbyMsg(void)
@@ -709,12 +709,12 @@ void SafariHandleResetActionMoveSelection(void)
 
 void SafariHandlecmd55(void)
 {
-    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     SafariBufferExecCompleted();
     if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_WILD))
-        gBattleBankFunc[gActiveBank] = sub_812B6AC;
+        gBattleBankFunc[gActiveBattler] = sub_812B6AC;
 }
 
 void SafariHandlecmd56(void)
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index c590b487c..2737a0095 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -27,7 +27,7 @@ struct MovePpInfo
     u8 ppBonuses;
 };
 
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern void (*gBattleBankFunc[])(void);
 extern u32 gBattleExecBuffer;
 extern u8 gBattleBufferA[][0x200];
@@ -238,7 +238,7 @@ void unref_sub_8137220(void)
 
 void SetBankFuncToWallyBufferRunCommand(void)
 {
-    gBattleBankFunc[gActiveBank] = WallyBufferRunCommand;
+    gBattleBankFunc[gActiveBattler] = WallyBufferRunCommand;
     ewram160A8 = 0;
     ewram160A9 = 0;
     ewram160AA = 0;
@@ -247,10 +247,10 @@ void SetBankFuncToWallyBufferRunCommand(void)
 
 void WallyBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < 0x39)
-            gWallyBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < 0x39)
+            gWallyBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             WallyBufferExecCompleted();
     }
@@ -325,7 +325,7 @@ void sub_81372BC(void)
 
 void sub_813741C(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         WallyBufferExecCompleted();
 }
 
@@ -355,7 +355,7 @@ void sub_81374C4(void)
 {
     if (!gPaletteFade.active)
     {
-        gBattleBankFunc[gActiveBank] = sub_81374FC;
+        gBattleBankFunc[gActiveBattler] = sub_81374FC;
         nullsub_14();
         PrepareBagForWallyTutorial();
     }
@@ -373,27 +373,27 @@ void sub_81374FC(void)
 
 void sub_8137538(void)
 {
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
-        sub_8141828(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler].unk0_7)
+        sub_8141828(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
 
-    if (!ewram17810[gActiveBank ^ 2].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_7)
-        sub_8141828(gActiveBank ^ 2, &gPlayerParty[gBattlePartyID[gActiveBank ^ 2]]);
+    if (!ewram17810[gActiveBattler ^ 2].unk0_3 && !ewram17810[gActiveBattler ^ 2].unk0_7)
+        sub_8141828(gActiveBattler ^ 2, &gPlayerParty[gBattlePartyID[gActiveBattler ^ 2]]);
 
-    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_3)
+    if (!ewram17810[gActiveBattler].unk0_3 && !ewram17810[gActiveBattler ^ 2].unk0_3)
     {
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank ^ 2]]);
-            sub_8045A5C(gHealthboxIDs[gActiveBank ^ 2], &gPlayerParty[gBattlePartyID[gActiveBank ^ 2]], 0);
-            sub_804777C(gActiveBank ^ 2);
-            sub_8043DFC(gHealthboxIDs[gActiveBank ^ 2]);
+            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler ^ 2]]);
+            sub_8045A5C(gHealthboxIDs[gActiveBattler ^ 2], &gPlayerParty[gBattlePartyID[gActiveBattler ^ 2]], 0);
+            sub_804777C(gActiveBattler ^ 2);
+            sub_8043DFC(gHealthboxIDs[gActiveBattler ^ 2]);
         }
-        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
-        sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 0);
-        sub_804777C(gActiveBank);
-        sub_8043DFC(gHealthboxIDs[gActiveBank]);
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBattler]]);
+        sub_8045A5C(gHealthboxIDs[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], 0);
+        sub_804777C(gActiveBattler);
+        sub_8043DFC(gHealthboxIDs[gActiveBattler]);
         ewram17840.unk9_0 = 0;
-        gBattleBankFunc[gActiveBank] = sub_81376B8;
+        gBattleBankFunc[gActiveBattler] = sub_81376B8;
     }
 }
 
@@ -401,18 +401,18 @@ void sub_81376B8(void)
 {
     bool8 r4 = FALSE;
 
-    if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxIDs[gActiveBattler]].callback == SpriteCallbackDummy)
         r4 = TRUE;
-    if (r4 && ewram17810[gActiveBank].unk1_0 && ewram17810[gActiveBank ^ 2].unk1_0)
+    if (r4 && ewram17810[gActiveBattler].unk1_0 && ewram17810[gActiveBattler ^ 2].unk1_0)
     {
-        ewram17810[gActiveBank].unk0_7 = 0;
-        ewram17810[gActiveBank].unk1_0 = 0;
-        ewram17810[gActiveBank ^ 2].unk0_7 = 0;
-        ewram17810[gActiveBank ^ 2].unk1_0 = 0;
+        ewram17810[gActiveBattler].unk0_7 = 0;
+        ewram17810[gActiveBattler].unk1_0 = 0;
+        ewram17810[gActiveBattler ^ 2].unk0_7 = 0;
+        ewram17810[gActiveBattler ^ 2].unk1_0 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
         CreateTask(c3_0802FDF4, 10);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         WallyBufferExecCompleted();
     }
 }
@@ -421,22 +421,22 @@ void sub_81377B0(void)
 {
     s16 r4;
 
-    r4 = sub_8045C78(gActiveBank, gHealthboxIDs[gActiveBank], 0, 0);
-    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    r4 = sub_8045C78(gActiveBattler, gHealthboxIDs[gActiveBattler], 0, 0);
+    sub_8043DFC(gHealthboxIDs[gActiveBattler]);
     if (r4 != -1)
     {
-        sub_80440EC(gHealthboxIDs[gActiveBank], r4, 0);
+        sub_80440EC(gHealthboxIDs[gActiveBattler], r4, 0);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         WallyBufferExecCompleted();
     }
 }
 
 void bx_blink_t5(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -455,11 +455,11 @@ void bx_blink_t5(void)
 
 void sub_813789C(void)
 {
-    if (!ewram17810[gActiveBank].unk0_6)
+    if (!ewram17810[gActiveBattler].unk0_6)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         WallyBufferExecCompleted();
     }
 }
@@ -467,35 +467,35 @@ void sub_813789C(void)
 // Duplicate of sub_813741C
 void sub_8137908(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         WallyBufferExecCompleted();
 }
 
 void sub_8137940(void)
 {
-    if (!ewram17810[gActiveBank].unk0_5)
+    if (!ewram17810[gActiveBattler].unk0_5)
         WallyBufferExecCompleted();
 }
 
 void WallyBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = WallyBufferRunCommand;
+    gBattleBankFunc[gActiveBattler] = WallyBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 multiplayerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &multiplayerId);
-        gBattleBufferA[gActiveBank][0] = 0x38;
+        gBattleBufferA[gActiveBattler][0] = 0x38;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
 void unref_sub_81379E4(void)
 {
-    if (!ewram17810[gActiveBank].unk0_4)
+    if (!ewram17810[gActiveBattler].unk0_4)
         WallyBufferExecCompleted();
 }
 
@@ -506,13 +506,13 @@ void WallyHandleGetAttributes(void)
     u8 r4;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        r6 = sub_8137A84(gBattlePartyID[gActiveBank], arr);
+        r6 = sub_8137A84(gBattlePartyID[gActiveBattler], arr);
     }
     else
     {
-        r4 = gBattleBufferA[gActiveBank][2];
+        r4 = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (r4 & 1)
@@ -534,7 +534,7 @@ u32 sub_8137A84(u8 a, u8 *buffer)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         battlePokemon.species = GetMonData(&gPlayerParty[a], MON_DATA_SPECIES);
@@ -596,7 +596,7 @@ u32 sub_8137A84(u8 a, u8 *buffer)
     case 5:
     case 6:
     case 7:
-        data16 = GetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4);
+        data16 = GetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - 4);
         buffer[0] = data16;
         buffer[1] = data16 >> 8;
         size = 2;
@@ -611,7 +611,7 @@ u32 sub_8137A84(u8 a, u8 *buffer)
     case 10:
     case 11:
     case 12:
-        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9);
+        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - 9);
         size = 1;
         break;
     case 17:
@@ -835,13 +835,13 @@ void WallyHandleSetAttributes(void)
     u8 r4;
     u8 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        sub_8138294(gBattlePartyID[gActiveBank]);
+        sub_8138294(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        r4 = gBattleBufferA[gActiveBank][2];
+        r4 = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (r4 & 1)
@@ -854,11 +854,11 @@ void WallyHandleSetAttributes(void)
 
 void sub_8138294(u8 a)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         {
@@ -899,10 +899,10 @@ void sub_8138294(u8 a)
         }
         break;
     case 1:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 2:
-        SetMonData(&gPlayerParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 3:
         for (i = 0; i < 4; i++)
@@ -916,157 +916,157 @@ void sub_8138294(u8 a)
     case 5:
     case 6:
     case 7:
-        SetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - 4, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 8:
-        SetMonData(&gPlayerParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case 9:
     case 10:
     case 11:
     case 12:
-        SetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - 9, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 17:
-        SetMonData(&gPlayerParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 18:
-        SetMonData(&gPlayerParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 19:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 20:
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 21:
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 22:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 23:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 24:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 25:
-        SetMonData(&gPlayerParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 26:
-        SetMonData(&gPlayerParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 27:
-        SetMonData(&gPlayerParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 28:
-        SetMonData(&gPlayerParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 29:
-        SetMonData(&gPlayerParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 30:
-        SetMonData(&gPlayerParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 31:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case 32:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 33:
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 34:
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 35:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 36:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 37:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 38:
-        SetMonData(&gPlayerParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 39:
-        SetMonData(&gPlayerParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 40:
-        SetMonData(&gPlayerParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 41:
-        SetMonData(&gPlayerParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 42:
-        SetMonData(&gPlayerParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 43:
-        SetMonData(&gPlayerParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 44:
-        SetMonData(&gPlayerParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 45:
-        SetMonData(&gPlayerParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 46:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 47:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 48:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 49:
-        SetMonData(&gPlayerParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 50:
-        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 51:
-        SetMonData(&gPlayerParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 52:
-        SetMonData(&gPlayerParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 53:
-        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 54:
-        SetMonData(&gPlayerParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 55:
-        SetMonData(&gPlayerParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 56:
-        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 57:
-        SetMonData(&gPlayerParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 58:
-        SetMonData(&gPlayerParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case 59:
-        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 }
 
 void WallyHandlecmd3(void)
@@ -1086,48 +1086,48 @@ void WallyHandleSendOutPoke(void)
 
 void WallyHandleReturnPokeToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 1);
-        gBattleBankFunc[gActiveBank] = sub_813789C;
+        move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 1);
+        gBattleBankFunc[gActiveBattler] = sub_813789C;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        sub_8043DB0(gHealthboxIDs[gActiveBattler]);
         WallyBufferExecCompleted();
     }
 }
 
 void WallyHandleTrainerThrow(void)
 {
-    LoadPlayerTrainerBankSprite(2, gActiveBank);
-    GetMonSpriteTemplate_803C5A0(2, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    LoadPlayerTrainerBankSprite(2, gActiveBattler);
+    GetMonSpriteTemplate_803C5A0(2, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       80, 80 + 4 * (8 - gTrainerBackPicCoords[2].coords),
       30);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
-    gBattleBankFunc[gActiveBank] = sub_813741C;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBattler] = sub_813741C;
 }
 
 void WallyHandleTrainerSlide(void)
 {
-    LoadPlayerTrainerBankSprite(2, gActiveBank);
-    GetMonSpriteTemplate_803C5A0(2, GetBankIdentity(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    LoadPlayerTrainerBankSprite(2, gActiveBattler);
+    GetMonSpriteTemplate_803C5A0(2, GetBankIdentity(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_02024E8C,
       80, 80 + 4 * (8 - gTrainerBackPicCoords[2].coords),
       30);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -96;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
-    gBattleBankFunc[gActiveBank] = sub_8137908;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -96;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBattler] = sub_8137908;
 }
 
 void WallyHandleTrainerSlideBack(void)
@@ -1149,18 +1149,18 @@ void WallyHandlecmd12(void)
 {
     ewram17840.unk8 = 4;
     gDoingBattleAnim = TRUE;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4);
-    gBattleBankFunc[gActiveBank] = bx_wait_t5;
+    move_anim_start_t4(gActiveBattler, gActiveBattler, GetBankByIdentity(1), 4);
+    gBattleBankFunc[gActiveBattler] = bx_wait_t5;
 }
 
 void WallyHandleBallThrow(void)
 {
-    u8 val = gBattleBufferA[gActiveBank][1];
+    u8 val = gBattleBufferA[gActiveBattler][1];
 
     ewram17840.unk8 = val;
     gDoingBattleAnim = TRUE;
-    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4);
-    gBattleBankFunc[gActiveBank] = bx_wait_t5;
+    move_anim_start_t4(gActiveBattler, gActiveBattler, GetBankByIdentity(1), 4);
+    gBattleBankFunc[gActiveBattler] = bx_wait_t5;
 }
 
 void WallyHandlePuase(void)
@@ -1170,15 +1170,15 @@ void WallyHandlePuase(void)
 
 void WallyHandleMoveAnimation(void)
 {
-    u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
+    u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
 
-    gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-    gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-    gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-    gAnimFriendship = gBattleBufferA[gActiveBank][10];
-    gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
-    gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-    gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+    gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+    gAnimMovePower = gBattleBufferA[gActiveBattler][4] | (gBattleBufferA[gActiveBattler][5] << 8);
+    gAnimMoveDmg = gBattleBufferA[gActiveBattler][6] | (gBattleBufferA[gActiveBattler][7] << 8) | (gBattleBufferA[gActiveBattler][8] << 16) | (gBattleBufferA[gActiveBattler][9] << 24);
+    gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+    gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8);
+    gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+    gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
     if (sub_8031720(move, gAnimMoveTurn) != 0)
     {
         // Dead code. sub_8031720 always returns 0.
@@ -1186,32 +1186,32 @@ void WallyHandleMoveAnimation(void)
     }
     else
     {
-        ewram17810[gActiveBank].unk4 = 0;
-        gBattleBankFunc[gActiveBank] = sub_81390D0;
+        ewram17810[gActiveBattler].unk4 = 0;
+        gBattleBankFunc[gActiveBattler] = sub_81390D0;
     }
 }
 
 void sub_81390D0(void)
 {
-    u16 r4 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
+    u16 r4 = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
 
 #ifndef NONMATCHING
     asm("":::"r6");
 #endif
 
-    switch (ewram17810[gActiveBank].unk4)
+    switch (ewram17810[gActiveBattler].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].substituteSprite == 1)
-            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
-        ewram17810[gActiveBank].unk4 = 1;
+        if (ewram17800[gActiveBattler].substituteSprite == 1)
+            move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 5);
+        ewram17810[gActiveBattler].unk4 = 1;
         break;
     case 1:
-        if (ewram17810[gActiveBank].unk0_6 == 0)
+        if (ewram17810[gActiveBattler].unk0_6 == 0)
         {
             sub_80326EC(0);
             DoMoveAnim(r4);
-            ewram17810[gActiveBank].unk4 = 2;
+            ewram17810[gActiveBattler].unk4 = 2;
         }
         break;
     case 2:
@@ -1219,17 +1219,17 @@ void sub_81390D0(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if (ewram17800[gActiveBank].substituteSprite == 1)
-                move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
-            ewram17810[gActiveBank].unk4 = 3;
+            if (ewram17800[gActiveBattler].substituteSprite == 1)
+                move_anim_start_t4(gActiveBattler, gActiveBattler, gActiveBattler, 6);
+            ewram17810[gActiveBattler].unk4 = 3;
         }
         break;
     case 3:
-        if (ewram17810[gActiveBank].unk0_6 == 0)
+        if (ewram17810[gActiveBattler].unk0_6 == 0)
         {
             sub_8031F24();
-            sub_80324BC(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            ewram17810[gActiveBank].unk4 = 0;
+            sub_80324BC(gActiveBattler, gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            ewram17810[gActiveBattler].unk4 = 0;
             WallyBufferExecCompleted();
         }
         break;
@@ -1242,17 +1242,17 @@ void WallyHandlePrintString(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    ptr = (u16 *)&gBattleBufferA[gActiveBank][2];
+    ptr = (u16 *)&gBattleBufferA[gActiveBattler][2];
     if (*ptr == 2)
         DestroyMenuCursor();
     BufferStringBattle(*ptr);
     Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 0x90, 2, 15);
-    gBattleBankFunc[gActiveBank] = sub_8137454;
+    gBattleBankFunc[gActiveBattler] = sub_8137454;
 }
 
 void WallyHandlePrintStringPlayerOnly(void)
 {
-    if (GetBankSide(gActiveBank) == 0)
+    if (GetBankSide(gActiveBattler) == 0)
         WallyHandlePrintString();
     else
         WallyBufferExecCompleted();
@@ -1267,7 +1267,7 @@ void WallyHandlecmd18(void)
     gUnknown_03004210.paletteNum = 0;
     Text_FillWindowRectDefPalette(&gUnknown_03004210, 10, 2, 15, 27, 18);
     Text_FillWindowRectDefPalette(&gUnknown_03004210, 10, 2, 35, 16, 36);
-    gBattleBankFunc[gActiveBank] = sub_81372BC;
+    gBattleBankFunc[gActiveBattler] = sub_81372BC;
     Text_InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35);
     Text_PrintWindow8002F44(&gUnknown_03004210);
     MenuCursor_Create814A5C0(0, 0xFFFF, 12, 0x2D9F, 0);
@@ -1313,8 +1313,8 @@ void WallyHandlecmd20(void)
 void WallyHandleOpenBag(void)
 {
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-    gBattleBankFunc[gActiveBank] = sub_81374C4;
-    gBankInMenu = gActiveBank;
+    gBattleBankFunc[gActiveBattler] = sub_81374C4;
+    gBankInMenu = gActiveBattler;
 }
 
 void WallyHandlecmd22(void)
@@ -1332,22 +1332,22 @@ void WallyHandleHealthBarUpdate(void)
     s16 r7;
 
     load_gfxc_health_bar(0);
-    r7 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    r7 = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
     if (r7 != 0x7FFF)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, curHP, r7);
+        sub_8043D84(gActiveBattler, gHealthboxIDs[gActiveBattler], maxHP, curHP, r7);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, 0, r7);
-        sub_80440EC(gHealthboxIDs[gActiveBank], 0, 0);
+        sub_8043D84(gActiveBattler, gHealthboxIDs[gActiveBattler], maxHP, 0, r7);
+        sub_80440EC(gHealthboxIDs[gActiveBattler], 0, 0);
     }
-    gBattleBankFunc[gActiveBank] = sub_81377B0;
+    gBattleBankFunc[gActiveBattler] = sub_81377B0;
 }
 
 void WallyHandleExpBarUpdate(void)
@@ -1432,16 +1432,16 @@ void WallyHandlecmd40(void)
 
 void WallyHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         WallyBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = 1;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        sub_8047858(gActiveBank);
-        gBattleBankFunc[gActiveBank] = bx_blink_t5;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        sub_8047858(gActiveBattler);
+        gBattleBankFunc[gActiveBattler] = bx_blink_t5;
     }
 }
 
@@ -1452,25 +1452,25 @@ void WallyHandlecmd42(void)
 
 void WallyHandleEffectivenessSound(void)
 {
-    PlaySE(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    PlaySE(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     WallyBufferExecCompleted();
 }
 
 void WallyHandlecmd44(void)
 {
-    PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     WallyBufferExecCompleted();
 }
 
 void WallyHandleFaintingCry(void)
 {
-    PlayCry1(GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES), 25);
+    PlayCry1(GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES), 25);
     WallyBufferExecCompleted();
 }
 
 void WallyHandleIntroSlide(void)
 {
-    StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]);
+    StartBattleIntroAnim(gBattleBufferA[gActiveBattler][1]);
     gUnknown_02024DE8 |= 1;
     WallyBufferExecCompleted();
 }
@@ -1480,23 +1480,23 @@ void WallyHandleTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = StartTranslateAnimSpriteByDeltas;
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
-    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBank]], sub_8030E38);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
+    StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_8030E38);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
     paletteNum = AllocSpritePalette(0xD6F8);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[2].data, 0x100 + paletteNum * 16, 32);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = paletteNum;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
     taskId = CreateTask(sub_8139A2C, 5);
-    gTasks[taskId].data[0] = gActiveBank;
-    if (ewram17810[gActiveBank].unk0_0)
-        gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0;
+    gTasks[taskId].data[0] = gActiveBattler;
+    if (ewram17810[gActiveBattler].unk0_0)
+        gTasks[gUnknown_02024E68[gActiveBattler]].func = sub_8044CA0;
     ewram17810[4].unk9 |= 1;
-    gBattleBankFunc[gActiveBank] = nullsub_91;
+    gBattleBankFunc[gActiveBattler] = nullsub_91;
 }
 
 void sub_81398BC(u8 bank)
@@ -1531,27 +1531,27 @@ void sub_8139A2C(u8 taskId)
     }
     else
     {
-        u8 savedActiveBank = gActiveBank;
+        u8 savedActiveBank = gActiveBattler;
 
-        gActiveBank = gTasks[taskId].data[0];
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_81398BC(gActiveBank);
-        gBattleBankFunc[gActiveBank] = sub_8137538;
-        gActiveBank = savedActiveBank;
+        gActiveBattler = gTasks[taskId].data[0];
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_81398BC(gActiveBattler);
+        gBattleBankFunc[gActiveBattler] = sub_8137538;
+        gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
 }
 
 void WallyHandlecmd48(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == 0)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBankSide(gActiveBattler) == 0)
     {
         WallyBufferExecCompleted();
     }
     else
     {
-        ewram17810[gActiveBank].unk0_0 = 1;
-        gUnknown_02024E68[gActiveBank] = sub_8044804(gActiveBank, (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBank][4], gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][2]);
+        ewram17810[gActiveBattler].unk0_0 = 1;
+        gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         WallyBufferExecCompleted();
     }
 }
@@ -1573,13 +1573,13 @@ void WallyHandleSpriteInvisibility(void)
 
 void WallyHandleBattleAnimation(void)
 {
-    u8 val2 = gBattleBufferA[gActiveBank][1];
-    u16 val = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    u8 val2 = gBattleBufferA[gActiveBattler][1];
+    u16 val = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-    if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, val2, val))
+    if (move_anim_start_t3(gActiveBattler, gActiveBattler, gActiveBattler, val2, val))
         WallyBufferExecCompleted();
     else
-        gBattleBankFunc[gActiveBank] = sub_8137940;
+        gBattleBankFunc[gActiveBattler] = sub_8137940;
 }
 
 void WallyHandleLinkStandbyMsg(void)
@@ -1594,12 +1594,12 @@ void WallyHandleResetActionMoveSelection(void)
 
 void WallyHandlecmd55(void)
 {
-    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     WallyBufferExecCompleted();
     if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_WILD))
-        gBattleBankFunc[gActiveBank] = sub_813746C;
+        gBattleBankFunc[gActiveBattler] = sub_813746C;
 }
 
 void WallyHandlecmd56(void)
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index ed7ab3a35..c428e4edd 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -155,7 +155,7 @@ extern const u8* const gBattleStringsTable[BATTLESTRINGS_NO];
 
 extern u16 gLastUsedItem;
 extern u8 gLastUsedAbility;
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u8 gBankAttacker;
 extern u8 gBankTarget;
 extern u8 gStringBank;
@@ -214,7 +214,7 @@ void BufferStringBattle(u16 stringID)
     int i;
     const u8* stringPtr = NULL;
 
-    gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBank][4]);
+    gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBattler][4]);
     gLastUsedItem = gStringInfo->lastItem;
     gLastUsedAbility = gStringInfo->lastAbility;
     gBattleStruct->scriptingActive = gStringInfo->scrActive;
@@ -265,7 +265,7 @@ void BufferStringBattle(u16 stringID)
         }
         break;
     case 1: // poke first send-out
-        if (GetBankSide(gActiveBank) == 0)
+        if (GetBankSide(gActiveBattler) == 0)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
             {
@@ -305,7 +305,7 @@ void BufferStringBattle(u16 stringID)
         }
         break;
     case 2: // sending poke to ball msg
-        if (GetBankSide(gActiveBank) == 0)
+        if (GetBankSide(gActiveBattler) == 0)
         {
             if (gBattleStruct->hpScale == 0)
                 stringPtr = BattleText_ComeBackSingle1;
@@ -377,7 +377,7 @@ void BufferStringBattle(u16 stringID)
         if (gBattleTextBuff1[0] & 0x80)
         {
             gBattleTextBuff1[0] &= ~(0x80);
-            if (GetBankSide(gActiveBank) == 1 && gBattleTextBuff1[0] != 3)
+            if (GetBankSide(gActiveBattler) == 1 && gBattleTextBuff1[0] != 3)
                 gBattleTextBuff1[0] ^= 3;
             if (gBattleTextBuff1[0] == BATTLE_LOST || gBattleTextBuff1[0] == BATTLE_DREW)
                 stringPtr = BattleText_GotAwaySafely;
@@ -391,7 +391,7 @@ void BufferStringBattle(u16 stringID)
         }
         else
         {
-            if (GetBankSide(gActiveBank) == 1 && gBattleTextBuff1[0] != 3)
+            if (GetBankSide(gActiveBattler) == 1 && gBattleTextBuff1[0] != 3)
                 gBattleTextBuff1[0] ^= 3;
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             {
@@ -636,7 +636,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
                 HANDLE_NICKNAME_STRING_CASE(gEffectBank, gBattlePartyID[gEffectBank])
                 break;
             case 15: // active bank name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gActiveBank, gBattlePartyID[gActiveBank])
+                HANDLE_NICKNAME_STRING_CASE(gActiveBattler, gBattlePartyID[gActiveBattler])
                 break;
             case 16: // scripting active bank name with prefix
                 HANDLE_NICKNAME_STRING_CASE(gBattleStruct->scriptingActive, gBattlePartyID[gBattleStruct->scriptingActive])
diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c
index 194a002d3..df227ab2c 100644
--- a/src/battle/battle_util.c
+++ b/src/battle/battle_util.c
@@ -25,7 +25,7 @@
 extern u8 gUnknown_02023A14_50;
 
 extern const u8* gBattlescriptCurrInstr;
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u8 gBattleBufferB[4][0x200];
 extern u8* gUnknown_02024C1C[4]; //battlescript location when you try to choose a move you're not allowed to
 extern u16 gLastUsedMove[4];
@@ -259,9 +259,9 @@ void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move)
     if (!(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
         && !(gDisableStructs[bankAtk].unk18_b & gBitTable[i]))
     {
-        gActiveBank = bankAtk;
-        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = bankAtk;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]);
+        MarkBufferBankForExecution(gActiveBattler);
     }
 }
 
@@ -293,9 +293,9 @@ void PressurePPLoseOnUsingImprision(u8 bankAtk)
         && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
         && !(gDisableStructs[bankAtk].unk18_b & gBitTable[imprisionPos]))
     {
-        gActiveBank = bankAtk;
-        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBank].pp[imprisionPos]);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = bankAtk;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisionPos]);
+        MarkBufferBankForExecution(gActiveBattler);
     }
 }
 
@@ -326,9 +326,9 @@ void PressurePPLoseOnUsingPerishSong(u8 bankAtk)
         && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
         && !(gDisableStructs[bankAtk].unk18_b & gBitTable[perishSongPos]))
     {
-        gActiveBank = bankAtk;
-        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBank].pp[perishSongPos]);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = bankAtk;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBattler].pp[perishSongPos]);
+        MarkBufferBankForExecution(gActiveBattler);
     }
 }
 
@@ -402,9 +402,9 @@ bool8 WasUnableToUseMove(u8 bank)
 
 void PrepareStringBattle(u16 stringId, u8 bank)
 {
-    gActiveBank = bank;
+    gActiveBattler = bank;
     EmitPrintString(0, stringId);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 }
 
 void ResetSentPokesToOpponentValue(void)
@@ -474,49 +474,49 @@ void BattleScriptPop(void)
 u8 TrySetCantSelectMoveBattleScript(void) //msg can't select a move
 {
     u8 limitations = 0;
-    u16 move = gBattleMons[gActiveBank].moves[gBattleBufferB[gActiveBank][2]];
+    u16 move = gBattleMons[gActiveBattler].moves[gBattleBufferB[gActiveBattler][2]];
     u8 holdEffect;
-    u16* choicedMove = CHOICED_MOVE(gActiveBank);
-    if (gDisableStructs[gActiveBank].disabledMove == move && move)
+    u16* choicedMove = CHOICED_MOVE(gActiveBattler);
+    if (gDisableStructs[gActiveBattler].disabledMove == move && move)
     {
-        gBattleStruct->scriptingActive = gActiveBank;
+        gBattleStruct->scriptingActive = gActiveBattler;
         gCurrentMove = move;
-        gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionDisabledMove;
+        gUnknown_02024C1C[gActiveBattler] = BattleScript_MoveSelectionDisabledMove;
         limitations++;
     }
-    if (move == gLastUsedMove[gActiveBank] && move != MOVE_STRUGGLE && gBattleMons[gActiveBank].status2 & STATUS2_TORMENT)
+    if (move == gLastUsedMove[gActiveBattler] && move != MOVE_STRUGGLE && gBattleMons[gActiveBattler].status2 & STATUS2_TORMENT)
     {
-        CancelMultiTurnMoves(gActiveBank);
-        gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionTormented;
+        CancelMultiTurnMoves(gActiveBattler);
+        gUnknown_02024C1C[gActiveBattler] = BattleScript_MoveSelectionTormented;
         limitations++;
     }
-    if (gDisableStructs[gActiveBank].tauntTimer1 && gBattleMoves[move].power == 0)
+    if (gDisableStructs[gActiveBattler].tauntTimer1 && gBattleMoves[move].power == 0)
     {
         gCurrentMove = move;
-        gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionTaunted;
+        gUnknown_02024C1C[gActiveBattler] = BattleScript_MoveSelectionTaunted;
         limitations++;
     }
-    if (IsImprisoned(gActiveBank, move))
+    if (IsImprisoned(gActiveBattler, move))
     {
         gCurrentMove = move;
-        gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionImprisoned;
+        gUnknown_02024C1C[gActiveBattler] = BattleScript_MoveSelectionImprisoned;
         limitations++;
     }
-    if (gBattleMons[gActiveBank].item == ITEM_ENIGMA_BERRY)
-        holdEffect = gEnigmaBerries[gActiveBank].holdEffect;
+    if (gBattleMons[gActiveBattler].item == ITEM_ENIGMA_BERRY)
+        holdEffect = gEnigmaBerries[gActiveBattler].holdEffect;
     else
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBank].item);
-    gStringBank = gActiveBank;
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
+    gStringBank = gActiveBattler;
     if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move)
     {
         gCurrentMove = *choicedMove;
-        gLastUsedItem = gBattleMons[gActiveBank].item;
-        gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionChoiceBanded;
+        gLastUsedItem = gBattleMons[gActiveBattler].item;
+        gUnknown_02024C1C[gActiveBattler] = BattleScript_MoveSelectionChoiceBanded;
         limitations++;
     }
-    if (gBattleMons[gActiveBank].pp[gBattleBufferB[gActiveBank][2]] == 0)
+    if (gBattleMons[gActiveBattler].pp[gBattleBufferB[gActiveBattler][2]] == 0)
     {
-        gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionNoPP;
+        gUnknown_02024C1C[gActiveBattler] = BattleScript_MoveSelectionNoPP;
         limitations++;
     }
     return limitations;
@@ -564,18 +564,18 @@ u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check)
 bool8 AreAllMovesUnusable(void)
 {
     u8 unusable;
-    unusable = CheckMoveLimitations(gActiveBank, 0, 0xFF);
+    unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
     if (unusable == 0xF) //all moves are unusable
     {
-        gProtectStructs[gActiveBank].onlyStruggle = 1;
-        gUnknown_02024C1C[gActiveBank] = BattleScript_NoMovesLeft;
+        gProtectStructs[gActiveBattler].onlyStruggle = 1;
+        gUnknown_02024C1C[gActiveBattler] = BattleScript_NoMovesLeft;
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-            gBattleBufferB[gActiveBank][3] = GetBankByIdentity((GetBankIdentity(gActiveBank) ^ 1) | (Random() & 2));
+            gBattleBufferB[gActiveBattler][3] = GetBankByIdentity((GetBankIdentity(gActiveBattler) ^ 1) | (Random() & 2));
         else
-            gBattleBufferB[gActiveBank][3] = GetBankByIdentity(GetBankIdentity(gActiveBank) ^ 1);
+            gBattleBufferB[gActiveBattler][3] = GetBankByIdentity(GetBankIdentity(gActiveBattler) ^ 1);
     }
     else
-        gProtectStructs[gActiveBank].onlyStruggle = 0;
+        gProtectStructs[gActiveBattler].onlyStruggle = 0;
     return (unusable == 0xF);
 }
 
@@ -638,7 +638,7 @@ u8 UpdateTurnCounters(void)
         case 1:
             while (gBattleStruct->turnSideTracker < 2)
             {
-                gActiveBank = gBankAttacker = sideBank = gBattleStruct->turnSideTracker;
+                gActiveBattler = gBankAttacker = sideBank = gBattleStruct->turnSideTracker;
 
                 if (gSideAffecting[sideBank] & SIDE_STATUS_REFLECT)
                 {
@@ -668,7 +668,7 @@ u8 UpdateTurnCounters(void)
         case 2:
             while (gBattleStruct->turnSideTracker < 2)
             {
-                gActiveBank = gBankAttacker = sideBank = gBattleStruct->turnSideTracker;
+                gActiveBattler = gBankAttacker = sideBank = gBattleStruct->turnSideTracker;
                 if (gSideAffecting[sideBank] & SIDE_STATUS_LIGHTSCREEN)
                 {
                     if (--gSideTimers[sideBank].lightscreenTimer == 0)
@@ -697,7 +697,7 @@ u8 UpdateTurnCounters(void)
         case 3:
             while (gBattleStruct->turnSideTracker < 2)
             {
-                gActiveBank = gBankAttacker = sideBank = gBattleStruct->turnSideTracker;
+                gActiveBattler = gBankAttacker = sideBank = gBattleStruct->turnSideTracker;
                 if (gSideTimers[sideBank].mistTimer && --gSideTimers[sideBank].mistTimer == 0)
                 {
                     gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST;
@@ -723,7 +723,7 @@ u8 UpdateTurnCounters(void)
         case 4:
             while (gBattleStruct->turnSideTracker < 2)
             {
-                gActiveBank = gBankAttacker = sideBank = gBattleStruct->turnSideTracker;
+                gActiveBattler = gBankAttacker = sideBank = gBattleStruct->turnSideTracker;
                 if (gSideAffecting[sideBank] & SIDE_STATUS_SAFEGUARD)
                 {
                     if (--gSideTimers[sideBank].safeguardTimer == 0)
@@ -746,10 +746,10 @@ u8 UpdateTurnCounters(void)
         case 5:
             while (gBattleStruct->turnSideTracker < gNoOfAllBanks)
             {
-                gActiveBank = gBanksByTurnOrder[gBattleStruct->turnSideTracker];
-                if (gWishFutureKnock.wishCounter[gActiveBank] && --gWishFutureKnock.wishCounter[gActiveBank] == 0 && gBattleMons[gActiveBank].hp)
+                gActiveBattler = gBanksByTurnOrder[gBattleStruct->turnSideTracker];
+                if (gWishFutureKnock.wishCounter[gActiveBattler] && --gWishFutureKnock.wishCounter[gActiveBattler] == 0 && gBattleMons[gActiveBattler].hp)
                 {
-                    gBankTarget = gActiveBank;
+                    gBankTarget = gActiveBattler;
                     BattleScriptExecute(BattleScript_WishComesTrue);
                     effect++;
                 }
@@ -856,8 +856,8 @@ u8 TurnBasedEffects(void)
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
     while (gBattleStruct->turnEffectsBank < gNoOfAllBanks && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
     {
-        gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->turnEffectsBank];
-        if (gAbsentBankFlags & gBitTable[gActiveBank])
+        gActiveBattler = gBankAttacker = gBanksByTurnOrder[gBattleStruct->turnEffectsBank];
+        if (gAbsentBankFlags & gBitTable[gActiveBattler])
         {
             gBattleStruct->turnEffectsBank++;
         }
@@ -866,11 +866,11 @@ u8 TurnBasedEffects(void)
             switch (gBattleStruct->turnEffectsTracker)
             {
             case 0:  // ingrain
-                if ((gStatuses3[gActiveBank] & STATUS3_ROOTED)
-                 && gBattleMons[gActiveBank].hp != gBattleMons[gActiveBank].maxHP
-                 && gBattleMons[gActiveBank].hp != 0)
+                if ((gStatuses3[gActiveBattler] & STATUS3_ROOTED)
+                 && gBattleMons[gActiveBattler].hp != gBattleMons[gActiveBattler].maxHP
+                 && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     gBattleMoveDamage *= -1;
@@ -880,25 +880,25 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 1:  // end turn abilities
-                if (AbilityBattleEffects(ABILITYEFFECT_ENDTURN, gActiveBank, 0, 0, 0))
+                if (AbilityBattleEffects(ABILITYEFFECT_ENDTURN, gActiveBattler, 0, 0, 0))
                     effect++;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 2:  // item effects
-                if (ItemBattleEffects(1, gActiveBank, 0))
+                if (ItemBattleEffects(1, gActiveBattler, 0))
                     effect++;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 18:  // item effects again
-                if (ItemBattleEffects(1, gActiveBank, 1))
+                if (ItemBattleEffects(1, gActiveBattler, 1))
                     effect++;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 3:  // leech seed
-                if (gStatuses3[gActiveBank] & STATUS3_LEECHSEED && gBattleMons[gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK].hp != 0 && gBattleMons[gActiveBank].hp != 0)
+                if (gStatuses3[gActiveBattler] & STATUS3_LEECHSEED && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK].hp != 0 && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBankTarget = gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
+                    gBankTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     gBattleStruct->animArg1 = gBankTarget;
@@ -909,9 +909,9 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 4:  // poison
-                if ((gBattleMons[gActiveBank].status1 & STATUS_POISON) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status1 & STATUS_POISON) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     BattleScriptExecute(BattleScript_PoisonTurnDmg);
@@ -920,23 +920,23 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 5:  // toxic poison
-                if ((gBattleMons[gActiveBank].status1 & STATUS_TOXIC_POISON) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status1 & STATUS_TOXIC_POISON) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    if ((gBattleMons[gActiveBank].status1 & 0xF00) != 0xF00) //not 16 turns
-                        gBattleMons[gActiveBank].status1 += 0x100;
-                    gBattleMoveDamage *= (gBattleMons[gActiveBank].status1 & 0xF00) >> 8;
+                    if ((gBattleMons[gActiveBattler].status1 & 0xF00) != 0xF00) //not 16 turns
+                        gBattleMons[gActiveBattler].status1 += 0x100;
+                    gBattleMoveDamage *= (gBattleMons[gActiveBattler].status1 & 0xF00) >> 8;
                     BattleScriptExecute(BattleScript_PoisonTurnDmg);
                     effect++;
                 }
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 6:  // burn
-                if ((gBattleMons[gActiveBank].status1 & STATUS_BURN) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status1 & STATUS_BURN) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     BattleScriptExecute(BattleScript_BurnTurnDmg);
@@ -945,10 +945,10 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 7:  // spooky nightmares
-                if ((gBattleMons[gActiveBank].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBattler].hp != 0)
                 {
                     // missing sleep check
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     BattleScriptExecute(BattleScript_NightmareTurnDmg);
@@ -957,9 +957,9 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 8:  // curse
-                if ((gBattleMons[gActiveBank].status2 & STATUS2_CURSED) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status2 & STATUS2_CURSED) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     BattleScriptExecute(BattleScript_CurseTurnDmg);
@@ -968,20 +968,20 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 9:  // wrap
-                if ((gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status2 & STATUS2_WRAPPED) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMons[gActiveBank].status2 -= 0x2000;
-                    if (gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED)  // damaged by wrap
+                    gBattleMons[gActiveBattler].status2 -= 0x2000;
+                    if (gBattleMons[gActiveBattler].status2 & STATUS2_WRAPPED)  // damaged by wrap
                     {
-                        gBattleStruct->animArg1 = ewram16004arr(0, gActiveBank);
-                        gBattleStruct->animArg2 = ewram16004arr(1, gActiveBank);
+                        gBattleStruct->animArg1 = ewram16004arr(0, gActiveBattler);
+                        gBattleStruct->animArg2 = ewram16004arr(1, gActiveBattler);
                         gBattleTextBuff1[0] = 0xFD;
                         gBattleTextBuff1[1] = 2;
-                        gBattleTextBuff1[2] = ewram16004arr(0, gActiveBank);
-                        gBattleTextBuff1[3] = ewram16004arr(1, gActiveBank);
+                        gBattleTextBuff1[2] = ewram16004arr(0, gActiveBattler);
+                        gBattleTextBuff1[3] = ewram16004arr(1, gActiveBattler);
                         gBattleTextBuff1[4] = EOS;
                         gBattlescriptCurrInstr = BattleScript_WrapTurnDmg;
-                        gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16;
+                        gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 16;
                         if (gBattleMoveDamage == 0)
                             gBattleMoveDamage = 1;
                     }
@@ -989,8 +989,8 @@ u8 TurnBasedEffects(void)
                     {
                         gBattleTextBuff1[0] = 0xFD;
                         gBattleTextBuff1[1] = 2;
-                        gBattleTextBuff1[2] = ewram16004arr(0, gActiveBank);
-                        gBattleTextBuff1[3] = ewram16004arr(1, gActiveBank);
+                        gBattleTextBuff1[2] = ewram16004arr(0, gActiveBattler);
+                        gBattleTextBuff1[3] = ewram16004arr(1, gActiveBattler);
                         gBattleTextBuff1[4] = EOS;
                         gBattlescriptCurrInstr = BattleScript_WrapEnds;
                     }
@@ -1000,7 +1000,7 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 10:  // uproar
-                if (gBattleMons[gActiveBank].status2 & STATUS2_UPROAR)
+                if (gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR)
                 {
                     for (gBankAttacker = 0; gBankAttacker < gNoOfAllBanks; gBankAttacker++)
                     {
@@ -1011,9 +1011,9 @@ u8 TurnBasedEffects(void)
                             gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                             BattleScriptExecute(BattleScript_MonWokeUpInUproar);
-                            gActiveBank = gBankAttacker;
-                            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-                            MarkBufferBankForExecution(gActiveBank);
+                            gActiveBattler = gBankAttacker;
+                            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                            MarkBufferBankForExecution(gActiveBattler);
                             break;
                         }
                     }
@@ -1024,22 +1024,22 @@ u8 TurnBasedEffects(void)
                     }
                     else
                     {
-                        gBankAttacker = gActiveBank;
-                        gBattleMons[gActiveBank].status2 -= 0x10;  // uproar timer goes down
-                        if (WasUnableToUseMove(gActiveBank))
+                        gBankAttacker = gActiveBattler;
+                        gBattleMons[gActiveBattler].status2 -= 0x10;  // uproar timer goes down
+                        if (WasUnableToUseMove(gActiveBattler))
                         {
-                            CancelMultiTurnMoves(gActiveBank);
+                            CancelMultiTurnMoves(gActiveBattler);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                         }
-                        else if (gBattleMons[gActiveBank].status2 & STATUS2_UPROAR)
+                        else if (gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR)
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-                            gBattleMons[gActiveBank].status2 |= STATUS2_MULTIPLETURNS;
+                            gBattleMons[gActiveBattler].status2 |= STATUS2_MULTIPLETURNS;
                         }
                         else
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                            CancelMultiTurnMoves(gActiveBank);
+                            CancelMultiTurnMoves(gActiveBattler);
                         }
                         BattleScriptExecute(BattleScript_PrintUproarOverTurns);
                         effect = 1;
@@ -1049,20 +1049,20 @@ u8 TurnBasedEffects(void)
                     gBattleStruct->turnEffectsTracker++;
                 break;
             case 11:  // thrash
-                if (gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE)
+                if (gBattleMons[gActiveBattler].status2 & STATUS2_LOCK_CONFUSE)
                 {
-                    gBattleMons[gActiveBank].status2 -= 0x400;
-                    if (WasUnableToUseMove(gActiveBank))
-                        CancelMultiTurnMoves(gActiveBank);
-                    else if (!(gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE)
-                     && (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS))
+                    gBattleMons[gActiveBattler].status2 -= 0x400;
+                    if (WasUnableToUseMove(gActiveBattler))
+                        CancelMultiTurnMoves(gActiveBattler);
+                    else if (!(gBattleMons[gActiveBattler].status2 & STATUS2_LOCK_CONFUSE)
+                     && (gBattleMons[gActiveBattler].status2 & STATUS2_MULTIPLETURNS))
                     {
-                        gBattleMons[gActiveBank].status2 &= ~(STATUS2_MULTIPLETURNS);
-                        if (!(gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION))
+                        gBattleMons[gActiveBattler].status2 &= ~(STATUS2_MULTIPLETURNS);
+                        if (!(gBattleMons[gActiveBattler].status2 & STATUS2_CONFUSION))
                         {
                             gBattleCommunication[MOVE_EFFECT_BYTE] = 0x47;
                             SetMoveEffect(1, 0);
-                            if (gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION)
+                            if (gBattleMons[gActiveBattler].status2 & STATUS2_CONFUSION)
                                 BattleScriptExecute(BattleScript_ThrashConfuses);
                             effect++;
                         }
@@ -1071,22 +1071,22 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 12:  // disable
-                if (gDisableStructs[gActiveBank].disableTimer1 != 0)
+                if (gDisableStructs[gActiveBattler].disableTimer1 != 0)
                 {
                     int i;
                     for (i = 0; i < 4; i++)
                     {
-                        if (gDisableStructs[gActiveBank].disabledMove == gBattleMons[gActiveBank].moves[i])
+                        if (gDisableStructs[gActiveBattler].disabledMove == gBattleMons[gActiveBattler].moves[i])
                             break;
                     }
                     if (i == 4)  // pokemon does not have the disabled move anymore
                     {
-                        gDisableStructs[gActiveBank].disabledMove = 0;
-                        gDisableStructs[gActiveBank].disableTimer1 = 0;
+                        gDisableStructs[gActiveBattler].disabledMove = 0;
+                        gDisableStructs[gActiveBattler].disableTimer1 = 0;
                     }
-                    else if (--gDisableStructs[gActiveBank].disableTimer1 == 0)  // disable ends
+                    else if (--gDisableStructs[gActiveBattler].disableTimer1 == 0)  // disable ends
                     {
-                        gDisableStructs[gActiveBank].disabledMove = 0;
+                        gDisableStructs[gActiveBattler].disabledMove = 0;
                         BattleScriptExecute(BattleScript_DisabledNoMore);
                         effect++;
                     }
@@ -1094,18 +1094,18 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 13:  // encore
-                if (gDisableStructs[gActiveBank].encoreTimer1 != 0)
+                if (gDisableStructs[gActiveBattler].encoreTimer1 != 0)
                 {
-                    if (gBattleMons[gActiveBank].moves[gDisableStructs[gActiveBank].encoredMovePos] != gDisableStructs[gActiveBank].encoredMove)  // pokemon does not have the encored move anymore
+                    if (gBattleMons[gActiveBattler].moves[gDisableStructs[gActiveBattler].encoredMovePos] != gDisableStructs[gActiveBattler].encoredMove)  // pokemon does not have the encored move anymore
                     {
-                        gDisableStructs[gActiveBank].encoredMove = 0;
-                        gDisableStructs[gActiveBank].encoreTimer1 = 0;
+                        gDisableStructs[gActiveBattler].encoredMove = 0;
+                        gDisableStructs[gActiveBattler].encoreTimer1 = 0;
                     }
-                    else if (--gDisableStructs[gActiveBank].encoreTimer1 == 0
-                     || gBattleMons[gActiveBank].pp[gDisableStructs[gActiveBank].encoredMovePos] == 0)
+                    else if (--gDisableStructs[gActiveBattler].encoreTimer1 == 0
+                     || gBattleMons[gActiveBattler].pp[gDisableStructs[gActiveBattler].encoredMovePos] == 0)
                     {
-                        gDisableStructs[gActiveBank].encoredMove = 0;
-                        gDisableStructs[gActiveBank].encoreTimer1 = 0;
+                        gDisableStructs[gActiveBattler].encoredMove = 0;
+                        gDisableStructs[gActiveBattler].encoreTimer1 = 0;
                         BattleScriptExecute(BattleScript_EncoredNoMore);
                         effect++;
                     }
@@ -1113,33 +1113,33 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 14:  // lock-on decrement
-                if (gStatuses3[gActiveBank] & STATUS3_ALWAYS_HITS)
-                    gStatuses3[gActiveBank] -= 0x8;
+                if (gStatuses3[gActiveBattler] & STATUS3_ALWAYS_HITS)
+                    gStatuses3[gActiveBattler] -= 0x8;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 15:  // charge
-                if (gDisableStructs[gActiveBank].chargeTimer1 && --gDisableStructs[gActiveBank].chargeTimer1 == 0)
-                    gStatuses3[gActiveBank] &= ~STATUS3_CHARGED_UP;
+                if (gDisableStructs[gActiveBattler].chargeTimer1 && --gDisableStructs[gActiveBattler].chargeTimer1 == 0)
+                    gStatuses3[gActiveBattler] &= ~STATUS3_CHARGED_UP;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 16:  // taunt
-                if (gDisableStructs[gActiveBank].tauntTimer1)
-                    gDisableStructs[gActiveBank].tauntTimer1--;
+                if (gDisableStructs[gActiveBattler].tauntTimer1)
+                    gDisableStructs[gActiveBattler].tauntTimer1--;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 17:  // yawn
-                if (gStatuses3[gActiveBank] & STATUS3_YAWN)
-                {
-                    gStatuses3[gActiveBank] -= 0x800;
-                    if (!(gStatuses3[gActiveBank] & STATUS3_YAWN) && !(gBattleMons[gActiveBank].status1 & STATUS_ANY)
-                     && gBattleMons[gActiveBank].ability != ABILITY_VITAL_SPIRIT
-                     && gBattleMons[gActiveBank].ability != ABILITY_INSOMNIA && !UproarWakeUpCheck(gActiveBank))
-                    {
-                        CancelMultiTurnMoves(gActiveBank);
-                        gBattleMons[gActiveBank].status1 |= (Random() & 3) + 2;
-                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-                        MarkBufferBankForExecution(gActiveBank);
-                        gEffectBank = gActiveBank;
+                if (gStatuses3[gActiveBattler] & STATUS3_YAWN)
+                {
+                    gStatuses3[gActiveBattler] -= 0x800;
+                    if (!(gStatuses3[gActiveBattler] & STATUS3_YAWN) && !(gBattleMons[gActiveBattler].status1 & STATUS_ANY)
+                     && gBattleMons[gActiveBattler].ability != ABILITY_VITAL_SPIRIT
+                     && gBattleMons[gActiveBattler].ability != ABILITY_INSOMNIA && !UproarWakeUpCheck(gActiveBattler))
+                    {
+                        CancelMultiTurnMoves(gActiveBattler);
+                        gBattleMons[gActiveBattler].status1 |= (Random() & 3) + 2;
+                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                        MarkBufferBankForExecution(gActiveBattler);
+                        gEffectBank = gActiveBattler;
                         BattleScriptExecute(BattleScript_YawnMakesAsleep);
                         effect++;
                     }
@@ -1167,26 +1167,26 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
     case 0: // future sight
         while (gBattleStruct->sub80170DC_Bank < gNoOfAllBanks)
         {
-            gActiveBank = gBattleStruct->sub80170DC_Bank;
-            if (gAbsentBankFlags & gBitTable[gActiveBank])
+            gActiveBattler = gBattleStruct->sub80170DC_Bank;
+            if (gAbsentBankFlags & gBitTable[gActiveBattler])
                 gBattleStruct->sub80170DC_Bank++;
             else
             {
                 gBattleStruct->sub80170DC_Bank++;
-                if (gWishFutureKnock.futureSightCounter[gActiveBank] && --gWishFutureKnock.futureSightCounter[gActiveBank] == 0 && gBattleMons[gActiveBank].hp)
+                if (gWishFutureKnock.futureSightCounter[gActiveBattler] && --gWishFutureKnock.futureSightCounter[gActiveBattler] == 0 && gBattleMons[gActiveBattler].hp)
                 {
-                    if (gWishFutureKnock.futureSightMove[gActiveBank] == MOVE_FUTURE_SIGHT)
+                    if (gWishFutureKnock.futureSightMove[gActiveBattler] == MOVE_FUTURE_SIGHT)
                         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                     else //Doom Desire
                         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                     gBattleTextBuff1[0] = 0xFD;
                     gBattleTextBuff1[1] = 2;
-                    gBattleTextBuff1[2] = gWishFutureKnock.futureSightMove[gActiveBank];
-                    gBattleTextBuff1[3] = gWishFutureKnock.futureSightMove[gActiveBank] >> 8;
+                    gBattleTextBuff1[2] = gWishFutureKnock.futureSightMove[gActiveBattler];
+                    gBattleTextBuff1[3] = gWishFutureKnock.futureSightMove[gActiveBattler] >> 8;
                     gBattleTextBuff1[4] = 0xFF;
-                    gBankTarget = gActiveBank;
-                    gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank];
-                    gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank];
+                    gBankTarget = gActiveBattler;
+                    gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler];
+                    gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler];
                     gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF;
                     BattleScriptExecute(BattleScript_MonTookFutureAttack);
                     return 1;
@@ -1198,29 +1198,29 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
     case 1: // perish song
         while (gBattleStruct->sub80170DC_Bank < gNoOfAllBanks)
         {
-            gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->sub80170DC_Bank];
-            if (gAbsentBankFlags & gBitTable[gActiveBank])
+            gActiveBattler = gBankAttacker = gBanksByTurnOrder[gBattleStruct->sub80170DC_Bank];
+            if (gAbsentBankFlags & gBitTable[gActiveBattler])
                 gBattleStruct->sub80170DC_Bank++;
             else
             {
                 gBattleStruct->sub80170DC_Bank++;
-                if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG)
+                if (gStatuses3[gActiveBattler] & STATUS3_PERISH_SONG)
                 {
                     gBattleTextBuff1[0] = 0xFD;
                     gBattleTextBuff1[1] = 1;
                     gBattleTextBuff1[2] = 1;
                     gBattleTextBuff1[3] = 1;
-                    gBattleTextBuff1[4] = gDisableStructs[gActiveBank].perishSong1;
+                    gBattleTextBuff1[4] = gDisableStructs[gActiveBattler].perishSongTimer1;
                     gBattleTextBuff1[5] = 0xFF;
-                    if (gDisableStructs[gActiveBank].perishSong1 == 0)
+                    if (gDisableStructs[gActiveBattler].perishSongTimer1 == 0)
                     {
-                        gStatuses3[gActiveBank] &= ~(STATUS3_PERISH_SONG);
-                        gBattleMoveDamage = gBattleMons[gActiveBank].hp;
+                        gStatuses3[gActiveBattler] &= ~(STATUS3_PERISH_SONG);
+                        gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
                         gBattlescriptCurrInstr = BattleScript_PerishSongHits;
                     }
                     else
                     {
-                        gDisableStructs[gActiveBank].perishSong1--;
+                        gDisableStructs[gActiveBattler].perishSongTimer1--;
                         gBattlescriptCurrInstr = BattleScript_PerishSongTimerGoesDown;
                     }
                     BattleScriptExecute(gBattlescriptCurrInstr);
@@ -1579,9 +1579,9 @@ u8 AtkCanceller_UnableToUseMove(void)
 
     if (effect == 2)
     {
-        gActiveBank = gBankAttacker;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = gBankAttacker;
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBufferBankForExecution(gActiveBattler);
     }
     return effect;
 }
@@ -1888,10 +1888,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         gBattleMons[bank].status1 = 0;
                         // BUG: The nightmare status does not get cleared here. This was fixed in Emerald.
                         //gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
-                        gBattleStruct->scriptingActive = gActiveBank = bank;
+                        gBattleStruct->scriptingActive = gActiveBattler = bank;
                         BattleScriptPushCursorAndCallback(BattleScript_ShedSkinActivates);
                         EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
-                        MarkBufferBankForExecution(gActiveBank);
+                        MarkBufferBankForExecution(gActiveBattler);
                         effect++;
                     }
                     break;
@@ -2300,9 +2300,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         BattleScriptPushCursor();
                         gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus;
                         gBattleStruct->scriptingActive = bank;
-                        gActiveBank = bank;
-                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-                        MarkBufferBankForExecution(gActiveBank);
+                        gActiveBattler = bank;
+                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                        MarkBufferBankForExecution(gActiveBattler);
                         return effect;
                     }
                 }
@@ -2384,29 +2384,29 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0
                          && gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0)
                         {
-                            gActiveBank = GetBankByIdentity(((Random() & 1) * 2) | side);
-                            gBattleMons[i].ability = gBattleMons[gActiveBank].ability;
-                            gLastUsedAbility = gBattleMons[gActiveBank].ability;
+                            gActiveBattler = GetBankByIdentity(((Random() & 1) * 2) | side);
+                            gBattleMons[i].ability = gBattleMons[gActiveBattler].ability;
+                            gLastUsedAbility = gBattleMons[gActiveBattler].ability;
                             effect++;
                         }
                         else if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0)
                         {
-                            gActiveBank = target1;
-                            gBattleMons[i].ability = gBattleMons[gActiveBank].ability;
-                            gLastUsedAbility = gBattleMons[gActiveBank].ability;
+                            gActiveBattler = target1;
+                            gBattleMons[i].ability = gBattleMons[gActiveBattler].ability;
+                            gLastUsedAbility = gBattleMons[gActiveBattler].ability;
                             effect++;
                         }
                         else if (gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0)
                         {
-                            gActiveBank = target2;
-                            gBattleMons[i].ability = gBattleMons[gActiveBank].ability;
-                            gLastUsedAbility = gBattleMons[gActiveBank].ability;
+                            gActiveBattler = target2;
+                            gBattleMons[i].ability = gBattleMons[gActiveBattler].ability;
+                            gLastUsedAbility = gBattleMons[gActiveBattler].ability;
                             effect++;
                         }
                     }
                     else
                     {
-                        gActiveBank = target1;
+                        gActiveBattler = target1;
                         if (gBattleMons[target1].ability && gBattleMons[target1].hp)
                         {
                             gBattleMons[i].ability = gBattleMons[target1].ability;
@@ -2422,8 +2422,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
 
                         gBattleTextBuff1[0] = 0xFD;
                         gBattleTextBuff1[1] = 4;
-                        gBattleTextBuff1[2] = gActiveBank;
-                        gBattleTextBuff1[3] = gBattlePartyID[gActiveBank];
+                        gBattleTextBuff1[2] = gActiveBattler;
+                        gBattleTextBuff1[3] = gBattlePartyID[gActiveBattler];
                         gBattleTextBuff1[4] = EOS;
 
                         gBattleTextBuff2[0] = 0xFD;
@@ -2663,7 +2663,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             {
                 gBattleStruct->scriptingActive = bank;
                 gStringBank = bank;
-                gActiveBank = gBankAttacker = bank;
+                gActiveBattler = gBankAttacker = bank;
                 BattleScriptExecute(BattleScript_WhiteHerbEnd2);
             }
             break;
@@ -2718,7 +2718,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         gBattleTextBuff1[4] = 0xFF;
                         BattleScriptExecute(BattleScript_BerryPPHealEnd2);
                         EmitSetMonData(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
-                        MarkBufferBankForExecution(gActiveBank);
+                        MarkBufferBankForExecution(gActiveBattler);
                         effect = ITEM_PP_CHANGE;
                     }
                 }
@@ -2736,7 +2736,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 {
                     gBattleStruct->scriptingActive = bank;
                     gStringBank = bank;
-                    gActiveBank = gBankAttacker = bank;
+                    gActiveBattler = gBankAttacker = bank;
                     BattleScriptExecute(BattleScript_WhiteHerbEnd2);
                 }
                 break;
@@ -3097,12 +3097,12 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             {
                 gBattleStruct->scriptingActive = bank;
                 gStringBank = bank;
-                gActiveBank = gBankAttacker = bank;
+                gActiveBattler = gBankAttacker = bank;
                 switch (effect)
                 {
                 case ITEM_STATUS_CHANGE:
                     EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                     break;
                 case ITEM_PP_CHANGE:
                     if (!(gBattleMons[bank].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[bank].unk18_b & gBitTable[i]))
@@ -3255,9 +3255,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             {
                 gBattleStruct->scriptingActive = bank;
                 gStringBank = bank;
-                gActiveBank = bank;
-                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-                MarkBufferBankForExecution(gActiveBank);
+                gActiveBattler = bank;
+                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                MarkBufferBankForExecution(gActiveBattler);
                 break;
             }
         }
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index 20c6d8676..15b65fa81 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -19,7 +19,7 @@
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern u16 gBattleTypeFlags;
 extern u8 gBankTarget;
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u16 gBattlePartyID[];
 extern u8 gBankSpriteIds[];
 extern u8 gDoingBattleAnim;
@@ -333,11 +333,11 @@ u8 sub_8046400(u16 a, u8 b)
     u8 taskId;
 
     gDoingBattleAnim = 1;
-    ewram17810[gActiveBank].unk0_3 = 1;
+    ewram17810[gActiveBattler].unk0_3 = 1;
     taskId = CreateTask(sub_8046464, 5);
     gTasks[taskId].data[1] = a;
     gTasks[taskId].data[2] = b;
-    gTasks[taskId].data[3] = gActiveBank;
+    gTasks[taskId].data[3] = gActiveBattler;
     return 0;
 }
 
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 17f073815..5b3e6ddad 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -22,7 +22,7 @@ extern u8 gPlayerPartyCount;
 extern u8 gEnemyPartyCount;
 
 extern u16 gBattleTypeFlags;
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern struct BattlePokemon gBattleMons[4];
 extern u16 gCurrentMove;
 extern u8 gLastUsedAbility;
@@ -60,7 +60,7 @@ u8 CountAliveMons(u8 a1)
     case 0:
         for (i = 0; i < 4; i++)
         {
-            if (i != gActiveBank && !(gAbsentBankFlags & gBitTable[i]))
+            if (i != gActiveBattler && !(gAbsentBankFlags & gBitTable[i]))
                 retVal++;
         }
         break;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 9346031a6..81a588e8e 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -28,7 +28,7 @@
 extern u8 gPlayerPartyCount;
 extern u8 gEnemyPartyCount;
 extern struct BattlePokemon gBattleMons[4];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern struct BattleEnigmaBerry gEnigmaBerries[];
 extern u16 gSpeciesToHoennPokedexNum[];
 extern u16 gSpeciesToNationalPokedexNum[];
@@ -95,7 +95,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
 
     if (itemId == ITEM_ENIGMA_BERRY)
     {
-        temp = gEnigmaBerries[gActiveBank].itemEffect;
+        temp = gEnigmaBerries[gActiveBattler].itemEffect;
     }
 
     itemEffect = temp;
diff --git a/src/pokemon_item_effect.c b/src/pokemon_item_effect.c
index 4ebece3b3..3b72ab739 100644
--- a/src/pokemon_item_effect.c
+++ b/src/pokemon_item_effect.c
@@ -20,7 +20,7 @@ extern u8 gAbsentBankFlags;
 extern u8 gBankInMenu;
 extern u8 gNoOfAllBanks;
 extern u16 gBattlePartyID[];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u8 gStringBank;
 extern struct BattlePokemon gBattleMons[];
 extern struct BattleEnigmaBerry gEnigmaBerries[];
@@ -78,8 +78,8 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
     gStringBank = gBankInMenu;
     if (gMain.inBattle)
     {
-        gActiveBank = gBankInMenu;
-        cmdIndex = (GetBankSide(gActiveBank) != 0);
+        gActiveBattler = gBankInMenu;
+        cmdIndex = (GetBankSide(gActiveBattler) != 0);
         while (cmdIndex < gNoOfAllBanks)
         {
             if (gBattlePartyID[cmdIndex] == partyIndex)
@@ -92,7 +92,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
     }
     else
     {
-        gActiveBank = 0;
+        gActiveBattler = 0;
         sp34 = 4;
     }
 
@@ -104,7 +104,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
     if (item == ITEM_ENIGMA_BERRY)
     {
         if (gMain.inBattle)
-            itemEffect = gEnigmaBerries[gActiveBank].itemEffect;
+            itemEffect = gEnigmaBerries[gActiveBattler].itemEffect;
         else
             itemEffect = gSaveBlock1.enigmaBerry.itemEffect;
     }
@@ -126,63 +126,63 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
                 retVal = FALSE;
             }
             if ((itemEffect[cmdIndex] & 0x30)
-             && !(gBattleMons[gActiveBank].status2 & STATUS2_FOCUS_ENERGY))
+             && !(gBattleMons[gActiveBattler].status2 & STATUS2_FOCUS_ENERGY))
             {
-                gBattleMons[gActiveBank].status2 |= STATUS2_FOCUS_ENERGY;
+                gBattleMons[gActiveBattler].status2 |= STATUS2_FOCUS_ENERGY;
                 retVal = FALSE;
             }
             if ((itemEffect[cmdIndex] & 0xF)
-             && gBattleMons[gActiveBank].statStages[STAT_STAGE_ATK] < 12)
+             && gBattleMons[gActiveBattler].statStages[STAT_STAGE_ATK] < 12)
             {
-                gBattleMons[gActiveBank].statStages[STAT_STAGE_ATK] += itemEffect[cmdIndex] & 0xF;
-                if (gBattleMons[gActiveBank].statStages[STAT_STAGE_ATK] > 12)
-                    gBattleMons[gActiveBank].statStages[STAT_STAGE_ATK] = 12;
+                gBattleMons[gActiveBattler].statStages[STAT_STAGE_ATK] += itemEffect[cmdIndex] & 0xF;
+                if (gBattleMons[gActiveBattler].statStages[STAT_STAGE_ATK] > 12)
+                    gBattleMons[gActiveBattler].statStages[STAT_STAGE_ATK] = 12;
                 retVal = FALSE;
             }
             break;
         // in-battle stat boosting effects?
         case 1:
             if ((itemEffect[cmdIndex] & 0xF0)
-             && gBattleMons[gActiveBank].statStages[STAT_STAGE_DEF] < 12)
+             && gBattleMons[gActiveBattler].statStages[STAT_STAGE_DEF] < 12)
             {
-                gBattleMons[gActiveBank].statStages[STAT_STAGE_DEF] += (itemEffect[cmdIndex] & 0xF0) >> 4;
-                if (gBattleMons[gActiveBank].statStages[STAT_STAGE_DEF] > 12)
-                    gBattleMons[gActiveBank].statStages[STAT_STAGE_DEF] = 12;
+                gBattleMons[gActiveBattler].statStages[STAT_STAGE_DEF] += (itemEffect[cmdIndex] & 0xF0) >> 4;
+                if (gBattleMons[gActiveBattler].statStages[STAT_STAGE_DEF] > 12)
+                    gBattleMons[gActiveBattler].statStages[STAT_STAGE_DEF] = 12;
                 retVal = FALSE;
             }
             if ((itemEffect[cmdIndex] & 0xF)
-             && gBattleMons[gActiveBank].statStages[STAT_STAGE_SPEED] < 12)
+             && gBattleMons[gActiveBattler].statStages[STAT_STAGE_SPEED] < 12)
             {
-                gBattleMons[gActiveBank].statStages[STAT_STAGE_SPEED] += itemEffect[cmdIndex] & 0xF;
-                if (gBattleMons[gActiveBank].statStages[STAT_STAGE_SPEED] > 12)
-                    gBattleMons[gActiveBank].statStages[STAT_STAGE_SPEED] = 12;
+                gBattleMons[gActiveBattler].statStages[STAT_STAGE_SPEED] += itemEffect[cmdIndex] & 0xF;
+                if (gBattleMons[gActiveBattler].statStages[STAT_STAGE_SPEED] > 12)
+                    gBattleMons[gActiveBattler].statStages[STAT_STAGE_SPEED] = 12;
                 retVal = FALSE;
             }
             break;
         // more stat boosting effects?
         case 2:
             if ((itemEffect[cmdIndex] & 0xF0)
-             && gBattleMons[gActiveBank].statStages[STAT_STAGE_ACC] < 12)
+             && gBattleMons[gActiveBattler].statStages[STAT_STAGE_ACC] < 12)
             {
-                gBattleMons[gActiveBank].statStages[STAT_STAGE_ACC] += (itemEffect[cmdIndex] & 0xF0) >> 4;
-                if (gBattleMons[gActiveBank].statStages[STAT_STAGE_ACC] > 12)
-                    gBattleMons[gActiveBank].statStages[STAT_STAGE_ACC] = 12;
+                gBattleMons[gActiveBattler].statStages[STAT_STAGE_ACC] += (itemEffect[cmdIndex] & 0xF0) >> 4;
+                if (gBattleMons[gActiveBattler].statStages[STAT_STAGE_ACC] > 12)
+                    gBattleMons[gActiveBattler].statStages[STAT_STAGE_ACC] = 12;
                 retVal = FALSE;
             }
             if ((itemEffect[cmdIndex] & 0xF)
-             && gBattleMons[gActiveBank].statStages[STAT_STAGE_SPATK] < 12)
+             && gBattleMons[gActiveBattler].statStages[STAT_STAGE_SPATK] < 12)
             {
-                gBattleMons[gActiveBank].statStages[STAT_STAGE_SPATK] += itemEffect[cmdIndex] & 0xF;
-                if (gBattleMons[gActiveBank].statStages[STAT_STAGE_SPATK] > 12)
-                    gBattleMons[gActiveBank].statStages[STAT_STAGE_SPATK] = 12;
+                gBattleMons[gActiveBattler].statStages[STAT_STAGE_SPATK] += itemEffect[cmdIndex] & 0xF;
+                if (gBattleMons[gActiveBattler].statStages[STAT_STAGE_SPATK] > 12)
+                    gBattleMons[gActiveBattler].statStages[STAT_STAGE_SPATK] = 12;
                 retVal = FALSE;
             }
             break;
         case 3:
             if ((itemEffect[cmdIndex] & 0x80)
-             && gSideTimers[GetBankSide(gActiveBank)].mistTimer == 0)
+             && gSideTimers[GetBankSide(gActiveBattler)].mistTimer == 0)
             {
-                gSideTimers[GetBankSide(gActiveBank)].mistTimer = 5;
+                gSideTimers[GetBankSide(gActiveBattler)].mistTimer = 5;
                 retVal = FALSE;
             }
             if ((itemEffect[cmdIndex] & 0x40)  // raise level
@@ -280,13 +280,13 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
                                 {
                                     gAbsentBankFlags &= ~gBitTable[sp34];
                                     CopyPlayerPartyMonToBattleData(sp34, pokemon_order_func(gBattlePartyID[sp34]));
-                                    if (GetBankSide(gActiveBank) == 0 && gBattleResults.unk4 < 255)
+                                    if (GetBankSide(gActiveBattler) == 0 && gBattleResults.unk4 < 255)
                                         gBattleResults.unk4++;
                                 }
                                 else
                                 {
-                                    gAbsentBankFlags &= ~gBitTable[gActiveBank ^ 2];
-                                    if (GetBankSide(gActiveBank) == 0 && gBattleResults.unk4 < 255)
+                                    gAbsentBankFlags &= ~gBitTable[gActiveBattler ^ 2];
+                                    if (GetBankSide(gActiveBattler) == 0 && gBattleResults.unk4 < 255)
                                         gBattleResults.unk4++;
                                 }
                             }
@@ -325,16 +325,16 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
                                 if (gMain.inBattle && sp34 != 4)
                                 {
                                     gBattleMons[sp34].hp = data;
-                                    if (!(r10 & 0x10) && GetBankSide(gActiveBank) == 0)
+                                    if (!(r10 & 0x10) && GetBankSide(gActiveBattler) == 0)
                                     {
                                         if (gBattleResults.unk3 < 255)
                                             gBattleResults.unk3++;
                                         // I have to re-use this variable to match.
-                                        r5 = gActiveBank;
-                                        gActiveBank = sp34;
+                                        r5 = gActiveBattler;
+                                        gActiveBattler = sp34;
                                         EmitGetAttributes(0, 0, 0);
-                                        MarkBufferBankForExecution(gActiveBank);
-                                        gActiveBank = r5;
+                                        MarkBufferBankForExecution(gActiveBattler);
+                                        gActiveBattler = r5;
                                     }
                                 }
                             }
diff --git a/src/rom3.c b/src/rom3.c
index 7b3051b86..58b64cebd 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -30,7 +30,7 @@ static EWRAM_DATA u8 gUnknown_020238C6 = 0;
 extern u32 gUnknown_020239FC;
 extern u8 gBattleBufferA[][0x200];
 extern u8 gBattleBufferB[][0x200];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u32 gBattleExecBuffer;
 extern u8 gNoOfAllBanks;
 extern u16 gBattlePartyID[];
@@ -371,14 +371,14 @@ void PrepareBufferDataTransfer(u8 a, u8 *data, u16 size)
         case 0:
             for (i = 0; i < size; i++)
             {
-                gBattleBufferA[gActiveBank][i] = *data;
+                gBattleBufferA[gActiveBattler][i] = *data;
                 data++;
             }
             break;
         case 1:
             for (i = 0; i < size; i++)
             {
-                gBattleBufferB[gActiveBank][i] = *data;
+                gBattleBufferB[gActiveBattler][i] = *data;
                 data++;
             }
             break;
@@ -416,7 +416,7 @@ void PrepareBufferDataTransferLink(u8 a, u16 size, u8 *data)
     }
 
     ewram14000arr(0, gTasks[gUnknown_020238C4].data[14]) = a;
-    ewram14000arr(1, gTasks[gUnknown_020238C4].data[14]) = gActiveBank;
+    ewram14000arr(1, gTasks[gUnknown_020238C4].data[14]) = gActiveBattler;
     ewram14000arr(2, gTasks[gUnknown_020238C4].data[14]) = gBankAttacker;
     ewram14000arr(3, gTasks[gUnknown_020238C4].data[14]) = gBankTarget;
     ewram14000arr(4, gTasks[gUnknown_020238C4].data[14]) = r9;