diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/union_room.h | 40 | ||||
| -rw-r--r-- | include/link_rfu.h | 10 | ||||
| -rw-r--r-- | include/strings.h | 11 | ||||
| -rw-r--r-- | include/union_room.h | 16 |
4 files changed, 45 insertions, 32 deletions
diff --git a/include/constants/union_room.h b/include/constants/union_room.h index 04ffa3037..b4e08b1a8 100644 --- a/include/constants/union_room.h +++ b/include/constants/union_room.h @@ -5,29 +5,31 @@ #define UNION_ROOM_SPAWN_IN 1 #define UNION_ROOM_SPAWN_OUT 2 -#define UROOM_ACTIVITY_NONE 0 -#define UROOM_ACTIVITY_BATTLE 1 -#define UROOM_ACTIVITY_DBLBATTLE 2 -#define UROOM_ACTIVITY_MLTBATTLE 3 -#define UROOM_ACTIVITY_TRADE 4 -#define UROOM_ACTIVITY_CHAT 5 -#define UROOM_ACTIVITY_WCARD 6 -#define UROOM_ACTIVITY_WNEWS 7 -#define UROOM_ACTIVITY_CARD 8 -#define UROOM_ACTIVITY_PJUMP 9 -#define UROOM_ACTIVITY_BCRUSH 10 -#define UROOM_ACTIVITY_BPICK 11 -#define UROOM_ACTIVITY_SEARCH 12 -#define UROOM_ACTIVITY_SPINTRADE 13 -#define UROOM_ACTIVITY_ITEMTRADE 14 +#define ACTIVITY_NONE 0 +#define ACTIVITY_BATTLE 1 +#define ACTIVITY_DBLBATTLE 2 +#define ACTIVITY_MLTBATTLE 3 +#define ACTIVITY_TRADE 4 +#define ACTIVITY_CHAT 5 +#define ACTIVITY_WCARD 6 +#define ACTIVITY_WNEWS 7 +#define ACTIVITY_CARD 8 +#define ACTIVITY_PJUMP 9 +#define ACTIVITY_BCRUSH 10 +#define ACTIVITY_BPICK 11 +#define ACTIVITY_SEARCH 12 +#define ACTIVITY_SPINTRADE 13 +#define ACTIVITY_ITEMTRADE 14 // Player response -#define UROOM_ACTIVITY_ACCEPT 17 -#define UROOM_ACTIVITY_DECLINE 18 +#define ACTIVITY_ACCEPT 17 +#define ACTIVITY_DECLINE 18 // Duplicate IDs? -#define UROOM_ACTIVITY_WCARD2 21 -#define UROOM_ACTIVITY_WNEWS2 22 +#define ACTIVITY_WCARD2 21 +#define ACTIVITY_WNEWS2 22 + +#define IN_UNION_ROOM 0x40 // Used in UR_AddTextPrinterParameterized #define UR_COLOR_DKE_WHT_LTE 0 diff --git a/include/link_rfu.h b/include/link_rfu.h index d25ed020e..40d69201e 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -279,7 +279,7 @@ typedef struct UnkRfuStruct_2 /* 0x004 */ u16 state; /* 0x006 */ u8 filler_06[4]; /* 0x00a */ u16 linkman_msg; - /* 0x00c */ u8 unk_0c; // parentChildMode? + /* 0x00c */ u8 parent_child; /* 0x00d */ u8 playerCount; /* 0x00e */ u8 unk_0e; /* 0x00f */ u8 unk_0f; @@ -372,7 +372,7 @@ void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0); void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0); void MEvent_CreateTask_Leader(u32 arg0); void sub_80F9E2C(void * data); -u8 sub_8116DE0(void); +u8 CreateTask_ListenToWireless(void); void sub_80FBB4C(void); void sub_80F86F4(void); void sub_80FB128(bool32 a0); @@ -392,7 +392,7 @@ bool32 LinkRfuMain1(void); bool32 LinkRfuMain2(void); bool32 IsRfuRecvQueueEmpty(void); u32 GetRfuRecvQueueLength(void); -void sub_80F8DC0(void); +void LinkRfu_Shutdown(void); void sub_80FBB20(void); bool8 sub_80FA484(bool32 a0); void var_800D_set_xB(void); @@ -425,10 +425,10 @@ bool32 sub_80FA634(u16 trainerId, const u8 *trainerName); void sub_80FA670(u8 a0, u16 a1, const u8 *a2); u32 sub_80FA6FC(u16 a0, const u8 *a1); void SetHostRFUtgtGname(u8 activity, u32 child_sprite_genders, u32 a2); -void sub_80FBB8C(u32 a0); +void InitializeRfuLinkManager_LinkLeader(u32 availSlots); void sub_80FBD4C(const u8 *trainerName, u16 trainerId); void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname); -void sub_80FBBD8(void); +void InitializeRfuLinkManager_JoinGroup(void); void sub_80FA6BC(void); void sub_80FBF54(const u8 *src, u16 trainerId); void sub_80FB008(u8 activity, u32 child_sprite_genders, u32 a2); diff --git a/include/strings.h b/include/strings.h index 5c8ffde4b..7ce955985 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1100,4 +1100,15 @@ extern const u8 gText_Symbols[]; extern const u8 gText_Register2[]; extern const u8 gText_Exit[]; +// wireless_communication_status_screen +extern const u8 gUnknown_841E2B4[]; +extern const u8 gUnknown_841E2BF[]; +extern const u8 gUnknown_841E2C9[]; +extern const u8 gUnknown_841E2D4[]; +extern const u8 gText_WirelessCommunicationStatus[]; +extern const u8 gText_PeopleTrading[]; +extern const u8 gText_PeopleBattling[]; +extern const u8 gText_PeopleInUnionRoom[]; +extern const u8 gText_PeopleCommunicating[]; + #endif //GUARD_STRINGS_H diff --git a/include/union_room.h b/include/union_room.h index d8f1a6dd9..4ca58e03e 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -12,21 +12,21 @@ #define UROOM_MAX_GROUP_COUNT 8 #define UROOM_MAX_PARTY_SIZE 5 -struct UnkStruct_Shared +struct UnionGnameUnamePair { struct GFtgtGname gname; - u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH + 1]; + u8 ALIGNED(4) uname[PLAYER_NAME_LENGTH + 1]; }; struct UnkStruct_x1C { - struct UnkStruct_Shared unk0; + struct UnionGnameUnamePair gname_uname; u8 active:1; }; struct UnkStruct_x20 { - struct UnkStruct_Shared unk; + struct UnionGnameUnamePair gname_uname; u16 field_18; u8 groupScheduledAnim:2; u8 field_1A_1:1; @@ -59,7 +59,7 @@ struct UnkStruct_Leader struct UnkStruct_Main0 * field_8; u8 state; u8 textState; - u8 field_E; + u8 delayTimerAfterOk; u8 listWindowId; u8 field_10; u8 field_11; @@ -68,8 +68,8 @@ struct UnkStruct_Leader u8 field_14; u8 field_15; u8 field_16; - u8 field_17; - u8 field_18; + u8 taskId_sub_8119EB8; + u8 activity; u8 field_19; u16 field_1A; }; @@ -88,7 +88,7 @@ struct UnkStruct_Group u8 field_F; u8 field_10; u8 field_11; - u8 field_12; + u8 cardOrNews; u8 field_13; u8 field_14; u8 field_15; |