ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update src/battle_script_commands.c

Browse Source 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
This commit is contained in:
LOuroboros 2021-12-28 12:18:44 -03:00 committed by GitHub
parent 713d97891f
commit cc1a243145
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/battle_script_commands.c
View File

@ -4190,12 +4190,21 @@ static void Cmd_unknown_24(void)
if (gBattleControllerExecFlags) if (gBattleControllerExecFlags)
return; return;
#ifdef B_MULTI_BATTLE_WHITEOUT >= GEN_4 #ifdef B_MULTI_BATTLE_WHITEOUT >= GEN_4
if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER) && NoAliveMonsForPlayerAndPartner()) if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER))
gBattleOutcome |= B_OUTCOME_LOST; {
#endif if (NoAliveMonsForPlayerAndPartner())
if (!(gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER)) && NoAliveMonsForPlayer()) gBattleOutcome |= B_OUTCOME_LOST;
}
else
{
if (NoAliveMonsForPlayer())
gBattleOutcome |= B_OUTCOME_LOST;
}
#else
if (NoAliveMonsForPlayer())
gBattleOutcome |= B_OUTCOME_LOST; gBattleOutcome |= B_OUTCOME_LOST;
#endif
if (NoAliveMonsForOpponent()) if (NoAliveMonsForOpponent())
gBattleOutcome |= B_OUTCOME_WON; gBattleOutcome |= B_OUTCOME_WON;