print stuff

include/PR/xstdio.h

@@ -23,15 +23,15 @@ typedef struct {
     /* 0x34 */ u8 qual;
 } _Pft;
 
-typedef void* (*PrintCallback)(void*, const char*, size_t);
-
 #define FLAGS_SPACE 1
 #define FLAGS_PLUS 2
 #define FLAGS_MINUS 4
 #define FLAGS_HASH 8
 #define FLAGS_ZERO 16
 
-int _Printf(PrintCallback pfn, void* arg, const char* fmt, va_list ap);
+typedef char *outfun(char*,const char*,size_t);
+
+int _Printf(outfun pfn, char* arg, const char* fmt, va_list ap);
 void _Litob(_Pft* args, u8 type);
 void _Ldtob(_Pft* args, u8 type);
 

include/fault_internal.h

@@ -9,7 +9,6 @@ typedef void (*FaultDrawerCallback)(void);
 void FaultDrawer_SetOsSyncPrintfEnabled(u32 enabled);
 void FaultDrawer_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 color);
 void FaultDrawer_FillScreen(void);
-void* FaultDrawer_FormatStringFunc(void* arg, const char* str, size_t count);
 void FaultDrawer_SetDrawerFrameBuffer(void* frameBuffer, u16 w, u16 h);
 void FaultDrawer_SetInputCallback(FaultDrawerCallback callback);
 void FaultDrawer_Init(void);

include/gfxprint.h

@@ -1,10 +1,9 @@
 #ifndef GFXPRINT_H
 #define GFXPRINT_H
 
+#include "ultra64.h"
 #include "color.h"
-#include "PR/gbi.h"
-#include "PR/ultratypes.h"
-#include "PR/xstdio.h"
+#include "libc64/aprintf.h"
 #include "unk.h"
 
 #define GFXP_UNUSED "\x8E"

include/libc64/aprintf.h

@@ -3,6 +3,8 @@
 
 #include "ultra64.h"
 
+typedef void* (*PrintCallback)(void*, const char*, size_t);
+
 int vaprintf(PrintCallback* pfn, const char* fmt, va_list args);
 int aprintf(PrintCallback* pfn, const char* fmt, ...);