4 files changed, 29 insertions, 30 deletions
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;