From 7a5deff0bc0f9ab00981e34680015c84618155b9 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Thu, 9 Apr 2020 15:18:53 -0400
Subject: Add misc party constant usage

---
 src/battle_pike.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/battle_pike.c')

diff --git a/src/battle_pike.c b/src/battle_pike.c
index 9bc7254ec..6b31419a5 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -874,20 +874,20 @@ static bool8 TryInflictRandomStatus(void)
 {
     u8 j, i;
     u8 count;
-    u8 indices[3];
+    u8 indices[FRONTIER_PARTY_SIZE];
     u32 status;
     u16 species;
     bool8 statusChosen;
     struct Pokemon *mon;
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
         indices[i] = i;
     for (j = 0; j < 10; j++)
     {
         u8 temp, id;
 
-        i = Random() % 3;
-        id = Random() % 3;
+        i = Random() % FRONTIER_PARTY_SIZE;
+        id = Random() % FRONTIER_PARTY_SIZE;
         SWAP(indices[i], indices[id], temp);
     }
 
@@ -921,7 +921,7 @@ static bool8 TryInflictRandomStatus(void)
         {
             status = sStatusFlags;
             j = 0;
-            for (i = 0; i < 3; i++)
+            for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
             {
                 mon = &gPlayerParty[indices[i]];
                 if (GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) == AILMENT_NONE
@@ -963,7 +963,7 @@ static bool8 TryInflictRandomStatus(void)
     }
 
     j = 0;
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
     {
         mon = &gPlayerParty[indices[i]];
         if (GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) == AILMENT_NONE
@@ -995,7 +995,7 @@ static bool8 AtLeastOneHealthyMon(void)
         count = 3;
 
     healthyMonsCount = 0;
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
     {
         struct Pokemon *mon = &gPlayerParty[i];
         if (GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) == AILMENT_NONE
@@ -1262,23 +1262,23 @@ static void Task_DoStatusInflictionScreenFlash(u8 taskId)
 static void TryHealMons(u8 healCount)
 {
     u8 j, i, k;
-    u8 indices[3];
+    u8 indices[FRONTIER_PARTY_SIZE];
 
     if (healCount == 0)
         return;
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
         indices[i] = i;
     for (k = 0; k < 10; k++)
     {
         u8 temp;
 
-        i = Random() % 3;
-        j = Random() % 3;
+        i = Random() % FRONTIER_PARTY_SIZE;
+        j = Random() % FRONTIER_PARTY_SIZE;
         SWAP(indices[i], indices[j], temp);
     }
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
     {
         bool32 canBeHealed = FALSE;
         struct Pokemon *mon = &gPlayerParty[indices[i]];
@@ -1483,7 +1483,7 @@ static bool8 AtLeastTwoAliveMons(void)
 
     mon = &gPlayerParty[0];
     countDead = 0;
-    for (i = 0; i < 3; i++, mon++)
+    for (i = 0; i < FRONTIER_PARTY_SIZE; i++, mon++)
     {
         if (GetMonData(mon, MON_DATA_HP) == 0)
             countDead++;
-- 
cgit v1.2.3