1 files changed, 12 insertions, 33 deletions

diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 3c8b1563f..2b918d018 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -12,34 +12,14 @@
 #include "constants/abilities.h"
 #include "battle_message.h"
 
-extern u32 gBattleExecBuffer;
-extern void (*gBattleBankFunc[4])(void);
-extern u8 gBanksByIdentity[4];
-extern u8 gActionSelectionCursor[4];
-extern u8 gMoveSelectionCursor[4];
-extern u8 gNoOfAllBanks;
-extern u8 gActiveBank;
-extern u16 gBattlePartyID[4];
-extern u8 gBattleBufferA[4][0x200];
-extern u8 gBattleBufferB[4][0x200];
 extern u8 gUnknown_02022D08;
 extern u8 gUnknown_02022D09;
 extern u8 gUnknown_02022D0A;
-extern u8 gBankAttacker;
-extern u8 gBankTarget;
-extern u8 gAbsentBankFlags;
-extern u8 gEffectBank;
-extern struct BattlePokemon gBattleMons[4];
-extern u16 gLastUsedMove;
-extern u8 gStringBank;
-extern u8 gBattleBuffersTransferData[0x100];
 
 static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {};
 
-extern const struct BattleMove gBattleMoves[];
-
 extern void task00_08081A90(u8 taskId); // cable_club
-extern void sub_81B8D64(u8 bank, u8 arg1); // party_menu
+extern void sub_81B8D64(u8 battlerId, u8 arg1); // party_menu
 
 // this file's funcionts
 static void CreateTasksForSendRecvLinkBuffers(void);
@@ -97,7 +77,6 @@ void SetUpBattleVarsAndBirchZigzagoon(void)
 void sub_8032768(void)
 {
     s32 i;
-    u8 *data;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
         sub_8184DA4(1);
@@ -120,11 +99,11 @@ void sub_8032768(void)
             sub_81B8D64(i, 0);
     }
 
-    for (i = 0; i < sizeof(gBattleStruct->field_1A4); i++)
-        *(gBattleStruct->field_1A4 + i) = 0;
+    for (i = 0; i < sizeof(gBattleStruct->tvMovePoints); i++)
+        *((u8*)(&gBattleStruct->tvMovePoints) + i) = 0;
 
-    for (i = 0; i < sizeof(gBattleStruct->field_204); i++)
-        *(gBattleStruct->field_204 + i) = 0;
+    for (i = 0; i < sizeof(gBattleStruct->tv); i++)
+        *((u8*)(&gBattleStruct->tv) + i) = 0;
 }
 
 static void InitSinglePlayerBtlControllers(void)
@@ -887,7 +866,7 @@ void sub_8033648(void)
 static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
 {
     u16 blockSize;
-    u8 bank;
+    u8 battlerId;
     u8 var;
 
     if (gTasks[taskId].data[15] != gTasks[taskId].data[14])
@@ -898,17 +877,17 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
             gTasks[taskId].data[12] = 0;
             gTasks[taskId].data[15] = 0;
         }
-        bank = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_ACTIVE_BANK];
+        battlerId = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_ACTIVE_BANK];
         blockSize = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_SIZE_LO] | (gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_SIZE_HI] << 8);
 
         switch (gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 0])
         {
         case 0:
-            if (gBattleControllerExecFlags & gBitTable[bank])
+            if (gBattleControllerExecFlags & gBitTable[battlerId])
                 return;
 
-            memcpy(gBattleBufferA[bank], &gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 8], blockSize);
-            sub_803F850(bank);
+            memcpy(gBattleBufferA[battlerId], &gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 8], blockSize);
+            sub_803F850(battlerId);
 
             if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
             {
@@ -919,11 +898,11 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
             }
             break;
         case 1:
-            memcpy(gBattleBufferB[bank], &gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 8], blockSize);
+            memcpy(gBattleBufferB[battlerId], &gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 8], blockSize);
             break;
         case 2:
             var = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_DATA];
-            gBattleControllerExecFlags &= ~(gBitTable[bank] << (var * 4));
+            gBattleControllerExecFlags &= ~(gBitTable[battlerId] << (var * 4));
             break;
         }