From 2dd706ca5410d98ad214ceff7026d6db276f4d5a Mon Sep 17 00:00:00 2001
From: melthelesbian <44884535+melthelesbian@users.noreply.github.com>
Date: Tue, 25 Dec 2018 12:50:15 -0500
Subject: use max mon moves constant where able (#480)

* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
---
 src/battle_controllers.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/battle_controllers.c')

diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 1b0ca6a73..06d856d28 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -142,7 +142,7 @@ static void InitSinglePlayerBtlControllers(void)
             gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
         }
 
-        gBattlersCount = 4;
+        gBattlersCount = MAX_BATTLERS_COUNT;
 
         sub_81B8D64(0, 0);
         sub_81B8D64(1, 0);
@@ -225,7 +225,7 @@ static void InitSinglePlayerBtlControllers(void)
         gBattlerControllerFuncs[3] = SetControllerToOpponent;
         gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-        gBattlersCount = 4;
+        gBattlersCount = MAX_BATTLERS_COUNT;
 
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         {
@@ -245,7 +245,7 @@ static void InitSinglePlayerBtlControllers(void)
                 gBattlerControllerFuncs[3] = SetControllerToOpponent;
                 gBattlerPositions[3] = 3;
 
-                gBattlersCount = 4;
+                gBattlersCount = MAX_BATTLERS_COUNT;
 
                 sub_81B8D64(0, 0);
                 sub_81B8D64(1, 0);
@@ -431,7 +431,7 @@ static void InitLinkBtlControllers(void)
             gBattlerControllerFuncs[3] = SetControllerToLinkOpponent;
             gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-            gBattlersCount = 4;
+            gBattlersCount = MAX_BATTLERS_COUNT;
         }
         else
         {
@@ -447,7 +447,7 @@ static void InitLinkBtlControllers(void)
             gBattlerControllerFuncs[2] = SetControllerToLinkOpponent;
             gBattlerPositions[2] = B_POSITION_OPPONENT_RIGHT;
 
-            gBattlersCount = 4;
+            gBattlersCount = MAX_BATTLERS_COUNT;
         }
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
@@ -468,7 +468,7 @@ static void InitLinkBtlControllers(void)
             gBattlerControllerFuncs[3] = SetControllerToOpponent;
             gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-            gBattlersCount = 4;
+            gBattlersCount = MAX_BATTLERS_COUNT;
         }
         else
         {
@@ -484,7 +484,7 @@ static void InitLinkBtlControllers(void)
             gBattlerControllerFuncs[3] = SetControllerToLinkOpponent;
             gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-            gBattlersCount = 4;
+            gBattlersCount = MAX_BATTLERS_COUNT;
         }
 
         sub_81B8D64(0, 0);
@@ -574,7 +574,7 @@ static void InitLinkBtlControllers(void)
             }
         }
 
-        gBattlersCount = 4;
+        gBattlersCount = MAX_BATTLERS_COUNT;
     }
 }
 
-- 
cgit v1.2.3