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_gfx_sfx_util.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/battle_gfx_sfx_util.c')

diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 3654cf6d4..3ceaef983 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -138,7 +138,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
     if (i == var1)
         percent = 2;
 
-    for (var2 = 0, i = 0; i < 4; i++)
+    for (var2 = 0, i = 0; i < MAX_MON_MOVES; i++)
     {
         if (moveInfo->moves[i] == MOVE_NONE)
             break;
@@ -160,7 +160,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
         {
             var1 = 0, var2 = 0;
 
-            for (i = 0; i < 4; i++)
+            for (i = 0; i < MAX_MON_MOVES; i++)
             {
                 if (sub_805D4A8(moveInfo->moves[i]) == 0 && !(gBitTable[i] & unusableMovesBits))
                     var1 += 0x1;
@@ -181,7 +181,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
             {
                 do
                 {
-                    i = Random() % 4;
+                    i = Random() % MAX_MON_MOVES;
                     if (!(gBitTable[i] & unusableMovesBits))
                         chosenMoveId = i;
                 } while (chosenMoveId == -1);
@@ -197,7 +197,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
 
                 do
                 {
-                    i = Random() % 4;
+                    i = Random() % MAX_MON_MOVES;
                     if (!(gBitTable[i] & unusableMovesBits) && var2 == sub_805D4A8(moveInfo->moves[i]))
                         chosenMoveId = i;
                 } while (chosenMoveId == -1);
@@ -682,7 +682,7 @@ void BattleLoadAllHealthBoxesGfxAtOnce(void)
         LoadCompressedSpriteSheet(&sSpriteSheets_DoublesPlayerHealthbox[1]);
         LoadCompressedSpriteSheet(&sSpriteSheets_DoublesOpponentHealthbox[0]);
         LoadCompressedSpriteSheet(&sSpriteSheets_DoublesOpponentHealthbox[1]);
-        numberOfBattlers = 4;
+        numberOfBattlers = MAX_BATTLERS_COUNT;
     }
     for (i = 0; i < numberOfBattlers; i++)
         LoadCompressedSpriteSheet(&sSpriteSheets_HealthBar[gBattlerPositions[i]]);
-- 
cgit v1.2.3