general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)

* typedef for cPhs_Step

* make sdk includes consistent

* d_menu_quit / d_msg_scrn_explain debug

* d_a_obj_testcube mostly done

* d_debug_pad mostly done

* jstudio tool library headers

* some JStudioCameraEditor headers

* d_jcam_editor mostly done

* try fixing some shield regressions

* d_bg_parts mostly done

* fix merge errors

* debug fix

9 files changed, 23 insertions, 18 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index a125cdf925..92ca58ef6b 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -69,6 +69,7 @@ public:
     BOOL isDrawModeOpaTexEdge() { return (mMaterialMode & 3) ? 1 : 0; }
     J3DPEBlock* getPEBlock() { return mPEBlock; }
     void onInvalid() { mInvalid = 1; }
+    u32 getInvalid() { return mInvalid; }
     u32 getTexGenNum() const { return mTexGenBlock->getTexGenNum(); }
     u8 getTevStageNum() const { return mTevBlock->getTevStageNum(); }
     J3DTexCoord* getTexCoord(u32 idx) { return mTexGenBlock->getTexCoord(idx); }
diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h
index 67dea2f83c..3e94e1830c 100644
--- a/include/JSystem/J3DGraphBase/J3DPacket.h
+++ b/include/JSystem/J3DGraphBase/J3DPacket.h
@@ -4,8 +4,8 @@
 #include "JSystem/J3DAssert.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DEnum.h"
-#include "dolphin/gd/GDBase.h"
-#include "dolphin/mtx.h"
+#include <dolphin/gd/GDBase.h>
+#include <dolphin/mtx.h>
 #include <stdint.h>
 
 class J3DMatPacket;
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index afcfa283fe..151f4235ab 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -189,7 +189,7 @@ public:
     J3DMaterial* getMaterial() const { return mMaterial; }
     u16 getIndex() const { return mIndex; }
     u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
-    u32 getMtxGroupNum() const { return mMtxGroupNum; }
+    u16 getMtxGroupNum() const { return mMtxGroupNum; }
     J3DShapeDraw* getShapeDraw(u16 idx) { return mShapeDraw[idx]; }
     J3DShapeMtx* getShapeMtx(u16 idx) { return mShapeMtx[idx]; }
     Vec* getMin() { return &mMin; }
diff --git a/include/JSystem/J3DGraphBase/J3DShapeDraw.h b/include/JSystem/J3DGraphBase/J3DShapeDraw.h
index 8d915610bb..ad3f7ec4cb 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeDraw.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeDraw.h
@@ -1,7 +1,7 @@
 #ifndef J3DSHAPEDRAW_H
 #define J3DSHAPEDRAW_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 /**
  * @ingroup jsystem-j3d
diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
index 7029ab3350..d840b66c7a 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
@@ -3,7 +3,7 @@
 
 #include "JSystem/J3DGraphBase/J3DShape.h"
 #include "JSystem/J3DAssert.h"
-#include "dolphin/mtx.h"
+#include <dolphin/mtx.h>
 
 class J3DTexMtx;
 class J3DTexGenBlock;
diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h
index 7ab166946a..cd41270401 100644
--- a/include/JSystem/J3DGraphBase/J3DStruct.h
+++ b/include/JSystem/J3DGraphBase/J3DStruct.h
@@ -2,8 +2,8 @@
 #define J3DSTRUCT_H
 
 #include <dolphin/gx.h>
-#include "dolphin/mtx.h"
-#include "dolphin/mtx.h"
+#include <dolphin/mtx.h>
+#include <dolphin/mtx.h>
 #include "global.h"
 
 /**
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index 711639e576..2f6c692e02 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -88,15 +88,6 @@ struct J3DSys {
     void setDrawModeOpaTexEdge() { mDrawMode = J3DSysDrawMode_OpaTexEdge; }
     void setDrawModeXlu() { mDrawMode = J3DSysDrawMode_Xlu; }
 
-    void* getVtxPos() { return mVtxPos; }
-    void setVtxPos(void* pVtxPos) { mVtxPos = pVtxPos; }
-
-    void* getVtxNrm() { return mVtxNrm; }
-    void setVtxNrm(void* pVtxNrm) { mVtxNrm = pVtxNrm; }
-
-    void* getVtxCol() { return mVtxCol; }
-    void setVtxCol(GXColor* pVtxCol) { mVtxCol = pVtxCol; }
-
     void setDrawBuffer(J3DDrawBuffer* buffer, int type) {
         J3D_ASSERT_RANGE(114, type >= 0 && type < J3DSysDrawBuf_MAX);
         J3D_ASSERT_NULLPTR(115, buffer);
@@ -160,6 +151,19 @@ struct J3DSys {
         GXSetArray(GX_NRM_MTX_ARRAY, mModelNrmMtx, sizeof(*mModelNrmMtx));
     }
 
+    void* getVtxPos() { return mVtxPos; }
+
+    void setVtxPos(void* pVtxPos) {
+        J3D_ASSERT_NULLPTR(252, pVtxPos != NULL);
+        mVtxPos = pVtxPos;
+    }
+
+    void* getVtxNrm() { return mVtxNrm; }
+    void setVtxNrm(void* pVtxNrm) { mVtxNrm = pVtxNrm; }
+
+    void* getVtxCol() { return mVtxCol; }
+    void setVtxCol(GXColor* pVtxCol) { mVtxCol = pVtxCol; }
+
     Mtx& getModelDrawMtx(u16 no) { return mModelDrawMtx[no]; }
     J3DShapePacket* getShapePacket() { return mShapePacket; }
 
diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h
index 1f7d6dfa59..a13b54e4a4 100644
--- a/include/JSystem/J3DGraphBase/J3DTevs.h
+++ b/include/JSystem/J3DGraphBase/J3DTevs.h
@@ -1,7 +1,7 @@
 #ifndef J3DTEVS_H
 #define J3DTEVS_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include <dolphin/gx.h>
 #include "JSystem/J3DGraphBase/J3DGD.h"
 #include "JSystem/J3DGraphBase/J3DStruct.h"
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index 1bfd011219..2486fdc41c 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -2,7 +2,7 @@
 #define J3DVERTEX_H
 
 #include <dolphin/gx.h>
-#include "dolphin/mtx.h"
+#include <dolphin/mtx.h>
 
 typedef struct _GXColor GXColor;
 class J3DModel;