Name remaining funcs in union_room.c

6 files changed, 32 insertions, 31 deletions

diff --git a/include/constants/union_room.h b/include/constants/union_room.h
index b4e08b1a8..aaeb3b34d 100644
--- a/include/constants/union_room.h
+++ b/include/constants/union_room.h
@@ -25,6 +25,9 @@
 #define ACTIVITY_ACCEPT    17
 #define ACTIVITY_DECLINE   18
 
+#define ACTIVITY_NPCTALK   19
+#define ACTIVITY_PLYRTALK  20
+
 // Duplicate IDs?
 #define ACTIVITY_WCARD2    21
 #define ACTIVITY_WNEWS2    22
diff --git a/include/event_object_lock.h b/include/event_object_lock.h
index 5c65585b5..1a0f452fc 100644
--- a/include/event_object_lock.h
+++ b/include/event_object_lock.h
@@ -11,6 +11,6 @@ void sub_8098630(void);
 bool8 sub_8098734(void);
 void sub_80696C0(void);
 bool8 walkrun_is_standing_still(void);
-void sub_80696F0(void);
+void UnionRoom_UnlockPlayerAndChatPartner(void);
 
 #endif // GUARD_EVENT_OBJECT_LOCK_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index dc96e3a77..472f5fa74 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -124,11 +124,11 @@ struct __attribute__((packed, aligned(2))) GFtgtGname
     u16 species:10;
     u16 type:6;
     u8 activity:7;
-    u8 unk_0a_7:1;
+    u8 started:1;
     u8 playerGender:1;
     u8 level:7;
-    u8 unk_0c;
-};
+    u8 padding;
+}; // size: RFU_GNAME_SIZE
 
 struct Padded_U8
 {
@@ -333,7 +333,7 @@ typedef struct UnkRfuStruct_2
     /* 0x99c */ u8 unk_ce4;
     /* 0x99d */ u8 unk_ce5;
     /* 0x99e */ u8 unk_ce6;
-    /* 0x99f */ u8 unk_ce7;
+    /* 0x99f */ u8 acceptSlot_flag;
     /* 0x9a0 */ bool8 unk_ce8;
     /* 0x9a1 */ u8 unk_ce9;
     /* 0x9a2 */ u8 unk_cea[RFU_CHILD_MAX];
@@ -371,7 +371,7 @@ void DestroyWirelessStatusIndicatorSprite(void);
 void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0);
 void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0);
 void MEvent_CreateTask_Leader(u32 arg0);
-void sub_80F9E2C(void * data);
+void RfuPrepareSend0x2f00(void * data);
 u8 CreateTask_ListenToWireless(void);
 void sub_80FBB4C(void);
 void sub_80F86F4(void);
@@ -412,26 +412,26 @@ 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 InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 r2, s32 r3);
-void sub_80FAFE0(bool8 unk_0a_7);
+void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 started, s32 child_sprite_genders);
+void UpdateGameData_GroupLockedIn(bool8 started);
 bool32 RfuSerialNumberIsValid(u32 a0);
 bool8 sub_80FC1B0(void);
-bool8 sub_80F8F40(void);
+bool8 LmanAcceptSlotFlagIsNotZero(void);
 void sub_80F8F5C(void);
 bool32 sub_80FA5D4(void);
 bool32 sub_80FC1CC(void);
-bool32 sub_80F8F7C(bool32 a0);
-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);
+bool32 WaitRfuState(bool32 a0);
+bool32 TrainerIdAndNameStillInPartnersList(u16 trainerId, const u8 *trainerName);
+void SendByteToPartnerByIdAndName(u8 a0, u16 a1, const u8 *a2);
+u32 WaitSendByteToPartnerByIdAndName(u16 a0, const u8 *a1);
 void SetHostRFUtgtGname(u8 activity, u32 child_sprite_genders, u32 a2);
 void InitializeRfuLinkManager_LinkLeader(u32 availSlots);
-void sub_80FBD4C(const u8 *trainerName, u16 trainerId);
+void RequestDisconnectSlotByTrainerNameAndId(const u8 *trainerName, u16 trainerId);
 void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname);
 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);
+void LinkRfuNIsend8(void);
+void CreateTask_sub_80FBE80(const u8 *src, u16 trainerId);
+void UpdateGameDataWithActivitySpriteGendersFlag(u8 activity, u32 child_sprite_genders, u32 started);
 void RecordMixTrainerNames(void);
 void LinkRfu_CreateConnectionAsParent();
 void LinkRfu_StopManagerBeforeEnteringChat();
diff --git a/include/menu.h b/include/menu.h
index b6d757f85..49dd43e26 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -30,7 +30,7 @@ s8 sub_812EAE4(u16 species, u32 personality, u8 a2);
 // list_menu
 void sub_8107CD8(u8 palOffset, u16 speciesId);
 void sub_8107CF8(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y);
-void sub_8107D38(u8 palOffset, u8 palId);
+void ListMenuLoadStdPalAt(u8 palOffset, u8 palId);
 void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y);
 
 // menu
diff --git a/include/mevent.h b/include/mevent.h
index 7f4925531..4f3e365f7 100644
--- a/include/mevent.h
+++ b/include/mevent.h
@@ -85,10 +85,10 @@ bool32 WonderCard_Test_Unk_08_6(void);
 u32 MENews_GetInput(u16 input);
 void InitMEventData(void);
 u16 MEvent_GetBattleCardCount(u32 command);
-void sub_8144714(u32 a0, u32 a1);
+void MEvent_RecordIdOfWonderCardSenderByEventType(u32 eventId, u32 trainerId);
 u16 *GetMEventProfileECWordsMaybe(void);
 void ResetReceivedWonderCardFlag(void);
-bool32 sub_81446D0(u16 a0);
+bool32 MEventHandleReceivedWonderCard(u16 cardId);
 u16 GetWonderCardFlagId(void);
 
 #endif //GUARD_MEVENT_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