diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
| commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
| tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /src/battle_controllers.c | |
| parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
| parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) | |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'src/battle_controllers.c')
| -rw-r--r-- | src/battle_controllers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c index ca2ef0b22..834b9e6b6 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -35,7 +35,7 @@ void HandleLinkBattleSetup(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK) { if (gWirelessCommType) - sub_800B1F4(); + SetWirelessCommType1(); if (!gReceivedRemoteLinkPlayers) OpenLink(); CreateTask(sub_8081A90, 0); @@ -491,7 +491,7 @@ void sub_800DD28(void) if (gReceivedRemoteLinkPlayers && (gBattleTypeFlags & BATTLE_TYPE_20) && (gLinkPlayers[0].linkType == 0x2211)) { - sub_80FBB4C(); + LinkRfu_DestroyIdleTask(); for (i = 0; i < GetLinkPlayerCount(); ++i) { if (GetBlockReceivedStatus() & gBitTable[i]) |