diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-06-08 00:45:06 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-06-08 15:24:25 -0400 |
| commit | 35867f531bbcfaf360045160734a1ff09ce0f6d8 (patch) | |
| tree | 91ab76846dd79dd2df56e49f309dcb56142ea767 /src/cable_club.c | |
| parent | c98342c9730175e57c0cf242292d5ccad61b471d (diff) | |
Some link rfu cleanup / link.c documentation
Diffstat (limited to 'src/cable_club.c')
| -rw-r--r-- | src/cable_club.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/cable_club.c b/src/cable_club.c index ffd7bcd8f..15e468390 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -283,7 +283,7 @@ static void Task_LinkupAwaitConfirmation(u8 taskId) if (linkPlayerCount < tMinPlayers) return; - sub_800AA04(linkPlayerCount); + SaveLinkPlayers(linkPlayerCount); ClearLinkPlayerCountWindow(tWindowId); ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1); ShowFieldAutoScrollMessage(gText_ConfirmStartLinkWithXPlayers); @@ -372,7 +372,7 @@ static void Task_LinkupExchangeDataWithLeader(u8 taskId) { gFieldLinkPlayerCount = GetLinkPlayerCount_2(); gLocalLinkPlayerId = GetMultiplayerId(); - sub_800AA04(gFieldLinkPlayerCount); + SaveLinkPlayers(gFieldLinkPlayerCount); card = (struct TrainerCard *)gBlockSendBuffer; TrainerCard_GenerateCardForPlayer(card); card->monSpecies[0] = GetMonData(&gPlayerParty[gSelectedOrderFromParty[0] - 1], MON_DATA_SPECIES, NULL); @@ -420,7 +420,7 @@ static void Task_LinkupCheckStatusAfterConfirm(u8 taskId) { gFieldLinkPlayerCount = GetLinkPlayerCount_2(); gLocalLinkPlayerId = GetMultiplayerId(); - sub_800AA04(gFieldLinkPlayerCount); + SaveLinkPlayers(gFieldLinkPlayerCount); card = (struct TrainerCard *)gBlockSendBuffer; TrainerCard_GenerateCardForPlayer(card); card->monSpecies[0] = GetMonData(&gPlayerParty[gSelectedOrderFromParty[0] - 1], MON_DATA_SPECIES, NULL); @@ -516,7 +516,7 @@ static void Task_LinkupAwaitTrainerCardData(u8 taskId) if (CheckLinkErrored(taskId) == TRUE) return; - if (GetBlockReceivedStatus() != sub_800A9A8()) + if (GetBlockReceivedStatus() != GetSavedLinkPlayerCountAsBitFlags()) return; for (index = 0; index < GetLinkPlayerCount(); index++) @@ -800,8 +800,8 @@ static void Task_ReestablishLinkAwaitConfirmation(u8 taskId) if (gReceivedRemoteLinkPlayers == TRUE && IsLinkPlayerDataExchangeComplete() == TRUE) { - sub_800AB18(); - sub_8009F18(); + CheckLinkPlayersMatchSaved(); + StartSendingKeysToLink(); DestroyTask(taskId); } } @@ -901,7 +901,7 @@ static void Task_StartWirelessCableClubBattle(u8 taskId) tState = 3; break; case 3: - if (GetBlockReceivedStatus() == sub_800A9D8()) + if (GetBlockReceivedStatus() == GetLinkPlayerCountAsBitFlags()) { for (i = 0; i < GetLinkPlayerCount(); i++) { @@ -1236,7 +1236,7 @@ void Task_WaitForLinkPlayerConnection(u8 taskId) // Players connected, destroy task if (gWirelessCommType == 0) { - if (!sub_800AA60()) + if (!DoesLinkPlayerCountMatchSaved()) { CloseLink(); SetMainCallback2(CB2_LinkError); |