Merge branch 'main' into pr/20

include/Runtime.PPCEABI.H/__va_arg.h

@@ -36,5 +36,6 @@ void *__va_arg(_va_list_struct *, int);
 #define __va_end(list) ((void)0)
 
 #define __va_copy(a, b) (*(a) = *(b))
+#define va_copy __va_copy
 
 #endif /* __VA_ARG_H */

include/egg/core/eggGraphicsFifo.h

@@ -22,7 +22,7 @@ public:
 
 public:
     /* 80576798 */ static GraphicsFifo *sGraphicsFifo;
-    /* 8057679c */ static bool sGpStatus[4];
+    /* 8057679c */ static u8 sGpStatus[5];
 };
 
 } // namespace EGG

include/egg/core/eggXfbManager.h

@@ -14,7 +14,7 @@ public:
     /* 0xC */ u8 mNumXfbs;      // Total number of Xfbs ever attached
     /* 0xD */ u8 mNumXfbs_Copy; // Unsure of purpose yet, but showing wont proceed until its under 3
 public:
-    /* 80498af0 */ bool isRegisterd(Xfb *xfb) const; // yes. this is correct spelling
+    /* 80498af0 */ bool isRegisterd(Xfb &xfb) const; // yes. this is correct spelling
     /* 80498b30 */ bool attach(Xfb *xfb);
     /* 80498c10 */ void copyEFB(bool);
     /* 80498d00 */ void setNextFrameBuffer();

include/egg/prim/eggAssert.h

@@ -8,14 +8,17 @@ namespace EGG {
 // TODO: Fixup funtions
 namespace Assert {
 
+typedef void (*AssertCallback)();
+
 /* 8049bf90 */ void wait(u32 time);
-/* 8049c010 */ void system_print();
-/* 8049c010 */ void system_report();
-/* 8049c0a0 */ s32 getPeriodPos(char *);
+/* 8049c010 */ void system_vreport(const char *str, va_list list);
+/* 8049c010 */ void system_report(const char *str, ...);
+/* 8049c0a0 */ s32 getPeriodPos(const char *);
 /* 8049c100 */ char *getMapSymbol();
 /* 8049c150 */ bool isOutsideMEM1(u32 addr);
-/* 8049c190 */ void system_halt();
-/* 8049c530 */ void assert();
+/* 8049c180 */ AssertCallback setAssertCallback(AssertCallback cb);
+/* 8049c190 */ void system_halt(const char *file, u32 line, const char *msg, va_list list);
+/* 8049c530 */ void assert(const char *file, u32 line, const char *msg, ...);
 
 } // namespace Assert
 

include/m/m_angle.h

@@ -5,18 +5,25 @@
 
 struct mAng {
     mAng() {}
-    mAng(s16 s) : val(s) {}
-    s16 val;
+    mAng(s16 s) : mVal(s) {}
+
+    s32 step(s16 target, s32 steps, s16 max, s16 min);
+
+    s16 mVal;
 };
 
 class mAng3_c {
 public:
     s16 x, y, z;
+    mAng3_c(s16 fx, s16 fy, s16 fz) : x(fx), y(fy), z(fz) {}
+
     void set(s16 fx, s16 fy, s16 fz) {
         x = fx;
         y = fy;
         z = fz;
     }
+
+    static mAng3_c Zero;
 };
 
 #endif

include/rvl/GX/GXFrameBuf.h

@@ -28,6 +28,7 @@ f32 GXGetYScaleFactor(u16 height, u16 width);
 u16 GXGetNumXfbLines(u16 height, f32 scale);
 void GXSetDispCopyDst(u16 width, u16 height);
 u32 GXSetDispCopyYScale(f32 scale);
+void GXCopyDisp(void *data, GXBool bUpdate);
 
 extern GXRenderModeObj GXNtsc480IntDf;
 extern GXRenderModeObj GXMpal480IntDf;

include/rvl/OS/OSError.h

@@ -1,6 +1,7 @@
 #ifndef RVL_SDK_OS_ERROR_H
 #define RVL_SDK_OS_ERROR_H
 #include <common.h>
+#include <Runtime.PPCEABI.H/__va_arg.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -41,6 +42,7 @@ extern OSErrorHandler __OSErrorTable[OS_ERR_MAX];
 extern u32 __OSFpscrEnableBits;
 
 DECL_WEAK void OSReport(const char *msg, ...);
+DECL_WEAK void OSVReport(const char *msg, va_list args);
 DECL_WEAK void OSPanic(const char *file, int line, const char *msg, ...);
 
 OSErrorHandler OSSetErrorHandler(u16 error, OSErrorHandler handler);