mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-18 17:34:20 +01:00
Merge pull request #2031 from LOuroboros/patch-2
Fixed usage of B_MULTI_BATTLE_WHITEOUT
This commit is contained in:
commit
3afda445ce
@ -4147,7 +4147,7 @@ static void Cmd_getexp(void)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef B_MULTI_BATTLE_WHITEOUT >= GEN_4
|
||||
#if B_MULTI_BATTLE_WHITEOUT >= GEN_4
|
||||
static bool32 NoAliveMonsForPlayerAndPartner(void)
|
||||
{
|
||||
u32 i;
|
||||
@ -4230,7 +4230,7 @@ static void Cmd_checkteamslost(void)
|
||||
if (gBattleControllerExecFlags)
|
||||
return;
|
||||
|
||||
#ifdef B_MULTI_BATTLE_WHITEOUT >= GEN_4
|
||||
#if B_MULTI_BATTLE_WHITEOUT >= GEN_4
|
||||
if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER))
|
||||
{
|
||||
if (NoAliveMonsForPlayerAndPartner())
|
||||
|
Loading…
x
Reference in New Issue
Block a user