Decompile the rest of text.c

3 files changed, 26 insertions, 18 deletions

diff --git a/include/fileselect.h b/include/fileselect.h
index 2d4d1122..066e3e88 100644
--- a/include/fileselect.h
+++ b/include/fileselect.h
@@ -23,15 +23,16 @@ static_assert(sizeof(ChooseFileState) == 0x30);
 // TODO: This occupies the same memory region as gMenu
 extern ChooseFileState gChooseFileState;
 
-typedef struct {
-    u8 filler0[0x1];
-    u8 unk1;
-    u8 charColor;
-    u8 bgColor;
-    u16 unk4;
-    u16 unk6;
-    u8* unk8;
-} struct_02036540;
+// typedef struct {
+//     u8 unk00 : 4;
+//     u8 unk04 : 4;
+//     u8 unk1;
+//     u8 charColor;
+//     u8 bgColor;
+//     u16 unk4;
+//     u16 unk6;
+//     u8* unk8;
+// } struct_02036540;
 
 extern struct_020227E8 gUnk_020227E8[];
 
@@ -51,13 +52,13 @@ extern struct_02019EE0 gMapDataBottomSpecial;
 // TODO size: 0x8000 from ClearTilemaps?
 
 extern void sub_08056FEC(u32, struct_020227E8*);
-extern void sub_0805F46C(u32, Font*);
+extern u32 sub_0805F46C(u32, Font*);
 extern void RecoverUI(u32 bottomPt, u32 topPt);
 extern void ClearTilemaps(void);
 extern void sub_0805194C(u32);
-extern struct_02036540* sub_0805F2C8(void);
-extern void sub_0805F7DC(u32, struct_02036540*);
-extern void sub_0805F300(struct_02036540*);
+extern WStruct* sub_0805F2C8(void);
+extern u32 sub_0805F7DC(u32, WStruct*);
+extern void sub_0805F300(WStruct*);
 extern void sub_08050A64(u32);
 extern void sub_08050AFC(u32);
 extern void sub_08050384();
diff --git a/include/message.h b/include/message.h
index d0fc84a9..4a450767 100644
--- a/include/message.h
+++ b/include/message.h
@@ -25,14 +25,17 @@ typedef struct {
 extern Message gMessage;
 
 typedef struct {
-    u8 flags;
+    u8 unk00 : 1;
+    u8 unk01 : 4;
+    u8 unk05 : 2;
+    u8 unk06 : 1;
     u8 code;      // first byte read
     u16 param;    // second byte read
     u16 extended; // ascii adjusted for jp chars
     u16 _6;
     u16 textIndex;
     void* _c;
-    u8 buf[32];
+    const u8* buf[8];
 } Token;
 
 typedef struct {
diff --git a/include/structures.h b/include/structures.h
index cfa85d7f..00e83b72 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -222,15 +222,19 @@ extern struct {
 static_assert(sizeof(gUnk_02034490) == 0x18);
 
 typedef struct {
-    u8 unk0;
+    u8 unk00 : 1;
+    u8 unk01 : 3;
+    u8 unk04 : 4;
     u8 unk1;
-    u8 unk2;
-    u8 unk3;
+    u8 charColor;
+    u8 bgColor;
     u16 unk4;
     u16 unk6;
     void* unk8;
 } WStruct;
 
+static_assert(sizeof(WStruct) == 12);
+
 typedef struct {
     u8 unk0;
     u8 unk1;