diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-15 20:44:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-15 20:44:57 -0500 |
| commit | a4cd331634d1fcc5f7cb217c51c328c5769a9616 (patch) | |
| tree | 7b610171c3d893d1cace513cf61e0b74014dbad2 /src/battle_controller_player.c | |
| parent | 34deceb13695e7b13a27ecb94666fc95d2ced550 (diff) | |
| parent | fee980decd6dfd5dc98c15ba13c9ea8f7b597934 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 4 |
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 |