diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/battle_main.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index f91386e6e..04a4a2acc 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -935,7 +935,7 @@ static void CB2_HandleStartBattle(void) case 1: if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - if (gReceivedRemoteLinkPlayers != 0) + if (gReceivedRemoteLinkPlayers) { if (IsLinkTaskFinished()) { @@ -1107,7 +1107,7 @@ static void CB2_PreInitMultiBattle(void) switch (gBattleCommunication[MULTIUSE_STATE]) { case 0: - if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished()) + if (gReceivedRemoteLinkPlayers && IsLinkTaskFinished()) { sub_80108C4(); SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_184, sizeof(gMultiPartnerParty)); @@ -1153,7 +1153,7 @@ static void CB2_PreInitMultiBattle(void) SetMainCallback2(CB2_InitBattleInternal); } } - else if (gReceivedRemoteLinkPlayers == 0) + else if (!gReceivedRemoteLinkPlayers) { gBattleTypeFlags = *savedBattleTypeFlags; gMain.savedCallback = *savedCallback; @@ -1190,7 +1190,7 @@ static void CB2_HandleStartMultiBattle(void) LoadWirelessStatusIndicatorSpriteGfx(); break; case 1: - if (gReceivedRemoteLinkPlayers != 0) + if (gReceivedRemoteLinkPlayers) { if (IsLinkTaskFinished()) { @@ -3843,7 +3843,7 @@ static void ReturnFromBattleToOverworld(void) RandomlyGivePartyPokerus(gPlayerParty); PartySpreadPokerus(gPlayerParty); } - if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) || gReceivedRemoteLinkPlayers == 0) + if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) || !gReceivedRemoteLinkPlayers) { gSpecialVar_Result = gBattleOutcome; gMain.inBattle = FALSE; |