17 files changed, 1310 insertions, 3 deletions
diff --git a/arm9/lib/include/GX_asm.h b/arm9/lib/include/GX_asm.h
new file mode 100644
index 00000000..d2622508
--- /dev/null
+++ b/arm9/lib/include/GX_asm.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_GX_ASM_H
+#define GUARD_GX_ASM_H
+
+void GX_SendFifo48B(register void *pSrc, register void *pDest);
+
+#endif //GUARD_GX_ASM_H
diff --git a/arm9/lib/include/GX_bgcnt.h b/arm9/lib/include/GX_bgcnt.h
new file mode 100644
index 00000000..a581443e
--- /dev/null
+++ b/arm9/lib/include/GX_bgcnt.h
@@ -0,0 +1,347 @@
+#ifndef GUARD_GX_BGCNT_H
+#define GUARD_GX_BGCNT_H
+
+void *G2_GetBG0ScrPtr();
+void *G2S_GetBG0ScrPtr();
+void *G2_GetBG1ScrPtr();
+void *G2S_GetBG1ScrPtr();
+void *G2_GetBG2ScrPtr();
+void *G2S_GetBG2ScrPtr();
+void *G2_GetBG3ScrPtr();
+void *G2S_GetBG3ScrPtr();
+void *G2_GetBG0CharPtr();
+void *G2S_GetBG0CharPtr();
+void *G2_GetBG1CharPtr();
+void *G2S_GetBG1CharPtr();
+void *G2_GetBG2CharPtr();
+void *G2S_GetBG2CharPtr();
+void *G2_GetBG3CharPtr();
+void *G2S_GetBG3CharPtr();
+
+typedef union
+{
+    u16     raw;
+    struct
+    {
+        u16     priority:2;
+        u16     charBase:4;
+        u16     mosaic:1;
+        u16     colorMode:1;
+        u16     screenBase:5;
+        u16     bgExtPltt:1;
+        u16     screenSize:2;
+    };
+}
+GXBg01Control;
+
+typedef union
+{
+    u16     raw;
+    struct
+    {
+        u16     priority:2;
+        u16     charBase:4;
+        u16     mosaic:1;
+        u16     colorMode:1;
+        u16     screenBase:5;
+        u16     _reserve:1;
+        u16     screenSize:2;
+    };
+}
+GXBg23ControlText;
+
+typedef union
+{
+    u16     raw;
+    struct
+    {
+        u16     priority:2;
+        u16     charBase:4;
+        u16     mosaic:1;
+        u16     _reserve:1;
+        u16     screenBase:5;
+        u16     areaOver:1;
+        u16     screenSize:2;
+    };
+}
+GXBg23ControlAffine;
+
+typedef union
+{
+    u16     raw;
+    struct
+    {
+        u16     priority:2;
+        u16     _reserve1:1;
+        u16     charBase:3;
+        u16     mosaic:1;
+        u16     _reserve2:1;
+        u16     screenBase:5;
+        u16     areaOver:1;
+        u16     screenSize:2;
+    };
+}
+GXBg23Control256x16Pltt;
+
+
+typedef union
+{
+    u16     raw;
+    struct
+    {
+        u16     priority:2;
+        u16     _reserve1:4;
+        u16     mosaic:1;
+        u16     _reserve2:1;
+        u16     screenBase:5;
+        u16     areaOver:1;
+        u16     screenSize:2;
+    };
+}
+GXBg23Control256Bmp, GXBg23ControlDCBmp;
+
+typedef union
+{
+    u16     raw;
+    struct
+    {
+        u16     priority:2;
+        u16     _reserve1:4;
+        u16     mosaic:1;
+        u16     _reserve2:6;
+        u16     areaOver:1;
+        u16     screenSize:2;
+    };
+}
+GXBg2ControlLargeBmp;
+
+
+
+typedef enum
+{
+    GX_BG_SCRSIZE_TEXT_256x256 = 0,
+    GX_BG_SCRSIZE_TEXT_512x256 = 1,
+    GX_BG_SCRSIZE_TEXT_256x512 = 2,
+    GX_BG_SCRSIZE_TEXT_512x512 = 3
+}
+GXBGScrSizeText;
+
+typedef enum
+{
+    GX_BG_SCRSIZE_AFFINE_128x128 = 0,
+    GX_BG_SCRSIZE_AFFINE_256x256 = 1,
+    GX_BG_SCRSIZE_AFFINE_512x512 = 2,
+    GX_BG_SCRSIZE_AFFINE_1024x1024 = 3
+}
+GXBGScrSizeAffine;
+
+typedef enum
+{
+    GX_BG_SCRSIZE_256x16PLTT_128x128 = 0,
+    GX_BG_SCRSIZE_256x16PLTT_256x256 = 1,
+    GX_BG_SCRSIZE_256x16PLTT_512x512 = 2,
+    GX_BG_SCRSIZE_256x16PLTT_1024x1024 = 3
+}
+GXBGScrSize256x16Pltt;
+
+typedef enum
+{
+    GX_BG_SCRSIZE_256BMP_128x128 = 0,
+    GX_BG_SCRSIZE_256BMP_256x256 = 1,
+    GX_BG_SCRSIZE_256BMP_512x256 = 2,
+    GX_BG_SCRSIZE_256BMP_512x512 = 3
+}
+GXBGScrSize256Bmp;
+
+typedef enum
+{
+    GX_BG_SCRSIZE_DCBMP_128x128 = 0,
+    GX_BG_SCRSIZE_DCBMP_256x256 = 1,
+    GX_BG_SCRSIZE_DCBMP_512x256 = 2,
+    GX_BG_SCRSIZE_DCBMP_512x512 = 3
+}
+GXBGScrSizeDcBmp;
+
+typedef enum
+{
+    GX_BG_SCRSIZE_LARGEBMP_512x1024 = 0,
+    GX_BG_SCRSIZE_LARGEBMP_1024x512 = 1
+}
+GXBGScrSizeLargeBmp;
+
+typedef enum
+{
+    GX_BG_COLORMODE_16 = 0,
+    GX_BG_COLORMODE_256 = 1
+}
+GXBGColorMode;
+
+typedef enum
+{
+    GX_BG_AREAOVER_XLU = 0,
+    GX_BG_AREAOVER_REPEAT = 1
+}
+GXBGAreaOver;
+
+typedef enum
+{
+    GX_BG_CHARBASE_0x00000 = 0,
+    GX_BG_CHARBASE_0x04000 = 1,
+    GX_BG_CHARBASE_0x08000 = 2,
+    GX_BG_CHARBASE_0x0c000 = 3,
+    GX_BG_CHARBASE_0x10000 = 4,
+    GX_BG_CHARBASE_0x14000 = 5,
+    GX_BG_CHARBASE_0x18000 = 6,
+    GX_BG_CHARBASE_0x1c000 = 7,
+    GX_BG_CHARBASE_0x20000 = 8,
+    GX_BG_CHARBASE_0x24000 = 9,
+    GX_BG_CHARBASE_0x28000 = 10,
+    GX_BG_CHARBASE_0x2c000 = 11,
+    GX_BG_CHARBASE_0x30000 = 12,
+    GX_BG_CHARBASE_0x34000 = 13,
+    GX_BG_CHARBASE_0x38000 = 14,
+    GX_BG_CHARBASE_0x3c000 = 15
+}
+GXBGCharBase;
+
+typedef enum
+{
+    GX_BG_SCRBASE_0x0000 = 0,
+    GX_BG_SCRBASE_0x0800 = 1,
+    GX_BG_SCRBASE_0x1000 = 2,
+    GX_BG_SCRBASE_0x1800 = 3,
+    GX_BG_SCRBASE_0x2000 = 4,
+    GX_BG_SCRBASE_0x2800 = 5,
+    GX_BG_SCRBASE_0x3000 = 6,
+    GX_BG_SCRBASE_0x3800 = 7,
+    GX_BG_SCRBASE_0x4000 = 8,
+    GX_BG_SCRBASE_0x4800 = 9,
+    GX_BG_SCRBASE_0x5000 = 10,
+    GX_BG_SCRBASE_0x5800 = 11,
+    GX_BG_SCRBASE_0x6000 = 12,
+    GX_BG_SCRBASE_0x6800 = 13,
+    GX_BG_SCRBASE_0x7000 = 14,
+    GX_BG_SCRBASE_0x7800 = 15,
+    GX_BG_SCRBASE_0x8000 = 16,
+    GX_BG_SCRBASE_0x8800 = 17,
+    GX_BG_SCRBASE_0x9000 = 18,
+    GX_BG_SCRBASE_0x9800 = 19,
+    GX_BG_SCRBASE_0xa000 = 20,
+    GX_BG_SCRBASE_0xa800 = 21,
+    GX_BG_SCRBASE_0xb000 = 22,
+    GX_BG_SCRBASE_0xb800 = 23,
+    GX_BG_SCRBASE_0xc000 = 24,
+    GX_BG_SCRBASE_0xc800 = 25,
+    GX_BG_SCRBASE_0xd000 = 26,
+    GX_BG_SCRBASE_0xd800 = 27,
+    GX_BG_SCRBASE_0xe000 = 28,
+    GX_BG_SCRBASE_0xe800 = 29,
+    GX_BG_SCRBASE_0xf000 = 30,
+    GX_BG_SCRBASE_0xf800 = 31
+}
+GXBGScrBase;
+
+typedef enum
+{
+    GX_BG_BMPSCRBASE_0x00000 = 0,
+    GX_BG_BMPSCRBASE_0x04000 = 1,
+    GX_BG_BMPSCRBASE_0x08000 = 2,
+    GX_BG_BMPSCRBASE_0x0c000 = 3,
+    GX_BG_BMPSCRBASE_0x10000 = 4,
+    GX_BG_BMPSCRBASE_0x14000 = 5,
+    GX_BG_BMPSCRBASE_0x18000 = 6,
+    GX_BG_BMPSCRBASE_0x1c000 = 7,
+    GX_BG_BMPSCRBASE_0x20000 = 8,
+    GX_BG_BMPSCRBASE_0x24000 = 9,
+    GX_BG_BMPSCRBASE_0x28000 = 10,
+    GX_BG_BMPSCRBASE_0x2c000 = 11,
+    GX_BG_BMPSCRBASE_0x30000 = 12,
+    GX_BG_BMPSCRBASE_0x34000 = 13,
+    GX_BG_BMPSCRBASE_0x38000 = 14,
+    GX_BG_BMPSCRBASE_0x3c000 = 15,
+    GX_BG_BMPSCRBASE_0x40000 = 16,
+    GX_BG_BMPSCRBASE_0x44000 = 17,
+    GX_BG_BMPSCRBASE_0x48000 = 18,
+    GX_BG_BMPSCRBASE_0x4c000 = 19,
+    GX_BG_BMPSCRBASE_0x50000 = 20,
+    GX_BG_BMPSCRBASE_0x54000 = 21,
+    GX_BG_BMPSCRBASE_0x58000 = 22,
+    GX_BG_BMPSCRBASE_0x5c000 = 23,
+    GX_BG_BMPSCRBASE_0x60000 = 24,
+    GX_BG_BMPSCRBASE_0x64000 = 25,
+    GX_BG_BMPSCRBASE_0x68000 = 26,
+    GX_BG_BMPSCRBASE_0x6c000 = 27,
+    GX_BG_BMPSCRBASE_0x70000 = 28,
+    GX_BG_BMPSCRBASE_0x74000 = 29,
+    GX_BG_BMPSCRBASE_0x78000 = 30,
+    GX_BG_BMPSCRBASE_0x7c000 = 31
+}
+GXBGBmpScrBase;
+
+typedef enum
+{
+    GX_BG_EXTPLTT_01 = 0,
+    GX_BG_EXTPLTT_23 = 1
+}
+GXBGExtPltt;
+
+//GX_capture
+typedef enum
+{
+    GX_CAPTURE_DEST_VRAM_A_0x00000 = 0,
+    GX_CAPTURE_DEST_VRAM_B_0x00000 = 1,
+    GX_CAPTURE_DEST_VRAM_C_0x00000 = 2,
+    GX_CAPTURE_DEST_VRAM_D_0x00000 = 3,
+
+    GX_CAPTURE_DEST_VRAM_A_0x08000 = 4,
+    GX_CAPTURE_DEST_VRAM_B_0x08000 = 5,
+    GX_CAPTURE_DEST_VRAM_C_0x08000 = 6,
+    GX_CAPTURE_DEST_VRAM_D_0x08000 = 7,
+
+    GX_CAPTURE_DEST_VRAM_A_0x10000 = 8,
+    GX_CAPTURE_DEST_VRAM_B_0x10000 = 9,
+    GX_CAPTURE_DEST_VRAM_C_0x10000 = 10,
+    GX_CAPTURE_DEST_VRAM_D_0x10000 = 11,
+
+    GX_CAPTURE_DEST_VRAM_A_0x18000 = 12,
+    GX_CAPTURE_DEST_VRAM_B_0x18000 = 13,
+    GX_CAPTURE_DEST_VRAM_C_0x18000 = 14,
+    GX_CAPTURE_DEST_VRAM_D_0x18000 = 15
+}
+GXCaptureDest;
+
+typedef enum
+{
+    GX_CAPTURE_SIZE_128x128 = 0,
+    GX_CAPTURE_SIZE_256x64 = 1,
+    GX_CAPTURE_SIZE_256x128 = 2,
+    GX_CAPTURE_SIZE_256x192 = 3
+}
+GXCaptureSize;
+
+typedef enum
+{
+    GX_CAPTURE_SRCA_2D3D = 0,
+    GX_CAPTURE_SRCA_3D = 1
+}
+GXCaptureSrcA;
+
+typedef enum
+{
+    GX_CAPTURE_SRCB_VRAM_0x00000 = 0,
+    GX_CAPTURE_SRCB_MRAM = 1,
+    GX_CAPTURE_SRCB_VRAM_0x08000 = 2,
+    GX_CAPTURE_SRCB_VRAM_0x10000 = 4,
+    GX_CAPTURE_SRCB_VRAM_0x18000 = 6
+}
+GXCaptureSrcB;
+
+typedef enum
+{
+    GX_CAPTURE_MODE_A = 0,
+    GX_CAPTURE_MODE_B = 1,
+    GX_CAPTURE_MODE_AB = 2
+}
+GXCaptureMode;
+
+#endif //GUARD_GX_BGCNT_H
diff --git a/arm9/lib/include/GX_dma.h b/arm9/lib/include/GX_dma.h
new file mode 100644
index 00000000..98f6a4a2
--- /dev/null
+++ b/arm9/lib/include/GX_dma.h
@@ -0,0 +1,53 @@
+#ifndef GUARD_GX_DMA_H
+#define GUARD_GX_DMA_H
+
+#define GX_DMA_NOT_USE -1
+#define GX_CPU_FASTER32_SIZE 0x30
+#define GX_CPU_FASTER16_SIZE 0x1C
+
+static inline void GXi_DmaCopy32(u32 dmaNo, const void *src, void *dest, u32 size)
+{
+    if (dmaNo != GX_DMA_NOT_USE && size > GX_CPU_FASTER32_SIZE)
+    {
+        MI_DmaCopy32(dmaNo, src, dest, size);
+    }
+    else
+    {
+        MIi_CpuCopy32(src, dest, size);
+    }
+}
+
+static inline void GXi_DmaCopy16(u32 dmaNo, const void *src, void *dest, u32 size)
+{
+    if (dmaNo != GX_DMA_NOT_USE && size > GX_CPU_FASTER16_SIZE)
+    {
+        MI_DmaCopy16(dmaNo, src, dest, size);
+    }
+    else
+    {
+        MIi_CpuCopy16(src, dest, size);
+    }
+}
+
+static inline void GXi_DmaCopy32Async(u32 dmaNo, const void *src, void *dest, u32 size,
+                                      MIDmaCallback callback, void *arg)
+{
+    if (dmaNo != GX_DMA_NOT_USE)
+    {
+        MI_DmaCopy32Async(dmaNo, src, dest, size, callback, arg);
+    }
+    else
+    {
+        MIi_CpuCopy32(src, dest, size);
+    }
+}
+
+static inline void GXi_WaitDma(u32 dmaNo)
+{
+    if (dmaNo != GX_DMA_NOT_USE)
+    {
+        MI_WaitDma(dmaNo);
+    }
+}
+
+#endif //GUARD_GX_DMA_H
diff --git a/arm9/lib/include/GX_g2.h b/arm9/lib/include/GX_g2.h
new file mode 100644
index 00000000..f8d86df0
--- /dev/null
+++ b/arm9/lib/include/GX_g2.h
@@ -0,0 +1,14 @@
+#ifndef GUARD_GX_G2_H
+#define GUARD_GX_G2_H
+
+#include "fx.h"
+
+void G2x_SetBGyAffine_(u32 *ptr, struct Mtx22 *mtx, fx32 a, fx32 b, fx32 c, fx32 d);
+void G2x_SetBlendAlpha_(u32 *ptr, fx32 a, fx32 b, fx32 c, fx32 d);
+void G2x_SetBlendBrightness_(u16 *ptr, fx32 a, fx32 brightness);
+void G2x_SetBlendBrightnessExt_(u16 *ptr, fx32 a, fx32 b, fx32 c, fx32 d, fx32 brightness);
+void *G2x_ChangeBlendBrightness_(u16 *ptr, fx32 brightness);
+
+//The g2 and g2_oam headers contain a lot of inline functions and enums that may want to be ported over at some point
+
+#endif //GUARD_GX_G2_H
diff --git a/arm9/lib/include/GX_g3.h b/arm9/lib/include/GX_g3.h
new file mode 100644
index 00000000..765ecc64
--- /dev/null
+++ b/arm9/lib/include/GX_g3.h
@@ -0,0 +1,184 @@
+#ifndef GUARD_GX_G3_H
+#define GUARD_GX_G3_H
+
+struct GXDLInfo
+{
+    u8     *curr_cmd;
+    u32    *curr_param;
+    u32    *bottom;
+    u32     length;
+    BOOL    param0_cmd_flg;
+};
+
+void G3_BeginMakeDL(struct GXDLInfo *displaylist, void *r1, u32 r2);
+s32 G3_EndMakeDL(struct GXDLInfo *displaylist);
+
+typedef enum
+{
+    GX_MTXMODE_PROJECTION = 0,
+    GX_MTXMODE_POSITION = 1,
+    GX_MTXMODE_POSITION_VECTOR = 2,
+    GX_MTXMODE_TEXTURE = 3
+}
+GXMtxMode;
+
+typedef enum
+{
+    GX_BEGIN_TRIANGLES = 0,
+    GX_BEGIN_QUADS = 1,
+    GX_BEGIN_TRIANGLE_STRIP = 2,
+    GX_BEGIN_QUAD_STRIP = 3
+}
+GXBegin;
+
+typedef enum
+{
+    GX_SORTMODE_AUTO = 0,
+    GX_SORTMODE_MANUAL = 1
+}
+GXSortMode;
+
+typedef enum
+{
+    GX_BUFFERMODE_Z = 0,
+    GX_BUFFERMODE_W = 1
+}
+GXBufferMode;
+
+typedef enum
+{
+    GX_LIGHTMASK_NONE = 0,
+    GX_LIGHTMASK_0 = 1,
+    GX_LIGHTMASK_1 = 2,
+    GX_LIGHTMASK_01 = 3,
+    GX_LIGHTMASK_2 = 4,
+    GX_LIGHTMASK_02 = 5,
+    GX_LIGHTMASK_12 = 6,
+    GX_LIGHTMASK_012 = 7,
+    GX_LIGHTMASK_3 = 8,
+    GX_LIGHTMASK_03 = 9,
+    GX_LIGHTMASK_13 = 10,
+    GX_LIGHTMASK_013 = 11,
+    GX_LIGHTMASK_23 = 12,
+    GX_LIGHTMASK_023 = 13,
+    GX_LIGHTMASK_123 = 14,
+    GX_LIGHTMASK_0123 = 15
+}
+GXLightMask;
+
+typedef enum
+{
+    GX_POLYGONMODE_MODULATE = 0,
+    GX_POLYGONMODE_DECAL = 1,
+    GX_POLYGONMODE_TOON = 2,
+    GX_POLYGONMODE_SHADOW = 3
+}
+GXPolygonMode;
+
+typedef enum
+{
+    GX_CULL_ALL = 0,
+    GX_CULL_FRONT = 1,
+    GX_CULL_BACK = 2,
+    GX_CULL_NONE = 3
+}
+GXCull;
+
+typedef enum
+{
+    GX_TEXREPEAT_NONE = 0,
+    GX_TEXREPEAT_S = 1,
+    GX_TEXREPEAT_T = 2,
+    GX_TEXREPEAT_ST = 3
+}
+GXTexRepeat;
+
+typedef enum
+{
+    GX_TEXFLIP_NONE = 0,
+    GX_TEXFLIP_S = 1,
+    GX_TEXFLIP_T = 2,
+    GX_TEXFLIP_ST = 3
+}
+GXTexFlip;
+
+typedef enum
+{
+    GX_TEXSIZE_S8 = 0,
+    GX_TEXSIZE_S16 = 1,
+    GX_TEXSIZE_S32 = 2,
+    GX_TEXSIZE_S64 = 3,
+    GX_TEXSIZE_S128 = 4,
+    GX_TEXSIZE_S256 = 5,
+    GX_TEXSIZE_S512 = 6,
+    GX_TEXSIZE_S1024 = 7
+}
+GXTexSizeS;
+
+typedef enum
+{
+    GX_TEXSIZE_T8 = 0,
+    GX_TEXSIZE_T16 = 1,
+    GX_TEXSIZE_T32 = 2,
+    GX_TEXSIZE_T64 = 3,
+    GX_TEXSIZE_T128 = 4,
+    GX_TEXSIZE_T256 = 5,
+    GX_TEXSIZE_T512 = 6,
+    GX_TEXSIZE_T1024 = 7
+}
+GXTexSizeT;
+
+typedef enum
+{
+    GX_TEXFMT_NONE = 0,
+    GX_TEXFMT_A3I5 = 1,
+    GX_TEXFMT_PLTT4 = 2,
+    GX_TEXFMT_PLTT16 = 3,
+    GX_TEXFMT_PLTT256 = 4,
+    GX_TEXFMT_COMP4x4 = 5,
+    GX_TEXFMT_A5I3 = 6,
+    GX_TEXFMT_DIRECT = 7
+}
+GXTexFmt;
+
+typedef enum
+{
+    GX_TEXPLTTCOLOR0_USE = 0,
+    GX_TEXPLTTCOLOR0_TRNS = 1
+}
+GXTexPlttColor0;
+
+typedef enum
+{
+    GX_TEXGEN_NONE = 0,
+    GX_TEXGEN_TEXCOORD = 1,
+    GX_TEXGEN_NORMAL = 2,
+    GX_TEXGEN_VERTEX = 3
+}
+GXTexGen;
+
+typedef enum
+{
+    GX_LIGHTID_0 = 0,
+    GX_LIGHTID_1 = 1,
+    GX_LIGHTID_2 = 2,
+    GX_LIGHTID_3 = 3
+}
+GXLightId;
+
+typedef union
+{
+    u32     val[3];
+    struct
+    {
+        fx16    x;
+        fx16    y;
+        fx16    z;
+        fx16    width;
+        fx16    height;
+        fx16    depth;
+    };
+}
+GXBoxTestParam;
+
+#endif //GUARD_GX_G3_H
diff --git a/arm9/lib/include/GX_g3_util.h b/arm9/lib/include/GX_g3_util.h
new file mode 100644
index 00000000..a9bc4c17
--- /dev/null
+++ b/arm9/lib/include/GX_g3_util.h
@@ -0,0 +1,11 @@
+#ifndef GUARD_GX_G3_UTIL_H
+#define GUARD_GX_G3_UTIL_H
+
+void G3i_PerspectiveW_(fx32 fovsin, fx32 fovcos, fx32 ratio, fx32 near, fx32 far, fx32 scale, u32 load, struct Mtx44 *mtx);
+void G3i_OrthoW_(fx32 top, fx32 bottom, fx32 left, fx32 right, fx32 near, fx32 far, fx32 scale, u32 load, struct Mtx44 *mtx);
+void G3i_LookAt_(struct Vecx32 *a, struct Vecx32 *b, struct Vecx32 *c, u32 load, struct Mtx44 *mtx);
+void G3_RotX(fx32 sinphi, fx32 cosphi);
+void G3_RotY(fx32 sinphi, fx32 cosphi);
+void G3_RotZ(fx32 sinphi, fx32 cosphi);
+
+#endif //GUARD_GX_G3_UTIL_H
diff --git a/arm9/lib/include/GX_g3b.h b/arm9/lib/include/GX_g3b.h
new file mode 100644
index 00000000..d299ea34
--- /dev/null
+++ b/arm9/lib/include/GX_g3b.h
@@ -0,0 +1,21 @@
+#ifndef GUARD_GX_G3B_H
+#define GUARD_GX_G3B_H
+
+#include "GX_g3.h"
+
+void G3BS_LoadMtx44(struct GXDLInfo *displaylist, struct Mtx44 *mtx);
+void G3B_PushMtx(struct GXDLInfo *displaylist);
+void G3B_PopMtx(struct GXDLInfo *displaylist, void *mtx);
+void G3B_LoadMtx44(struct GXDLInfo *displaylist, struct Mtx44 *mtx);
+void G3B_Color(struct GXDLInfo * displaylist, u32 vtx_col);
+void G3B_Normal(struct GXDLInfo * displaylist, fx16 x, fx16 y, fx16 z);
+void G3B_Vtx(struct GXDLInfo * displaylist, fx32 x, fx32 y, fx32 z);
+void G3B_PolygonAttr(struct GXDLInfo *displaylist, u32 r1, u32 r2, u32 r3, u32 r4, u32 r5, u32 r6);
+void G3B_MaterialColorDiffAmb(struct GXDLInfo *displaylist, u32 diffuse_col, u32 ambient_col, u32 replace);
+void G3B_MaterialColorSpecEmi(struct GXDLInfo *displaylist, u32 specular_col, u32 emission_col, u32 shiny_table);
+void G3B_LightVector(struct GXDLInfo * displaylist, u32 light_num, fx16 x, fx16 y, fx16 z);
+void G3B_LightColor(struct GXDLInfo * displaylist, u32 light_num, u32 col);
+void G3B_Begin(struct GXDLInfo * displaylist, u32 type);
+void G3B_End(struct GXDLInfo * displaylist);
+
+#endif //GUARD_GX_G3B_H
diff --git a/arm9/lib/include/GX_g3imm.h b/arm9/lib/include/GX_g3imm.h
new file mode 100644
index 00000000..f811dc68
--- /dev/null
+++ b/arm9/lib/include/GX_g3imm.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_GX_G3IMM_H
+#define GUARD_GX_G3IMM_H
+
+#include "fx.h"
+
+void G3_LoadMtx43(struct Mtx43 *mtx);
+void G3_MultMtx43(struct Mtx43 *mtx);
+void G3_MultMtx33(struct Mtx33 *mtx);
+
+#endif //GUARD_GX_G3IMM_H
diff --git a/arm9/lib/include/GX_g3x.h b/arm9/lib/include/GX_g3x.h
new file mode 100644
index 00000000..4bd55831
--- /dev/null
+++ b/arm9/lib/include/GX_g3x.h
@@ -0,0 +1,69 @@
+#ifndef GUARD_GX_G3X_H
+#define GUARD_GX_G3X_H
+
+void GXi_NopClearFifo128_(void *reg);
+void G3X_Init();
+void G3X_ResetMtxStack();
+void G3X_ClearFifo();
+void G3X_InitMtxStack();
+void G3X_ResetMtxStack_2();
+void G3X_SetFog(u32 enable, u32 alphamode, u32 depth, s32 offset);
+u32 G3X_GetClipMtx(struct Mtx44 *dst);
+u32 G3X_GetVectorMtx(struct Mtx33 *dst);
+void G3X_SetEdgeColorTable(void *tbl_ptr);
+void G3X_SetFogTable(void *tbl_ptr);
+void G3X_SetClearColor(u32 col, u32 alpha, u32 depth, u32 polygon_id, u32 enable_fog);
+void G3X_InitTable();
+u32 G3X_GetMtxStackLevelPV(u32 *level);
+u32 G3X_GetMtxStackLevelPJ(u32 *level);
+u32 G3X_GetBoxTestResult(u32 *result);
+void G3X_SetHOffset(u32 offset);
+
+typedef enum
+{
+    GX_SHADING_TOON = 0,
+    GX_SHADING_HIGHLIGHT = 1
+}
+GXShading;
+
+typedef enum
+{
+    GX_FOGBLEND_COLOR_ALPHA = 0,
+    GX_FOGBLEND_ALPHA = 1
+}
+GXFogBlend;
+
+typedef enum
+{
+    GX_FOGSLOPE_0x8000 = 0,
+    GX_FOGSLOPE_0x4000 = 1,
+    GX_FOGSLOPE_0x2000 = 2,
+    GX_FOGSLOPE_0x1000 = 3,
+    GX_FOGSLOPE_0x0800 = 4,
+    GX_FOGSLOPE_0x0400 = 5,
+    GX_FOGSLOPE_0x0200 = 6,
+    GX_FOGSLOPE_0x0100 = 7,
+    GX_FOGSLOPE_0x0080 = 8,
+    GX_FOGSLOPE_0x0040 = 9,
+    GX_FOGSLOPE_0x0020 = 10
+}
+GXFogSlope;
+
+typedef enum
+{
+    GX_FIFOINTR_COND_DISABLE = 0,
+    GX_FIFOINTR_COND_UNDERHALF = 1,
+    GX_FIFOINTR_COND_EMPTY = 2
+}
+GXFifoIntrCond;
+
+typedef enum
+{
+    GX_FIFOSTAT_EMPTY = 6,
+    GX_FIFOSTAT_UNDERHALF = 2,
+    GX_FIFOSTAT_OVERHALF = 0,
+    GX_FIFOSTAT_FULL = 1
+}
+GXFifoStat;
+
+#endif //GUARD_GX_G3X_H
diff --git a/arm9/lib/include/GX_load2d.h b/arm9/lib/include/GX_load2d.h
new file mode 100644
index 00000000..3c9fb5cb
--- /dev/null
+++ b/arm9/lib/include/GX_load2d.h
@@ -0,0 +1,41 @@
+#ifndef GUARD_GX_LOAD2D_H
+#define GUARD_GX_LOAD2D_H
+
+void GX_LoadBGPltt(void *src, u32 offset, u32 size);
+void GXS_LoadBGPltt(void *src, u32 offset, u32 size);
+void GX_LoadOBJPltt(void *src, u32 offset, u32 size);
+void GXS_LoadOBJPltt(void *src, u32 offset, u32 size);
+void GX_LoadOAM(void *src, u32 offset, u32 size);
+void GXS_LoadOAM(void *src, u32 offset, u32 size);
+void GX_LoadOBJ(void *src, u32 offset, u32 size);
+void GXS_LoadOBJ(void *src, u32 offset, u32 size);
+void GX_LoadBG0Scr(void *src, u32 offset, u32 size);
+void GXS_LoadBG0Scr(void *src, u32 offset, u32 size);
+void GX_LoadBG1Scr(void *src, u32 offset, u32 size);
+void GXS_LoadBG1Scr(void *src, u32 offset, u32 size);
+void GX_LoadBG2Scr(void *src, u32 offset, u32 size);
+void GXS_LoadBG2Scr(void *src, u32 offset, u32 size);
+void GX_LoadBG3Scr(void *src, u32 offset, u32 size);
+void GXS_LoadBG3Scr(void *src, u32 offset, u32 size);
+void GX_LoadBG0Char(void *src, u32 offset, u32 size);
+void GXS_LoadBG0Char(void *src, u32 offset, u32 size);
+void GX_LoadBG1Char(void *src, u32 offset, u32 size);
+void GXS_LoadBG1Char(void *src, u32 offset, u32 size);
+void GX_LoadBG2Char(void *src, u32 offset, u32 size);
+void GXS_LoadBG2Char(void *src, u32 offset, u32 size);
+void GX_LoadBG3Char(void *src, u32 offset, u32 size);
+void GXS_LoadBG3Char(void *src, u32 offset, u32 size);
+void GX_BeginLoadBGExtPltt();
+void GX_LoadBGExtPltt(void *src, u32 offset, u32 size);
+void GX_EndLoadBGExtPltt();
+void GX_BeginLoadOBJExtPltt();
+void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size);
+void GX_EndLoadOBJExtPltt();
+void GXS_BeginLoadBGExtPltt();
+void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size);
+void GXS_EndLoadBGExtPltt();
+void GXS_BeginLoadOBJExtPltt();
+void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size);
+void GXS_EndLoadOBJExtPltt();
+
+#endif //GUARD_GX_LOAD2D_H
diff --git a/arm9/lib/include/GX_load3d.h b/arm9/lib/include/GX_load3d.h
new file mode 100644
index 00000000..09fd296a
--- /dev/null
+++ b/arm9/lib/include/GX_load3d.h
@@ -0,0 +1,15 @@
+#ifndef GUARD_GX_LOAD3D_H
+#define GUARD_GX_LOAD3D_H
+
+void GX_BeginLoadTex();
+void GX_LoadTex(void *src, u32 offset, u32 size);
+void GX_EndLoadTex();
+void GX_BeginLoadTexPltt();
+void GX_LoadTexPltt(void *src, u32 offset, u32 size);
+void GX_EndLoadTexPltt();
+void GX_BeginLoadClearImage();
+void GX_LoadClearImageColor(void *src, u32 size);
+void GX_LoadClearImageDepth(void *src, u32 size);
+void GX_EndLoadClearImage();
+
+#endif //GUARD_GX_LOAD3D_H
diff --git a/arm9/lib/include/GX_state.h b/arm9/lib/include/GX_state.h
new file mode 100644
index 00000000..c94b6c07
--- /dev/null
+++ b/arm9/lib/include/GX_state.h
@@ -0,0 +1,24 @@
+#ifndef GUARD_GX_STATE_H
+#define GUARD_GX_STATE_H
+
+struct GX_State
+{
+    u16     lcdc;
+    u16     bg;
+    u16     obj;
+    u16     arm7;
+    u16     tex;
+    u16     texPltt;
+    u16     clrImg;
+    u16     bgExtPltt;
+    u16     objExtPltt;
+
+    u16     sub_bg;
+    u16     sub_obj;
+    u16     sub_bgExtPltt;
+    u16     sub_objExtPltt;
+};
+
+void GX_InitGXState();
+
+#endif //GUARD_GX_STATE_H
diff --git a/arm9/lib/include/GX_struct_2d.h b/arm9/lib/include/GX_struct_2d.h
new file mode 100644
index 00000000..3b544927
--- /dev/null
+++ b/arm9/lib/include/GX_struct_2d.h
@@ -0,0 +1,243 @@
+#ifndef GUARD_GX_STRUCT_2D_H
+#define GUARD_GX_STRUCT_2D_H
+
+typedef u16 GXScrFmtText;
+#define GX_SCRFMT_TEXT_CHARNAME_SHIFT                      (0)
+#define GX_SCRFMT_TEXT_CHARNAME_MASK                       (0x03ff)
+#define GX_SCRFMT_TEXT_HF_SHIFT                            (10)
+#define GX_SCRFMT_TEXT_HF_MASK                             (0x0400)
+#define GX_SCRFMT_TEXT_VF_SHIFT                            (11)
+#define GX_SCRFMT_TEXT_VF_MASK                             (0x0800)
+#define GX_SCRFMT_TEXT_COLORPLTT_SHIFT                     (12)
+#define GX_SCRFMT_TEXT_COLORPLTT_MASK                      (0xf000)
+#define GX_SCRFMT_TEXT(pltt, vf, hf, name)              \
+    ((u16)(((name) << GX_SCRFMT_TEXT_CHARNAME_SHIFT) |  \
+           ((hf) << GX_SCRFMT_TEXT_HF_SHIFT)         |  \
+           ((vf) << GX_SCRFMT_TEXT_VF_SHIFT)         |  \
+           ((pltt) << GX_SCRFMT_TEXT_COLORPLTT_SHIFT)))
+
+typedef u8 GXScrFmtAffine;
+#define GX_SCRFMT_AFFINE_CHARNAME_SHIFT                    (0)
+#define GX_SCRFMT_AFFINE_CHARNAME_MASK                     (0xff)
+
+typedef u8 GXScrFmt256Bmp;
+#define GX_SCRFMT_256BMP_COLORNO_SHIFT                     (0)
+#define GX_SCRFMT_256BMP_COLORNO_MASK                      (0xff)
+
+typedef union
+{
+    u32     data32[8];
+    u16     data16[16];
+    u8      data8[32];
+}
+GXCharFmt16;
+
+typedef union
+{
+    u32     data32[16];
+    u16     data16[32];
+    u8      data8[64];
+}
+GXCharFmt256;
+
+typedef union
+{
+    u16     data16[16];
+    u32     data32[8];
+    GXRgb   rgb[16];
+}
+GXBGPltt16;
+
+typedef GXBGPltt16 GXOBJPltt16;
+
+typedef union
+{
+    u16     data16[256];
+    u32     data32[128];
+    GXRgb   rgb[256];
+}
+GXBGPltt256;
+
+typedef GXBGPltt256 GXOBJPltt256;
+
+typedef union
+{
+    u16     data16[32 * 32];
+    u32     data32[32 * 32 / 2];
+    GXScrFmtText scr[32][32];
+}
+GXScrText32x32;
+
+typedef union
+{
+    u16     data16[64 * 32];
+    u32     data32[64 * 32 / 2];
+    GXScrFmtText scr[64][32];
+}
+GXScrText64x32;
+
+typedef union
+{
+    // 4K bytes
+    u16     data16[32 * 64];
+    u32     data32[32 * 64 / 2];
+    GXScrFmtText scr[32][64];
+}
+GXScrText32x64;
+
+typedef union
+{
+    u16     data16[64 * 64];
+    u32     data32[64 * 64 / 2];
+    GXScrFmtText scr[64][64];
+}
+GXScrText64x64;
+
+typedef union
+{
+    u8      data8[16 * 16];
+    u32     data32[16 * 16 / 4];
+    GXScrFmtAffine scr[16][16];
+}
+GXScrAffine16x16;
+
+typedef union
+{
+    u8      data8[32 * 32];
+    u32     data32[32 * 32 / 4];
+    GXScrFmtAffine scr[32][32];
+}
+GXScrAffine32x32;
+
+typedef union
+{
+    u8      data8[64 * 64];
+    u32     data32[64 * 64 / 4];
+    GXScrFmtAffine scr[64][64];
+}
+GXScrAffine64x64;
+
+typedef union
+{
+    u8      data8[128 * 128];
+    u32     data32[128 * 128 / 4];
+    GXScrFmtAffine scr[128][128];
+}
+GXScrAffine128x128;
+
+typedef union
+{
+    u8      data8[128 * 128];
+    u32     data32[128 * 128 / 4];
+    GXScrFmt256Bmp scr[128][128];
+}
+GXScr256Bmp128x128;
+
+typedef union
+{
+    u8      data8[256 * 256];
+    u32     data32[256 * 256 / 4];
+    GXScrFmt256Bmp scr[256][256];
+}
+GXScr256Bmp256x256;
+
+typedef union
+{
+    u8      data8[512 * 256];
+    u32     data32[512 * 256 / 4];
+    GXScrFmt256Bmp scr[512][256];
+}
+GXScr256Bmp512x256;
+
+typedef union
+{
+    u8      data8[512 * 512];
+    u32     data32[512 * 512 / 4];
+    GXScrFmt256Bmp scr[512][512];
+}
+GXScr256Bmp512x512;
+
+typedef union
+{
+    u16     data16[128 * 128];
+    u32     data32[128 * 128 / 2];
+    GXRgba  scr[128][128];
+}
+GXScrDCBmp128x128;
+
+typedef union
+{
+    u16     data16[256 * 256];
+    u32     data32[256 * 256 / 2];
+    GXRgba  scr[256][256];
+}
+GXScrDCBmp256x256;
+
+typedef union
+{
+    u16     data16[512 * 256];
+    u32     data32[512 * 256 / 2];
+    GXRgba  scr[512][256];
+}
+GXScrDCBmp512x256;
+
+typedef union
+{
+    u16     data16[512 * 512];
+    u32     data32[512 * 512 / 2];
+    GXRgba  scr[512][512];
+}
+GXScrDCBmp512x512;
+
+typedef struct
+{
+    GXCharFmt16 ch[1024];
+}
+GXCharBGText16;
+
+typedef struct
+{
+    GXCharFmt256 ch[1024];
+}
+GXCharBGText256;
+
+typedef struct
+{
+    GXCharFmt256 ch[256];
+}
+GXCharBGAffine256;
+
+typedef union
+{
+    GXBGPltt256 pltt256;
+    GXBGPltt16 pltt16[16];
+}
+GXBGStdPlttData;
+
+typedef union
+{
+    GXOBJPltt256 pltt256;
+    GXOBJPltt16 pltt16[16];
+}
+GXOBJStdPlttData;
+
+typedef struct
+{
+    GXBGStdPlttData bgPltt;
+    GXOBJStdPlttData objPltt;
+}
+GXStdPlttData;
+
+typedef struct
+{
+    GXBGPltt256 pltt256[16];
+}
+GXBGExtPlttData;
+
+typedef struct
+{
+    GXOBJPltt256 pltt256[16];
+}
+GXOBJExtPlttData;
+
+#endif //GUARD_GX_STRUCT_2D_H
diff --git a/arm9/lib/include/GX_vramcnt.h b/arm9/lib/include/GX_vramcnt.h
new file mode 100644
index 00000000..6fe677bc
--- /dev/null
+++ b/arm9/lib/include/GX_vramcnt.h
@@ -0,0 +1,57 @@
+#ifndef GUARD_GX_VRAMCNT_H
+#define GUARD_GX_VRAMCNT_H
+
+//some of the symbols don't match what the function does
+void GX_VRAMCNT_SetLCDC_(u32 mask);
+void GX_SetBankForBG(s32 bg);
+void GX_SetBankForOBJ(s32 obj);
+void GX_SetBankForBGExtPltt(s32 bgextpltt);
+void GX_SetBankForOBJExtPltt(s32 objextpltt);
+void GX_SetBankForTex(s32 tex);
+void GX_SetBankForTexPltt(s32 texpltt);
+void GX_SetBankForClearImage(s32 clearimage);
+void GX_SetBankForARM7(s32 arm7);
+void GX_SetBankForLCDC(s32 lcdc);
+void GX_SetBankForSubBG(s32 subbg);
+void GX_SetBankForSubOBJ(s32 subobj);
+void GX_SetBankForSubBGExtPltt(s32 subbgextpltt);
+void GX_SetBankForSubOBJExtPltt(s32 subobjextpltt);
+u32 FUN_020C6130(u16 *ptr);
+u32 GX_ResetBankForBG();
+u32 GX_ResetBankForOBJ();
+u32 GX_ResetBankForBGExtPltt();
+u32 GX_ResetBankForOBJExtPltt();
+u32 GX_ResetBankForTex();
+u32 GX_ResetBankForTexPltt();
+u32 GX_ResetBankForClearImage();
+u32 GX_ResetBankForSubBG();
+u32 FUN_020C605C();
+u32 FUN_020C6034();
+u32 GX_ResetBankForSubOBJ();
+u32 FUN_020C5F28(u16 *ptr);
+u32 disableBankForX_();
+u32 GX_DisableBankForOBJExtPltt_2();
+u32 GX_DisableBankForBGExtPltt();
+u32 GX_DisableBankForOBJExtPltt();
+u32 GX_DisableBankForTexPltt_2();
+u32 GX_DisableBankForTexPltt();
+u32 GX_DisableBankForClearImage();
+u32 GX_DisableBankForARM7();
+u32 GX_DisableBankForLCDC();
+u32 GX_DisableBankForSubBGExtPltt();
+u32 GX_DisableBankForSubOBJExtPltt_2();
+u32 FUN_020C5E04();
+u32 GX_DisableBankForSubOBJExtPltt();
+u32 GX_GetBankForBGExtPltt_2();
+u32 GX_GetBankForOBJ();
+u32 GX_GetBankForBGExtPltt();
+u32 GX_GetBankForOBJExtPltt();
+u32 FUN_020C5D8C();
+u32 GX_GetBankForTexPltt();
+u32 GX_GetBankForLCDC();
+u32 GX_GetBankForSubBGExtPltt_2();
+u32 GX_GetBankForSubOBJ();
+u32 GX_GetBankForSubBGExtPltt();
+u32 GX_GetBankForSubOBJExtPltt();
+
+#endif //GUARD_GX_VRAMCNT_H
diff --git a/arm9/lib/include/GXcommon.h b/arm9/lib/include/GXcommon.h
new file mode 100644
index 00000000..a83f4384
--- /dev/null
+++ b/arm9/lib/include/GXcommon.h
@@ -0,0 +1,29 @@
+#ifndef GUARD_GXCOMMON_H
+#define GUARD_GXCOMMON_H
+
+typedef u16 GXRgb;
+#define GXRGB_ASSERT(gxrgb)       SDK_ASSERT(((gxrgb) & 0x8000) == 0)
+#define GX_RGB_R_SHIFT            (0)
+#define GX_RGB_R_MASK             (0x001f)
+#define GX_RGB_G_SHIFT            (5)
+#define GX_RGB_G_MASK             (0x03e0)
+#define GX_RGB_B_SHIFT            (10)
+#define GX_RGB_B_MASK             (0x7c00)
+#define GX_RGB(r, g, b)           ((GXRgb)(((r) << GX_RGB_R_SHIFT) | \
+                                           ((g) << GX_RGB_G_SHIFT) | \
+                                           ((b) << GX_RGB_B_SHIFT)))
+
+typedef u16 GXRgba;
+#define GX_RGBA_R_SHIFT           (0)
+#define GX_RGBA_R_MASK            (0x001f)
+#define GX_RGBA_G_SHIFT           (5)
+#define GX_RGBA_G_MASK            (0x03e0)
+#define GX_RGBA_B_SHIFT           (10)
+#define GX_RGBA_B_MASK            (0x7c00)
+#define GX_RGBA_A_SHIFT           (15)
+#define GX_RGBA_A_MASK            (0x8000)
+#define GX_RGBA(r, g, b, a)       ((GXRgba)(((r) << GX_RGBA_R_SHIFT) | \
+                                            ((g) << GX_RGBA_G_SHIFT) | \
+                                            ((b) << GX_RGBA_B_SHIFT) | \
+                                            ((a) << GX_RGBA_A_SHIFT)))
+#endif //GUARD_GXCOMMON_H
diff --git a/arm9/lib/include/fx.h b/arm9/lib/include/fx.h
index b1c3aa88..e0ba52f3 100644
--- a/arm9/lib/include/fx.h
+++ b/arm9/lib/include/fx.h
@@ -46,10 +46,14 @@ typedef s64 fx64c;
 #define FX64C_INT_ABS(x)           FX_INT_ABS(FX64C, x)
 #define FX64C_FRAC(x)              FX_FRAC(FX64C, x)
 
-#define FX32_MUL(a, b)               ((fx32)(((fx64)a * b) >> FX32_INT_SHIFT))
-#define FX32_MUL_ADD_MUL(a, b, c, d) ((fx32)(((fx64)a * b + (fx64)c * d) >> FX32_INT_SHIFT))
+//TODO: clean up these macros
+#define FX32_MUL_NO_ROUND(a, b)      ((fx32)(((fx64)(a) * (b)) >> FX32_INT_SHIFT))
+#define FX32_MUL(a, b)               ((fx32)((((fx64)(a) * (b) + (1 << (FX32_INT_SHIFT - 1))) >> FX32_INT_SHIFT)))
+#define FX32_MUL_ADD_MUL(a, b, c, d) ((fx32)(((fx64)(a) * (b) + (fx64)c * d) >> FX32_INT_SHIFT))
 //the extra term here is for rounding
-#define FX32_MUL_SUB_MUL(a, b, c, d) ((fx32)(((fx64)a * b - (fx64)c * d + (1 << (FX32_INT_SHIFT - 1))) >> FX32_INT_SHIFT))
+#define FX32_MUL_SUB_MUL(a, b, c, d) ((fx32)(((fx64)(a) * (b) - (fx64)c * d + (1 << (FX32_INT_SHIFT - 1))) >> FX32_INT_SHIFT))
+
+#define FX_MUL_FX32_FX64C(a, b)      ((fx32)((((a) * (b) + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT)))
 
 struct Vecx32
 {
diff --git a/arm9/lib/include/gx.h b/arm9/lib/include/gx.h
new file mode 100644
index 00000000..8abe4e40
--- /dev/null
+++ b/arm9/lib/include/gx.h
@@ -0,0 +1,179 @@
+#ifndef GUARD_GX_H
+#define GUARD_GX_H
+
+#include "fx.h"
+
+//temporary while other files aren't decompiled
+
+void GXi_NopClearFifo128_(void *);
+void MI_Copy16B(const void *, void *);
+void MI_DmaFill32Async(u32, void *, u32, u32, u32, u32);
+void MI_DmaFill32(u32, void *, u32, u32);
+void MIi_CpuClear32(u32, void *, u32);
+void MI_Copy64B(void *src, void *dst);
+void MI_WaitDma(u32);
+void MI_DmaCopy32Async(u32, const void *, void *, u32, void *, void *);
+void MI_DmaCopy16(u32 unk, const void *src, void *dst, u32 size);
+void MIi_CpuCopy16(const void *src, void *dst, u32 size);
+void MI_DmaCopy32(u32 unk, const void *src, void *dst, u32 size);
+void MIi_CpuCopy32(const void *src, void *dst, u32 size);
+void OSi_UnlockVram(u16, u16);
+void MIi_CpuClear32(u32, void *, u32);
+
+#include "GXcommon.h"
+#include "GX_struct_2d.h"
+#include "GX_g3.h"
+#include "GX_g3_util.h"
+#include "GX_g3x.h"
+#include "GX_g3b.h"
+#include "GX_asm.h"
+#include "GX_vramcnt.h"
+#include "GX_bgcnt.h"
+#include "GX_load2d.h"
+#include "GX_load3d.h"
+#include "GX_g2.h"
+#include "GX_state.h"
+#include "GX_g3imm.h"
+#include "GX_dma.h"
+
+void GX_Init();
+u32 GX_HBlankIntr(u32 enable);
+u32 GX_VBlankIntr(u32 enable);
+void GX_DispOff();
+void GX_DispOn();
+void GX_SetGraphicsMode(u32 mode1, u32 mode2, u32 mode3);
+void GXS_SetGraphicsMode(u32 mode);
+void GXx_SetMasterBrightness_(vu16 *dst, s32 brightness);
+
+typedef union
+{
+    u32     raw;
+    struct
+    {
+        u32     bgMode:3;
+        u32     bg0_2d3d:1;
+        u32     objMapChar:1;
+        u32     objMapBmp:2;
+        u32     blankScr:1;
+        u32     visiblePlane:5;
+        u32     visibleWnd:3;
+        u32     dispMode:4;
+        u32     extObjMapChar:2;
+        u32     extObjMapBmp:1;
+        u32     hBlankObjProc:1;
+        u32     bgCharOffset:3;
+        u32     bgScrOffset:3;
+        u32     bgExtPltt:1;
+        u32     objExtPltt:1;
+    };
+}
+GXDispCnt;
+
+typedef union
+{
+    u32     raw;
+    struct
+    {
+        u32     bgMode:3;
+        u32     _reserve1:1;
+        u32     objMapChar:1;
+        u32     objMapBmp:2;
+        u32     blankScr:1;
+        u32     visiblePlane:5;
+        u32     visibleWnd:3;
+        u32     dispMode:1;
+        u32     _reserve2:3;
+        u32     extObjMapChar:2;
+        u32     _reserve3:1;
+        u32     hBlankObjProc:1;
+        u32     _reserve4:6;
+        u32     bgExtPltt:1;
+        u32     objExtPltt:1;
+    };
+}
+GXSDispCnt;
+
+typedef enum
+{
+    GX_BGMODE_0 = 0,
+    GX_BGMODE_1 = 1,
+    GX_BGMODE_2 = 2,
+    GX_BGMODE_3 = 3,
+    GX_BGMODE_4 = 4,
+    GX_BGMODE_5 = 5,
+    GX_BGMODE_6 = 6
+}
+GXBGMode;
+
+typedef enum
+{
+    GX_BG0_AS_2D = 0,
+    GX_BG0_AS_3D = 1
+}
+GXBG0As;
+
+typedef enum
+{
+    GX_DISPMODE_GRAPHICS = 0x01,
+    GX_DISPMODE_VRAM_A = 0x02,
+    GX_DISPMODE_VRAM_B = 0x06,
+    GX_DISPMODE_VRAM_C = 0x0a,
+    GX_DISPMODE_VRAM_D = 0x0e,
+    GX_DISPMODE_MMEM = 0x03
+}
+GXDispMode;
+
+typedef enum
+{
+    GX_PLANEMASK_NONE = 0x00,
+    GX_PLANEMASK_BG0 = 0x01,
+    GX_PLANEMASK_BG1 = 0x02,
+    GX_PLANEMASK_BG2 = 0x04,
+    GX_PLANEMASK_BG3 = 0x08,
+    GX_PLANEMASK_OBJ = 0x10
+}
+GXPlaneMask;
+
+typedef enum
+{
+    GX_WNDMASK_NONE = 0x00,
+    GX_WNDMASK_W0 = 0x01,
+    GX_WNDMASK_W1 = 0x02,
+    GX_WNDMASK_OW = 0x04
+}
+GXWndMask;
+
+typedef enum
+{
+    GX_BGCHAROFFSET_0x00000 = 0x00,
+    GX_BGCHAROFFSET_0x10000 = 0x01,
+    GX_BGCHAROFFSET_0x20000 = 0x02,
+    GX_BGCHAROFFSET_0x30000 = 0x03,
+    GX_BGCHAROFFSET_0x40000 = 0x04,
+    GX_BGCHAROFFSET_0x50000 = 0x05,
+    GX_BGCHAROFFSET_0x60000 = 0x06,
+    GX_BGCHAROFFSET_0x70000 = 0x07
+}
+GXBGCharOffset;
+
+typedef enum
+{
+    GX_BGSCROFFSET_0x00000 = 0x00,
+    GX_BGSCROFFSET_0x10000 = 0x01,
+    GX_BGSCROFFSET_0x20000 = 0x02,
+    GX_BGSCROFFSET_0x30000 = 0x03,
+    GX_BGSCROFFSET_0x40000 = 0x04,
+    GX_BGSCROFFSET_0x50000 = 0x05,
+    GX_BGSCROFFSET_0x60000 = 0x06,
+    GX_BGSCROFFSET_0x70000 = 0x07
+}
+GXBGScrOffset;
+
+typedef enum
+{
+    GX_DISP_SELECT_SUB_MAIN = 0,
+    GX_DISP_SELECT_MAIN_SUB = 1
+}
+GXDispSelect;
+
+#endif //GUARD_GX_H