Merge pull request #479 from Birdulon/PartySize

Fix party size calculations for larger-than-six PARTY_SIZE
2022-01-01 10:20:01 -05:00
parent 4c023cb8c7 92d6d97c65
commit cb7b53adee
1 changed files with 2 additions and 2 deletions
@@ -3675,7 +3675,7 @@ u8 CalculatePlayerPartyCount(void)
 {
    gPlayerPartyCount = 0;

-    while (gPlayerPartyCount < 6
+    while (gPlayerPartyCount < PARTY_SIZE
        && GetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, NULL) != SPECIES_NONE)
    {
        gPlayerPartyCount++;
@@ -3689,7 +3689,7 @@ u8 CalculateEnemyPartyCount(void)
 {
    gEnemyPartyCount = 0;

-    while (gEnemyPartyCount < 6
+    while (gEnemyPartyCount < PARTY_SIZE
        && GetMonData(&gEnemyParty[gEnemyPartyCount], MON_DATA_SPECIES, NULL) != SPECIES_NONE)
    {
        gEnemyPartyCount++;