diff --git a/include/libultra/gfxprint.h b/include/libultra/gfxprint.h
index 211bcda9..bd848f26 100644
--- a/include/libultra/gfxprint.h
+++ b/include/libultra/gfxprint.h
@@ -2,21 +2,117 @@
 #define GFXPRINT_H
 
 #include "types.h"
-typedef void* (*PrintCallback)(void*, const char*, size_t);
-typedef struct gfxprint_obj  {
-    PrintCallback callback;
-    struct unknown_struct * unk4; // This is from GBI.h, from what I've seen
-    s16 NewX;
-    s16 NewY;
-    u16 PrevX;
-    u8 PrevY;
-    u8 flags;
-    u8 R;
-	u8 B;
-	u8 G;
-	u8 A;
-};
-
-void gfxprint_locate(struct gfxprint_obj*, s32, s32); 
+#include "u64types.h"
+#include <PR/gbi.h>
+#include "va_args.h"
 
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#define GFXPRINT_NUM_SUBPIXELS 4
+#define GFXPRINT_PIXELS_PER_BLOCK 8
+#define GFXPRINT_PAD GFXPRINT_PIXELS_PER_BLOCK * GFXPRINT_NUM_SUBPIXELS
+
+#define GFXPRINT_FLAG_KANA_MODE (1 << 0) /* Japanese characters displayed as hiragana or katakana */
+#define GFXPRINT_FLAG_GRADIENT (1 << 1) /* Gradient state */
+#define GFXPRINT_FLAG_SHADOW (1 << 2) /* Shadow state */
+#define GFXPRINT_FLAG_CHANGED (1 << 3) /* Text changed */
+/* Unused...? */
+#define GFXPRINT_FLAG_HIGHRES (1 << 6) /* Highres text */
+#define GFXPRINT_FLAG_OPENED (1 << 7) /* Open state */
+
+#define GFXPRINT_KANA_MODE_KATAKANA 0
+#define GFXPRINT_KANA_MODE_HIRAGANA 1
+
+/* NOTE: this should be a void return type but we're going to use a void* for readibility */
+typedef void* (*PrintCallback)(void*, const char*, int);
+typedef struct gfxprint_obj  {
+    PrintCallback prout_func; /* Current print out func */
+    Gfx* glistp; /* Current display list to write text to */
+    u16 position_x; /* Display coords (sub-pixel units) */
+    u16 position_y; /* Display coords (sub-pixel units) */
+    u16 offset_x; /* Display offset */
+    u8 offset_y; /* Display offset */
+    u8 flags; /* 1: Kana mode -> 0: Katakana/1: Hiragana
+                 2: Gradient displayed
+                 4: Shadow displayed
+                 8: Attribute changed
+                 64: Low-res -> high-res conversion
+                 128: Opened state */
+    rgba8888 color; /* Current font color */
+    u8 dummy[28]; /* For size compatibility */
+} gfxprint_t;
+
+/* Default gfxprint flag values set in game_ct func, default value is 0x40 (GFXPRINT_FLAG_HIGHRES on) */
+extern u8 __gfxprint_default_flags;
+
+/* Macros for quickly checking state of gfxprint struct */
+#define gfxprint_isFlagOn(this, flag) ((this->flags & flag) != 0)
+#define gfxprint_setFlag(this, flag) (this->flags |= flag)
+#define gfxprint_clrFlag(this, flag) (this->flags &= ~flag)
+
+#define gfxprint_isOpened(this) (gfxprint_isFlagOn(this, GFXPRINT_FLAG_OPENED))
+#define gfxprint_setOpened(this) (gfxprint_setFlag(this, GFXPRINT_FLAG_OPENED))
+#define gfxprint_clrOpened(this) (gfxprint_clrFlag(this, GFXPRINT_FLAG_OPENED))
+
+#define gfxprint_isHighres(this) (gfxprint_isFlagOn(this, GFXPRINT_FLAG_HIGHRES))
+#define gfxprint_setHighres(this) (gfxprint_setFlag(this, GFXPRINT_FLAG_HIGHRES))
+#define gfxprint_clrHighres(this) (gfxprint_clrFlag(this, GFXPRINT_FLAG_HIGHRES))
+
+#define gfxprint_isHiragana(this) ((this->flags & GFXPRINT_FLAG_KANA_MODE) != GFXPRINT_KANA_MODE_KATAKANA)
+#define gfxprint_isKatakana(this) ((this->flags & GFXPRINT_FLAG_KANA_MODE) == GFXPRINT_KANA_MODE_KATAKANA)
+#define gfxprint_setHiragana(this) (this->flags |= GFXPRINT_FLAG_KANA_MODE)
+#define gfxprint_setKatakana(this) (this->flags &= ~GFXPRINT_FLAG_KANA_MODE)
+
+#define gfxprint_isGradient(this) (gfxprint_isFlagOn(this, GFXPRINT_FLAG_GRADIENT))
+#define gfxprint_setGradient(this) (gfxprint_setFlag(this, GFXPRINT_FLAG_GRADIENT))
+#define gfxprint_clrGradient(this) (gfxprint_clrFlag(this, GFXPRINT_FLAG_GRADIENT))
+
+#define gfxprint_isShadow(this) (gfxprint_isFlagOn(this, GFXPRINT_FLAG_SHADOW))
+#define gfxprint_setShadow(this) (gfxprint_setFlag(this, GFXPRINT_FLAG_SHADOW))
+#define gfxprint_clrShadow(this) (gfxprint_clrFlag(this, GFXPRINT_FLAG_SHADOW))
+
+#define gfxprint_isChanged(this) (gfxprint_isFlagOn(this, GFXPRINT_FLAG_CHANGED))
+#define gfxprint_setChanged(this) (gfxprint_setFlag(this, GFXPRINT_FLAG_CHANGED))
+#define gfxprint_clrChanged(this) (gfxprint_clrFlag(this, GFXPRINT_FLAG_CHANGED))
+
+static void gfxprint_setup(gfxprint_t* this);
+static void gfxprint_putc1(gfxprint_t* this, char c);
+static gfxprint_t* gfxprint_prout(gfxprint_t* this, const char* buffer, size_t n);
+
+extern void gfxprint_color(gfxprint_t* this, u32 r, u32 g, u32 b, u32 a);
+
+extern void gfxprint_locate(gfxprint_t* this, int x, int y); 
+extern void gfxprint_locate8x8(gfxprint_t* this, int x, int y);
+extern void gfxprint_setoffset(gfxprint_t* this, int x, int y);
+
+extern void gfxprint_putc(gfxprint_t* this, char c);
+extern void gfxprint_write(gfxprint_t* this, const void* buffer, size_t size, size_t n);
+extern void gfxprint_puts(gfxprint_t* this, char* string);
+
+extern void gfxprint_init(gfxprint_t* this);
+extern void gfxprint_cleanup(gfxprint_t* this);
+
+extern void gfxprint_open(gfxprint_t* this, Gfx* glistp);
+extern Gfx* gfxprint_close(gfxprint_t* this);
+
+extern int gfxprint_vprintf(gfxprint_t* this, const char* fmt, va_list ap);
+extern int gfxprint_printf(gfxprint_t* this, const char* fmt, ...);
+
+/* Custom macro to match gDPLoadTLUT_pal16 but with N palette entries */
+#define gDPLoadTLUT_palX(pkt, pal, dram, count)				\
+do {									\
+	gDPSetTextureImage(pkt, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dram);	\
+	gDPTileSync(pkt);						\
+	gDPSetTile(pkt, 0, 0, 0, (256+(((pal)&0xf)*16)),		\
+		G_TX_LOADTILE, 0 , 0, 0, 0, 0, 0, 0);			\
+	gDPLoadSync(pkt);						\
+	gDPLoadTLUTCmd(pkt, G_TX_LOADTILE, (count)-1);				\
+	gDPPipeSync(pkt);						\
+} while (0)
+
+#ifdef __cplusplus
+}
+#endif
 #endif
diff --git a/src/libultra/gfxprint/gfxprint_locate.c b/src/libultra/gfxprint/gfxprint_locate.c
deleted file mode 100644
index 4491b42a..00000000
--- a/src/libultra/gfxprint/gfxprint_locate.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "libultra/gfxprint.h"
-
-void gfxprint_locate(struct gfxprint_obj* gfxprint, s32 x, s32 y) {
-    gfxprint->NewX = (s16) (gfxprint->PrevX + (x * 4));
-    gfxprint->NewY = (s16) (gfxprint->PrevY + (y * 4));
-}
\ No newline at end of file
diff --git a/src/libultra/gfxprint/gfxprint_locate8x8.c b/src/libultra/gfxprint/gfxprint_locate8x8.c
deleted file mode 100644
index 36229349..00000000
--- a/src/libultra/gfxprint/gfxprint_locate8x8.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "libultra/gfxprint.h"
-
-void gfxprint_locate8x8(struct gfxprint_obj* arg0, s32 arg1, s32 arg2) {
-    s32 x = arg1 << 3;
-    s32 y = arg2 << 3;
-    gfxprint_locate(arg0, x, y);
-}
\ No newline at end of file