From 70e7f464cafb9173aef2eb0a8a7b47bc90238f09 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Jan 2020 21:57:31 -0500 Subject: PLAYER_NAME_LENGTH to 7 --- include/union_room.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/union_room.h') diff --git a/include/union_room.h b/include/union_room.h index 3cb8eb84a..7e48b3e6e 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -7,7 +7,7 @@ struct UnkStruct_Shared { struct GFtgtGname gname; - u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH]; + u8 ALIGNED(4) playerName[PLAYER_NAME_LENGTH + 1]; }; struct UnkStruct_x1C -- cgit v1.2.3 From 78196be41e84f632d3569f5f40cf4da2844902eb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 30 Jan 2020 10:48:42 -0500 Subject: More RFU documentation --- include/union_room.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include/union_room.h') diff --git a/include/union_room.h b/include/union_room.h index 7e48b3e6e..0600d9cc0 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -4,6 +4,11 @@ #include "global.h" #include "link_rfu.h" +// Return value of IsRequestedTypeAndSpeciesInPlayerParty +#define UR_TRADE_MATCH 0 +#define UR_TRADE_NOTYPE 1 +#define UR_TRADE_NOEGG 2 + struct UnkStruct_Shared { struct GFtgtGname gname; @@ -20,7 +25,7 @@ struct UnkStruct_x20 { struct UnkStruct_Shared unk; u16 field_18; - u8 field_1A_0:2; + u8 tradeStatus:2; u8 field_1A_1:1; u8 field_1B; u8 field_1D; @@ -56,7 +61,7 @@ struct UnkStruct_Leader u8 field_10; u8 field_11; u8 listTaskId; - u8 field_13; + u8 playerCount; u8 field_14; u8 field_15; u8 field_16; -- cgit v1.2.3 From 46a3ca51341fd3b68e4fe5251e70abc8a03644c5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Feb 2020 13:42:57 -0500 Subject: Union room activity documentation --- include/union_room.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'include/union_room.h') diff --git a/include/union_room.h b/include/union_room.h index 0600d9cc0..f5a1ecf04 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -25,7 +25,7 @@ struct UnkStruct_x20 { struct UnkStruct_Shared unk; u16 field_18; - u8 tradeStatus:2; + u8 groupScheduledAnim:2; u8 field_1A_1:1; u8 field_1B; u8 field_1D; @@ -114,19 +114,21 @@ struct UnkStruct_URoom /* 0x018 */ u8 field_18; /* 0x019 */ u8 field_19; /* 0x01A */ u8 field_1A; - /* 0x01B */ u8 field_1B; - /* 0x01C */ u8 field_1C; - /* 0x01D */ u8 field_1D; - /* 0x01E */ u8 field_1E; + /* 0x01B */ u8 topListMenuWindowId; + /* 0x01C */ u8 topListMenuListMenuId; + /* 0x01D */ u8 tradeBoardSelectWindowId; + /* 0x01E */ u8 tradeBoardDetailsWindowId; /* 0x01F */ u8 field_1F; /* 0x020 */ u8 field_20; /* 0x021 */ u8 spriteIds[40]; /* 0x049 */ u8 field_49; - /* 0x04A */ u8 field_4A; - /* 0x04C */ u16 field_4C[6]; - /* 0x058 */ u8 field_58[4][11]; - /* 0x084 */ u16 field_98; - /* 0x086 */ u16 field_9A[3]; + /* 0x04A */ u8 tradeBoardListMenuId; + + // For communication with potential link partners + /* 0x04C */ u16 playerSendBuffer[6]; + /* 0x058 */ u8 activityRequestStrbufs[4][11]; + /* 0x084 */ u16 partnerYesNoResponse; + /* 0x086 */ u16 recvActivityRequest[3]; // activity[, species, level] /* 0x08C */ struct UnionObj unionObjs[8]; /* 0x0AC */ u8 trainerCardStrbufs[12][15]; /* 0x160 */ u8 field_174[48]; -- cgit v1.2.3 From d522588538e39b8d8a6dc47b557dcc4ae322a093 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Feb 2020 13:51:38 -0500 Subject: Some more documentation of array sizes --- include/union_room.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/union_room.h') diff --git a/include/union_room.h b/include/union_room.h index f5a1ecf04..2c32760cb 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -9,6 +9,9 @@ #define UR_TRADE_NOTYPE 1 #define UR_TRADE_NOEGG 2 +#define UROOM_MAX_GROUP_COUNT 8 +#define UROOM_MAX_PARTY_SIZE 5 + struct UnkStruct_Shared { struct GFtgtGname gname; @@ -18,7 +21,7 @@ struct UnkStruct_Shared struct UnkStruct_x1C { struct UnkStruct_Shared unk0; - u8 unk18:1; + u8 active:1; }; struct UnkStruct_x20 -- cgit v1.2.3 From 7bd0a83d359beafc69a1a63cb51b11e98186a292 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Feb 2020 16:41:25 -0500 Subject: I'm so original with these commit names --- include/union_room.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/union_room.h') diff --git a/include/union_room.h b/include/union_room.h index 2c32760cb..d8f1a6dd9 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -160,7 +160,7 @@ struct UnionRoomTrade u32 personality; }; -extern struct GFtgtGnameSub gUnknown_203B064; +extern struct GFtgtGnameSub gPartnerTgtGnameSub; extern u16 gUnionRoomOfferedSpecies; extern u8 gUnionRoomRequestedMonType; -- cgit v1.2.3 From e0d25c32898b1284297159a5d1c1c6422a040150 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 Feb 2020 20:09:14 -0500 Subject: Document wireless_communication_status_screen --- include/union_room.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include/union_room.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; -- cgit v1.2.3 From 6af7391add68be30c6bd7d22803a3dd454e08a33 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Feb 2020 17:01:57 -0500 Subject: More renaming in union_room.c --- include/union_room.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/union_room.h') diff --git a/include/union_room.h b/include/union_room.h index 4ca58e03e..3efca7867 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -61,14 +61,14 @@ struct UnkStruct_Leader u8 textState; u8 delayTimerAfterOk; u8 listWindowId; - u8 field_10; - u8 field_11; + u8 bButtonCancelWindowId; + u8 nPlayerModeWindowId; u8 listTaskId; u8 playerCount; - u8 field_14; + u8 messageWindowId; u8 field_15; u8 field_16; - u8 taskId_sub_8119EB8; + u8 listenTaskId; u8 activity; u8 field_19; u16 field_1A; @@ -87,11 +87,11 @@ struct UnkStruct_Group u8 listTaskId; u8 field_F; u8 field_10; - u8 field_11; + u8 listenTaskId; u8 cardOrNews; u8 field_13; u8 field_14; - u8 field_15; + u8 delayBeforePrint; }; struct UnionObj -- cgit v1.2.3 From 78caeff45b98bf3cce180d37606d5a5239fbb030 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 6 Feb 2020 10:44:22 -0500 Subject: Name remaining funcs in union_room.c --- include/union_room.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'include/union_room.h') diff --git a/include/union_room.h b/include/union_room.h index 3efca7867..e24bcd480 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -29,11 +29,9 @@ struct UnkStruct_x20 struct UnionGnameUnamePair gname_uname; u16 field_18; u8 groupScheduledAnim:2; - u8 field_1A_1:1; + bool8 field_1A_1:1; u8 field_1B; - u8 field_1D; - u8 field_1E; - u8 field_1F; + u32 field_1C; // unused }; // These arrays are dynamically allocated but must be @@ -80,17 +78,17 @@ struct UnkStruct_Group struct UnkStruct_Main4 * field_4; u8 state; u8 textState; - u8 field_A; + u8 field_A; // unused u8 listWindowId; - u8 field_C; - u8 field_D; + u8 bButtonCancelWindowId; + u8 playerNameAndIdWindowId; u8 listTaskId; - u8 field_F; + u8 leaderId; u8 field_10; u8 listenTaskId; u8 cardOrNews; - u8 field_13; - u8 field_14; + u8 field_13; // referenced but never set + u8 refreshTimer; u8 delayBeforePrint; }; @@ -164,6 +162,6 @@ extern struct GFtgtGnameSub gPartnerTgtGnameSub; extern u16 gUnionRoomOfferedSpecies; extern u8 gUnionRoomRequestedMonType; -void sub_81173C0(u16 battleFlags); +void StartUnionRoomBattle(u16 battleFlags); #endif //GUARD_UNION_ROOM_H -- cgit v1.2.3