Fix parameterization

4 files changed, 26 insertions, 40 deletions

diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c
index 6bff812a..426ba876 100644
--- a/arm9/src/error_message_reset.c
+++ b/arm9/src/error_message_reset.c
@@ -20,18 +20,17 @@ 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_02016C18(u32 *param0, struct Window * param1, const u32 *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_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 FillWindowPixelRect(u32 *, u8, u16, u16, u16, u16);
-extern void FUN_0200CCA4(u32 *param0, u32 param1, u32 param2, u32 param3);
+extern void FUN_02019150(u32 *param0, struct Window *param1, const u32 *param2);
+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);
+extern void FUN_02019178(struct Window *param0);
 
 THUMB_FUNC void VBlankHandler()
 {
@@ -44,7 +43,7 @@ THUMB_FUNC void PrintErrorMessageAndReset()
 {
 
     u32 *ptr;
-    u32 buf[4];
+    struct Window buf;
 
     if (sErrorMessagePrinterLock != 1)
     {
@@ -97,13 +96,13 @@ THUMB_FUNC void PrintErrorMessageAndReset()
         struct String *str = String_ctor(6 << 6, 0);
 
         FUN_0201BD5C();
-        FUN_02019150(ptr, buf, UNK_020FF49C);
-        FillWindowPixelRect(buf, 15, 0, 0, 0xd0, 0x90);
-        FUN_0200CCA4(buf, 0, 0x1f7, 2);
+        FUN_02019150(ptr, &buf, UNK_020FF49C);
+        FillWindowPixelRect(&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(&buf, 0, (const u16 *)str, 0, 0, 0, NULL); // wtf
 
         String_dtor(str);
         GX_BothDispOn();
@@ -133,7 +132,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);
diff --git a/arm9/src/list_menu.c b/arm9/src/list_menu.c
index e3832145..cd9abde0 100644
--- a/arm9/src/list_menu.c
+++ b/arm9/src/list_menu.c
@@ -2,18 +2,8 @@
 #include "heap.h"
 #include "main.h"
 #include "list_menu.h"
+#include "text.h"
 
-extern void * ListMenuCursorNew(u32 heap_id);
-extern void * ListMenuUpdateCursorObj(struct ListMenuCursor *, struct Window *, u8 x, u8 y);
-extern void ListMenuCursorSetColor(void *, u32);
-extern void DestroyListMenuCursorObj(void *);
-extern void FillWindowPixelBuffer(struct Window *, u32);
-extern void CopyWindowToVram(struct Window *);
-extern s32 GetFontAttribute(u8 fontId, s32 attr);
-extern void FillWindowPixelRect(struct Window *, u32 fillValue, u16 x, u16 y, u16 width, u16 height);
-extern void ScrollWindow(struct Window *, u8, u8, u8);
-extern u16 GetWindowWidth(struct Window *);
-extern u16 GetWindowHeight(struct Window *);
 void ListMenuPrintEntries(struct ListMenu * list, u16 startIndex, u16 yOffset, u16 count);
 void ListMenuDrawCursor(struct ListMenu * list);
 BOOL ListMenuChangeSelection(struct ListMenu * list, u8 updateCursorAndCallCallback, u8 count, u8 movingDown);
diff --git a/arm9/src/text.c b/arm9/src/text.c
index 926fa29f..bbaa3472 100644
--- a/arm9/src/text.c
+++ b/arm9/src/text.c
@@ -24,7 +24,6 @@ extern u32 FontFunc(u8 fontId, struct TextPrinter *printer);
 
 extern void *FUN_02006BB0(u32 param0, u32 param1, u32 param2, struct TextPrinter **param3, u32 param4);
 
-extern u32 GetWindowWidth(struct Window * window);
 extern void FUN_02019658(struct Window * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9);
 
 
@@ -349,7 +348,7 @@ THUMB_FUNC void FUN_0201C1EC(struct TextPrinter *printer, u32 param1, u32 param2
         printer->Unk2C = FUN_0201C1B0();
     }
     u32 r6 = (u32)printer->Unk2C + param3 * (sizeof(struct TextPrinter) * 8);
-    u32 r2 = ((GetWindowWidth(window) - 3) << 0x13) >> 0x10;
+    u16 r2 = (GetWindowWidth(window) - 3) * 8;
     FUN_02019658(window, r6, 0, 0, 24, 32, r2, 0, 24, 32);
 }
 
diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c
index 392af46d..e2765c6f 100644
--- a/arm9/src/text_02054590.c
+++ b/arm9/src/text_02054590.c
@@ -7,18 +7,16 @@ extern void FUN_02002EEC(u32 param0, u32 param1, u32 param2);
 
 extern void FUN_02019064(u32 param0, u32 param1, u32 param2, u8 param3, u32 param4, u8 param5, u32 param6, u32 param7, u32 param8);
 
-extern void FUN_0200CD68(u32 param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
-extern u32 FUN_0201AB08(u32 *param0);
-extern void FUN_0200D0BC(u32 *param0, u32 param1, u32 param2, u32 param3);
-
-extern void FillWindowPixelBuffer(u32 *param0, u32 param1);
+extern void FUN_0200CD68(void * param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
+extern u32 FUN_0201AB08(struct Window *param0);
+extern void FUN_0200D0BC(struct Window *param0, u32 param1, u32 param2, u32 param3);
 
 extern void FUN_02002B60(u8 param0);
 extern void FUN_02002B7C(u32 param0);
 extern void FUN_02002BB8(u32 param0);
 
-extern void FUN_0200D300(u32 param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5, u32 param6);
-extern void FUN_0200D6F8(u32 *param0, u32 param1, u32 param2, u32 param3, u8 param4);
+extern void FUN_0200D300(void * param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5, u32 param6);
+extern void FUN_0200D6F8(struct Window *param0, u32 param1, u32 param2, u32 param3, u8 param4);
 
 
 THUMB_FUNC void FUN_02054590(u32 param0, u32 param1)
@@ -43,32 +41,32 @@ THUMB_FUNC void FUN_020545B8(u32 param0, u32 param1, u32 param2)
     }
 }
 
-THUMB_FUNC void FUN_02054608(u32 *param0, struct Options *options)
+THUMB_FUNC void FUN_02054608(struct Window *param0, struct Options *options)
 {
-    FUN_0200CD68(*param0, FUN_0201AB08(param0), 994, 10, (u8)Options_GetFrame(options), 4);
+    FUN_0200CD68(param0->unk_00, FUN_0201AB08(param0), 994, 10, (u8)Options_GetFrame(options), 4);
     FUN_0205464C(param0);
     FUN_0200D0BC(param0, 0, 994, 10);
 }
 
-THUMB_FUNC void FUN_0205464C(u32 *param0)
+THUMB_FUNC void FUN_0205464C(struct Window *param0)
 {
     FillWindowPixelBuffer(param0, 15);
 }
 
-THUMB_FUNC u16 FUN_02054658(u8 windowId, const u16 *str, struct Options *options, u8 param3)
+THUMB_FUNC u16 FUN_02054658(struct Window * window, const u16 *str, struct Options *options, u8 param3)
 {
     FUN_02002B60(param3);
     FUN_02002B7C(0);
     FUN_02002BB8(0);
-    return AddTextPrinterParameterized(windowId, 1, str, 0, 0, (u32)Options_GetTextFrameDelay(options), NULL);
+    return AddTextPrinterParameterized(window, 1, str, 0, 0, (u32)Options_GetTextFrameDelay(options), NULL);
 }
 
-THUMB_FUNC u16 DrawFieldMessage(u8 windowId, const u16 *str, u8 fontId, u32 speed, u8 a4, u32 a5)
+THUMB_FUNC u16 DrawFieldMessage(struct Window * window, const u16 *str, u8 fontId, u32 speed, u8 a4, u32 a5)
 {
     FUN_02002B60(a4);
     FUN_02002B7C(a5);
     FUN_02002BB8(0);
-    return AddTextPrinterParameterized(windowId, fontId, str, 0, 0, speed, NULL);
+    return AddTextPrinterParameterized(window, fontId, str, 0, 0, speed, NULL);
 }
 
 THUMB_FUNC u8 FUN_020546C8(u32 param0) //bool8?
@@ -100,9 +98,9 @@ THUMB_FUNC void FUN_020546E0(u32 param0, u32 param1, u32 param2, u32 param3)
     }
 }
 
-THUMB_FUNC void FUN_02054744(u32 *param0, u32 param1, u32 param2)
+THUMB_FUNC void FUN_02054744(struct Window *param0, u32 param1, u32 param2)
 {
-    FUN_0200D300(*param0, FUN_0201AB08(param0), 0x399, 9, (u8)param1, param2, 4);
+    FUN_0200D300(param0->unk_00, FUN_0201AB08(param0), 0x399, 9, (u8)param1, param2, 4);
     FillWindowPixelBuffer(param0, 15);
     FUN_0200D6F8(param0, 0, 0x399, 9, (u8)param1);
 }