Start decompiling union_room_chat.c

data/union_room_chat.s

@@ -3,23 +3,6 @@
 
 	.section .rodata
 
-	.align 2
-gUnknown_082F2A7C:: @ 82F2A7C
-	.4byte sub_801DFAC
-	.4byte sub_801E030
-	.4byte sub_801E120
-	.4byte sub_801E240
-	.4byte sub_801E764
-	.4byte sub_801E838
-	.4byte sub_801E460
-	.4byte sub_801E5C4
-	.4byte sub_801E668
-	.4byte sub_801E978
-
-	.align 2
-gUnknown_082F2AA4:: @ 82F2AA4
-	.byte 0x09, 0x09, 0x09, 0x09
-
 	.align 2
 gUnknown_082F2AA8:: @ 82F2AA8
 	.byte 0x00, 0x16, 0x17, 0x68, 0x19, 0x1a, 0x1b, 0x1c
@@ -57,36 +40,9 @@ gUnknown_082F2AA8:: @ 82F2AA8
 
 	.align 2
 gUnknown_082F2BA8:: @ 82F2BA8
-	.4byte gUnknown_0862B9F9
+	.4byte gUnknown_0862B9F9, gUnknown_0862B9FF, gUnknown_0862BA05, gUnknown_0862BA0B, gUnknown_0862BA11, gUnknown_0862BA17, gUnknown_0862BA1D, gUnknown_0862BA23, gUnknown_0862BA29, gUnknown_0862BA2F
-	.4byte gUnknown_0862B9FF
+	.4byte gUnknown_0862BA35, gUnknown_0862BA3B, gUnknown_0862BA41, gUnknown_0862BA47, gUnknown_0862BA4D, gUnknown_0862BA53, gUnknown_0862BA59, gUnknown_0862BA5F, gUnknown_0862BA65, gUnknown_0862BA6B
-	.4byte gUnknown_0862BA05
+	.4byte gUnknown_0862BA79, gUnknown_0862BA84, gUnknown_0862BA8F, gUnknown_0862BA9A, gUnknown_0862BAA3, gUnknown_0862BAAE, gUnknown_0862BAB9, gUnknown_0862BAC4, gUnknown_0862BACF, gUnknown_0862BADA
-	.4byte gUnknown_0862BA0B
-	.4byte gUnknown_0862BA11
-	.4byte gUnknown_0862BA17
-	.4byte gUnknown_0862BA1D
-	.4byte gUnknown_0862BA23
-	.4byte gUnknown_0862BA29
-	.4byte gUnknown_0862BA2F
-	.4byte gUnknown_0862BA35
-	.4byte gUnknown_0862BA3B
-	.4byte gUnknown_0862BA41
-	.4byte gUnknown_0862BA47
-	.4byte gUnknown_0862BA4D
-	.4byte gUnknown_0862BA53
-	.4byte gUnknown_0862BA59
-	.4byte gUnknown_0862BA5F
-	.4byte gUnknown_0862BA65
-	.4byte gUnknown_0862BA6B
-	.4byte gUnknown_0862BA79
-	.4byte gUnknown_0862BA84
-	.4byte gUnknown_0862BA8F
-	.4byte gUnknown_0862BA9A
-	.4byte gUnknown_0862BAA3
-	.4byte gUnknown_0862BAAE
-	.4byte gUnknown_0862BAB9
-	.4byte gUnknown_0862BAC4
-	.4byte gUnknown_0862BACF
-	.4byte gUnknown_0862BADA
 
 	.align 2
 gUnknown_082F2C20:: @ 82F2C20

include/global.h

@@ -962,7 +962,8 @@ struct SaveBlock1
     /*0x3B24*/ u8 seen2[DEX_FLAGS_NO];
     /*0x3B58*/ LilycoveLady lilycoveLady;
     /*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20];
-    /*0x3C88*/ u8 unk3C88[11][20];
+    /*0x3C88*/ u8 unk3C88[10][21];
+    /*0x3D5A*/ u8 filler3D5A[0xA];
     /*0x3D64*/ struct SaveTrainerHill trainerHill;
     /*0x3D70*/ struct WaldaPhrase waldaPhrase;
     // sizeof: 0x3D88

include/link.h

@@ -236,7 +236,6 @@ u32 LinkMain1(u8 *shouldAdvanceLinkState, u16 *sendCmd, u16 (*recvCmds)[CMD_LENG
 void LinkVSync(void);
 void Timer3Intr(void);
 void SerialCB(void);
-u8 GetLinkPlayerCount(void);
 bool32 InUnionRoom(void);
 void sub_800E0E8(void);
 bool8 IsLinkTaskFinished(void);

include/link_rfu.h

@@ -284,5 +284,8 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx);
 s32 sub_800E87C(u8 idx);
 void sub_8011BA4(void);
 void sub_8010198(void);
+bool32 sub_8011A9C(void);
+void sub_80104B0(void);
+void sub_8011A50(void);
 
 #endif //GUARD_LINK_RFU_H

include/union_room_chat.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_UNION_ROOM_CHAT_H
+#define GUARD_UNION_ROOM_CHAT_H
+
+void sub_801DD98(void);
+
+#endif // GUARD_UNION_ROOM_CHAT_H

ld_script.txt

@@ -62,6 +62,7 @@ SECTIONS {
         asm/mevent_server_ish.o(.text);
         asm/mevent_server_helpers.o(.text);
         asm/mevent_news.o(.text);
+        src/union_room_chat.o(.text);
         asm/union_room_chat.o(.text);
         asm/berry_crush.o(.text);
         src/berry_powder.o(.text);
@@ -412,6 +413,7 @@ SECTIONS {
         src/mevent2.o(.rodata);
         data/mevent_801BAAC.o(.rodata);
         data/mevent_server.o(.rodata);
+        src/union_room_chat.o(.rodata);
         data/union_room_chat.o(.rodata);
         data/berry_crush.o(.rodata);
         data/berry_powder.o(.rodata);

src/link_rfu.c

@@ -4729,7 +4729,7 @@ bool32 sub_8011A80(void)
         return FALSE;
 }
 
-u8 sub_8011A9C(void)
+bool32 sub_8011A9C(void)
 {
     return gUnknown_03005000.unk_ce8;
 }

src/union_room.c

@@ -35,6 +35,7 @@
 #include "field_screen_effect.h"
 #include "script_pokemon_util_80F87D8.h"
 #include "mevent.h"
+#include "union_room_chat.h"
 
 struct UnkStruct_Shared
 {
@@ -231,7 +232,6 @@ bool32 sub_8017678(struct UnkStruct_x20 *arg0, struct UnkStruct_x1C *arg1);
 u32 sub_8018120(struct TradeUnkStruct *arg0, u8 multiplayerId);
 void sub_801807C(struct TradeUnkStruct *arg0);
 void sub_801AC54(void);
-void sub_801DD98(void);
 void sub_802A9A8(u8 monId, MainCallback callback);
 void sub_802493C(u8 monId, MainCallback callback);
 void sub_8020C70(MainCallback callback);