summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/contest.h4
-rw-r--r--include/contest_link.h23
-rw-r--r--include/link.h22
-rw-r--r--include/link_rfu.h20
4 files changed, 34 insertions, 35 deletions
diff --git a/include/contest.h b/include/contest.h
index 1cad71705..5808cb925 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -322,7 +322,7 @@ extern u8 gContestMonPartyIndex;
extern u8 gContestPlayerMonIndex;
extern u8 gContestantTurnOrder[CONTESTANT_COUNT];
extern u8 gLinkContestFlags;
-extern u8 gUnknown_02039F2B;
+extern u8 gContestLinkLeaderIndex;
extern u16 gSpecialVar_ContestCategory;
extern u16 gSpecialVar_ContestRank;
extern u8 gNumLinkContestPlayers;
@@ -342,7 +342,7 @@ void CreateContestMonFromParty(u8 partyIndex);
void SetContestants(u8 contestType, u8 rank);
void SetLinkAIContestants(u8 contestType, u8 rank, bool32 isPostgame);
u8 GetContestEntryEligibility(struct Pokemon *pkmn);
-void sub_80DB09C(u8 contestCategory);
+void CalculateRound1Points(u8 contestCategory);
bool8 IsSpeciesNotUnown(u16 species);
bool8 Contest_IsMonsTurnDisabled(u8 a);
void SaveLinkContestResults(void);
diff --git a/include/contest_link.h b/include/contest_link.h
index 52b7ee330..02eb2f11d 100644
--- a/include/contest_link.h
+++ b/include/contest_link.h
@@ -2,23 +2,22 @@
#define GUARD_CONTEST_LINK_H
void sub_80FCC88(u8);
-void sub_80FCC88(u8);
void Task_LinkContest_CommunicateFinalStandings(u8);
-void sub_80FC580(u8);
-void sub_80FC6BC(u8);
-void sub_80FC804(u8);
-void sub_80FCE48(u8);
-void sub_80FC894(u8);
-void Task_LinkContest_CommunicateMonIdxs(u8 taskId);
-void sub_81D9DE4(u8 taskId);
+void Task_LinkContest_Init(u8);
+void Task_LinkContest_CommunicateMonsRS(u8);
+void Task_LinkContest_CommunicateRngRS(u8);
+void Task_LinkContest_CommunicateLeaderIdsRS(u8);
+void Task_LinkContest_CommunicateCategoryRS(u8);
+void Task_LinkContest_CommunicateMonIdxs(u8);
+void Task_LinkContest_StartCommunicationEm(u8);
void Task_LinkContest_CommunicateRound1Points(u8);
void Task_LinkContest_CommunicateTurnOrder(u8);
-void sub_80F8714(u8);
-bool32 sub_80FC670(s16 *);
+void Task_LinkContest_FinalizeConnection(u8);
+void Task_LinkContest_CommunicateMoveSelections(u8);
+bool32 LinkContest_TryLinkStandby(s16 *);
bool32 LinkContest_SendBlock(void *, u16);
bool8 LinkContest_GetBlockReceivedFromAllPlayers(void);
bool8 LinkContest_GetBlockReceived(u8);
-u8 sub_80F86E0(u8 *);
-void Task_LinkContest_CommunicateMoveSelections(u8 taskId);
+u8 LinkContest_GetLeaderIndex(u8 *);
#endif //GUARD_CONTEST_LINK_H
diff --git a/include/link.h b/include/link.h
index 25e62ff1e..de10bb8dc 100644
--- a/include/link.h
+++ b/include/link.h
@@ -49,11 +49,11 @@
(((status) & LINK_STAT_ERRORS) >> LINK_STAT_ERRORS_SHIFT)
#define LINKCMD_SEND_LINK_TYPE 0x2222
-#define LINKCMD_0x2FFE 0x2FFE
+#define LINKCMD_READY_EXIT_STANDBY 0x2FFE
#define LINKCMD_SEND_HELD_KEYS 0x4444
#define LINKCMD_0x5555 0x5555
#define LINKCMD_0x5566 0x5566
-#define LINKCMD_0x5FFF 0x5FFF
+#define LINKCMD_READY_CLOSE_LINK 0x5FFF
#define LINKCMD_0x6666 0x6666
#define LINKCMD_0x7777 0x7777
#define LINKCMD_CONT_BLOCK 0x8888
@@ -64,7 +64,7 @@
#define LINKCMD_INIT_BLOCK 0xBBBB
#define LINKCMD_READY_CANCEL_TRADE 0xBBCC
#define LINKCMD_SEND_HELD_KEYS_2 0xCAFE
-#define LINKCMD_0xCCCC 0xCCCC
+#define LINKCMD_SEND_BLOCK_REQ 0xCCCC
#define LINKCMD_START_TRADE 0xCCDD
#define LINKCMD_CONFIRM_FINISH_TRADE 0xDCBA
#define LINKCMD_SET_MONS_TO_TRADE 0xDDDD
@@ -273,11 +273,11 @@ bool32 InUnionRoom(void);
void LoadWirelessStatusIndicatorSpriteGfx(void);
bool8 IsLinkTaskFinished(void);
void CreateWirelessStatusIndicatorSprite(u8, u8);
-void sub_800ADF8(void);
+void SetLinkStandbyCallback(void);
void SetWirelessCommType1(void);
void CheckShouldAdvanceLinkState(void);
u8 IsLinkMaster(void);
-void sub_800AC34(void);
+void SetCloseLinkCallback(void);
bool8 HandleLinkConnection(void);
void SetLinkDebugValues(u32 seed, u32 flags);
void sub_800A418(void);
@@ -305,9 +305,9 @@ extern u16 gLinkHeldKeys;
extern u32 gLinkStatus;
extern u8 gUnknown_030030E4;
extern u8 gUnknown_030030E8;
-extern u8 gUnknown_030030EC[MAX_LINK_PLAYERS];
-extern u8 gUnknown_030030F0[MAX_LINK_PLAYERS];
-extern u16 gUnknown_030030F4;
+extern bool8 gReadyToExitStandby[MAX_LINK_PLAYERS];
+extern bool8 gReadyToCloseLink[MAX_LINK_PLAYERS];
+extern u16 gReadyCloseLinkType;
extern u8 gSuppressLinkErrorMessage;
extern u8 gWirelessCommType;
extern bool8 gSavedLinkPlayerCount;
@@ -334,15 +334,15 @@ bool32 LinkDummy_Return2(void);
void SetLocalLinkPlayerId(u8);
u8 GetSavedPlayerCount(void);
void sub_8009FAC(void);
-bool8 sub_800A4D8(u8 a0);
+bool8 SendBlockRequest(u8 type);
u8 GetLinkPlayerCountAsBitFlags(void);
u8 sub_800A0C8(s32, s32);
u8 GetSavedLinkPlayerCountAsBitFlags(void);
-void sub_800AD10(void);
+void SetCloseLinkCallbackHandleJP(void);
void CheckLinkPlayersMatchSaved(void);
void StartSendingKeysToLink(void);
bool8 DoesLinkPlayerCountMatchSaved(void);
-void sub_800ABF4(u16 a0);
+void SetCloseLinkCallbackAndType(u16 type);
bool32 IsSendingKeysToLink(void);
u32 GetLinkRecvQueueLength(void);
diff --git a/include/link_rfu.h b/include/link_rfu.h
index eede41d60..4d00039eb 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -8,11 +8,11 @@
#define RFU_COMMAND_0x4400 0x4400
#define RFU_COMMAND_0x8800 0x8800
#define RFU_COMMAND_0x8900 0x8900
-#define RFU_COMMAND_0xA100 0xA100
+#define RFU_COMMAND_SEND_BLOCK_REQ 0xA100
#define RFU_COMMAND_0x7700 0x7700
#define RFU_COMMAND_0x7800 0x7800
-#define RFU_COMMAND_0x6600 0x6600
-#define RFU_COMMAND_0x5F00 0x5F00
+#define RFU_COMMAND_READY_EXIT_STANDBY 0x6600
+#define RFU_COMMAND_READY_CLOSE_LINK 0x5F00
#define RFU_COMMAND_0x2F00 0x2F00
#define RFU_COMMAND_0xBE00 0xBE00
#define RFU_COMMAND_0xEE00 0xEE00
@@ -125,7 +125,7 @@ struct GFRfuManager
/* 0x012 */ u16 unk_12;
/* 0x014 */ u8 unk_14[RFU_CHILD_MAX][14];
/* 0x04c */ u8 unk_4c[14];
- /* 0x05a */ u8 unk_5a;
+ /* 0x05a */ u8 blockRequestType;
/* 0x05b */ u8 unk_5b;
/* 0x05c */ bool8 blockReceived[MAX_RFU_PLAYERS];
/* 0x061 */ bool8 numBlocksReceived[MAX_RFU_PLAYERS];
@@ -134,14 +134,14 @@ struct GFRfuManager
/* 0x068 */ u8 filler_68[4];
/* 0x06c */ struct RfuBlockSend sendBlock;
/* 0x080 */ struct RfuBlockSend recvBlock[MAX_RFU_PLAYERS];
- /* 0x0e4 */ u8 unk_e4[5];
- /* 0x0e9 */ u8 unk_e9[5];
+ /* 0x0e4 */ bool8 readyCloseLink[MAX_RFU_PLAYERS];
+ /* 0x0e9 */ bool8 readyExitStandby[MAX_RFU_PLAYERS];
/* 0x0ee */ vu8 errorState;
/* 0x0ef */ bool8 isShuttingDown;
/* 0x0f0 */ u8 linkLossRecoveryState;
/* 0x0f1 */ u8 status;
/* 0x0f2 */ u16 unk_f2[6];
- /* 0x0fe */ u16 unk_fe;
+ /* 0x0fe */ u16 resendExitStandbyTimer;
/* 0x100 */ u16 unk_100;
/* 0x102 */ u8 unk_102;
/* 0x103 */ u8 filler_103[0x10A - 0x103];
@@ -203,11 +203,11 @@ bool32 Rfu_InitBlockSend(const u8 *src, size_t size);
void ClearLinkRfuCallback(void);
u8 Rfu_GetLinkPlayerCount(void);
u8 Rfu_GetMultiplayerId(void);
-bool8 sub_8010100(u8 a0);
+bool8 Rfu_SendBlockRequest(u8 type);
bool8 IsLinkRfuTaskFinished(void);
bool8 Rfu_IsMaster(void);
-void task_add_05_task_del_08FA224_when_no_RfuFunc(void);
-void sub_8010434(void);
+void Rfu_SetCloseLinkCallback(void);
+void Rfu_SetLinkStandbyCallback(void);
void ResetLinkRfuGFLayer(void);
void UpdateWirelessStatusIndicatorSprite(void);
void InitRFU(void);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:16:10 +0000