Link gfxprint

include/libu64/gfxprint.h

@@ -2,8 +2,8 @@
 #define GFXPRINT_H
 
 #include "types.h"
-#include "u64types.h"
-#include <PR/gbi.h>
+#include "libultra/u64types.h"
+#include "PR/mbi.h"
 #include "va_args.h"
 
 #ifdef __cplusplus
@@ -45,7 +45,10 @@ typedef struct gfxprint_obj  {
 } gfxprint_t;
 
 /* Default gfxprint flag values set in game_ct func, default value is 0x40 (GFXPRINT_FLAG_HIGHRES on) */
-extern u8 __gfxprint_default_flags;
+static u8 __gfxprint_default_flags;
+
+extern u16 gfxprint_moji_tlut[];
+extern u8 gfxprint_font[];
 
 /* Macros for quickly checking state of gfxprint struct */
 #define gfxprint_isFlagOn(this, flag) ((this->flags & flag) != 0)
@@ -79,7 +82,7 @@ extern u8 __gfxprint_default_flags;
 
 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);
+static void* gfxprint_prout(void* this, const char* buffer, int n);
 
 extern void gfxprint_color(gfxprint_t* this, u32 r, u32 g, u32 b, u32 a);
 

include/libultra/gu.h

@@ -1,6 +1,6 @@
 #ifndef GU_H
 #define GU_H
-#include <PR/gbi.h">
+#include "PR/mbi.h"
 #include "types.h"
 #include "libultra/u64types.h"
 

include/libultra/libultra.h

@@ -13,6 +13,6 @@ void osWritebackDCache(void* vaddr, u32 nbytes);
 u32 osGetCount(void);
 OSTime osGetTime(void);
 
-s32 osAppNMIBuffer[15]; 
+static s32 osAppNMIBuffer[15]; 
 
 #endif

include/libultra/u64types.h

@@ -3,8 +3,6 @@
 
 #include "types.h"
 
-typedef u64 OSTime;
-
 typedef struct {
   u32 r:8;
   u32 g:8;
@@ -17,9 +15,11 @@ typedef union {
   rgba8888_t c;
 } rgba8888;
 
+/*
 typedef struct {
     float m[4][4];
 } Mtx;
+*/
 
 typedef float MtxF_t[4][4];
 typedef union {