diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/cable_club.h | 1 | ||||
| -rw-r--r-- | include/event_scripts.h | 18 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 1 | ||||
| -rw-r--r-- | include/link.h | 2 | ||||
| -rw-r--r-- | include/link_rfu.h | 10 | ||||
| -rw-r--r-- | include/overworld.h | 10 |
6 files changed, 32 insertions, 10 deletions
diff --git a/include/cable_club.h b/include/cable_club.h index 57515efc7..ccdc6b98d 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -11,5 +11,6 @@ void sub_8081A90(u8 taskId); u8 CreateTask_ReestablishLinkInCableClubRoom(void); void CB2_ReturnFromCableClubBattle(void); +bool32 GetSeeingLinkPlayerCardMsg(u8 who); #endif //GUARD_CABLE_CLUB_H diff --git a/include/event_scripts.h b/include/event_scripts.h index add2da0d1..a1bb5e35d 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1262,5 +1262,23 @@ extern const u8 EventScript_1C1361[]; // overworld extern const u8 EventScript_ResetEliteFourEnd[]; +extern const u8 CableClub_EventScript_DoLinkRoomExit[]; +extern const u8 CableClub_EventScript_TooBusyToNotice[]; +extern const u8 CableClub_EventScript_ReadTrainerCard[]; +extern const u8 CableClub_EventScript_ReadTrainerCardColored[]; +extern const u8 BattleColosseum_4P_EventScript_PlayerSpot0[]; +extern const u8 BattleColosseum_4P_EventScript_PlayerSpot1[]; +extern const u8 BattleColosseum_4P_EventScript_PlayerSpot2[]; +extern const u8 BattleColosseum_4P_EventScript_PlayerSpot3[]; +extern const u8 RecordCenter_EventScript_Spot0[]; +extern const u8 RecordCenter_EventScript_Spot1[]; +extern const u8 RecordCenter_EventScript_Spot2[]; +extern const u8 RecordCenter_EventScript_Spot3[]; +extern const u8 BattleColosseum_2P_EventScript_PlayerSpot0[]; +extern const u8 BattleColosseum_2P_EventScript_PlayerSpot1[]; +extern const u8 TradeCenter_EventScript_Chair0[]; +extern const u8 TradeCenter_EventScript_Chair1[]; +extern const u8 TradeCenter_ConfirmLeaveRoom[]; +extern const u8 TradeCenter_TerminateLink[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 2dc8aab84..79e6c2aef 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -62,5 +62,6 @@ bool32 PlayerIsMovingOnRockStairs(u8 direction); void sub_805BEB8(void); void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender); void nullsub_24(u8 direction); +u8 GetRSAvatarGraphicsIdByGender(u8 gender); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/link.h b/include/link.h index e5a40d6a5..d6f35f66d 100644 --- a/include/link.h +++ b/include/link.h @@ -289,5 +289,7 @@ void sub_800A900(u8 a0); u8 sub_800A8A4(void); void sub_800A9A4(void); void SetLocalLinkPlayerId(u8 playerId); +bool32 IsSendingKeysToLink(void); +u32 GetLinkRecvQueueLength(void); #endif // GUARD_LINK_H diff --git a/include/link_rfu.h b/include/link_rfu.h index ba2eb0120..31075be77 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -88,7 +88,7 @@ struct UnkRfuStruct_2_Sub_124 /* 0x57b */ vu8 full; }; -struct UnkRfuStruct_2_Sub_9e8 +struct RfuSendQueue { /* 0x000 */ u8 slots[40][14]; /* 0x230 */ vu8 recv_slot; @@ -148,7 +148,7 @@ typedef struct UnkRfuStruct_2 /* 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; + /* 0x6a0 */ struct RfuSendQueue sendQueue; /* 0x8d4 */ struct UnkRfuStruct_2_Sub_c1c unk_c1c; /* 0x8f4 */ vu8 unk_c3c; /* 0x8f5 */ u8 reconnectedParentIdx; @@ -227,16 +227,16 @@ void InitRFU(void); bool32 RfuIsErrorStatus1or2(void); void RFU_queue_20_70_reset(struct UnkRfuStruct_2_Sub_124 *ptr); -void RFU_queue_40_14_reset(struct UnkRfuStruct_2_Sub_9e8 *ptr); +void RFU_queue_40_14_reset(struct RfuSendQueue *ptr); void RfuSetErrorStatus(u8 a0, u16 msg); u8 RfuGetErrorStatus(void); void RFU_queue_20_70_recv(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2); -bool8 RFU_queue_40_14_send(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2); +bool8 RFU_queue_40_14_send(struct RfuSendQueue *q1, u8 *q2); bool8 RFU_queue_2_14_send(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2); void RFU_queue_2_14_recv(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2); bool8 RFU_queue_20_70_send(struct UnkRfuStruct_2_Sub_124 * a0, u8 *a1); -void RFU_queue_40_14_recv(struct UnkRfuStruct_2_Sub_9e8 * a0, u8 *a1); +void RFU_queue_40_14_recv(struct RfuSendQueue * a0, u8 *a1); void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 started, s32 child_sprite_genders); void UpdateGameData_GroupLockedIn(bool8 started); bool32 RfuSerialNumberIsValid(u32 a0); diff --git a/include/overworld.h b/include/overworld.h index c4d4520bf..f90d88e4e 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -38,7 +38,7 @@ struct LinkPlayerObjectEvent u8 active; u8 linkPlayerId; u8 objEventId; - u8 mode; + u8 movementMode; }; struct CreditsOverworldCmd @@ -177,11 +177,11 @@ u8 GetCurrentMapBattleScene(void); void Overworld_ResetStateAfterFly(void); bool8 sub_8055B38(u16 metatileBehavior); void Overworld_ResetMapMusic(void); -void sub_8057F5C(void); -void sub_8057F34(void); +u16 QueueExitLinkRoomKey(void); +u16 sub_8057F34(void); u32 sub_8057EC0(void); -void sub_8057F70(void); -void sub_8057F48(void); +u16 sub_8057F70(void); +u16 sub_8057F48(void); void SetMainCallback1(MainCallback cb); void CB1_Overworld(void); void CB2_ReturnToFieldContinueScript(void); |