From 85d97542cdb269278aad3cc3735c29845f9d8738 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Sun, 8 Sep 2019 11:53:48 -0400
Subject: Use MAX_MON_MOVES constants

---
 src/battle_ai_script_commands.c | 18 +++++++++---------
 1 file changed, 9 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 3c07cc227..6a8163b96 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -397,8 +397,8 @@ u8 BattleAI_ChooseMoveOrAction(void)
 
 static u8 ChooseMoveOrAction_Singles(void)
 {
-    u8 currentMoveArray[4];
-    u8 consideredMoveArray[4];
+    u8 currentMoveArray[MAX_MON_MOVES];
+    u8 consideredMoveArray[MAX_MON_MOVES];
     u8 numOfBestMoves;
     s32 i;
 
@@ -452,11 +452,11 @@ static u8 ChooseMoveOrAction_Doubles(void)
     s32 i;
     s32 j;
     s32 scriptsToRun;
-    s16 bestMovePointsForTarget[4];
-    s8 mostViableTargetsArray[4];
-    u8 actionOrMoveIndex[4];
-    u8 mostViableMovesScores[4];
-    u8 mostViableMovesIndices[4];
+    s16 bestMovePointsForTarget[MAX_BATTLERS_COUNT];
+    s8 mostViableTargetsArray[MAX_BATTLERS_COUNT];
+    u8 actionOrMoveIndex[MAX_BATTLERS_COUNT];
+    u8 mostViableMovesScores[MAX_MON_MOVES];
+    u8 mostViableMovesIndices[MAX_MON_MOVES];
     s32 mostViableTargetsNo;
     s32 mostViableMovesNo;
     s16 mostMovePoints;
@@ -543,7 +543,7 @@ static u8 ChooseMoveOrAction_Doubles(void)
     mostViableTargetsArray[0] = 0;
     mostViableTargetsNo = 1;
 
-    for (i = 1; i < MAX_MON_MOVES; i++)
+    for (i = 1; i < MAX_BATTLERS_COUNT; i++)
     {
         if (mostMovePoints == bestMovePointsForTarget[i])
         {
@@ -1167,7 +1167,7 @@ static void BattleAICmd_get_considered_move_power(void)
 static void BattleAICmd_get_how_powerful_move_is(void)
 {
     s32 i, checkedMove;
-    s32 moveDmgs[4];
+    s32 moveDmgs[MAX_MON_MOVES];
 
     for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++)
     {
-- 
cgit v1.2.3


From b46c4b670339754ca83fd9f2809f13d4de0dc6a5 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Sun, 8 Sep 2019 12:21:24 -0400
Subject: more constant usage

---
 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 6a8163b96..b581a8bbc 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -298,7 +298,7 @@ void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves)
             )
        )
     {
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < MAX_TRAINER_ITEMS; i++)
         {
             if (gTrainers[gTrainerBattleOpponent_A].items[i] != 0)
             {
-- 
cgit v1.2.3