diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:08:43 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-16 11:08:43 -0500 |
commit | 533df93dc16c6af8666033711ce66b4d9a4afd64 (patch) | |
tree | 710b66921d56cee486f8aa21a3d8215e05b39715 /src/battle_controllers.c | |
parent | 30f01c7df68bb9cf80ece491a457c8ce96c52c83 (diff) | |
parent | 04130a97d9ff799c9f1b439d091c0116adb31bfb (diff) |
Merge branch 'master' into doc-caves
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]) |