1 files changed, 13 insertions, 21 deletions

diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c
index f70fec0f..52873cdf 100644
--- a/arm9/src/error_message_reset.c
+++ b/arm9/src/error_message_reset.c
@@ -2,36 +2,28 @@
 #include "GX_layers.h"
 #include "unk_02031734.h"
 #include "unk_0202F150.h"
+#include "unk_02016B94.h"
 
 
 
-const u32 UNK_020FF49C[2] = { 0x1a030300, 0x00230112 };
+const struct UnkStruct4 UNK_020FF49C = { 0, 3, 3, 0x1a, 0x12, 1, 0x23 };
 
 const u32 UNK_020FF4A4[2] = { 0x00020000, 0x00000000 };
 
 const struct GraphicsModes UNK_020FF4AC = { mode1 : 1 };
 
-const u32 UNK_020FF4BC[7] = { 0x00, 0x00, 0x0800, 0x00, 0x06000001, 0x0100, 0x00 };
+const struct UnkStruct1 UNK_020FF4BC = { 0, 0, 0x800, 0, 1, 0, 0, 6, 0, 1, 0, 0, 0 };
 
 const struct GraphicsBanks UNK_020FF4D8 = { bg : 3 };
 
 u32 sErrorMessagePrinterLock;
 
 extern void FUN_0200E3A0(PMLCDTarget, int);
-extern u32 *FUN_02016B94(u32 param0);
-extern void FUN_02016BBC(const struct GraphicsModes *modes);
-extern void FUN_02016C18(u32 *param0, u32 param1, void *param2, u32 param3);
-extern void FUN_02018744(u32 *param0, u32 param1);
-extern void FUN_0200CB00(u32 *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
+extern void FUN_0200CB00(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
 extern void FUN_02002ED0(u32 param0, u32 param1, u32 param2);
-extern void FUN_02017F18(u32 param0, u32 param1, u32 param2, u32 param3);
-extern void FUN_02017FE4(u32 param0, u32 param1);
-extern void FUN_02019150(u32 *param0, u32 *param1, const u32 *param2);
-extern void FUN_020196F4(u32 *, u8, u16, u16, u16, u16);
-extern void FUN_0200CCA4(u32 *param0, u32 param1, u32 param2, u32 param3);
+extern void FUN_0200CCA4(struct Window *param0, u32 param1, u32 param2, u32 param3);
 extern void FUN_0200E394(u32 param0);
 extern void FUN_0200A274(u32 param0, u32 param1, u32 param2);
-extern void FUN_02019178(u32 *param0);
 
 THUMB_FUNC void VBlankHandler()
 {
@@ -43,8 +35,8 @@ THUMB_FUNC void VBlankHandler()
 THUMB_FUNC void PrintErrorMessageAndReset()
 {
 
-    u32 *ptr;
-    u32 buf[4];
+    struct UnkStruct2 *ptr;
+    struct Window buf;
 
     if (sErrorMessagePrinterLock != 1)
     {
@@ -83,7 +75,7 @@ THUMB_FUNC void PrintErrorMessageAndReset()
         ptr = FUN_02016B94(0);
         FUN_02016BBC(&UNK_020FF4AC);
 
-        FUN_02016C18(ptr, 0, UNK_020FF4BC, 0);
+        FUN_02016C18(ptr, 0, &UNK_020FF4BC, 0);
         FUN_02018744(ptr, 0);
 
         FUN_0200CB00(ptr, 0, 503, 2, 0, 0);
@@ -97,13 +89,13 @@ THUMB_FUNC void PrintErrorMessageAndReset()
         struct String *str = String_ctor(6 << 6, 0);
 
         FUN_0201BD5C();
-        FUN_02019150(ptr, buf, UNK_020FF49C);
-        FUN_020196F4(buf, 15, 0, 0, 0xd0, 0x90);
-        FUN_0200CCA4(buf, 0, 0x1f7, 2);
+        FUN_02019150(ptr, &buf, &UNK_020FF49C);
+        FUN_020196F4(&buf, 15, 0, 0, 0xd0, 0x90);
+        FUN_0200CCA4(&buf, 0, 0x1f7, 2);
 
         ReadMsgDataIntoString(msg_data, 3, str);
 
-        AddTextPrinterParameterized((u32)buf, 0, (const u16 *)str, 0, 0, 0, NULL); // wtf
+        AddTextPrinterParameterized((u32)(&buf), 0, (const u16 *)str, 0, 0, 0, NULL); // wtf
 
         String_dtor(str);
         GX_BothDispOn();
@@ -133,7 +125,7 @@ THUMB_FUNC void PrintErrorMessageAndReset()
         FUN_0200E3A0(PM_LCD_TOP, 0x7FFF);
         FUN_0200E3A0(PM_LCD_BOTTOM, 0x7FFF);
 
-        FUN_02019178(buf);
+        FUN_02019178(&buf);
 
         DestroyMsgData(msg_data);
         FreeToHeap(ptr);