dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #479 from Birdulon/PartySize

Browse Source 
Fix party size calculations for larger-than-six PARTY_SIZE
This commit is contained in:
GriffinR
2022-01-01 10:20:01 -05:00
committed by GitHub
parent 4c023cb8c7 92d6d97c65
commit cb7b53adee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon.c
+2 -2
View File
@@ -3675,7 +3675,7 @@ u8 CalculatePlayerPartyCount(void)
{ {
gPlayerPartyCount = 0; gPlayerPartyCount = 0;
while (gPlayerPartyCount < 6 while (gPlayerPartyCount < PARTY_SIZE
&& GetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, NULL) != SPECIES_NONE) && GetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, NULL) != SPECIES_NONE)
{ {
gPlayerPartyCount++; gPlayerPartyCount++;
@@ -3689,7 +3689,7 @@ u8 CalculateEnemyPartyCount(void)
{ {
gEnemyPartyCount = 0; gEnemyPartyCount = 0;
while (gEnemyPartyCount < 6 while (gEnemyPartyCount < PARTY_SIZE
&& GetMonData(&gEnemyParty[gEnemyPartyCount], MON_DATA_SPECIES, NULL) != SPECIES_NONE) && GetMonData(&gEnemyParty[gEnemyPartyCount], MON_DATA_SPECIES, NULL) != SPECIES_NONE)
{ {
gEnemyPartyCount++; gEnemyPartyCount++;