Merge pull request #701 from Henny022p/cleanup/250302HEADmaster

Various code cleanup changes

1 files changed, 59 insertions, 5 deletions

diff --git a/include/message.h b/include/message.h
index b25e9df5..dbb5ac55 100644
--- a/include/message.h
+++ b/include/message.h
@@ -3,11 +3,55 @@
 
 #include "global.h"
 #include "entity.h"
-#include "structures.h"
 
 #define MESSAGE_ACTIVE 0x7f
 
 typedef struct {
+    u8 unk00 : 1;
+    u8 unk01 : 3;
+    u8 unk04 : 4;
+    u8 unk1;
+    u8 charColor;
+    u8 bgColor;
+    u16 unk4;
+    u16 unk6;
+    void* unk8;
+} WStruct;
+
+static_assert(sizeof(WStruct) == 12);
+
+typedef union {
+    char s[8];
+    u32 w[2];
+} String8;
+
+extern String8 gUnk_020227E8[];
+extern u32 NumberToAscii(u32, String8*);
+extern WStruct* sub_0805F2C8(void);
+extern u32 sub_0805F7DC(u32, WStruct*);
+extern void sub_0805F300(WStruct*);
+extern void sub_0805F8E4(u32 r0, WStruct* r1);
+extern s32 sub_08056338(void);
+
+typedef struct {
+    u16* dest;
+    void* gfx_dest;
+    void* buffer_loc;
+    u32 _c;
+    u16 gfx_src;
+    u8 width;
+    u8 right_align : 1;
+    u8 sm_border : 1;
+    u8 unused : 1;
+    u8 draw_border : 1;
+    u8 border_type : 4;
+    u8 fill_type;
+    u8 charColor;
+    u8 _16;
+    u8 stylized;
+} Font;
+
+typedef struct {
     u8 state;
     u8 unk;
     u8 textSpeed;
@@ -45,9 +89,11 @@ typedef struct {
     Token curToken;
     WStruct _50;
     char player_name[10];
-    u8 _66[0x10];
-    u8 _76;
-    u8 _77[0x11];
+    u8 _66[2];
+    String8 _68;
+    String8 _70;
+    String8 _78;
+    String8 _80;
     u8 msgStatus;
     u8 renderStatus;
     u8 newlineDelay;
@@ -81,6 +127,14 @@ typedef struct {
 extern TextRender gTextRender;
 static_assert(sizeof(TextRender) == 0xa8);
 
+typedef struct {
+    u8 unk_00;
+    u8 unk_01;
+    u8 unk_02[0xE];
+} struct_02000040;
+
+extern struct_02000040 gUnk_02000040;
+
 /**
  * @brief Initialize the message system.
  */
@@ -138,7 +192,7 @@ void MessageClose(void);
 
 void DispMessageFrame(u16*, s32, s32, u32);
 
-void sub_08057044(u32, struct_020227E8*, u32);
+void NumberToAsciiPad3Digits(u32, String8*, u32);
 
 typedef enum {
     TEXT_SAVE,