summaryrefslogtreecommitdiff
path: root/src/battle_controller_player.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-02-16 11:08:43 -0500
committerGitHub <noreply@github.com>2020-02-16 11:08:43 -0500
commit533df93dc16c6af8666033711ce66b4d9a4afd64 (patch)
tree710b66921d56cee486f8aa21a3d8215e05b39715 /src/battle_controller_player.c
parent30f01c7df68bb9cf80ece491a457c8ce96c52c83 (diff)
parent04130a97d9ff799c9f1b439d091c0116adb31bfb (diff)
Merge branch 'master' into doc-caves
Diffstat (limited to 'src/battle_controller_player.c')
-rw-r--r--src/battle_controller_player.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index cb9e04a50..7b0a8aa47 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -831,9 +831,9 @@ void sub_802F6A8(void)
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
if (gWirelessCommType == 0)
- sub_800AAC0();
+ Link_TryStartSend5FFF();
else
- sub_800AB9C();
+ PrepareSendLinkCmd2FFE_or_RfuCmd6600();
gBattlerControllerFuncs[gActiveBattler] = sub_802F610;
}
else