Fix compile with Dusk's mtx lib

Move Mtx33 and similar types to JMath

Rename mtx.h in decomp to _mtx.h so Aurora's header is used instead.

include/JSystem/J3DGraphBase/J3DStruct.h

@@ -5,6 +5,7 @@
 #include <dolphin/mtx.h>
 #include <dolphin/mtx.h>
 #include "global.h"
+#include "JSystem/JMath/JMath.h"
 
 /**
  * @ingroup jsystem-j3d

include/JSystem/J3DGraphBase/J3DSys.h

@@ -4,6 +4,7 @@
 #include <dolphin/gx.h>
 #include <dolphin/mtx.h>
 #include "JSystem/J3DAssert.h"
+#include "JSystem/JMath/JMath.h"
 
 enum J3DSysDrawBuf {
     /* 0x0 */ J3DSysDrawBuf_Opa,

include/JSystem/J3DGraphBase/J3DTransform.h

@@ -2,6 +2,7 @@
 #define J3DTRANSFORM_H
 
 #include <dolphin/mtx.h>
+#include "JSystem/JMath/JMath.h"
 
 struct J3DTextureSRTInfo;
 

include/JSystem/JMath/JMath.h

@@ -4,6 +4,13 @@
 #include "dolphin/mtx.h"
 #include <cmath>
 
+typedef f32 Mtx33[3][3];
+typedef f32 Mtx23[2][3];
+typedef f32 (*Mtx3P)[3];
+typedef f32 (*MtxP)[4];
+typedef const f32 (*CMtxP)[4];
+typedef f32 QuaternionP[4];
+
 void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32);
 void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3);
 void JMAQuatLerp(const Quaternion*, const Quaternion*, f32, Quaternion*);

include/dolphin/_mtx.h

@@ -31,14 +31,6 @@ typedef f32 (*Mtx44Ptr)[4];
 typedef f32 ROMtx[4][3];
 typedef f32 (*ROMtxPtr)[4];
 
-// do these belong in the sdk?
-typedef f32 Mtx33[3][3];
-typedef f32 Mtx23[2][3];
-typedef f32 (*Mtx3P)[3];
-typedef f32 (*MtxP)[4];
-typedef const f32 (*CMtxP)[4];
-typedef f32 QuaternionP[4];
-
 typedef struct {
     u32 numMtx;
     MtxPtr stackBase;

include/m_Do/m_Do_mtx.h

@@ -4,6 +4,7 @@
 #include "SSystem/SComponent/c_sxyz.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include <dolphin/mtx.h>
+#include "JSystem/JMath/JMath.h"
 
 extern u8 g_printCurrentHeapDebug;
 extern u8 g_printOtherHeapDebug;