From 045331d139f04169df59f4550fd2f5fadac14a58 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Tue, 30 Jul 2019 02:54:50 +0800
Subject: ported battle_controllers from pokeem

---
 src/battle_ai_script_commands.c | 120 ++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

(limited to 'src/battle_ai_script_commands.c')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 1650f1056..86e7d3143 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -249,7 +249,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] =
 };
 
 // TODO: move these
-extern u8 sBattler_AI;
+extern u8 gBattlerAttacker;
 extern const u32 gBitTable[]; // util.h
 extern u32 gStatuses3[]; // battle_2.h
 extern u16 gSideAffecting[2];
@@ -318,7 +318,7 @@ void BattleAI_SetupAIData(void)
     }
 
     gBattleResources->AI_ScriptsStack->size = 0;
-    sBattler_AI = gActiveBattler;
+    gBattlerAttacker = gActiveBattler;
 
     // Decide a random target battlerId in doubles.
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -331,7 +331,7 @@ void BattleAI_SetupAIData(void)
     // There's only one choice in single battles.
     else
     {
-        gBattlerTarget = sBattler_AI ^ BIT_SIDE;
+        gBattlerTarget = gBattlerAttacker ^ BIT_SIDE;
     }
 
     // Choose proper trainer ai scripts.
@@ -425,13 +425,13 @@ void BattleAI_DoAIProcessing(void)
             break;
         case AIState_SettingUp:
             gAIScriptPtr = BattleAIs[AI_THINKING_STRUCT->aiLogicId]; // set the AI ptr.
-            if (gBattleMons[sBattler_AI].pp[AI_THINKING_STRUCT->movesetIndex] == 0)
+            if (gBattleMons[gBattlerAttacker].pp[AI_THINKING_STRUCT->movesetIndex] == 0)
             {
                 AI_THINKING_STRUCT->moveConsidered = 0; // don't consider a move you have 0 PP for, idiot.
             }
             else
             {
-                AI_THINKING_STRUCT->moveConsidered = gBattleMons[sBattler_AI].moves[AI_THINKING_STRUCT->movesetIndex];
+                AI_THINKING_STRUCT->moveConsidered = gBattleMons[gBattlerAttacker].moves[AI_THINKING_STRUCT->movesetIndex];
             }
             AI_THINKING_STRUCT->aiState++;
             break;
@@ -544,7 +544,7 @@ static void BattleAICmd_if_hp_less_than(void)
     u16 index;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -559,7 +559,7 @@ static void BattleAICmd_if_hp_more_than(void)
     u16 index;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -574,7 +574,7 @@ static void BattleAICmd_if_hp_equal(void)
     u16 index;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -589,7 +589,7 @@ static void BattleAICmd_if_hp_not_equal(void)
     u16 index;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -605,7 +605,7 @@ static void BattleAICmd_if_status(void)
     u32 arg;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -623,7 +623,7 @@ static void BattleAICmd_if_not_status(void)
     u32 arg;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -641,7 +641,7 @@ static void BattleAICmd_if_status2(void)
     u32 arg;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -659,7 +659,7 @@ static void BattleAICmd_if_not_status2(void)
     u32 arg;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -677,7 +677,7 @@ static void BattleAICmd_if_status3(void)
     u32 arg;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -695,7 +695,7 @@ static void BattleAICmd_if_not_status3(void)
     u32 arg;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -713,7 +713,7 @@ static void BattleAICmd_if_status4(void)
     u32 arg1, arg2;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -732,7 +732,7 @@ static void BattleAICmd_if_not_status4(void)
     u32 arg1, arg2;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -907,8 +907,8 @@ static void BattleAICmd_if_user_can_damage(void)
 
     for (i = 0; i < MAX_MON_MOVES; i++)
     {
-        if (gBattleMons[sBattler_AI].moves[i] != 0
-            && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].power != 0)
+        if (gBattleMons[gBattlerAttacker].moves[i] != 0
+            && gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].power != 0)
             break;
     }
     if (i == MAX_MON_MOVES)
@@ -923,8 +923,8 @@ static void BattleAICmd_if_user_cant_damage(void)
 
     for (i = 0; i < MAX_MON_MOVES; i++)
     {
-        if (gBattleMons[sBattler_AI].moves[i] != 0
-         && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].power != 0)
+        if (gBattleMons[gBattlerAttacker].moves[i] != 0
+         && gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].power != 0)
             break;
     }
     if (i != MAX_MON_MOVES)
@@ -944,13 +944,13 @@ static void BattleAICmd_get_type(void)
     switch (gAIScriptPtr[1])
     {
     case 1: // player primary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[sBattler_AI].type1;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattlerAttacker].type1;
         break;
     case 0: // enemy primary type
         AI_THINKING_STRUCT->funcResult = gBattleMons[gBattlerTarget].type1;
         break;
     case 3: // player secondary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[sBattler_AI].type2;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattlerAttacker].type2;
         break;
     case 2: // enemy secondary type
         AI_THINKING_STRUCT->funcResult = gBattleMons[gBattlerTarget].type2;
@@ -992,17 +992,17 @@ static void BattleAICmd_is_most_powerful_move(void)
         {
             for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++)
             {
-                if (gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].effect == sDiscouragedPowerfulMoveEffects[i])
+                if (gBattleMoves[gBattleMons[gBattlerAttacker].moves[checkedMove]].effect == sDiscouragedPowerfulMoveEffects[i])
                     break;
             }
 
-            if (gBattleMons[sBattler_AI].moves[checkedMove] != MOVE_NONE
+            if (gBattleMons[gBattlerAttacker].moves[checkedMove] != MOVE_NONE
                 && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF
-                && gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].power > 1)
+                && gBattleMoves[gBattleMons[gBattlerAttacker].moves[checkedMove]].power > 1)
             {
-                gCurrentMove = gBattleMons[sBattler_AI].moves[checkedMove];
-                AI_CalcDmg(sBattler_AI, gBattlerTarget);
-                TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget);
+                gCurrentMove = gBattleMons[gBattlerAttacker].moves[checkedMove];
+                AI_CalcDmg(gBattlerAttacker, gBattlerTarget);
+                TypeCalc(gCurrentMove, gBattlerAttacker, gBattlerTarget);
                 moveDmgs[checkedMove] = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[checkedMove] / 100;
                 if (moveDmgs[checkedMove] == 0)
                     moveDmgs[checkedMove] = 1;
@@ -1035,7 +1035,7 @@ static void BattleAICmd_is_most_powerful_move(void)
 static void BattleAICmd_get_move(void)
 {
     if (gAIScriptPtr[1] == USER)
-        AI_THINKING_STRUCT->funcResult = gLastUsedMove[sBattler_AI];
+        AI_THINKING_STRUCT->funcResult = gLastUsedMove[gBattlerAttacker];
     else
         AI_THINKING_STRUCT->funcResult = gLastUsedMove[gBattlerTarget];
 
@@ -1060,7 +1060,7 @@ static void BattleAICmd_if_arg_not_equal(void)
 
 static void BattleAICmd_if_would_go_first(void)
 {
-    if (GetWhoStrikesFirst(sBattler_AI, gBattlerTarget, TRUE) == gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(gBattlerAttacker, gBattlerTarget, TRUE) == gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1068,7 +1068,7 @@ static void BattleAICmd_if_would_go_first(void)
 
 static void BattleAICmd_if_would_not_go_first(void)
 {
-    if (GetWhoStrikesFirst(sBattler_AI, gBattlerTarget, TRUE) != gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(gBattlerAttacker, gBattlerTarget, TRUE) != gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1092,7 +1092,7 @@ static void BattleAICmd_count_alive_pokemon(void)
     AI_THINKING_STRUCT->funcResult = 0;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -1145,7 +1145,7 @@ static void BattleAICmd_get_ability(void)
     u8 index;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -1218,11 +1218,11 @@ static void BattleAICmd_get_highest_possible_damage(void)
     for (i = 0; i < 4; i++)
     {
         gBattleMoveDamage = 40;
-        gCurrentMove = gBattleMons[sBattler_AI].moves[i];
+        gCurrentMove = gBattleMons[gBattlerAttacker].moves[i];
 
         if (gCurrentMove != 0)
         {
-            TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget);
+            TypeCalc(gCurrentMove, gBattlerAttacker, gBattlerTarget);
 
             if (gBattleMoveDamage == 120) // Super effective STAB.
                 gBattleMoveDamage = AI_EFFECTIVENESS_x2;
@@ -1257,7 +1257,7 @@ static void BattleAICmd_if_type_effectiveness(void)
     gBattleMoveDamage = AI_EFFECTIVENESS_x1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
 
-    TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget);
+    TypeCalc(gCurrentMove, gBattlerAttacker, gBattlerTarget);
 
     if (gBattleMoveDamage == 120) // Super effective STAB.
         gBattleMoveDamage = AI_EFFECTIVENESS_x2;
@@ -1402,7 +1402,7 @@ static void BattleAICmd_if_stat_level_less_than(void)
     u32 party;
 
     if (gAIScriptPtr[1] == USER)
-        party = sBattler_AI;
+        party = gBattlerAttacker;
     else
         party = gBattlerTarget;
 
@@ -1417,7 +1417,7 @@ static void BattleAICmd_if_stat_level_more_than(void)
     u32 party;
 
     if (gAIScriptPtr[1] == USER)
-        party = sBattler_AI;
+        party = gBattlerAttacker;
     else
         party = gBattlerTarget;
 
@@ -1432,7 +1432,7 @@ static void BattleAICmd_if_stat_level_equal(void)
     u32 party;
 
     if (gAIScriptPtr[1] == USER)
-        party = sBattler_AI;
+        party = gBattlerAttacker;
     else
         party = gBattlerTarget;
 
@@ -1447,7 +1447,7 @@ static void BattleAICmd_if_stat_level_not_equal(void)
     u32 party;
 
     if (gAIScriptPtr[1] == USER)
-        party = sBattler_AI;
+        party = gBattlerAttacker;
     else
         party = gBattlerTarget;
 
@@ -1471,8 +1471,8 @@ static void BattleAICmd_if_can_faint(void)
     gMoveResultFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    AI_CalcDmg(sBattler_AI, gBattlerTarget);
-    TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget);
+    AI_CalcDmg(gBattlerAttacker, gBattlerTarget);
+    TypeCalc(gCurrentMove, gBattlerAttacker, gBattlerTarget);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
@@ -1500,8 +1500,8 @@ static void BattleAICmd_if_cant_faint(void)
     gMoveResultFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    AI_CalcDmg(sBattler_AI, gBattlerTarget);
-    TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget);
+    AI_CalcDmg(gBattlerAttacker, gBattlerTarget);
+    TypeCalc(gCurrentMove, gBattlerAttacker, gBattlerTarget);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
@@ -1524,7 +1524,7 @@ static void BattleAICmd_if_has_move(void)
     case 3:
         for (i = 0; i < MAX_MON_MOVES; i++)
         {
-            if (gBattleMons[sBattler_AI].moves[i] == *temp_ptr)
+            if (gBattleMons[gBattlerAttacker].moves[i] == *temp_ptr)
                 break;
         }
         if (i == MAX_MON_MOVES)
@@ -1558,7 +1558,7 @@ static void BattleAICmd_if_dont_have_move(void)
     case 3:
         for (i = 0; i < MAX_MON_MOVES; i++)
         {
-            if (gBattleMons[sBattler_AI].moves[i] == *temp_ptr)
+            if (gBattleMons[gBattlerAttacker].moves[i] == *temp_ptr)
                 break;
         }
         if (i != MAX_MON_MOVES)
@@ -1591,7 +1591,7 @@ static void BattleAICmd_if_move_effect(void)
     case 3:
         for (i = 0; i < MAX_MON_MOVES; i++)
         {
-            if (gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].effect == gAIScriptPtr[2])
+            if (gBattleMons[gBattlerAttacker].moves[i] != 0 && gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i != MAX_MON_MOVES)
@@ -1603,7 +1603,7 @@ static void BattleAICmd_if_move_effect(void)
     case 2:
         for (i = 0; i < 8; i++)
         {
-            if (gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i]].effect == gAIScriptPtr[2])
+            if (gBattleMons[gBattlerAttacker].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i]].effect == gAIScriptPtr[2])
                 break;
         }
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@@ -1620,7 +1620,7 @@ static void BattleAICmd_if_not_move_effect(void)
     case 3:
         for (i = 0; i < MAX_MON_MOVES; i++)
         {
-            if (gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].effect == gAIScriptPtr[2])
+            if (gBattleMons[gBattlerAttacker].moves[i] != 0 && gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i != MAX_MON_MOVES)
@@ -1644,7 +1644,7 @@ static void BattleAICmd_if_last_move_did_damage(void)
     u8 index;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -1739,7 +1739,7 @@ static void BattleAICmd_get_hold_effect(void)
     u16 side;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -1759,7 +1759,7 @@ static void BattleAICmd_get_gender(void)
     u8 index;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -1773,7 +1773,7 @@ static void BattleAICmd_is_first_turn(void)
     u8 index;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -1787,7 +1787,7 @@ static void BattleAICmd_get_stockpile_count(void)
     u8 index;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -1808,7 +1808,7 @@ static void BattleAICmd_get_used_held_item(void)
     u8 battlerId;
 
     if (gAIScriptPtr[1] == AI_USER)
-        battlerId = sBattler_AI;
+        battlerId = gBattlerAttacker;
     else
         battlerId = gBattlerTarget;
 
@@ -1848,7 +1848,7 @@ static void BattleAICmd_get_protect_count(void)
     u8 index;
 
     if (gAIScriptPtr[1] == USER)
-        index = sBattler_AI;
+        index = gBattlerAttacker;
     else
         index = gBattlerTarget;
 
@@ -1903,7 +1903,7 @@ static void BattleAICmd_if_level_compare(void)
     switch (gAIScriptPtr[1])
     {
     case 0: // greater than
-        if (gBattleMons[sBattler_AI].level > gBattleMons[gBattlerTarget].level)
+        if (gBattleMons[gBattlerAttacker].level > gBattleMons[gBattlerTarget].level)
         {
             gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
             return;
@@ -1911,7 +1911,7 @@ static void BattleAICmd_if_level_compare(void)
         gAIScriptPtr += 6;
         return;
     case 1: // less than
-        if (gBattleMons[sBattler_AI].level < gBattleMons[gBattlerTarget].level)
+        if (gBattleMons[gBattlerAttacker].level < gBattleMons[gBattlerTarget].level)
         {
             gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
             return;
@@ -1919,7 +1919,7 @@ static void BattleAICmd_if_level_compare(void)
         gAIScriptPtr += 6;
         return;
     case 2: // equal
-        if (gBattleMons[sBattler_AI].level == gBattleMons[gBattlerTarget].level)
+        if (gBattleMons[gBattlerAttacker].level == gBattleMons[gBattlerTarget].level)
         {
             gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
             return;
-- 
cgit v1.2.3


From 035df4d7a4a2782cf7bc3789f56471a03ffbfca0 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Tue, 30 Jul 2019 12:10:40 +0800
Subject: ported documentation of battle_util.s

---
 src/battle_ai_script_commands.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/battle_ai_script_commands.c')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 86e7d3143..1c281e853 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -252,7 +252,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] =
 extern u8 gBattlerAttacker;
 extern const u32 gBitTable[]; // util.h
 extern u32 gStatuses3[]; // battle_2.h
-extern u16 gSideAffecting[2];
+extern u16 gSideStatuses[2];
 extern const struct BattleMove gBattleMoves[];
 extern u16 gDynamicBasePower;
 extern u8 gMoveResultFlags;
@@ -720,7 +720,7 @@ static void BattleAICmd_if_status4(void)
     arg1 = GetBattlerPosition(index) & 1;
     arg2 = T1_READ_32(gAIScriptPtr + 2);
 
-    if ((gSideAffecting[arg1] & arg2) != 0)
+    if ((gSideStatuses[arg1] & arg2) != 0)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -739,7 +739,7 @@ static void BattleAICmd_if_not_status4(void)
     arg1 = GetBattlerPosition(index) & 1;
     arg2 = T1_READ_32(gAIScriptPtr + 2);
 
-    if ((gSideAffecting[arg1] & arg2) == 0)
+    if ((gSideStatuses[arg1] & arg2) == 0)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
-- 
cgit v1.2.3


From c88c9c6edfb7122524b319e4601c5d2b97bf06ca Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Wed, 31 Jul 2019 07:57:24 +0800
Subject: progress #1 on porting battle_util

---
 src/battle_ai_script_commands.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/battle_ai_script_commands.c')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 1c281e853..0d389aa7f 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -34,7 +34,6 @@ enum
 
 extern const u8 *gAIScriptPtr;
 extern u8 *BattleAIs[];
-extern u16 gLastUsedMove[];
 
 static void BattleAICmd_if_random_less_than(void);
 static void BattleAICmd_if_random_greater_than(void);
@@ -466,7 +465,7 @@ void sub_80C7164(void)
     {
         if (BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] == 0)
         {
-            BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] = gLastUsedMove[gBattlerTarget];
+            BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] = gLastMoves[gBattlerTarget];
             return;
         }
     }
@@ -1035,9 +1034,9 @@ static void BattleAICmd_is_most_powerful_move(void)
 static void BattleAICmd_get_move(void)
 {
     if (gAIScriptPtr[1] == USER)
-        AI_THINKING_STRUCT->funcResult = gLastUsedMove[gBattlerAttacker];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[gBattlerAttacker];
     else
-        AI_THINKING_STRUCT->funcResult = gLastUsedMove[gBattlerTarget];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[gBattlerTarget];
 
     gAIScriptPtr += 2;
 }
@@ -1373,7 +1372,7 @@ static void BattleAICmd_get_weather(void)
         AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_RAIN;
     if (gBattleWeather & WEATHER_SANDSTORM_ANY)
         AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SANDSTORM;
-    if (gBattleWeather & WEATHER_SUNNY_ANY)
+    if (gBattleWeather & WEATHER_SUN_ANY)
         AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SUNNY;
     if (gBattleWeather & WEATHER_HAIL)
         AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_HAIL;
@@ -1931,7 +1930,7 @@ static void BattleAICmd_if_level_compare(void)
 
 static void BattleAICmd_if_taunted(void)
 {
-    if (gDisableStructs[gBattlerTarget].tauntTimer1 != 0)
+    if (gDisableStructs[gBattlerTarget].tauntTimer != 0)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -1939,7 +1938,7 @@ static void BattleAICmd_if_taunted(void)
 
 static void BattleAICmd_if_not_taunted(void)
 {
-    if (gDisableStructs[gBattlerTarget].tauntTimer1 == 0)
+    if (gDisableStructs[gBattlerTarget].tauntTimer == 0)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
-- 
cgit v1.2.3


From 3eb1f1bc783308dac445eaacc05c9f14e9b78822 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Thu, 1 Aug 2019 12:25:38 +0800
Subject: matched AbilityBattleEffects

---
 src/battle_ai_script_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/battle_ai_script_commands.c')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 0d389aa7f..913068aed 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -479,7 +479,7 @@ void sub_80C71A8(u8 a)
         BATTLE_HISTORY->usedMoves[a / 2][i] = 0;
 }
 
-void sub_80C71D0(u8 a, u8 b)
+void RecordAbilityBattle(u8 a, u8 b)
 {
     if (GetBattlerSide(a) == 0)
         BATTLE_HISTORY->abilities[GetBattlerPosition(a) & 1] = b;
-- 
cgit v1.2.3


From c2964e818143757ca5586b1a811669a1c287e870 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Fri, 2 Aug 2019 05:05:35 +0800
Subject: ported battle_util from pokeem

---
 src/battle_ai_script_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/battle_ai_script_commands.c')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 913068aed..1be10d228 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -485,7 +485,7 @@ void RecordAbilityBattle(u8 a, u8 b)
         BATTLE_HISTORY->abilities[GetBattlerPosition(a) & 1] = b;
 }
 
-void sub_80C7208(u8 a, u8 b)
+void RecordItemEffectBattle(u8 a, u8 b)
 {
     if (GetBattlerSide(a) == 0)
         BATTLE_HISTORY->itemEffects[GetBattlerPosition(a) & 1] = b;
-- 
cgit v1.2.3


From 8fed9a5f205cec0d86149a908d64f73316cbb1f4 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Sat, 3 Aug 2019 07:44:51 +0800
Subject: quick review on battle_ai_script_commands

---
 src/battle_ai_script_commands.c | 76 ++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

(limited to 'src/battle_ai_script_commands.c')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 1be10d228..c675e45fe 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1,16 +1,17 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_2.h"
+#include "util.h"
 #include "item.h"
+#include "random.h"
 #include "pokemon.h"
+#include "battle_ai_script_commands.h"
 #include "constants/species.h"
 #include "constants/abilities.h"
 #include "constants/battle_ai.h"
 #include "constants/battle_move_effects.h"
 #include "constants/moves.h"
 
-extern u16 Random(void);
-extern void sub_80C7164(void);
-
 #define AI_ACTION_DONE          0x0001
 #define AI_ACTION_FLEE          0x0002
 #define AI_ACTION_WATCH         0x0004
@@ -32,8 +33,16 @@ enum
     AIState_DoNotProcess
 };
 
+/*
+gAIScriptPtr is a pointer to the next battle AI cmd command to read.
+when a command finishes processing, gAIScriptPtr is incremented by
+the number of bytes that the current command had reserved for arguments
+in order to read the next command correctly. refer to battle_ai_scripts.s for the
+AI scripts.
+*/
+
 extern const u8 *gAIScriptPtr;
-extern u8 *BattleAIs[];
+extern u8 *gBattleAI_ScriptsTable[];
 
 static void BattleAICmd_if_random_less_than(void);
 static void BattleAICmd_if_random_greater_than(void);
@@ -130,6 +139,11 @@ static void BattleAICmd_if_level_compare(void);
 static void BattleAICmd_if_taunted(void);
 static void BattleAICmd_if_not_taunted(void);
 
+static void RecordLastUsedMoveByTarget(void);
+static void BattleAI_DoAIProcessing(void);
+static void AIStackPushVar(const u8 *ptr);
+static bool8 AIStackPop(void);
+
 typedef void (*BattleAICmdFunc)(void);
 
 static const BattleAICmdFunc sBattleAICmdTable[] =
@@ -247,23 +261,6 @@ static const u16 sDiscouragedPowerfulMoveEffects[] =
     0xFFFF
 };
 
-// TODO: move these
-extern u8 gBattlerAttacker;
-extern const u32 gBitTable[]; // util.h
-extern u32 gStatuses3[]; // battle_2.h
-extern u16 gSideStatuses[2];
-extern const struct BattleMove gBattleMoves[];
-extern u16 gDynamicBasePower;
-extern u8 gMoveResultFlags;
-extern u8 gCritMultiplier;
-extern u16 gCurrentMove;
-extern s32 gBattleMoveDamage;
-
-void BattleAI_SetupAIData(void);
-void BattleAI_DoAIProcessing(void);
-void AIStackPushVar(const u8 *ptr);
-bool8 AIStackPop(void);
-
 void BattleAI_HandleItemUseBeforeAISetup(void)
 {
     s32 i;
@@ -274,9 +271,9 @@ void BattleAI_HandleItemUseBeforeAISetup(void)
 
     // Items are allowed to use in ONLY trainer battles.
     // TODO: Use proper flags
-    if ((gBattleTypeFlags & 0x8)
+    if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
         && (gTrainerBattleOpponent_A != 0x400)
-        && !(gBattleTypeFlags & 0x80982)
+        && !(gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_SAFARI | BATTLE_TYPE_LINK))
         )
     {
         for (i = 0; i < 4; i++)
@@ -366,14 +363,14 @@ void BattleAI_SetupAIData(void)
     AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent_A].aiFlags;
 }
 
-u8 BattleAI_GetAIActionToUse(void)
+u8 BattleAI_ChooseMoveOrAction(void)
 {
     u8 currentMoveArray[MAX_MON_MOVES];
     u8 consideredMoveArray[MAX_MON_MOVES];
     u8 numOfBestMoves;
     s32 i;
 
-    sub_80C7164();
+    RecordLastUsedMoveByTarget();
     while (AI_THINKING_STRUCT->aiFlags != 0)
     {
         if (AI_THINKING_STRUCT->aiFlags & 1)
@@ -414,7 +411,7 @@ u8 BattleAI_GetAIActionToUse(void)
     return consideredMoveArray[Random() % numOfBestMoves]; // break any ties that exist.
 }
 
-void BattleAI_DoAIProcessing(void)
+static void BattleAI_DoAIProcessing(void)
 {
     while (AI_THINKING_STRUCT->aiState != AIState_FinishedProcessing)
     {
@@ -423,7 +420,7 @@ void BattleAI_DoAIProcessing(void)
         case AIState_DoNotProcess: //Needed to match.
             break;
         case AIState_SettingUp:
-            gAIScriptPtr = BattleAIs[AI_THINKING_STRUCT->aiLogicId]; // set the AI ptr.
+            gAIScriptPtr = gBattleAI_ScriptsTable[AI_THINKING_STRUCT->aiLogicId]; // set the AI ptr.
             if (gBattleMons[gBattlerAttacker].pp[AI_THINKING_STRUCT->movesetIndex] == 0)
             {
                 AI_THINKING_STRUCT->moveConsidered = 0; // don't consider a move you have 0 PP for, idiot.
@@ -457,7 +454,7 @@ void BattleAI_DoAIProcessing(void)
     }
 }
 
-void sub_80C7164(void)
+static void RecordLastUsedMoveByTarget(void)
 {
     s32 i;
 
@@ -471,24 +468,25 @@ void sub_80C7164(void)
     }
 }
 
-void sub_80C71A8(u8 a)
+// not used
+static void ClearBattlerMoveHistory(u8 battlerId)
 {
     s32 i;
 
     for (i = 0; i < 8; i++)
-        BATTLE_HISTORY->usedMoves[a / 2][i] = 0;
+        BATTLE_HISTORY->usedMoves[battlerId / 2][i] = MOVE_NONE;
 }
 
-void RecordAbilityBattle(u8 a, u8 b)
+void RecordAbilityBattle(u8 battlerId, u8 abilityId)
 {
-    if (GetBattlerSide(a) == 0)
-        BATTLE_HISTORY->abilities[GetBattlerPosition(a) & 1] = b;
+    if (GetBattlerSide(battlerId) == 0)
+        BATTLE_HISTORY->abilities[GetBattlerPosition(battlerId) & 1] = abilityId;
 }
 
-void RecordItemEffectBattle(u8 a, u8 b)
+void RecordItemEffectBattle(u8 battlerId, u8 itemEffect)
 {
-    if (GetBattlerSide(a) == 0)
-        BATTLE_HISTORY->itemEffects[GetBattlerPosition(a) & 1] = b;
+    if (GetBattlerSide(battlerId) == 0)
+        BATTLE_HISTORY->itemEffects[GetBattlerPosition(battlerId) & 1] = itemEffect;
 }
 
 static void BattleAICmd_if_random_less_than(void)
@@ -1944,18 +1942,18 @@ static void BattleAICmd_if_not_taunted(void)
         gAIScriptPtr += 5;
 }
 
-void AIStackPushVar(const u8 *var)
+static void AIStackPushVar(const u8 *var)
 {
     gBattleResources->AI_ScriptsStack->ptr[gBattleResources->AI_ScriptsStack->size++] = var;
 }
 
 // unused
-void AIStackPushVar_cursor(void)
+static void AIStackPushVar_cursor(void)
 {
     gBattleResources->AI_ScriptsStack->ptr[gBattleResources->AI_ScriptsStack->size++] = gAIScriptPtr;
 }
 
-bool8 AIStackPop(void)
+static bool8 AIStackPop(void)
 {
     if (gBattleResources->AI_ScriptsStack->size != 0)
     {
-- 
cgit v1.2.3


From b9d547a02f615b991713158bb7068ce0d7169088 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Mon, 5 Aug 2019 08:15:58 +0800
Subject: ported battle_controller_player from pokeem and matched several new
 functions

---
 src/battle_ai_script_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/battle_ai_script_commands.c')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index c675e45fe..ce1b081e7 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "battle.h"
-#include "battle_2.h"
+#include "battle_main.h"
 #include "util.h"
 #include "item.h"
 #include "random.h"
-- 
cgit v1.2.3


From 08e8856f1020ea05f3978a205cf51e8d75b169a6 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Mon, 5 Aug 2019 09:25:46 +0800
Subject: minor issue

---
 src/battle_ai_script_commands.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/battle_ai_script_commands.c')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index ce1b081e7..b7cf113d4 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -344,12 +344,12 @@ void BattleAI_SetupAIData(void)
     }
     else if (!(gBattleTypeFlags & (0x80900)) && (gTrainerBattleOpponent_A != 0x400)) // _080C6ECC
     {
-        if(gBattleTypeFlags & (0x80 << 10))
+        if (gBattleTypeFlags & (0x80 << 10))
         {
             AI_THINKING_STRUCT->aiFlags = 1;
             return;
         }
-        else if(gBattleTypeFlags & (0x80 << 11))
+        else if (gBattleTypeFlags & (0x80 << 11))
         {
             AI_THINKING_STRUCT->aiFlags = 7;
             return;
@@ -1704,22 +1704,22 @@ static void BattleAICmd_frlg_safari(void)
 {
     u8 var;
 
-    if(gBattleStruct->safariGoNearCounter)
+    if (gBattleStruct->safariGoNearCounter)
     {
         var = gBattleStruct->safariEscapeFactor * 2;
-        if(var > 20)
+        if (var > 20)
             var = 20;
     }
-    else if(gBattleStruct->safariPkblThrowCounter != 0) // _080C91DC
+    else if (gBattleStruct->safariPkblThrowCounter != 0) // _080C91DC
     {
         var = gBattleStruct->safariEscapeFactor / 4;
-        if(var == 0)
+        if (var == 0)
             var = 1;
     }
     else
         var = gBattleStruct->safariEscapeFactor;
     var *= 5;
-    if((u8)(Random() % 100) < var)
+    if ((u8)(Random() % 100) < var)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
-- 
cgit v1.2.3


From ca130a8aeb39d05340495766a1f33dc854f6b4a1 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Tue, 27 Aug 2019 10:27:36 +0800
Subject: thru atkc0

---
 src/battle_ai_script_commands.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/battle_ai_script_commands.c')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index b7cf113d4..55d135a4e 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1647,7 +1647,7 @@ static void BattleAICmd_if_last_move_did_damage(void)
 
     if (gAIScriptPtr[2] == 0)
     {
-        if (gDisableStructs[index].disabledMove == 0)
+        if (gDisableStructs[index].disabledMove == MOVE_NONE)
         {
             gAIScriptPtr += 7;
             return;
@@ -1660,7 +1660,7 @@ static void BattleAICmd_if_last_move_did_damage(void)
         gAIScriptPtr += 7;
         return;
     }
-    else if (gDisableStructs[index].encoredMove != 0)
+    else if (gDisableStructs[index].encoredMove != MOVE_NONE)
     {
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
         return;
-- 
cgit v1.2.3


From 2bd15329e07a23d3515dc1c9c9e5d8f75d3be429 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Tue, 27 Aug 2019 23:40:52 +0800
Subject: minor fixes

and remove unnecessary NONMATCHING
---
 src/battle_ai_script_commands.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/battle_ai_script_commands.c')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 55d135a4e..c57825b4f 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -21,8 +21,8 @@
 #define AI_ACTION_UNK7          0x0040
 #define AI_ACTION_UNK8          0x0080
 
-#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(gBattleResources->ai))
-#define BATTLE_HISTORY ((struct BattleHistory *)(gBattleResources->battleHistory))
+#define AI_THINKING_STRUCT (gBattleResources->ai)
+#define BATTLE_HISTORY (gBattleResources->battleHistory)
 
 // AI states
 enum
@@ -1808,14 +1808,8 @@ static void BattleAICmd_get_used_held_item(void)
         battlerId = gBattlerAttacker;
     else
         battlerId = gBattlerTarget;
-
     // This is likely a leftover from Ruby's code and its ugly ewram access.
-    #ifdef NONMATCHING
-        AI_THINKING_STRUCT->funcResult = gBattleStruct->usedHeldItems[battlerId];
-    #else
-        AI_THINKING_STRUCT->funcResult = *(u8*)((u8*)(gBattleStruct) + offsetof(struct BattleStruct, usedHeldItems) + (battlerId * 2));
-    #endif // NONMATCHING
-
+    AI_THINKING_STRUCT->funcResult = ((u8 *)gBattleStruct->usedHeldItems)[battlerId * 2];
     gAIScriptPtr += 2;
 }
 
-- 
cgit v1.2.3