Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix no eligible mons when only the partner wins in multi battle (#6626)

Browse Source
This commit is contained in:
Bivurnum 2025-04-19 07:15:13 -05:00 committed by GitHub
parent 17b992bec5
commit d342b373f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/battle_script_commands.c
View File

@ -5344,6 +5344,7 @@ bool32 NoAliveMonsForPlayer(void)
u32 i;
u32 maxI = PARTY_SIZE;
u32 HP_count = 0;
u32 ineligibleMonsCount = 0;
if (B_MULTI_BATTLE_WHITEOUT < GEN_4 && gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER))
maxI = MULTI_PARTY_SIZE;
@ -5356,6 +5357,28 @@ bool32 NoAliveMonsForPlayer(void)
{
HP_count += GetMonData(&gPlayerParty[i], MON_DATA_HP);
}
// Get the number of fainted mons or eggs (not empty slots) in the first three party slots.
if (i < 3 && ((GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) && !GetMonData(&gPlayerParty[i], MON_DATA_HP))
|| GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)))
ineligibleMonsCount++;
}
// Get the number of inelligible slots in the saved player party.
if (B_MULTI_BATTLE_WHITEOUT > GEN_3 && gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER)
&& !(gBattleTypeFlags & BATTLE_TYPE_ARENA))
{
for (i = 0; i < PARTY_SIZE; i++)
{
if (!GetMonData(&gSaveBlock1Ptr->playerParty[i], MON_DATA_SPECIES)
|| !GetMonData(&gSaveBlock1Ptr->playerParty[i], MON_DATA_HP)
|| GetMonData(&gSaveBlock1Ptr->playerParty[i], MON_DATA_IS_EGG))
ineligibleMonsCount++;
}
// If the total number of ineligible mons is 6 or more, lose the battle.
if (ineligibleMonsCount >= 6)
return TRUE;
}
return (HP_count == 0);