diff options
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index a69a16dac..41b2b1313 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -735,7 +735,7 @@ static void CB2_HandleStartBattle(void) sub_805EF14(); gBattleCommunication[MULTIUSE_STATE] = 1; } - if (gSerialIsRFU) + if (gWirelessCommType) sub_800E0E8(); break; case 1: @@ -759,7 +759,7 @@ static void CB2_HandleStartBattle(void) SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32); gBattleCommunication[MULTIUSE_STATE] = 2; } - if (gSerialIsRFU) + if (gWirelessCommType) sub_800DFB4(0, 0); } } @@ -930,7 +930,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) sub_805EF14(); gBattleCommunication[MULTIUSE_STATE] = 1; } - if (gSerialIsRFU) + if (gWirelessCommType) sub_800E0E8(); // fall through case 1: @@ -961,7 +961,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) gBattleCommunication[MULTIUSE_STATE] = 2; } - if (gSerialIsRFU) + if (gWirelessCommType) sub_800DFB4(0, 0); } } @@ -1238,14 +1238,14 @@ static void CB2_PreInitMultiBattle(void) if (sub_800A520() && !gPaletteFade.active) { gBattleCommunication[MULTIUSE_STATE]++; - if (gSerialIsRFU) + if (gWirelessCommType) sub_800ADF8(); else sub_800AC34(); } break; case 3: - if (gSerialIsRFU) + if (gWirelessCommType) { if (sub_8010500()) { @@ -1330,7 +1330,7 @@ static void CB2_HandleStartMultiBattle(void) sub_805EF14(); gBattleCommunication[MULTIUSE_STATE] = 1; } - if (gSerialIsRFU) + if (gWirelessCommType) sub_800E0E8(); break; case 1: @@ -1348,7 +1348,7 @@ static void CB2_HandleStartMultiBattle(void) SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32); gBattleCommunication[MULTIUSE_STATE]++; } - if (gSerialIsRFU) + if (gWirelessCommType) sub_800DFB4(0, 0); } } @@ -2133,12 +2133,12 @@ static void sub_8038F34(void) } break; case 8: - if (!gSerialIsRFU) + if (!gWirelessCommType) sub_800AC34(); gBattleCommunication[MULTIUSE_STATE]++; break; case 9: - if (!gMain.field_439_x4 || gSerialIsRFU || gReceivedRemoteLinkPlayers != 1) + if (!gMain.field_439_x4 || gWirelessCommType || gReceivedRemoteLinkPlayers != 1) { gMain.field_439_x4 = 0; SetMainCallback2(gMain.savedCallback); @@ -2317,13 +2317,13 @@ static void sub_803939C(void) case 8: if (--gBattleCommunication[1] == 0) { - if (gMain.field_439_x4 && !gSerialIsRFU) + if (gMain.field_439_x4 && !gWirelessCommType) sub_800AC34(); gBattleCommunication[MULTIUSE_STATE]++; } break; case 9: - if (!gMain.field_439_x4 || gSerialIsRFU || gReceivedRemoteLinkPlayers != 1) + if (!gMain.field_439_x4 || gWirelessCommType || gReceivedRemoteLinkPlayers != 1) { gMain.field_439_x4 = 0; if (!gPaletteFade.active) |