diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:45:31 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:45:31 -0400 |
| commit | 431c60c92c59ba0c2d5a658e0c490f46162bb5d2 (patch) | |
| tree | 7f03009ed9475a0f8e7aac6ed6ca2ab89a527577 /src/battle_controllers.c | |
| parent | 8b462f3f6c30de55767808136861e892fc3f0356 (diff) | |
| parent | 8b80b417e2172a44098a22473717da20585bd15d (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
Diffstat (limited to 'src/battle_controllers.c')
| -rw-r--r-- | src/battle_controllers.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c index b411c12f6..7f78c1ac9 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -6,6 +6,7 @@ #include "battle_message.h" #include "cable_club.h" #include "link.h" +#include "link_rfu.h" #include "party_menu.h" #include "pokemon.h" #include "recorded_battle.h" @@ -33,10 +34,10 @@ void HandleLinkBattleSetup(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK) { if (gWirelessCommType) - sub_800B488(); + SetWirelessCommType1(); if (!gReceivedRemoteLinkPlayers) OpenLink(); - CreateTask(task00_08081A90, 0); + CreateTask(Task_WaitForLinkPlayerConnection, 0); CreateTasksForSendRecvLinkBuffers(); } } @@ -827,7 +828,7 @@ void sub_8033648(void) if (gReceivedRemoteLinkPlayers != 0 && (gBattleTypeFlags & BATTLE_TYPE_20)) { - sub_8011BD0(); + DestroyTask_RfuIdle(); for (i = 0; i < GetLinkPlayerCount(); i++) { if (GetBlockReceivedStatus() & gBitTable[i]) |