more extern cleanups

8 files changed, 38 insertions, 41 deletions

diff --git a/arm9/src/GX_layers.c b/arm9/src/GX_layers.c
index ce188876..f0ac9472 100644
--- a/arm9/src/GX_layers.c
+++ b/arm9/src/GX_layers.c
@@ -1,4 +1,7 @@
 #include "GX_layers.h"
+#include "GX_vramcnt.h"
+#include "gx.h"
+#include "main.h"
 
 
 struct GX_LayerData layer_data;
diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c
index e9a55051..68ab5934 100644
--- a/arm9/src/script_buffers.c
+++ b/arm9/src/script_buffers.c
@@ -21,8 +21,6 @@ extern void StringCat_HandleTrainerName(struct String * dest, const struct Strin
 extern void StrAddChar(struct String * str, u16 val);
 extern void * FUN_02006BB0(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32);
 extern BOOL UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL a2, u32 heap_id, BOOL a4);
-extern void FUN_02019658(int, u8 *, u16, u16, u16, u16, u16, u16, u16, u16);
-extern void FUN_020196F4(int, u8, u16, u16, u16, u16);
 
 const u16 UNK_020ECE6C[][2] = {
     { 0x0140, 0x0008 },
@@ -803,12 +801,12 @@ void MessagePrinter_delete(struct UnkStruct_0200B870 * a0)
     }
 }
 
-void FUN_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, int a2, int a3, int a4)
+void FUN_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, struct Window *a2, int a3, int a4)
 {
     FUN_02019658(a2, a0->unk_4->unk_14 + UNK_020ECE6C[a1][0], 0, 0, UNK_020ECE6C[a1][1], 8, (u16)a3, (u16)a4, UNK_020ECE6C[a1][1], 8);
 }
 
-void FUN_0200B9EC(struct UnkStruct_0200B870 * string, u32 value, u32 n, enum PrintingMode mode, int sp30, int r5, int r7)
+void FUN_0200B9EC(struct UnkStruct_0200B870 * string, u32 value, u32 n, enum PrintingMode mode, struct Window *sp30, int r5, int r7)
 {
     ConvertUIntToDecimalString(string->data, value, mode, n);
     for (int i = 0; string->data[i] != EOS; i++)
diff --git a/arm9/src/text.c b/arm9/src/text.c
index 3034baab..68559146 100644
--- a/arm9/src/text.c
+++ b/arm9/src/text.c
@@ -18,15 +18,11 @@ extern struct TextPrinter *FUN_0201B6C8(void);
 extern void FUN_0200CAB4(u32 param0);
 
 extern void FUN_0201C1A8(struct TextPrinter *printer);
-extern void CopyWindowToVram(u32 windowId);
 
 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 FUN_0201AB0C(u32 windowId);
-extern void FUN_02019658(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9);
-
 
 THUMB_FUNC void SetFontsPointer(const struct FontInfo *fonts)
 {
@@ -214,7 +210,7 @@ THUMB_FUNC u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 s
         }
         if (speed != 0xff)
         {
-            CopyWindowToVram(printer->printerTemplate.windowId); // CopyWindowToVram?
+            CopyWindowToVram(printer->printerTemplate.windowId);
         }
         FUN_0201C238(printer);
         FreeToHeap((void *)printer);
@@ -343,13 +339,13 @@ THUMB_FUNC void *FUN_0201C1B0(void)
 THUMB_FUNC void FUN_0201C1EC(struct TextPrinter *printer, u32 param1, u32 param2, u32 param3)
 {
 #pragma unused (param1, param2)
-    u32 windowId = printer->printerTemplate.windowId;
+    struct Window * windowId = printer->printerTemplate.windowId;
     if (printer->Unk2C == NULL)
     {
         printer->Unk2C = FUN_0201C1B0();
     }
     u32 r6 = (u32)printer->Unk2C + param3 * (sizeof(struct TextPrinter) * 8);
-    u32 r2 = ((FUN_0201AB0C(windowId) - 3) << 0x13) >> 0x10;
+    u16 r2 = (FUN_0201AB0C(windowId) - 3) <<3;
     FUN_02019658(windowId, r6, 0, 0, 24, 32, r2, 0, 24, 32);
 }
 
diff --git a/arm9/src/unk_02016B94.c b/arm9/src/unk_02016B94.c
index e5403f12..7eb00747 100644
--- a/arm9/src/unk_02016B94.c
+++ b/arm9/src/unk_02016B94.c
@@ -3,6 +3,7 @@
 #include "GX_layers.h"
 #include "gx.h"
 #include "heap.h"
+#include "game_init.h"
 
 extern void FUN_020B0030(void *param0, u32 *param1);
 extern void FUN_020B0138(void *param0, u32 *param1);
diff --git a/include/GX_layers.h b/include/GX_layers.h
index e94fb4ec..69fdc198 100644
--- a/include/GX_layers.h
+++ b/include/GX_layers.h
@@ -3,9 +3,6 @@
 
 
 #include "global.h"
-#include "GX_vramcnt.h"
-#include "error_message_reset.h"
-#include "gx.h"
 
 struct GX_LayerData
 {
@@ -20,6 +17,30 @@ typedef enum {
 } GX_LayerToggle;
 
 
+struct GraphicsBanks
+{
+    s32 bg;
+    s32 bgextpltt;
+    s32 subbg;
+    s32 subbgextpltt;
+    s32 obj;
+    s32 objextpltt;
+    s32 subobj;
+    s32 subobjextpltt;
+    s32 tex;
+    s32 texpltt;
+};
+
+
+struct GraphicsModes {
+    u32 mode1;
+    u32 mode2;
+    u32 mode3;
+    u32 mode4;
+};
+
+
+
 THUMB_FUNC void GX_SetBanks(const struct GraphicsBanks *banks);
 THUMB_FUNC void GX_DisableEngineALayers();
 THUMB_FUNC void GX_EngineAToggleLayers(u32 layer_mask, GX_LayerToggle layer_toggle);
diff --git a/include/error_message_reset.h b/include/error_message_reset.h
index d12cbf33..8c44c0a8 100644
--- a/include/error_message_reset.h
+++ b/include/error_message_reset.h
@@ -9,30 +9,6 @@
 #include "text.h"
 
 
-
-struct GraphicsBanks
-{
-    s32 bg;
-    s32 bgextpltt;
-    s32 subbg;
-    s32 subbgextpltt;
-    s32 obj;
-    s32 objextpltt;
-    s32 subobj;
-    s32 subobjextpltt;
-    s32 tex;
-    s32 texpltt;
-};
-
-
-struct GraphicsModes {
-    u32 mode1;
-    u32 mode2;
-    u32 mode3;
-    u32 mode4;
-};
-
-
 THUMB_FUNC void VBlankHandler();
 THUMB_FUNC void PrintErrorMessageAndReset();
 
diff --git a/include/script_buffers.h b/include/script_buffers.h
index d0fff528..20de53de 100644
--- a/include/script_buffers.h
+++ b/include/script_buffers.h
@@ -4,6 +4,7 @@
 #include "pokemon.h"
 #include "pokemon_storage_system.h"
 #include "trainer_data.h"
+#include "unk_02016B94.h"
 
 struct UnkStruct_0200AA80_sub_sub
 {
@@ -105,7 +106,7 @@ void StringExpandPlaceholders(struct ScrStrBufs * mgr, struct String * dest, str
 void ScrStrBufs_ResetBuffers(struct ScrStrBufs * mgr);
 struct UnkStruct_0200B870 * MessagePrinter_new(u32 r5, u32 r6, u32 sp4, u32 r4);
 void MessagePrinter_delete(struct UnkStruct_0200B870 * a0);
-void FUN_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, int a2, int a3, int a4);
-void FUN_0200B9EC(struct UnkStruct_0200B870 * string, u32 value, u32 n, enum PrintingMode mode, int sp30, int r5, int r7);
+void FUN_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, struct Window *a2, int a3, int a4);
+void FUN_0200B9EC(struct UnkStruct_0200B870 * string, u32 value, u32 n, enum PrintingMode mode, struct Window *sp30, int r5, int r7);
 
 #endif //POKEDIAMOND_SCRIPT_BUFFERS_H
diff --git a/include/text.h b/include/text.h
index 40f4d03a..0874f21d 100644
--- a/include/text.h
+++ b/include/text.h
@@ -2,11 +2,12 @@
 #define POKEDIAMOND_TEXT_H
 
 #include "global.h"
+#include "unk_02016B94.h"
 
 struct TextPrinterTemplate
 {
     const u16* currentChar;
-    u32 windowId;
+    struct Window *windowId;
     u8 padding[1];
     u8 fontId;
     u8 x;