diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/union_room.h | 3 | ||||
| -rw-r--r-- | include/link.h | 16 | ||||
| -rw-r--r-- | include/link_rfu.h | 26 | ||||
| -rw-r--r-- | include/overworld.h | 2 |
4 files changed, 25 insertions, 22 deletions
diff --git a/include/constants/union_room.h b/include/constants/union_room.h index aaeb3b34d..b23860645 100644 --- a/include/constants/union_room.h +++ b/include/constants/union_room.h @@ -54,4 +54,7 @@ #define LINK_GROUP_WONDER_NEWS 8 #define NUM_LINK_GROUP_TYPES 9 +#define LINK_GROUP_UNION_ROOM_RESUME 9 +#define LINK_GROUP_UNION_ROOM_INIT 10 + #endif //GUARD_CONSTANTS_UNION_ROOM_H diff --git a/include/link.h b/include/link.h index 7b20c71b4..e36ac8078 100644 --- a/include/link.h +++ b/include/link.h @@ -246,11 +246,11 @@ void sub_800E0E8(void); bool8 sub_800A520(void); bool8 sub_8010500(void); void sub_800DFB4(u8, u8); -void sub_800AB9C(void); -void sub_800B1F4(void); +void PrepareSendLinkCmd2FFE_or_RfuCmd6600(void); +void SetWirelessCommType1(void); void sub_8009734(void); void sub_800A620(void); -void sub_80FBB4C(void); +void LinkRfu_DestroyIdleTask(void); u8 sub_800ABAC(void); u8 sub_800ABBC(void); void Link_TryStartSend5FFF(void); @@ -264,19 +264,19 @@ bool8 IsLinkTaskFinished(void); bool32 sub_800B270(void); void ResetSerial(void); void sub_8054A28(void); -void sub_800B1F4(void); +void SetWirelessCommType1(void); void LoadWirelessStatusIndicatorSpriteGfx(void); void CreateWirelessStatusIndicatorSprite(u8, u8); void sub_8009FE8(void); void ClearLinkCallback_2(void); -void sub_80FA42C(void); -void sub_800B284(struct LinkPlayer * linkPlayer); +void LinkRfu_SetRfuFuncToSend6600(void); +void IntlConvertLinkPlayerName(struct LinkPlayer * linkPlayer); bool8 IsWirelessAdapterConnected(void); bool8 sub_800A474(u8 a0); void LinkVSync(void); bool8 HandleLinkConnection(void); -void sub_800B0B4(void); -void sub_800B110(u32 who); +void PrepareLocalLinkPlayerBlock(void); +void LinkPlayerFromBlock(u32 who); void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06); u8 sub_800A8D4(void); diff --git a/include/link_rfu.h b/include/link_rfu.h index 52d3a4c9c..86d55047d 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -87,21 +87,21 @@ typedef struct UnkRfuStruct_2 /* 0x06c */ struct RfuBlockSend cmd_8800_sendbuf; /* 0x080 */ struct RfuBlockSend cmd_8800_recvbuf[5]; /* 0x0e4 */ u8 cmd5f00Ack[5]; - /* 0x0e9 */ u8 unk_e9[5]; + /* 0x0e9 */ u8 cmd_6600_recvd[5]; /* 0x0ee */ vu8 errorState; /* 0x0ef */ u8 unk_ef; /* 0x0f0 */ u8 linkLossRecoveryState; /* 0x0f1 */ u8 unk_f1; /* 0x0f2 */ u16 unk_f2[6]; - /* 0x0fe */ u16 unk_fe; - /* 0x100 */ u16 unk_100; + /* 0x0fe */ u16 cmd_6600_timer; + /* 0x100 */ u16 cmd_6600_count; /* 0x102 */ u8 unk_102; /* 0x104 */ struct RfuTgtData unk_104; /* 0x124 */ struct UnkRfuStruct_2_Sub_124 unk_124; /* 0x6a0 */ struct UnkRfuStruct_2_Sub_9e8 unk_9e8; /* 0x8d4 */ struct UnkRfuStruct_2_Sub_c1c unk_c1c; /* 0x8f4 */ vu8 unk_c3c; - /* 0x8f5 */ u8 unk_c3d; + /* 0x8f5 */ u8 reconnectedParentIdx; /* 0x8f6 */ vu8 child_slot; /* 0x8f7 */ u8 unk_c3f[70]; /* 0x93d */ u8 unk_c85; @@ -118,12 +118,12 @@ typedef struct UnkRfuStruct_2 /* 0x993 */ vu8 unk_cdb; /* 0x994 */ vu8 unk_cdc; /* 0x995 */ u8 unk_cdd; - /* 0x996 */ u8 unk_cde[RFU_CHILD_MAX]; + /* 0x996 */ u8 linkPlayerIdx[RFU_CHILD_MAX]; /* 0x99a */ u8 bm_PartnerFlags; /* 0x99b */ u8 bm_DisconnectSlot; /* 0x99c */ u8 unk_ce4; /* 0x99d */ u8 unk_ce5; - /* 0x99e */ u8 unk_ce6; + /* 0x99e */ u8 unionRoomChatters; /* 0x99f */ u8 acceptSlot_flag; /* 0x9a0 */ bool8 unk_ce8; /* 0x9a1 */ u8 unk_ce9; @@ -147,7 +147,7 @@ void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0); void MEvent_CreateTask_Leader(u32 arg0); void RfuPrepareSend0x2f00(void * data); u8 CreateTask_ListenToWireless(void); -void sub_80FBB4C(void); +void LinkRfu_DestroyIdleTask(void); void sub_80F86F4(void); void sub_80FB128(bool32 a0); bool32 IsSendingKeysToRfu(void); @@ -161,13 +161,13 @@ u8 Rfu_GetBlockReceivedStatus(void); void Rfu_SetBlockReceivedFlag(u8 who); void Rfu_ResetBlockReceivedFlag(u8 who); bool8 Rfu_IsMaster(void); -void sub_80F85F8(void); +void ResetLinkRfuGFLayer(void); bool32 LinkRfuMain1(void); bool32 LinkRfuMain2(void); bool32 IsRfuRecvQueueEmpty(void); u32 GetRfuRecvQueueLength(void); void LinkRfu_Shutdown(void); -void sub_80FBB20(void); +void LinkRfu_CreateIdleTask(void); bool8 sub_80FA484(bool32 a0); void var_800D_set_xB(void); struct GFtgtGname *GetHostRFUtgtGname(void); @@ -191,7 +191,7 @@ void UpdateGameData_GroupLockedIn(bool8 started); bool32 RfuSerialNumberIsValid(u32 a0); bool8 sub_80FC1B0(void); bool8 LmanAcceptSlotFlagIsNotZero(void); -void sub_80F8F5C(void); +void LinkRfu_StopManagerAndFinalizeSlots(void); bool32 sub_80FA5D4(void); bool32 sub_80FC1CC(void); bool32 WaitRfuState(bool32 a0); @@ -204,7 +204,7 @@ void RequestDisconnectSlotByTrainerNameAndId(const u8 *trainerName, u16 trainerI void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname); void InitializeRfuLinkManager_JoinGroup(void); void LinkRfuNIsend8(void); -void CreateTask_sub_80FBE80(const u8 *src, u16 trainerId); +void CreateTask_RfuReconnectWithParent(const u8 *src, u16 trainerId); void UpdateGameDataWithActivitySpriteGendersFlag(u8 activity, u32 child_sprite_genders, u32 started); void RecordMixTrainerNames(void); void LinkRfu_CreateConnectionAsParent(); @@ -213,8 +213,8 @@ void SetGnameBufferWonderFlags(bool32 hasNews, bool32 hasCard); void ClearAndInitHostRFUtgtGname(void); void sub_80F8FA0(void); void RfuUpdatePlayerGnameStateAndSend(u32 type, u32 species, u32 level); -bool32 sub_80FBB0C(void); -void sub_80FBC00(void); +bool32 IsUnionRoomListenTaskActive(void); +void InitializeRfuLinkManager_EnterUnionRoom(void); void sub_80FBD6C(u32 a0); void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 a2); bool32 PlayerHasMetTrainerBefore(u16 id, u8 *name); diff --git a/include/overworld.h b/include/overworld.h index b783248ce..8242615c7 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -156,7 +156,7 @@ u8 GetCurrentMapType(void); u8 get_map_light_from_warp0(void); const struct MapHeader *warp1_get_mapheader(void); void sub_8055F88(void); -void sub_8056788(void); +void CB2_ReturnToFieldCableClub(void); void ResetGameStats(void); void Overworld_CreditsMainCB(void); |