Merge several EWRAM definitions into gBattleStruct

7 files changed, 46 insertions, 46 deletions

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 956cc2f6e..9f0cc406d 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -957,8 +957,8 @@ static void BattleAICmd_is_most_powerful_move(void)
         && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF)
     {
         gDynamicBasePower = 0;
-        eDynamicMoveType = 0;
-        eDmgMultiplier = 1;
+        gBattleStruct->dynamicMoveType = 0;
+        gBattleStruct->dmgMultiplier = 1;
         gMoveResultFlags = 0;
         gCritMultiplier = 1;
 
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index be72d673e..9dbb8bade 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -232,10 +232,10 @@ void unref_sub_8137220(void)
 void SetBankFuncToWallyBufferRunCommand(void)
 {
     gBattlerControllerFuncs[gActiveBattler] = WallyBufferRunCommand;
-    ewram160A8 = 0;
-    ewram160A9 = 0;
-    ewram160AA = 0;
-    ewram160AB = 0;
+    gBattleStruct->unk160A8 = 0;
+    gBattleStruct->unk160A9 = 0;
+    gBattleStruct->unk160AA = 0;
+    gBattleStruct->unk160AB = 0;
 }
 
 void WallyBufferRunCommand(void)
@@ -253,59 +253,59 @@ void sub_81372BC(void)
 {
     u8 r4;
 
-    switch (ewram160A8)
+    switch (gBattleStruct->unk160A8)
     {
     case 0:
-        ewram160AA = 64;
-        ewram160A8++;
+        gBattleStruct->unk160AA = 64;
+        gBattleStruct->unk160A8++;
         // fall through
     case 1:
-        r4 = --ewram160AA;
+        r4 = --gBattleStruct->unk160AA;
         if (r4 == 0)
         {
             PlaySE(SE_SELECT);
             BtlController_EmitTwoReturnValues(1, 0, 0);
             WallyBufferExecCompleted();
-            ewram160A8++;
-            ewram160A9 = r4;
-            ewram160AA = 64;
+            gBattleStruct->unk160A8++;
+            gBattleStruct->unk160A9 = r4;
+            gBattleStruct->unk160AA = 64;
         }
         break;
     case 2:
-        r4 = --ewram160AA;
+        r4 = --gBattleStruct->unk160AA;
         if (r4 == 0)
         {
             PlaySE(SE_SELECT);
             BtlController_EmitTwoReturnValues(1, 0, 0);
             WallyBufferExecCompleted();
-            ewram160A8++;
-            ewram160A9 = r4;
-            ewram160AA = 64;
+            gBattleStruct->unk160A8++;
+            gBattleStruct->unk160A9 = r4;
+            gBattleStruct->unk160AA = 64;
         }
         break;
     case 3:
-        r4 = --ewram160AA;
+        r4 = --gBattleStruct->unk160AA;
         if (r4 == 0)
         {
             BtlController_EmitTwoReturnValues(1, 9, 0);
             WallyBufferExecCompleted();
-            ewram160A8++;
-            ewram160A9 = r4;
-            ewram160AA = 64;
+            gBattleStruct->unk160A8++;
+            gBattleStruct->unk160A9 = r4;
+            gBattleStruct->unk160AA = 64;
         }
         break;
     case 4:
-        if (--ewram160AA == 0)
+        if (--gBattleStruct->unk160AA == 0)
         {
             PlaySE(SE_SELECT);
             nullsub_8(0);
             sub_802E3E4(1, 0);
-            ewram160AA = 64;
-            ewram160A8++;
+            gBattleStruct->unk160AA = 64;
+            gBattleStruct->unk160A8++;
         }
         break;
     case 5:
-        if (--ewram160AA == 0)
+        if (--gBattleStruct->unk160AA == 0)
         {
             PlaySE(SE_SELECT);
             DestroyMenuCursor();
@@ -1284,16 +1284,16 @@ void WallyHandlecmd19(void)
 
 void WallyHandlecmd20(void)
 {
-    switch (ewram160A9)
+    switch (gBattleStruct->unk160A9)
     {
     case 0:
         sub_80304A8();
-        ewram160A9++;
-        ewram160AB = 80;
+        gBattleStruct->unk160A9++;
+        gBattleStruct->unk160AB = 80;
         // fall through
     case 1:
-        ewram160AB--;
-        if (ewram160AB == 0)
+        gBattleStruct->unk160AB--;
+        if (gBattleStruct->unk160AB == 0)
         {
             DestroyMenuCursor();
             PlaySE(SE_SELECT);
diff --git a/src/battle_main.c b/src/battle_main.c
index bc53dad78..e8978b01c 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -4778,7 +4778,7 @@ void SetActionsAndBanksTurnOrder(void)
                 }
             }
             gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
-            eFocusPunchBattler = 0;
+            gBattleStruct->focusPunchBattler = 0;
             return;
         }
         else
@@ -4821,7 +4821,7 @@ void SetActionsAndBanksTurnOrder(void)
     }
 
     gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
-    eFocusPunchBattler = 0;
+    gBattleStruct->focusPunchBattler = 0;
 }
 
 static void TurnValuesCleanUp(bool8 var0)
@@ -4877,10 +4877,10 @@ void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
 {
     if (!(gHitMarker & HITMARKER_RUN))
     {
-        while (eFocusPunchBattler < gBattlersCount)
+        while (gBattleStruct->focusPunchBattler < gBattlersCount)
         {
-            gActiveBattler = gBattlerAttacker = eFocusPunchBattler;
-            eFocusPunchBattler++;
+            gActiveBattler = gBattlerAttacker = gBattleStruct->focusPunchBattler;
+            gBattleStruct->focusPunchBattler++;
             if (gChosenMovesByBanks[gActiveBattler] == MOVE_FOCUS_PUNCH
                 && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
                 && !(gDisableStructs[gBattlerAttacker].truantCounter)
@@ -5187,7 +5187,7 @@ void HandleAction_UseMove(void)
     }
 
     gCritMultiplier = 1;
-    eDmgMultiplier = 1;
+    gBattleStruct->dmgMultiplier = 1;
     gBattleStruct->atkCancellerTracker = 0;
     gMoveResultFlags = 0;
     gMultiHitCounter = 0;
@@ -5687,7 +5687,7 @@ void HandleAction_ActionFinished(void)
     gBattleStruct->animTargetsHit = 0;
     gLastLandedMoves[gBattlerAttacker] = 0;
     gLastHitByType[gBattlerAttacker] = 0;
-    eDynamicMoveType = 0;
+    gBattleStruct->dynamicMoveType = 0;
     gDynamicBasePower = 0;
     gBattleStruct->cmd49StateTracker = 0;
     gBattleCommunication[3] = 0;
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index d8537670d..044914037 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -94,7 +94,7 @@ void sub_8094958(void)
 
 void sub_8094978(u8 arg1, u8 arg2)
 {
-    sub_8094A74((UNK_201606C_ARRAY) + arg1 * 3, arg2, arg1);
+    sub_8094A74(gBattleStruct->unk1606C[arg1], arg2, arg1);
 }
 
 static void sub_8094998(u8 arg[3], u8 player_number)
@@ -204,7 +204,7 @@ void sub_8094B6C(u8 a, u8 b, u8 c)
 
     if (IsLinkDoubleBattle())
     {
-        u8 *arr = &ewram1606Carr(0, a);
+        u8 *arr = gBattleStruct->unk1606C[a];
 
         for (i = 0, j = 0; i < 3; i++)
         {
@@ -686,7 +686,7 @@ static void Task_BattlePartyMenuShift(u8 taskId)
         gTasks[taskId].func = Task_80954C0;
         return;
     }
-    if (sub_8094C20(partySelection) == EWRAM_1609D)
+    if (sub_8094C20(partySelection) == gBattleStruct->unk1609D)
     {
         PartyMenuEraseMsgBoxAndFrame();
         GetMonNickname(&gPlayerParty[partySelection], gStringVar1);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index a98a0eae0..270151d17 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -12806,7 +12806,7 @@ static void atkD2_tryswapitems(void)
         else {
             u16 oldItemAtk, *newItemAtk;
 
-            newItemAtk = (u16 *)(ewram160F0 + 2 * gBattlerAttacker);
+            newItemAtk = (u16 *)(gBattleStruct->changedItems + gBattlerAttacker);
             oldItemAtk = gBattleMons[gBattlerAttacker].item;
             *newItemAtk = gBattleMons[gBattlerTarget].item;
 
@@ -13094,7 +13094,7 @@ static void atkE1_trygetintimidatetarget(void)
 {
     u8 side;
 
-    gBattleStruct->scriptingActive = ewram160DD;
+    gBattleStruct->scriptingActive = gBattleStruct->intimidateBank;
     side = GetBattlerSide(gBattleStruct->scriptingActive);
     gBattleTextBuff1[0] = 0xFD;
     gBattleTextBuff1[1] = 9;
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 6b8af4d86..38d859869 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -1351,7 +1351,7 @@ void SetBattleTowerProperty(void)
     switch (gSpecialVar_0x8004)
     {
     case 0:
-        ewram160FB = gSaveBlock2.battleTower.var_4AE[battleTowerLevelType];
+        gBattleStruct->unk160FB = gSaveBlock2.battleTower.var_4AE[battleTowerLevelType];
         gSaveBlock2.battleTower.var_4AE[battleTowerLevelType] = gSpecialVar_0x8005;
         break;
     case 1:
@@ -1400,7 +1400,7 @@ void SetBattleTowerProperty(void)
             ResetBattleTowerStreak(battleTowerLevelType);
         break;
     case 12:
-        gSaveBlock2.battleTower.var_4AE[battleTowerLevelType] = ewram160FB;
+        gSaveBlock2.battleTower.var_4AE[battleTowerLevelType] = gBattleStruct->unk160FB;
         break;
     case 13:
         gSaveBlock2.battleTower.currentWinStreaks[battleTowerLevelType] = GetCurrentBattleTowerWinStreak(battleTowerLevelType);
@@ -1449,7 +1449,7 @@ void BattleTowerUtil(void)
         ResetBattleTowerStreak(battleTowerLevelType);
         break;
     case 12:
-        gSaveBlock2.battleTower.var_4AE[battleTowerLevelType] = ewram160FB;
+        gSaveBlock2.battleTower.var_4AE[battleTowerLevelType] = gBattleStruct->unk160FB;
         break;
     case 13:
         gSaveBlock2.battleTower.currentWinStreaks[battleTowerLevelType] = GetCurrentBattleTowerWinStreak(battleTowerLevelType);
diff --git a/src/battle_util.c b/src/battle_util.c
index 4f8a0b036..406aefbdb 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -227,7 +227,7 @@ u8 GetBattlerForBattleScript(u8 caseId)
         ret = 0;
         break;
     case BS_GET_SCRIPTING_BANK:
-        ret = ewram16003;
+        ret = gBattleStruct->scriptingActive;
         break;
     case BS_GET_gBank1:
         ret = gBank1;