From b332fecc4359cf0db42cacd23e7a2fb6968ae34c Mon Sep 17 00:00:00 2001
From: cawtds <dennis.stamm@gmx.de>
Date: Fri, 3 May 2024 21:24:13 +0200
Subject: [PATCH] remove unused variables, pass battler to function instead of
 gActiveBattler

---
 include/battle.h                    |  2 --
 include/battle_ai_script_commands.h |  2 +-
 src/battle_ai_script_commands.c     | 10 ++++++----
 src/battle_controller_opponent.c    |  2 +-
 src/battle_controllers.c            |  4 ----
 src/battle_main.c                   |  2 --
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/include/battle.h b/include/battle.h
index 20a2ad71f..239ee3ec1 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -994,8 +994,6 @@ extern u8 *gBattleAnimBgTileBuffer;
 extern u8 *gBattleAnimBgTilemapBuffer;
 extern void (*gBattleMainFunc)(void);
 extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
-extern u32 gUnusedFirstBattleVar1;
-extern u8 gUnusedFirstBattleVar2;
 extern u8 gBattlerAttacker;
 extern u8 gEffectBattler;
 extern u8 gMultiHitCounter;
diff --git a/include/battle_ai_script_commands.h b/include/battle_ai_script_commands.h
index 7c39fb0b6..dd8b9e3f6 100644
--- a/include/battle_ai_script_commands.h
+++ b/include/battle_ai_script_commands.h
@@ -9,7 +9,7 @@
 #define AI_CHOICE_WATCH 5
 
 void BattleAI_HandleItemUseBeforeAISetup(void);
-void BattleAI_SetupAIData(void);
+void BattleAI_SetupAIData(u32 battler);
 u8 BattleAI_ChooseMoveOrAction(void);
 void ClearBankMoveHistory(u8 bank);
 void RecordAbilityBattle(u32 bank, u32 abilityId);
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index d788392ee..15900685b 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -317,10 +317,12 @@ void BattleAI_HandleItemUseBeforeAISetup(void)
         }
     }
 
-    BattleAI_SetupAIData();
+    // TODO: check if always calling with 0 or 2 is fine
+    // always called with 0 if first battle of this load or if for any further battle
+    BattleAI_SetupAIData(gActiveBattler);
 }
 
-void BattleAI_SetupAIData(void)
+void BattleAI_SetupAIData(u32 battler)
 {
     s32 i;
     u8 *data = (u8 *)AI_THINKING_STRUCT;
@@ -333,7 +335,7 @@ void BattleAI_SetupAIData(void)
     for (i = 0; i < MAX_MON_MOVES; i++)
         AI_THINKING_STRUCT->score[i] = 100;
 
-    moveLimitations = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
+    moveLimitations = CheckMoveLimitations(battler, 0, 0xFF);
 
     // Ignore moves that aren't possible to use.
     for (i = 0; i < MAX_MON_MOVES; i++)
@@ -345,7 +347,7 @@ void BattleAI_SetupAIData(void)
     }
 
     gBattleResources->AI_ScriptsStack->size = 0;
-    gBattlerAttacker = gActiveBattler;
+    gBattlerAttacker = battler;
 
     // Decide a random target battlerId in doubles.
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index e6599ddbf..ba83fc971 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1355,7 +1355,7 @@ static void OpponentHandleChooseMove(u32 battler)
     if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_FIRST_BATTLE | BATTLE_TYPE_SAFARI | BATTLE_TYPE_ROAMER))
     {
 
-        BattleAI_SetupAIData();
+        BattleAI_SetupAIData(gActiveBattler);
         chosenMoveId = BattleAI_ChooseMoveOrAction();
 
         switch (chosenMoveId)
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 82d6ff624..7699e5637 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -57,10 +57,6 @@ void SetUpBattleVars(void)
     ClearBattleAnimationVars();
     ClearBattleMonForms();
     BattleAI_HandleItemUseBeforeAISetup();
-
-    // Below are never read
-    gUnusedFirstBattleVar1 = 0;
-    gUnusedFirstBattleVar2 = 0;
 }
 
 void InitBattleControllers(void)
diff --git a/src/battle_main.c b/src/battle_main.c
index 1a81d5e92..d33f2acdb 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -131,7 +131,6 @@ EWRAM_DATA u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT] = {0};
 static EWRAM_DATA u32 sFlickerArray[25] = {0};
 EWRAM_DATA u32 gBattleTypeFlags = 0;
 EWRAM_DATA u8 gBattleTerrain = 0;
-EWRAM_DATA u32 gUnusedFirstBattleVar1 = 0;
 EWRAM_DATA struct MultiBattlePokemonTx gMultiPartnerParty[3] = {0};
 EWRAM_DATA u8 *gBattleAnimBgTileBuffer = NULL;
 EWRAM_DATA u8 *gBattleAnimBgTilemapBuffer = NULL;
@@ -183,7 +182,6 @@ EWRAM_DATA u8 gMoveResultFlags = 0;
 EWRAM_DATA u32 gHitMarker = 0;
 static EWRAM_DATA u8 sUnusedBattlersArray[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT] = {0};
-EWRAM_DATA u8 gUnusedFirstBattleVar2 = 0;
 EWRAM_DATA u32 gSideStatuses[NUM_BATTLE_SIDES] = {0};
 EWRAM_DATA struct SideTimer gSideTimers[2] = {0};
 EWRAM_DATA u32 gStatuses3[MAX_BATTLERS_COUNT] = {0};