4 files changed, 30 insertions, 12 deletions
diff --git a/include/gba/macro.h b/include/gba/macro.h
index 230fb4383..0217898e8 100644
--- a/include/gba/macro.h
+++ b/include/gba/macro.h
@@ -27,6 +27,8 @@
 
 #define CpuFastFill16(value, dest, size) CpuFastFill(((value) << 16) | (value), (dest), (size))
 
+#define CpuFastFill8(value, dest, size) CpuFastFill(((value) << 24) | ((value) << 16) | ((value) << 8) | (value), (dest), (size))
+
 #define CpuFastCopy(src, dest, size) CpuFastSet(src, dest, ((size)/(32/8) & 0x1FFFFF))
 
 #define DmaSet(dmaNum, src, dest, control)        \
diff --git a/include/global.h b/include/global.h
index b7038025b..08ccc670b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -96,4 +96,11 @@ struct SaveBlock2
 
 extern struct SaveBlock2 *gSaveBlock2Ptr;
 
+struct Bitmap           // TODO: Find a better spot for this
+{
+    u8* pixels;
+    u32 width:16;
+    u32 height:16;
+};
+
 #endif // GUARD_GLOBAL_H
diff --git a/include/text.h b/include/text.h
index 9a3434583..d8fc6f89d 100644
--- a/include/text.h
+++ b/include/text.h
@@ -13,18 +13,6 @@
 
 #define NUM_TEXT_PRINTERS 32
 
-struct Window
-{
-    u8 priority;
-    u8 tilemapLeft;
-    u8 tilemapTop;
-    u8 width;
-    u8 height;
-    u8 paletteNum;
-    u16 baseBlock;
-    u8 *tileData;
-};
-
 struct TextPrinter
 {
     struct TextSubPrinter {     // TODO: Better name
diff --git a/include/window.h b/include/window.h
new file mode 100644
index 000000000..ca0520d41
--- /dev/null
+++ b/include/window.h
@@ -0,0 +1,21 @@
+#ifndef GUARD_WINDOW_H
+#define GUARD_WINDOW_H
+
+struct WindowTemplate
+{
+    u8 priority;
+    u8 tilemapLeft;
+    u8 tilemapTop;
+    u8 width;
+    u8 height;
+    u8 paletteNum;
+    u16 baseBlock;
+};
+
+struct Window
+{
+    struct WindowTemplate window;
+    u8 *tileData;
+};
+
+#endif // GUARD_WINDOW_H