diff --git a/config/GZ2E01/symbols.txt b/config/GZ2E01/symbols.txt
index c1ecddb9cb..c966841d08 100644
--- a/config/GZ2E01/symbols.txt
+++ b/config/GZ2E01/symbols.txt
@@ -22251,9 +22251,9 @@ sMtxPtrTbl__21J3DShapeMtxConcatView = .sbss:0x804515B8; // type:object size:0x8
 sTexGenBlock__17J3DDifferedTexMtx = .sbss:0x804515C0; // type:object size:0x4 scope:global align:4 data:4byte
 sTexMtxObj__17J3DDifferedTexMtx = .sbss:0x804515C4; // type:object size:0x4 scope:global align:4 data:4byte
 sInterruptFlag$903 = .sbss:0x804515C8; // type:object size:0x4 scope:local align:4 data:4byte
-sInitInterruptFlag = .sbss:0x804515CC; // type:object size:0x1 scope:local align:1 data:byte
+init$465 = .sbss:0x804515CC; // type:object size:0x1 scope:local align:1 data:byte
 sOldVcdVatCmd__8J3DShape = .sbss:0x804515D0; // type:object size:0x4 scope:global align:4 data:4byte
-data_804515D4 = .sbss:0x804515D4; // type:object size:0x4 scope:local align:4 data:byte
+sEnvelopeFlag__8J3DShape = .sbss:0x804515D4; // type:object size:0x4 scope:local align:4 data:byte
 SizeOfJ3DColorBlockLightOffLoad = .sbss:0x804515D8; // type:object size:0x4 scope:global align:4 data:4byte
 SizeOfJ3DColorBlockAmbientOnLoad = .sbss:0x804515DC; // type:object size:0x4 scope:global align:4 data:4byte
 entryNum__13J3DDrawBuffer = .sbss:0x804515E0; // type:object size:0x4 scope:global align:4 data:4byte
@@ -26427,7 +26427,7 @@ j2dDefaultAlphaCmp = .sdata2:0x804561AE; // type:object size:0x2 scope:global al
 @1171 = .sdata2:0x804563B8; // type:object size:0x8 scope:local align:8 data:double
 j3dDefaultColInfo = .sdata2:0x804563C0; // type:object size:0x4 scope:global align:4 data:4byte
 j3dDefaultAmbInfo = .sdata2:0x804563C4; // type:object size:0x4 scope:global align:4 data:4byte
-data_804563C8 = .sdata2:0x804563C8; // type:object size:0x1 scope:global align:1 data:byte
+j3dDefaultNumChans = .sdata2:0x804563C8; // type:object size:0x1 scope:global align:1 data:byte
 j3dDefaultTevOrderInfoNull = .sdata2:0x804563CC; // type:object size:0x4 scope:global align:4 data:4byte
 j3dDefaultIndTexOrderNull = .sdata2:0x804563D0; // type:object size:0x4 scope:global align:4 data:4byte
 j3dDefaultTevColor = .sdata2:0x804563D4; // type:object size:0x8 scope:global align:4 data:4byte
diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index eb393c3fad..8820f36b05 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -56,10 +56,10 @@ class J2DAnmVtxColor : public J2DAnmBase {
 public:
     J2DAnmVtxColor() {
         mKind = KIND_VTX_COLOR;
-        for (s32 i = 0; i < ARRAY_SIZE(mAnmTableNum); i++) {
+        for (s32 i = 0; i < ARRAY_SIZEU(mAnmTableNum); i++) {
             mAnmTableNum[i] = NULL;
         }
-        for (s32 i = 0; i < ARRAY_SIZE(mVtxColorIndexData); i++) {
+        for (s32 i = 0; i < ARRAY_SIZEU(mVtxColorIndexData); i++) {
             mVtxColorIndexData[i] = NULL;
         }
     }
@@ -88,7 +88,7 @@ struct J3DTextureSRTInfo;
 class J2DAnmVtxColorKey : public J2DAnmVtxColor {
 public:
     J2DAnmVtxColorKey() {
-        for (s32 i = 0; i < ARRAY_SIZE(mInfoTable); i++) {
+        for (s32 i = 0; i < ARRAY_SIZEU(mInfoTable); i++) {
             mInfoTable[i] = NULL;
         }
     }
@@ -109,7 +109,7 @@ public:
 class J2DAnmVtxColorFull : public J2DAnmVtxColor {
 public:
     J2DAnmVtxColorFull() {
-        for (s32 i = 0; i < ARRAY_SIZE(mInfoTable); i++) {
+        for (s32 i = 0; i < ARRAY_SIZEU(mInfoTable); i++) {
             mInfoTable[i] = NULL;
         }
     }
diff --git a/include/JSystem/J3DAssert.h b/include/JSystem/J3DAssert.h
new file mode 100644
index 0000000000..24fe88274e
--- /dev/null
+++ b/include/JSystem/J3DAssert.h
@@ -0,0 +1,11 @@
+#ifndef J3DASSERT_H
+#define J3DASSERT_H
+
+#include "JSystem/JUtility/JUTAssert.h"
+
+#define J3D_ASSERT_NULLPTR(LINE, COND) JUT_ASSERT_MSG(LINE, (COND) != 0, "Error : null pointer.")
+#define J3D_ASSERT_RANGE(LINE, COND) JUT_ASSERT_MSG(LINE, (COND) != 0, "Error : range over.")
+#define J3D_ASSERT_NONZEROARG(LINE, COND) JUT_ASSERT_MSG(LINE, (COND) != 0, "Error : non-zero argument is specified 0.")
+#define J3D_ASSERT_ALLOCMEM(LINE, COND) JUT_ASSERT_MSG(LINE, (COND) != 0, "Error : allocate memory.")
+
+#endif /* J3DASSERT_H */
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index 58a0f1912b..1003219d24 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -476,10 +476,10 @@ public:
         mFrame = 0.0f;
     }
 
-    J3DAnmBase(s16 i_frameMax) {
+    J3DAnmBase(s16 frameMax) {
         mAttribute = 0;
         field_0x5 = 0;
-        mFrameMax = i_frameMax;
+        mFrameMax = frameMax;
         mFrame = 0.0f;
     }
 
@@ -515,7 +515,7 @@ public:
     /* 0x18 */ s16 field_0x18;
     /* 0x1A */ s16 field_0x1a;
     /* 0x1C */ u16 field_0x1c;
-    /* 0x1E */ s16 field_0x1e;
+    /* 0x1E */ u16 field_0x1e;
 };  // Size: 0x20
 
 /**
@@ -533,8 +533,8 @@ public:
 
     /* 8003B8D0 */ virtual ~J3DAnmTransformKey() {}
     /* 8003C800 */ virtual s32 getKind() const { return 8; }
-    /* 8003C808 */ virtual void getTransform(u16 param_0, J3DTransformInfo* param_1) const {
-        calcTransform(mFrame, param_0, param_1);
+    /* 8003C808 */ virtual void getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
+        calcTransform(mFrame, jointNo, pTransform);
     }
 
     /* 0x20 */ int mDecShift;
@@ -585,25 +585,25 @@ public:
     /* 8032C198 */ virtual ~J3DAnmTextureSRTKey() {}
     /* 8032C220 */ virtual s32 getKind() const { return 4; }
 
-    void getTransform(u16 param_0, J3DTextureSRTInfo* pSRTInfo) const {
-        calcTransform(getFrame(), param_0, pSRTInfo);
+    void getTransform(u16 jointNo, J3DTextureSRTInfo* pSRTInfo) const {
+        calcTransform(getFrame(), jointNo, pSRTInfo);
     }
 
     u16 getUpdateMaterialID(u16 idx) const {
-        J3D_ASSERT(1029, idx < mTrackNum / 3, "Error : range over.");
+        J3D_ASSERT_RANGE(1029, idx < mTrackNum / 3);
         return mUpdateMaterialID[idx];
     }
     u16 getUpdateMaterialNum() const { return mTrackNum / 3; }
     u16 getPostUpdateMaterialNum() const { return field_0x4a / 3; }
 
     int getUpdateTexMtxID(u16 idx) const {
-        J3D_ASSERT(1017, idx < mTrackNum / 3, "Error : range over.");
+        J3D_ASSERT_RANGE(1017, idx < mTrackNum / 3);
         return mUpdateTexMtxID[idx];
     }
     bool isValidUpdateMaterialID(u16 idx) const { return mUpdateMaterialID[idx] != 0xffff; }
     u32 getTexMtxCalcType() { return mTexMtxCalcType; }
     Vec* getSRTCenter(u16 idx) {
-        J3D_ASSERT(1047, idx < mTrackNum / 3, "Error : range over.");
+        J3D_ASSERT_RANGE(1047, idx < mTrackNum / 3);
         return &mSRTCenter[idx];
     }
 
@@ -650,7 +650,7 @@ public:
     /* 8032BD94 */ virtual s32 getKind() const { return 2; }
 
     u16 getUpdateMaterialID(u16 idx) const {
-        J3D_ASSERT(2288, idx < mUpdateMaterialNum, "Error : range over.");
+        J3D_ASSERT_RANGE(2288, idx < mUpdateMaterialNum);
         return mUpdateMaterialID[idx];
     }
     u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
@@ -684,19 +684,19 @@ public:
     u16 getKRegUpdateMaterialNum() const { return mKRegUpdateMaterialNum; }
 
     u16 getCRegUpdateMaterialID(u16 idx) const {
-        J3D_ASSERT(2100, idx < mCRegUpdateMaterialNum, "Error : range over.");
+        J3D_ASSERT_RANGE(2100, idx < mCRegUpdateMaterialNum);
         return mCRegUpdateMaterialID[idx];
     }
     u16 getKRegUpdateMaterialID(u16 idx) const {
-        J3D_ASSERT(2140, idx < mKRegUpdateMaterialNum, "Error : range over.");
+        J3D_ASSERT_RANGE(2140, idx < mKRegUpdateMaterialNum);
         return mKRegUpdateMaterialID[idx];
     }
 
-    const J3DAnmCRegKeyTable* getAnmCRegKeyTable() const { return mAnmCRegKeyTable; }
-    const J3DAnmKRegKeyTable* getAnmKRegKeyTable() const { return mAnmKRegKeyTable; }
+    const J3DAnmCRegKeyTable* getAnmCRegKeyTable() { return mAnmCRegKeyTable; }
+    const J3DAnmKRegKeyTable* getAnmKRegKeyTable() { return mAnmKRegKeyTable; }
 
-    bool isValidCRegUpdateMaterialID(u16 idx) { return mCRegUpdateMaterialID[idx] != 0xffff; }
-    bool isValidKRegUpdateMaterialID(u16 idx) { return mKRegUpdateMaterialID[idx] != 0xffff; }
+    bool isValidCRegUpdateMaterialID(u16 idx) const { return mCRegUpdateMaterialID[idx] != 0xffff; }
+    bool isValidKRegUpdateMaterialID(u16 idx) const { return mKRegUpdateMaterialID[idx] != 0xffff; }
 
     /* 0x0C */ u16 mCRegUpdateMaterialNum;
     /* 0x0E */ u16 mKRegUpdateMaterialNum;
@@ -740,7 +740,7 @@ public:
     u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
     bool isValidUpdateMaterialID(u16 id) const { return mUpdateMaterialID[id] != 0xFFFF; }
     u16 getUpdateMaterialID(u16 idx) const { 
-        J3D_ASSERT(1578, idx < mUpdateMaterialNum, "Error : range over.");
+        J3D_ASSERT_RANGE(1578, idx < mUpdateMaterialNum);
         return mUpdateMaterialID[idx];
     }
 
@@ -851,7 +851,7 @@ public:
  */
 class J3DAnmCluster : public J3DAnmBase {
 public:
-    J3DAnmCluster(s16 param_1, f32* param_2) : J3DAnmBase(param_1) { mWeight = param_2; }
+    J3DAnmCluster(s16 frameMax, f32* pWeight) : J3DAnmBase(frameMax) { mWeight = pWeight; }
 
     /* 8032BCAC */ virtual ~J3DAnmCluster() {}
     /* 8032BF44 */ virtual s32 getKind() const { return 3; }
@@ -866,7 +866,7 @@ public:
  */
 class J3DAnmClusterFull : public J3DAnmCluster {
 public:
-    J3DAnmClusterFull() : J3DAnmCluster(0, 0) { mAnmTable = NULL; }
+    J3DAnmClusterFull() : J3DAnmCluster(0, NULL) { mAnmTable = NULL; }
 
     /* 8032BCAC */ virtual ~J3DAnmClusterFull() {}
     /* 8032BF44 */ virtual s32 getKind() const { return 12; }
@@ -965,10 +965,10 @@ public:
 };  // Size: 0x14
 
 struct J3DMtxCalcAnmBase: public J3DMtxCalc {
-    J3DMtxCalcAnmBase(J3DAnmTransform* param_0) { mAnmTransform = param_0; }
+    J3DMtxCalcAnmBase(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
     /* 8000D8EC */ ~J3DMtxCalcAnmBase() {}
     /* 80014FB8 */ J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
-    /* 80014FC0 */ void setAnmTransform(J3DAnmTransform* param_0) { mAnmTransform = param_0; }
+    /* 80014FC0 */ void setAnmTransform(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
 
     J3DAnmTransform* mAnmTransform;
 };
@@ -980,29 +980,33 @@ struct J3DMtxCalcAnimationAdaptorBase {
 
 template <typename A0>
 struct J3DMtxCalcAnimationAdaptorDefault : public J3DMtxCalcAnimationAdaptorBase {
-    J3DMtxCalcAnimationAdaptorDefault(J3DAnmTransform* param_0) {}
-    void calc(J3DMtxCalcAnmBase* param_0) {
+    J3DMtxCalcAnimationAdaptorDefault(J3DAnmTransform* pAnmTransform) {}
+
+    void calc(J3DMtxCalcAnmBase* pMtxCalc) {
         J3DTransformInfo transform;
         J3DTransformInfo* transform_p;
-        if (param_0->getAnmTransform() != NULL) {
+        if (pMtxCalc->getAnmTransform() != NULL) {
             u16 jnt_no = J3DMtxCalc::getJoint()->getJntNo();
-            param_0->getAnmTransform()->getTransform(jnt_no, &transform);
+            pMtxCalc->getAnmTransform()->getTransform(jnt_no, &transform);
             transform_p = &transform;
         } else {
             transform_p = &J3DMtxCalc::getJoint()->getTransformInfo();
         }
+
         A0::calcTransform(*transform_p);
     }
 };
 
 template <typename A0, typename B0>
 struct J3DMtxCalcAnimation : public J3DMtxCalcAnmBase {
-    J3DMtxCalcAnimation(J3DAnmTransform* param_0) : J3DMtxCalcAnmBase(param_0), field_0x8(param_0) {}
+    J3DMtxCalcAnimation(J3DAnmTransform* pAnmTransform) : J3DMtxCalcAnmBase(pAnmTransform), field_0x8(pAnmTransform) {}
     ~J3DMtxCalcAnimation() {}
-    void setAnmTransform(J3DAnmTransform* param_0) {
-        mAnmTransform = param_0;
-        field_0x8.change(param_0);
+
+    void setAnmTransform(J3DAnmTransform* pAnmTransform) {
+        mAnmTransform = pAnmTransform;
+        field_0x8.change(pAnmTransform);
     }
+
     void init(const Vec& param_0, const Mtx& param_1) { B0::init(param_0, param_1); }
     void calc() { field_0x8.calc(this); }
 
diff --git a/include/JSystem/J3DGraphAnimator/J3DCluster.h b/include/JSystem/J3DGraphAnimator/J3DCluster.h
index ded3d1a2ca..0ef5185db8 100644
--- a/include/JSystem/J3DGraphAnimator/J3DCluster.h
+++ b/include/JSystem/J3DGraphAnimator/J3DCluster.h
@@ -1,8 +1,7 @@
 #ifndef J3DCLUSTER_H
 #define J3DCLUSTER_H
 
-#include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/types.h"
+#include "JSystem/J3DAssert.h"
 
 class J3DDeformer;
 class J3DClusterKey;
@@ -81,13 +80,13 @@ public:
     /* 8032E364 */ void setAnm(J3DAnmCluster*);
 
     J3DCluster* getClusterPointer(u16 index) {
-        J3D_ASSERT(186, (index < mClusterNum), "Error : range over.");
+        J3D_ASSERT_RANGE(186, (index < mClusterNum));
         return &mClusterPointer[index];
     }
     u16 getClusterNum() const { return mClusterNum; }
     u16 getClusterKeyNum() const { return mClusterKeyNum; }
     J3DClusterKey* getClusterKeyPointer(u16 i) {
-        J3D_ASSERT(199, (i < mClusterKeyNum), "Error : range over.");
+        J3D_ASSERT_RANGE(199, (i < mClusterKeyNum));
         return &mClusterKeyPointer[i];
     }
     f32* getVtxPos() { return mVtxPos; }
diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h
index ccd676967a..b20b48d792 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJoint.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h
@@ -3,6 +3,7 @@
 
 #include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
+#include "JSystem/J3DGraphBase/J3DMaterial.h"
 
 class J3DAnmTransform;
 class J3DJoint;
@@ -29,7 +30,7 @@ public:
 
     static J3DMtxBuffer* getMtxBuffer() { return mMtxBuffer; }
     static J3DJoint* getJoint() {
-        J3D_ASSERT(185, mJoint != NULL, "Error : null pointer.")
+        J3D_ASSERT_NULLPTR(185, mJoint != NULL)
         return mJoint;
     }
     static void setJoint(J3DJoint* joint) { mJoint = joint; }
@@ -51,7 +52,17 @@ public:
     /* 8032F254 */ void entryIn();
     /* 8032F3F8 */ void recursiveCalc();
 
+    u32 getType() const { return 'NJNT'; }
+
     J3DMaterial* getMesh() { return mMesh; }
+    void addMesh(J3DMaterial* pMesh) {
+        if (mMesh != NULL) {
+            pMesh->setNext(mMesh);
+        }
+
+        mMesh = pMesh;
+    }
+
     u16 getJntNo() const { return mJntNo; }
     u8 getScaleCompensate() const { return mScaleCompensate; }
     J3DJoint* getYounger() { return mYounger; }
@@ -67,13 +78,13 @@ public:
     J3DMtxCalc* getMtxCalc() { return mMtxCalc; }
     J3DMtxCalc* getCurrentMtxCalc() { return mCurrentMtxCalc; };
     J3DJoint* getChild() { return mChild; }
-    u8 getMtxType() { return (mKind & 0xf0) >> 4; }
+    u8 getMtxType() const { return (mKind & 0xf0) >> 4; }
     void setMtxType(u8 type) { mKind = (mKind & ~0xf0) | (type << 4); }
     f32 getRadius() const { return mBoundingSphereRadius; }
 
     static J3DMtxCalc* mCurrentMtxCalc;
 
-    inline u8 getKind() { return mKind & 15; }
+    u8 getKind() { return mKind & 15; }
 
 private:
     friend struct J3DJointFactory;
diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
index 01c55620bd..1b959ecbb8 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
@@ -64,14 +64,14 @@ public:
     JUTNameTab* getJointName() const { return mJointName; }
     J3DJoint* getRootNode() { return mRootNode; }
     J3DJoint* getJointNodePointer(u16 idx) const {
-        J3D_ASSERT(139, idx < mJointNum, "Error : range over.");
+        J3D_ASSERT_RANGE(139, idx < mJointNum);
         return mJointNodePointer[idx];
     }
-    J3DMtxCalc* getBasicMtxCalc() const { return mBasicMtxCalc; }
+    J3DMtxCalc* getBasicMtxCalc() { return mBasicMtxCalc; }
     Mtx& getInvJointMtx(int idx) { return mInvJointMtx[idx]; }
     u32 getModelDataType() const { return mModelDataType; }
     void setModelDataType(u32 type) { mModelDataType = type; }
-    bool checkFlag(u32 flag) { return mFlags & flag; }
+    bool checkFlag(u32 flag) const { return mFlags & flag ? true : false; }
     void setFlag(u32 flag) { mFlags = flag; }
 
 private:
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
index e77a550462..43f6a577da 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
@@ -3,9 +3,6 @@
 
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 
-typedef struct _GXColor GXColor;
-typedef struct _GXColorS10 GXColorS10;
-
 /**
  * @ingroup jsystem-j3d
  * 
@@ -13,11 +10,14 @@ typedef struct _GXColorS10 GXColorS10;
 class J3DMatColorAnm {
 public:
     /* 8003B2B8 */ ~J3DMatColorAnm() {}
+
     /* 8003B2F4 */ J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {}
-    J3DMatColorAnm(u16 param_1, J3DAnmColor* param_2) {
+
+    J3DMatColorAnm(u16 param_1, J3DAnmColor* pAnmColor) {
         field_0x0 = param_1;
         mAnmFlag = 1;
-        mAnmColor = param_2;
+        mAnmColor = pAnmColor;
+        J3D_ASSERT_NULLPTR(56, pAnmColor != NULL);
     }
 
     void operator=(J3DMatColorAnm const& other) {
@@ -28,7 +28,11 @@ public:
 
     void setAnmFlag(bool flag) { mAnmFlag = flag; }
     bool getAnmFlag() const { return mAnmFlag; }
-    void calc(_GXColor* pColor) const { mAnmColor->getColor(field_0x0, pColor); }
+
+    void calc(GXColor* pColor) const {
+        J3D_ASSERT_NULLPTR(507, pColor != NULL);
+        mAnmColor->getColor(field_0x0, pColor);
+    }
 
 private:
     /* 0x0 */ u16 field_0x0;
@@ -36,6 +40,43 @@ private:
     /* 0x4 */ J3DAnmColor* mAnmColor;
 };  // Size: 0x8
 
+/**
+ * @ingroup jsystem-j3d
+ * 
+ */
+class J3DTexMtxAnm {
+public:
+    /* 8003B264 */ ~J3DTexMtxAnm() {}
+    /* 8003B2A0 */ J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {}
+
+    J3DTexMtxAnm(u16 param_1, J3DAnmTextureSRTKey* pSRTKey) {
+        field_0x0 = param_1;
+        mAnmFlag = 1;
+        mAnmTransform = pSRTKey;
+        J3D_ASSERT_NULLPTR(134, pSRTKey != NULL);
+    }
+
+    void operator=(J3DTexMtxAnm const& other) {
+        mAnmTransform = other.mAnmTransform;
+        field_0x0 = other.field_0x0;
+        mAnmFlag = other.mAnmFlag;
+    }
+
+    void setAnmFlag(bool flag) { mAnmFlag = flag; }
+
+    void calc(J3DTextureSRTInfo* pSRTInfo) const {
+        J3D_ASSERT_NULLPTR(519, pSRTInfo != NULL);
+        mAnmTransform->getTransform(field_0x0, pSRTInfo);
+    }
+
+    bool getAnmFlag() const { return mAnmFlag; }
+
+private:
+    /* 0x0 */ u16 field_0x0;
+    /* 0x2 */ u16 mAnmFlag;
+    /* 0x4 */ J3DAnmTextureSRTKey* mAnmTransform;
+};  // Size: 0x8
+
 /**
  * @ingroup jsystem-j3d
  * 
@@ -44,11 +85,14 @@ class J3DTexNoAnm {
 public:
     /* 8003B1F8 */ ~J3DTexNoAnm() {}
     /* 8003B240 */ J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {}
-    J3DTexNoAnm(u16 param_1, J3DAnmTexPattern* param_2) {
+
+    J3DTexNoAnm(u16 param_1, J3DAnmTexPattern* pAnmTexPattern) {
         field_0x4 = param_1;
         mAnmFlag = 1;
-        mAnmTexPattern = param_2;
+        mAnmTexPattern = pAnmTexPattern;
+        J3D_ASSERT_NULLPTR(214, pAnmTexPattern != NULL);
     }
+
     /* 8003C82C */ virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); }
 
     void operator=(J3DTexNoAnm const& other) {
@@ -71,49 +115,19 @@ private:
  * @ingroup jsystem-j3d
  * 
  */
-class J3DTexMtxAnm {
+class J3DTevColorAnm {
 public:
-    /* 8003B264 */ ~J3DTexMtxAnm() {}
-    /* 8003B2A0 */ J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {}
-    J3DTexMtxAnm(u16 param_1, J3DAnmTextureSRTKey* param_2) {
+    /* 8003B1A4 */ ~J3DTevColorAnm() {}
+    /* 8003B1E0 */ J3DTevColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
+
+    J3DTevColorAnm(u16 param_1, J3DAnmTevRegKey* pTevRegKey) {
         field_0x0 = param_1;
         mAnmFlag = 1;
-        mAnmTransform = param_2;
+        mAnmTevReg = pTevRegKey;
+        J3D_ASSERT_NULLPTR(293, pTevRegKey != NULL);
     }
 
-    void operator=(J3DTexMtxAnm const& other) {
-        mAnmTransform = other.mAnmTransform;
-        field_0x0 = other.field_0x0;
-        mAnmFlag = other.mAnmFlag;
-    }
-
-    void setAnmFlag(bool flag) { mAnmFlag = flag; }
-    void calc(J3DTextureSRTInfo* pSRTInfo) const {
-        mAnmTransform->getTransform(field_0x0, pSRTInfo);
-    }
-    bool getAnmFlag() const { return mAnmFlag; }
-
-private:
-    /* 0x0 */ u16 field_0x0;
-    /* 0x2 */ u16 mAnmFlag;
-    /* 0x4 */ J3DAnmTextureSRTKey* mAnmTransform;
-};  // Size: 0x8
-
-/**
- * @ingroup jsystem-j3d
- * 
- */
-class J3DTevKColorAnm {
-public:
-    /* 8003B150 */ ~J3DTevKColorAnm() {}
-    /* 8003B18C */ J3DTevKColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
-    J3DTevKColorAnm(u16 param_1, J3DAnmTevRegKey* param_2) {
-        field_0x0 = param_1;
-        mAnmFlag = 1;
-        mAnmTevReg = param_2;
-    }
-
-    void operator=(J3DTevKColorAnm const& other) {
+    void operator=(J3DTevColorAnm const& other) {
         mAnmTevReg = other.mAnmTevReg;
         field_0x0 = other.field_0x0;
         mAnmFlag = other.mAnmFlag;
@@ -121,7 +135,11 @@ public:
 
     void setAnmFlag(bool flag) { mAnmFlag = flag; }
     bool getAnmFlag() const { return mAnmFlag; }
-    void calc(_GXColor* pColor) const { mAnmTevReg->getTevKonstReg(field_0x0, pColor); }
+
+    void calc(GXColorS10* pColor) const {
+        J3D_ASSERT_NULLPTR(545, pColor != NULL);
+        mAnmTevReg->getTevColorReg(field_0x0, pColor);
+    }
 
 private:
     /* 0x0 */ u16 field_0x0;
@@ -133,17 +151,19 @@ private:
  * @ingroup jsystem-j3d
  * 
  */
-class J3DTevColorAnm {
+class J3DTevKColorAnm {
 public:
-    /* 8003B1A4 */ ~J3DTevColorAnm() {}
-    /* 8003B1E0 */ J3DTevColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
-    J3DTevColorAnm(u16 param_1, J3DAnmTevRegKey* param_2) {
+    /* 8003B150 */ ~J3DTevKColorAnm() {}
+    /* 8003B18C */ J3DTevKColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
+
+    J3DTevKColorAnm(u16 param_1, J3DAnmTevRegKey* pTevRegKey) {
         field_0x0 = param_1;
         mAnmFlag = 1;
-        mAnmTevReg = param_2;
+        mAnmTevReg = pTevRegKey;
+        J3D_ASSERT_NULLPTR(371, pTevRegKey != NULL);
     }
 
-    void operator=(J3DTevColorAnm const& other) {
+    void operator=(J3DTevKColorAnm const& other) {
         mAnmTevReg = other.mAnmTevReg;
         field_0x0 = other.field_0x0;
         mAnmFlag = other.mAnmFlag;
@@ -151,7 +171,11 @@ public:
 
     void setAnmFlag(bool flag) { mAnmFlag = flag; }
     bool getAnmFlag() const { return mAnmFlag; }
-    void calc(_GXColorS10* pColor) const { mAnmTevReg->getTevColorReg(field_0x0, pColor); }
+
+    void calc(GXColor* pColor) const {
+        J3D_ASSERT_NULLPTR(558, pColor != NULL);
+        mAnmTevReg->getTevKonstReg(field_0x0, pColor);
+    }
 
 private:
     /* 0x0 */ u16 field_0x0;
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
index eb53887ea4..028c81b87c 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
@@ -1,8 +1,7 @@
 #ifndef J3DMATERIALATTACH_H
 #define J3DMATERIALATTACH_H
 
-#include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/types.h"
+#include "JSystem/J3DAssert.h"
 
 class J3DMaterial;
 class J3DTexture;
@@ -33,7 +32,7 @@ public:
     /* 8032F604 */ virtual ~J3DMaterialTable();
 
     J3DMaterial* getMaterialNodePointer(u16 idx) const {
-        J3D_ASSERT(92, idx < mMaterialNum, "Error : range over.");
+        J3D_ASSERT_RANGE(92, idx < mMaterialNum);
         return mMaterialNodePointer[idx];
     }
 
diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index 9e412af352..b21abd212f 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -6,15 +6,15 @@
 #include "dolphin/types.h"
 
 enum J3DMdlFlag {
-    J3DMdlFlag_None = 0x0,
-    /* 0x00001 */ J3DMdlFlag_Unk00001 = 0x1,
-    /* 0x00002 */ J3DMdlFlag_Unk00002 = 0x2,
-    /* 0x00004 */ J3DMdlFlag_SkinPosCpu = 0x4,
-    /* 0x00008 */ J3DMdlFlag_SkinNrmCpu = 0x8,
-    /* 0x00010 */ J3DMdlFlag_Unk00010 = 0x10, 
-    /* 0x20000 */ J3DMdlFlag_Unk20000 = 0x20000,
-    /* 0x40000 */ J3DMdlFlag_Unk40000 = 0x40000,
-    /* 0x80000 */ J3DMdlFlag_Unk80000 = 0x80000,
+    J3DMdlFlag_None                           = 0x0,
+    /* 0x00001 */ J3DMdlFlag_Unk1             = 0x1,
+    /* 0x00002 */ J3DMdlFlag_UseDefaultJ3D    = 0x2,
+    /* 0x00004 */ J3DMdlFlag_SkinPosCpu       = 0x4,
+    /* 0x00008 */ J3DMdlFlag_SkinNrmCpu       = 0x8,
+    /* 0x00010 */ J3DMdlFlag_EnableLOD        = 0x10, 
+    /* 0x20000 */ J3DMdlFlag_UseSharedDL      = 0x20000,
+    /* 0x40000 */ J3DMdlFlag_UseSingleDL      = 0x40000,
+    /* 0x80000 */ J3DMdlFlag_DifferedDLBuffer = 0x80000,
 };
 
 /**
@@ -45,9 +45,10 @@ public:
     J3DModel() {
         initialize();
     }
-    J3DModel(J3DModelData* param_0, u32 param_1, u32 param_2) {
+
+    J3DModel(J3DModelData* pModelData, u32 mdlFlags, u32 mtxBufferFlag) {
         initialize();
-        entryModelData(param_0, param_1, param_2);
+        entryModelData(pModelData, mdlFlags, mtxBufferFlag);
     }
 
     /* 80327100 */ void initialize();
@@ -66,6 +67,8 @@ public:
     /* 803281B4 */ void calcBumpMtx();
     /* 803282B8 */ void calcBBoardMtx();
     /* 803282EC */ void prepareShapePackets();
+    void ptrToIndex();
+    void makeDL();
 
     /* 80327CA4 */ virtual void update();
     /* 80327E4C */ virtual void entry();
@@ -85,21 +88,22 @@ public:
 
     Mtx& getBaseTRMtx() { return mBaseTransformMtx; }
     void setBaseTRMtx(Mtx m) { MTXCopy(m, mBaseTransformMtx); }
-    u32 getMtxCalcMode() const { return mFlags & 0x03; }
+    u32 getMtxCalcMode() { return mFlags & (J3DMdlFlag_Unk1 | J3DMdlFlag_UseDefaultJ3D); }
     J3DVertexBuffer* getVertexBuffer() { return (J3DVertexBuffer*)&mVertexBuffer; }
     J3DMatPacket* getMatPacket(u16 idx) const { return &mMatPacket[idx]; }
     J3DShapePacket* getShapePacket(u16 idx) const { return &mShapePacket[idx]; }
-    J3DMtxBuffer* getMtxBuffer() const { return mMtxBuffer; }
+    J3DMtxBuffer* getMtxBuffer() { return mMtxBuffer; }
     void setScaleFlag(int idx, u8 flag) { mMtxBuffer->setScaleFlag(idx, flag); }
-    Mtx33* getBumpMtxPtr(int idx) const { return mMtxBuffer->getBumpMtxPtr(idx); }
-    Mtx33* getNrmMtxPtr() const { return mMtxBuffer->getNrmMtxPtr(); }
-    Mtx* getDrawMtxPtr() const { return mMtxBuffer->getDrawMtxPtr(); }
+    Mtx33* getBumpMtxPtr(int idx) { return mMtxBuffer->getBumpMtxPtr(idx); }
+    Mtx33* getNrmMtxPtr() { return mMtxBuffer->getNrmMtxPtr(); }
+    Mtx* getDrawMtxPtr() { return mMtxBuffer->getDrawMtxPtr(); }
     void setBaseScale(const Vec& scale) { mBaseScale = scale; }
     void setUserArea(u32 area) { mUserArea = area; }
     u32 getUserArea() const { return mUserArea; }
     Vec* getBaseScale() { return &mBaseScale; }
     void setAnmMtx(int jointNo, Mtx m) { mMtxBuffer->setAnmMtx(jointNo, m); }
     MtxP getAnmMtx(int jointNo) { return mMtxBuffer->getAnmMtx(jointNo); }
+    MtxP getWeightAnmMtx(int i) { return mMtxBuffer->getWeightAnmMtx(i); }
     J3DSkinDeform* getSkinDeform() { return mSkinDeform; }
 
     /* 0x04 */ J3DModelData* mModelData;
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index f6a57b7030..643d1f7849 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -8,7 +8,6 @@
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
 
-typedef struct _GXColor GXColor;
 class JUTNameTab;
 
 /**
@@ -68,7 +67,7 @@ public:
     bool checkFlag(u32 flag) const { return (mFlags & flag) ? true : false; }
     u32 getFlag() const { return mFlags; }
     void const* getRawData() const { return mpRawData; }
-    u16 checkBumpFlag() const { return mbHasBumpArray; }
+    bool checkBumpFlag() const { return mbHasBumpArray == 1; }
     void setBumpFlag(u32 flag) { mbHasBumpArray = flag; }
     bool checkBBoardFlag() const { return mbHasBillboard == 1; }
     bool isLocked() { return mMaterialTable.isLocked(); }
diff --git a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
index 5f9d4da047..00f401d673 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
@@ -25,28 +25,28 @@ public:
     /* 80326D3C */ void calcNrmMtx();
     /* 80326EF0 */ void calcBBoardMtx();
 
-    MtxP getAnmMtx(int idx) const { return mpAnmMtx[idx]; }
+    MtxP getAnmMtx(int idx) { return mpAnmMtx[idx]; }
     void setAnmMtx(int i, Mtx m) { MTXCopy(m, (MtxP)mpAnmMtx[i]); }
-    MtxP getWeightAnmMtx(int idx) const { return mpWeightEvlpMtx[idx]; }
-    MtxP getUserAnmMtx(int idx) const { return mpUserAnmMtx[idx]; }
+    MtxP getWeightAnmMtx(int idx) { return mpWeightEvlpMtx[idx]; }
+    MtxP getUserAnmMtx(int idx) { return mpUserAnmMtx[idx]; }
 
     void setScaleFlag(int idx, u8 flag) { mpScaleFlagArr[idx] = flag; }
     u32* getCurrentViewNoPtr() { return &mCurrentViewNo; }
     u8* getScaleFlagArray() const { return mpScaleFlagArr; }
     u8 getScaleFlag(int idx) const { return mpScaleFlagArr[idx]; }
     u8 getEnvScaleFlag(int idx) const { return mpEvlpScaleFlagArr[idx]; }
-    Mtx** getDrawMtxPtrPtr() const { return mpDrawMtxArr[1]; }
-    Mtx* getDrawMtxPtr() const { return mpDrawMtxArr[1][mCurrentViewNo]; }
-    Mtx* getDrawMtx(int idx) const { return &mpDrawMtxArr[1][mCurrentViewNo][idx]; }
-    Mtx33** getNrmMtxPtrPtr() const { return mpNrmMtxArr[1]; }
-    Mtx33* getNrmMtxPtr() const { return mpNrmMtxArr[1][mCurrentViewNo]; }
-    Mtx33* getNrmMtx(u16 idx) const { return &mpNrmMtxArr[1][mCurrentViewNo][idx]; }
+    Mtx** getDrawMtxPtrPtr() { return mpDrawMtxArr[1]; }
+    Mtx* getDrawMtxPtr() { return mpDrawMtxArr[1][mCurrentViewNo]; }
+    Mtx* getDrawMtx(int idx) { return &mpDrawMtxArr[1][mCurrentViewNo][idx]; }
+    Mtx33** getNrmMtxPtrPtr() { return mpNrmMtxArr[1]; }
+    Mtx33* getNrmMtxPtr() { return mpNrmMtxArr[1][mCurrentViewNo]; }
+    Mtx33* getNrmMtx(int idx) { return &mpNrmMtxArr[1][mCurrentViewNo][idx]; }
     Mtx33*** getBumpMtxPtrPtr() const { return mpBumpMtxArr[1]; }
-    Mtx33* getBumpMtxPtr(int idx) const { return mpBumpMtxArr[1][idx][mCurrentViewNo]; }
+    Mtx33* getBumpMtxPtr(int idx) { return mpBumpMtxArr[1][idx][mCurrentViewNo]; }
     J3DJointTree* getJointTree() const { return mJointTree; }
 
-    void setNrmMtx(int idx, Mtx* mtx) {
-        J3DPSMtx33CopyFrom34(*mtx, mpNrmMtxArr[1][mCurrentViewNo][idx]);
+    void setNrmMtx(int idx, Mtx mtx) {
+        J3DPSMtx33CopyFrom34(mtx, mpNrmMtxArr[1][mCurrentViewNo][idx]);
     }
 
     void swapDrawMtx() {
@@ -66,7 +66,6 @@ public:
     static Mtx* sNoUseDrawMtxPtr;
     static Mtx33* sNoUseNrmMtxPtr;
 
-private:
     /* 0x00 */ J3DJointTree* mJointTree;
     /* 0x04 */ u8* mpScaleFlagArr;
     /* 0x08 */ u8* mpEvlpScaleFlagArr;
@@ -75,7 +74,7 @@ private:
     /* 0x14 */ Mtx** mpDrawMtxArr[2];
     /* 0x1C */ Mtx33** mpNrmMtxArr[2];
     /* 0x24 */ Mtx33*** mpBumpMtxArr[2];
-    /* 0x2C */ u32 mFlags;
+    /* 0x2C */ u32 mMtxNum;
     /* 0x30 */ u32 mCurrentViewNo;
     /* 0x34 */ Mtx* mpUserAnmMtx;
 
diff --git a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h b/include/JSystem/J3DGraphAnimator/J3DShapeTable.h
index 6754b6f83a..6446979e32 100644
--- a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h
+++ b/include/JSystem/J3DGraphAnimator/J3DShapeTable.h
@@ -27,7 +27,7 @@ public:
 
     u16 getShapeNum() const { return mShapeNum; }
     J3DShape* getShapeNodePointer(u16 idx) const {
-        J3D_ASSERT(85, idx < mShapeNum, "Error : range over.");
+        J3D_ASSERT_RANGE(85, idx < mShapeNum);
         return mShapeNodePointer[idx];
     }
 
diff --git a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
index 5e03122ce3..d9b743a96c 100644
--- a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
+++ b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
@@ -53,14 +53,14 @@ public:
     Mtx3P getNrmMtx(int i) { return mNrmMtx[i]; }
     void onFlag(u32 flag) { mFlags |= flag; }
     void offFlag(u32 flag) { mFlags &= ~flag; }
-    bool checkFlag(u32 flag) { return mFlags & flag; }
+    bool checkFlag(u32 flag) { return mFlags & flag ? true : false; }
 
     /* 8032E064 */ virtual void deform(J3DVertexBuffer*, J3DMtxBuffer*);
     /* 8032E1B0 */ virtual ~J3DSkinDeform();
 
     static u16* sWorkArea_WEvlpMixMtx[1024];
     static f32* sWorkArea_WEvlpMixWeight[1024];
-    static u16 sWorkArea_MtxReg[1024 + 4 /* padding */];
+    static u16 sWorkArea_MtxReg[1024];
 
 private:
     /* 0x04 */ u16* mPosData;
@@ -89,7 +89,7 @@ public:
     /* 8032EBCC */ void normalizeWeight(int, f32*);
 
     void offFlag(u32 i_flag) { mFlags &= ~i_flag; }
-    bool checkFlag(u32 i_flag) { return mFlags & i_flag; }
+    bool checkFlag(u32 i_flag) { return mFlags & i_flag ? true : false; }
     void setAnmCluster(J3DAnmCluster* anm) { mAnmCluster = anm; }
     void normalize(f32* i_vec) { VECNormalize((Vec*)i_vec, (Vec*)i_vec); }
 
diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
index e58be9e6a9..1cc88b4079 100644
--- a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
+++ b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
@@ -33,8 +33,23 @@ class J3DDrawPacket;
 class J3DMatPacket;
 class J3DShapePacket;
 
-typedef int (J3DDrawBuffer::*sortFunc)(J3DMatPacket*);
-typedef void (J3DDrawBuffer::*drawFunc)() const;
+enum J3DDrawBufDrawMode {
+    J3DDrawBufDrawMode_Head,
+    J3DDrawBufDrawMode_Tail,
+
+    J3DDrawBufDrawMode_MAX,
+};
+
+enum J3DDrawBufSortMode {
+    J3DDrawBufSortMode_Mat,
+    J3DDrawBufSortMode_MatAnm,
+    J3DDrawBufSortMode_Z,
+    J3DDrawBufSortMode_Model,
+    J3DDrawBufSortMode_Invalid,
+    J3DDrawBufSortMode_Non,
+
+    J3DDrawBufSortMode_MAX,
+};
 
 /**
  * @ingroup jsystem-j3d
@@ -42,24 +57,13 @@ typedef void (J3DDrawBuffer::*drawFunc)() const;
  */
 class J3DDrawBuffer {
 public:
-    enum EDrawType {
-        DRAW_HEAD,
-        DRAW_TAIL,
-    };
-
-    enum ESortType {
-        SORT_MAT,
-        SORT_MAT_ANM,
-        SORT_Z,
-        SORT_MODEL,
-        SORT_INVALID,
-        SORT_NON,
-    };
+    typedef int (J3DDrawBuffer::*sortFunc)(J3DMatPacket*);
+    typedef void (J3DDrawBuffer::*drawFunc)() const;
 
     J3DDrawBuffer() { initialize(); }
     ~J3DDrawBuffer();
     void initialize();
-    J3DError allocBuffer(u32);
+    int allocBuffer(u32);
     void frameInit();
     int entryMatSort(J3DMatPacket*);
     int entryMatAnmSort(J3DMatPacket*);
@@ -72,18 +76,19 @@ public:
     void drawHead() const;
     void drawTail() const;
 
-    u32 getEntryTableSize() { return mBufSize; }
+    u32 getEntryTableSize() { return mEntryTableSize; }
+    int getSortMode() { return mSortMode; }
 
     inline void calcZRatio();
-    void setNonSort() { mSortType = 5; }
-    void setZSort() { mSortType = 2; }
+    void setNonSort() { mSortMode = J3DDrawBufSortMode_Non; }
+    void setZSort() { mSortMode = J3DDrawBufSortMode_Z; }
     void setZMtx(MtxP mtx) { mpZMtx = mtx; }
 
 public:
-    /* 0x00 */ J3DPacket** mpBuf;
-    /* 0x04 */ u32 mBufSize;
-    /* 0x08 */ u32 mDrawType;
-    /* 0x0C */ u32 mSortType;
+    /* 0x00 */ J3DPacket** mpBuffer;
+    /* 0x04 */ u32 mEntryTableSize;
+    /* 0x08 */ u32 mDrawMode;
+    /* 0x0C */ u32 mSortMode;
     /* 0x10 */ f32 mZNear;
     /* 0x14 */ f32 mZFar;
     /* 0x18 */ f32 mZRatio;
diff --git a/include/JSystem/J3DGraphBase/J3DFifo.h b/include/JSystem/J3DGraphBase/J3DFifo.h
new file mode 100644
index 0000000000..c93943864c
--- /dev/null
+++ b/include/JSystem/J3DGraphBase/J3DFifo.h
@@ -0,0 +1,67 @@
+#ifndef J3DFIFO_H
+#define J3DFIFO_H
+
+#include <dolphin/gx.h>
+#include <dolphin/gd.h>
+
+inline void J3DFifoLoadBPCmd(u32 regval) {
+    GXCmd1u8(GX_LOAD_BP_REG);
+    GXCmd1u32(regval);
+}
+
+inline void J3DFifoWriteXFCmdHdr(u16 addr, u8 len) {
+    GXCmd1u8(GX_LOAD_XF_REG);
+    GXCmd1u16(len - 1);
+    GXCmd1u16(addr);
+}
+
+inline void J3DFifoLoadIndx(u8 cmd, u16 indx, u16 addr) {
+    GXWGFifo.u8 = cmd;
+    GXWGFifo.u16 = indx;
+    GXWGFifo.u16 = addr;
+}
+
+inline void J3DFifoWriteCPCmd(u8 cmd, u32 param) {
+    GXWGFifo.u8 = GX_LOAD_CP_REG;
+    GXWGFifo.u8 = cmd;
+    GXWGFifo.u32 = param;
+}
+
+inline void J3DFifoLoadCPCmd(u8 reg, u32 value) {
+    GXCmd1u8(GX_LOAD_CP_REG);
+    GXCmd1u8(reg);
+    GXCmd1u32(value);
+}
+
+inline void J3DFifoWriteXFCmd(u16 cmd, u16 len) {
+    GXWGFifo.u8 = GX_LOAD_XF_REG;
+    GXWGFifo.u16 = (len - 1);
+    GXWGFifo.u16 = cmd;
+}
+
+inline void J3DFifoLoadXFCmdHdr(u16 addr, u8 len) {
+    GXCmd1u8(GX_LOAD_XF_REG);
+    GXCmd1u16(len - 1);
+    GXCmd1u16(addr);
+}
+
+inline void J3DFifoLoadPosMtxIndx(u16 index, u32 addr) {
+    GXCmd1u8(GX_LOAD_INDX_A);
+    GXCmd1u16(index);
+    GXCmd1u16(((sizeof(Vec) - 1) << 12) | (u16)(addr * 4));
+}
+
+inline void J3DFifoLoadNrmMtxIndx3x3(u16 index, u32 addr) {
+    GXCmd1u8(GX_LOAD_INDX_B);
+    GXCmd1u16(index);
+    GXCmd1u16(((9 - 1) << 12) | (u16)((addr * 3) + 0x400));
+}
+
+void J3DFifoLoadPosMtxImm(f32 (*)[4], u32);
+void J3DFifoLoadNrmMtxImm(f32 (*)[4], u32);
+void J3DFifoLoadNrmMtxImm3x3(f32 (*)[3], u32);
+void J3DFifoLoadNrmMtxToTexMtx(f32 (*)[4], u32);
+void J3DFifoLoadNrmMtxToTexMtx3x3(f32 (*)[3], u32);
+void J3DFifoLoadTexCached(GXTexMapID, u32, GXTexCacheSize, u32, GXTexCacheSize);
+
+#endif /* J3DFIFO_H */
diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/include/JSystem/J3DGraphBase/J3DGD.h
index 854cecef65..b01dc7187f 100644
--- a/include/JSystem/J3DGraphBase/J3DGD.h
+++ b/include/JSystem/J3DGraphBase/J3DGD.h
@@ -2,64 +2,62 @@
 #define J3DGD_H
 
 #include <dolphin/gx.h>
-#include "dolphin/gd/GDBase.h"
+#include <dolphin/gd.h>
 
-inline void J3DGDWrite_u8(u8 param) {
-    __GDWrite(param);
+inline void J3DGDWrite_u8(u8 data) {
+    __GDWrite(data);
 }
 
-inline void J3DGDWrite_u16(u16 param) {
-    __GDWrite((param & 0xffff) >> 8);
-    __GDWrite(param & 0xff);
+inline void J3DGDWrite_u16(u16 data) {
+    __GDWrite((u8)((data >> 8)));
+    __GDWrite((u8)((data >> 0) & 0xFF));
 }
 
-inline void J3DGDWrite_u32(u32 param) {
-    __GDWrite((param >> 24) & 0xff);
-    __GDWrite((param >> 16) & 0xff);
-    __GDWrite((param >> 8) & 0xff);
-    __GDWrite(param & 0xff);
+inline void J3DGDWrite_u32(u32 data) {
+    __GDWrite((u8)((data >> 24) & 0xFF));
+    __GDWrite((u8)((data >> 16) & 0xFF));
+    __GDWrite((u8)((data >> 8) & 0xFF));
+    __GDWrite((u8)((data >> 0) & 0xFF));
 }
 
-inline void J3DGDWrite_f32(f32 param) {
-    u32 tmp = *(u32*)&param;
-    J3DGDWrite_u32(tmp);
+inline void J3DGDWrite_f32(f32 data) {
+    union {
+        f32 f;
+        u32 u;
+    } fid;
+    fid.f = data;
+    J3DGDWrite_u32(fid.u);
 }
 
-inline void J3DGDWriteBPCmd(u32 cmd) {
-    J3DGDWrite_u8(0x61);
-    J3DGDWrite_u32(cmd);
+inline void J3DGDWriteBPCmd(u32 regval) {
+    J3DGDWrite_u8(GX_LOAD_BP_REG);
+    J3DGDWrite_u32(regval);
 }
 
-inline void J3DFifoLoadBPCmd(u32 cmd) {
-    GXWGFifo.u8 = 0x61;
-    GXWGFifo.u32 = cmd;
-}
-
-inline void J3DGDWriteXFCmd(u16 addr, u32 cmd) {
-    J3DGDWrite_u8(0x10);
+inline void J3DGDWriteXFCmd(u16 addr, u32 val) {
+    J3DGDWrite_u8(GX_LOAD_XF_REG);
     J3DGDWrite_u16(0);
     J3DGDWrite_u16(addr);
-    J3DGDWrite_u32(cmd);
+    J3DGDWrite_u32(val);
 }
 
 inline void J3DGDWriteXFCmdHdr(u16 addr, u8 len) {
-    J3DGDWrite_u8(0x10);
+    J3DGDWrite_u8(GX_LOAD_XF_REG);
     J3DGDWrite_u16(len - 1);
     J3DGDWrite_u16(addr);
 }
 
-inline void J3DFifoWriteXFCmdHdr(u16 addr, u8 len) {
-    GXWGFifo.u8 = 0x10;
-    GXWGFifo.u16 = len - 1;
-    GXWGFifo.u16 = addr;
+inline void J3DGXCmd1f32ptr(f32* data) {
+    GXCmd1u32(*(u32*)data);
 }
 
-inline void J3DGXCmd1f32ptr(f32* value) {
-    GXWGFifo.u32 = *(u32*)value;
-}
-
-inline void J3DGXCmd1f32(f32 value) {
-    GXWGFifo.u32 = *(u32*)&value;
+inline void J3DGXCmd1f32(f32 data) {
+    union {
+        f32 f;
+        u32 u;
+    } fid;
+    fid.f = data;
+    GXCmd1u32(fid.u);
 }
 
 inline void J3DGDWriteCPCmd(u8 reg, u32 value) {
@@ -96,18 +94,6 @@ void J3DGDSetTevKColor(GXTevKColorID, GXColor);
 void J3DGDSetTevColorS10(GXTevRegID, GXColorS10);
 void J3DGDSetFog(GXFogType, f32, f32, f32, f32, GXColor);
 void J3DGDSetFogRangeAdj(u8, u16, _GXFogAdjTable*);
-void J3DFifoLoadPosMtxImm(f32 (*)[4], u32);
-void J3DFifoLoadNrmMtxImm(f32 (*)[4], u32);
-void J3DFifoLoadNrmMtxImm3x3(f32 (*)[3], u32);
-void J3DFifoLoadNrmMtxToTexMtx(f32 (*)[4], u32);
-void J3DFifoLoadNrmMtxToTexMtx3x3(f32 (*)[3], u32);
-void J3DFifoLoadTexCached(GXTexMapID, u32, GXTexCacheSize, u32, GXTexCacheSize);
-
-static inline void J3DFifoLoadIndx(u8 cmd, u16 indx, u16 addr) {
-    GXWGFifo.u8 = cmd;
-    GXWGFifo.u16 = indx;
-    GXWGFifo.u16 = addr;
-}
 
 inline void J3DGDSetNumChans(u8 numChans) {
     J3DGDWriteXFCmd(0x1009, numChans);
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
index cf3e76d9d3..6d019321c5 100644
--- a/include/JSystem/J3DGraphBase/J3DMatBlock.h
+++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h
@@ -4,8 +4,7 @@
 #include "JSystem/J3DGraphBase/J3DGD.h"
 #include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
-#include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/types.h"
+#include "JSystem/J3DAssert.h"
 #include "global.h"
 
 /**
@@ -46,21 +45,28 @@ struct J3DGXColor : public GXColor {
     }
 };
 
+extern const J3DNBTScaleInfo j3dDefaultNBTScaleInfo;
+
 /**
  * @ingroup jsystem-j3d
  *
  */
 struct J3DNBTScale : public J3DNBTScaleInfo {
-    J3DNBTScale() {}
+    J3DNBTScale() {
+        mbHasScale = j3dDefaultNBTScaleInfo.mbHasScale;
+        mScale.x = j3dDefaultNBTScaleInfo.mScale.x;
+        mScale.y = j3dDefaultNBTScaleInfo.mScale.y;
+        mScale.z = j3dDefaultNBTScaleInfo.mScale.z;
+    }
+
     J3DNBTScale(J3DNBTScaleInfo const& info) {
         mbHasScale = info.mbHasScale;
         mScale = info.mScale;
     }
+
     Vec* getScale() { return &mScale; }
 };
 
-extern const J3DNBTScaleInfo j3dDefaultNBTScaleInfo;
-
 /**
  * @ingroup jsystem-j3d
  *
@@ -222,39 +228,39 @@ public:
     /* 80319D30 */ virtual void diffColorChan();
     /* 80323560 */ virtual u32 getType() { return 'CLOF'; }
     /* 80323184 */ virtual void setMatColor(u32 idx, J3DGXColor const* color) {
-        J3D_ASSERT(0x121, idx >= 0 && idx < ARRAY_SIZE(mMatColor), "Error : range over.");
-        J3D_ASSERT(0x122, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x121, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
+        J3D_ASSERT_NULLPTR(0x122, color != 0);
         mMatColor[idx] = *color;
     }
     /* 80323158 */ virtual void setMatColor(u32 idx, J3DGXColor color) {
-        J3D_ASSERT(0x128, idx >= 0 && idx < ARRAY_SIZE(mMatColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x128, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         mMatColor[idx] = color;
     }
     /* 803231B0 */ virtual J3DGXColor* getMatColor(u32 idx) {
-        J3D_ASSERT(0x12d, idx >= 0 && idx < ARRAY_SIZE(mMatColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x12d, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         return &mMatColor[idx];
     }
     /* 803231D0 */ virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
     /* 803231C4 */ virtual void setColorChanNum(u8 const* num) {
-        J3D_ASSERT(0x137, num != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x137, num != 0);
         mColorChanNum = *num;
     }
     /* 803231D8 */ virtual u8 getColorChanNum() const { return mColorChanNum; }
     /* 803231F4 */ virtual void setColorChan(u32 idx, J3DColorChan const& chan) {
-        J3D_ASSERT(0x142, idx >= 0 && idx < ARRAY_SIZE(mColorChan), "Error : range over.");
+        J3D_ASSERT_RANGE(0x142, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         mColorChan[idx] = chan;
     }
     /* 803231E0 */ virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
-        J3D_ASSERT(0x148, idx >= 0 && idx < ARRAY_SIZE(mColorChan), "Error : range over.");
-        J3D_ASSERT(0x149, chan != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x148, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
+        J3D_ASSERT_NULLPTR(0x149, chan != 0);
         mColorChan[idx] = *chan;
     }
     /* 80323208 */ virtual J3DColorChan* getColorChan(u32 idx) {
-        J3D_ASSERT(0x14e, idx >= 0 && idx < ARRAY_SIZE(mColorChan), "Error : range over.");
+        J3D_ASSERT_RANGE(0x14e, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         return &mColorChan[idx];
     }
     /* 80323224 */ virtual void setCullMode(u8 const* mode) {
-        J3D_ASSERT(0x154, mode != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x154, mode != 0);
         mCullMode = *mode;
     }
     /* 8032321C */ virtual void setCullMode(u8 mode) { mCullMode = mode; }
@@ -289,16 +295,16 @@ public:
     /* 80317B8C */ virtual s32 countDLSize();
     /* 80323074 */ virtual u32 getType() { return 'CLAB'; }
     /* 803230AC */ virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
-        J3D_ASSERT(0x1a3, idx >= 0 && idx < ARRAY_SIZE(mAmbColor), "Error : range over.");
-        J3D_ASSERT(0x1a4, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x1a3, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
+        J3D_ASSERT_NULLPTR(0x1a4, color != 0);
         mAmbColor[idx] = *color;
     }
     /* 80323080 */ virtual void setAmbColor(u32 idx, J3DGXColor color) {
-        J3D_ASSERT(0x1aa, idx >= 0 && idx < ARRAY_SIZE(mAmbColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x1aa, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         mAmbColor[idx] = color;
     }
     /* 803230D8 */ virtual J3DGXColor* getAmbColor(u32 idx) {
-        J3D_ASSERT(0x1af, idx >= 0 && idx < ARRAY_SIZE(mAmbColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x1af, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         return &mAmbColor[idx];
     }
     /* 803230EC */ virtual ~J3DColorBlockAmbientOn() {}
@@ -330,60 +336,60 @@ public:
     /* 80317B94 */ virtual s32 countDLSize();
     /* 80322E80 */ virtual u32 getType() { return 'CLON'; }
     /* 80322EB8 */ virtual void setMatColor(u32 idx, J3DGXColor const* color) {
-        J3D_ASSERT(0x1e9, idx >= 0 && idx < ARRAY_SIZE(mMatColor), "Error : range over.");
-        J3D_ASSERT(0x1ea, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x1e9, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
+        J3D_ASSERT_NULLPTR(0x1ea, color != 0);
         mMatColor[idx] = *color;
     }
     /* 80322E8C */ virtual void setMatColor(u32 idx, J3DGXColor color) {
-        J3D_ASSERT(0x1f0, idx >= 0 && idx < ARRAY_SIZE(mMatColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x1f0, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         mMatColor[idx] = color;
     }
     /* 80322EE4 */ virtual J3DGXColor* getMatColor(u32 idx) {
-        J3D_ASSERT(0x1f5, idx >= 0 && idx < ARRAY_SIZE(mMatColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x1f5, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         return &mMatColor[idx];
     }
     /* 80322F24 */ virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
-        J3D_ASSERT(0x1fc, idx >= 0 && idx < ARRAY_SIZE(mAmbColor), "Error : range over.");
-        J3D_ASSERT(0x1fd, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x1fc, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
+        J3D_ASSERT_NULLPTR(0x1fd, color != 0);
         mAmbColor[idx] = *color;
     }
     /* 80322EF8 */ virtual void setAmbColor(u32 idx, J3DGXColor color) {
-        J3D_ASSERT(0x203, idx >= 0 && idx < ARRAY_SIZE(mAmbColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x203, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         mAmbColor[idx] = color;
     }
     /* 80322F50 */ virtual J3DGXColor* getAmbColor(u32 idx) {
-        J3D_ASSERT(0x208, idx >= 0 && idx < ARRAY_SIZE(mAmbColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x208, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         return &mAmbColor[idx];
     }
     /* 80322F70 */ virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
     /* 80322F64 */ virtual void setColorChanNum(u8 const* num) {
-        J3D_ASSERT(0x212, num != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x212, num != 0);
         mColorChanNum = *num;
     }
     /* 80322F78 */ virtual u8 getColorChanNum() const { return mColorChanNum; }
     /* 80322F94 */ virtual void setColorChan(u32 idx, J3DColorChan const& chan) {
-        J3D_ASSERT(0x21d, idx >= 0 && idx < ARRAY_SIZE(mColorChan), "Error : range over.");
+        J3D_ASSERT_RANGE(0x21d, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         mColorChan[idx] = chan;
     }
     /* 80322F80 */ virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
-        J3D_ASSERT(0x223, idx >= 0 && idx < ARRAY_SIZE(mColorChan), "Error : range over.");
-        J3D_ASSERT(0x224, chan != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x223, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
+        J3D_ASSERT_NULLPTR(0x224, chan != 0);
         mColorChan[idx] = *chan;
     }
     /* 80322FA8 */ virtual J3DColorChan* getColorChan(u32 idx) {
-        J3D_ASSERT(0x229, idx >= 0 && idx < ARRAY_SIZE(mColorChan), "Error : range over.");
+        J3D_ASSERT_RANGE(0x229, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         return &mColorChan[idx];
     }
     /* 80322FBC */ virtual void setLight(u32 idx, J3DLightObj* light) {
-        J3D_ASSERT(0x230, idx >= 0 && idx < ARRAY_SIZE(mLight), "Error : range over.");
+        J3D_ASSERT_RANGE(0x230, idx >= 0 && idx < ARRAY_SIZEU(mLight));
         mLight[idx] = light;
     }
     /* 80322FCC */ virtual J3DLightObj* getLight(u32 idx) {
-        J3D_ASSERT(0x235, idx >= 0 && idx < ARRAY_SIZE(mLight), "Error : range over.");
+        J3D_ASSERT_RANGE(0x235, idx >= 0 && idx < ARRAY_SIZEU(mLight));
         return mLight[idx];
     }
     /* 80322FE4 */ virtual void setCullMode(u8 const* mode) {
-        J3D_ASSERT(0x23b, mode != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x23b, mode != 0);
         mCullMode = *mode;
     }
     /* 80322FDC */ virtual void setCullMode(u8 mode) {
@@ -479,26 +485,26 @@ public:
     /* 80317B9C */ virtual s32 countDLSize();
     /* 80322E74 */ virtual u32 getType() { return 'TGPT'; }
     /* 80322D3C */ virtual void setTexGenNum(u32 const* num) {
-        J3D_ASSERT(0x335, num != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x335, num != 0);
         mTexGenNum = *num;
     }
     /* 80322D34 */ virtual void setTexGenNum(u32 num) { mTexGenNum = num; }
     /* 80322D48 */ virtual u32 getTexGenNum() const { return mTexGenNum; }
     /* 80322D50 */ virtual void setTexCoord(u32 idx, J3DTexCoord const* coord) {
-        J3D_ASSERT(0x344, idx >= 0 && idx < ARRAY_SIZE(mTexCoord), "Error : range over.");
-        J3D_ASSERT(0x345, coord != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x344, idx >= 0 && idx < ARRAY_SIZEU(mTexCoord));
+        J3D_ASSERT_NULLPTR(0x345, coord != 0);
         mTexCoord[idx] = *coord;
     }
     /* 80322D64 */ virtual J3DTexCoord* getTexCoord(u32 idx) {
-        J3D_ASSERT(0x34a, idx >= 0 && idx < ARRAY_SIZE(mTexCoord), "Error : range over.");
+        J3D_ASSERT_RANGE(0x34a, idx >= 0 && idx < ARRAY_SIZEU(mTexCoord));
         return &mTexCoord[idx];
     }
     /* 80322D78 */ virtual void setTexMtx(u32 idx, J3DTexMtx* mtx) {
-        J3D_ASSERT(0x351, idx >= 0 && idx < ARRAY_SIZE(mTexMtx), "Error : range over.");
+        J3D_ASSERT_RANGE(0x351, idx >= 0 && idx < ARRAY_SIZEU(mTexMtx));
         mTexMtx[idx] = mtx;
     }
     /* 80322D88 */ virtual J3DTexMtx* getTexMtx(u32 idx) {
-        J3D_ASSERT(0x356, idx >= 0 && idx < ARRAY_SIZE(mTexMtx), "Error : range over.");
+        J3D_ASSERT_RANGE(0x356, idx >= 0 && idx < ARRAY_SIZEU(mTexMtx));
         return mTexMtx[idx];
     }
     /* 80322D98 */ virtual u32 getTexMtxOffset() const { return mTexMtxOffset; }
@@ -517,7 +523,7 @@ public:
  */
 class J3DTexGenBlock4 : public J3DTexGenBlockPatched {
 public:
-    J3DTexGenBlock4() : mNBTScale(j3dDefaultNBTScaleInfo) {
+    J3DTexGenBlock4() : mNBTScale() {
         initialize();
     }
     /* 80317674 */ void initialize();
@@ -528,7 +534,7 @@ public:
     /* 80317BA4 */ virtual s32 countDLSize();
     /* 80322DA8 */ virtual u32 getType() { return 'TGB4'; }
     /* 80322DD8 */ virtual void setNBTScale(J3DNBTScale const* scale) {
-        J3D_ASSERT(0x393, scale != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x393, scale != 0);
         mNBTScale = *scale;
     }
     /* 80322DB4 */ virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
@@ -544,7 +550,7 @@ public:
  */
 class J3DTexGenBlockBasic : public J3DTexGenBlockPatched {
 public:
-    J3DTexGenBlockBasic() : mNBTScale(j3dDefaultNBTScaleInfo) {
+    J3DTexGenBlockBasic() : mNBTScale() {
         initialize();
     }
     /* 803176A4 */ void initialize();
@@ -555,7 +561,7 @@ public:
     /* 80317BAC */ virtual s32 countDLSize();
     /* 80322C6C */ virtual u32 getType() { return 'TGBC'; }
     /* 80322C9C */ virtual void setNBTScale(J3DNBTScale const* scale) {
-        J3D_ASSERT(0x3ca, scale != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x3ca, scale != 0);
         mNBTScale = *scale;
     }
     /* 80322C78 */ virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
@@ -672,107 +678,107 @@ public:
     /* 80322974 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
     /* 80322998 */ virtual u32 getType() { return 'TVPT'; }
     /* 803229AC */ virtual void setTevStageNum(u8 const* num) {
-        J3D_ASSERT(0x52c, num != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x52c, num != 0);
         mTevStageNum = *num;
     }
     /* 803229A4 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
     /* 803229B8 */ virtual u8 getTevStageNum() const { return mTevStageNum; }
     /* 80317BB4 */ virtual s32 countDLSize();
     /* 803229D0 */ virtual void setTexNo(u32 idx, u16 const* texNo) {
-        J3D_ASSERT(0x53b, idx >= 0 && idx < ARRAY_SIZE(mTexNo), "Error : range over.");
-        J3D_ASSERT(0x53c, texNo != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x53b, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
+        J3D_ASSERT_NULLPTR(0x53c, texNo != 0);
         mTexNo[idx] = *texNo;
     }
     /* 803229C0 */ virtual void setTexNo(u32 idx, u16 texNo) {
-        J3D_ASSERT(0x542, idx >= 0 && idx < ARRAY_SIZE(mTexNo), "Error : range over.");
+        J3D_ASSERT_RANGE(0x542, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = texNo;
     }
     /* 803229E4 */ virtual u16 getTexNo(u32 idx) const {
-        J3D_ASSERT(1353, idx >= 0 && idx < 8, "Error : range over.");
+        J3D_ASSERT_RANGE(1353, idx >= 0 && idx < 8);
         return mTexNo[idx];
     }
     /* 80322A08 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
-        J3D_ASSERT(0x550, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
-        J3D_ASSERT(0x551, order != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x550, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
+        J3D_ASSERT_NULLPTR(0x551, order != 0);
         mTevOrder[idx] = *order;
     }
     /* 803229F4 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
-        J3D_ASSERT(0x557, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0x557, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
     /* 80322A1C */ virtual J3DTevOrder* getTevOrder(u32 idx) {
-        J3D_ASSERT(0x55c, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0x55c, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
     /* 80322A6C */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
-        J3D_ASSERT(0x563, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
-        J3D_ASSERT(0x564, stage != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x563, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
+        J3D_ASSERT_NULLPTR(0x564, stage != 0);
         mTevStage[idx] = *stage;
     }
     /* 80322A30 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
-        J3D_ASSERT(0x56a, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x56a, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
     /* 80322AA8 */ virtual J3DTevStage* getTevStage(u32 idx) {
-        J3D_ASSERT(0x56f, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x56f, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
     /* 80322AD0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
-        J3D_ASSERT(0x576, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
-        J3D_ASSERT(0x577, stage != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x576, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
+        J3D_ASSERT_NULLPTR(0x577, stage != 0);
         mIndTevStage[idx] = *stage;
     }
     /* 80322ABC */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
-        J3D_ASSERT(0x57d, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x57d, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
     /* 80322AE4 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
-        J3D_ASSERT(0x582, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x582, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
     /* 80322B24 */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
-        J3D_ASSERT(0x589, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
-        J3D_ASSERT(0x58a, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x589, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
+        J3D_ASSERT_NULLPTR(0x58a, color != 0);
         mTevColor[idx] = *color;
     }
     /* 80322AF8 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
-        J3D_ASSERT(0x590, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x590, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
     /* 80322B50 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
-        J3D_ASSERT(0x595, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x595, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
     /* 80322B90 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
-        J3D_ASSERT(0x59c, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
-        J3D_ASSERT(0x59d, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x59c, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
+        J3D_ASSERT_NULLPTR(0x59d, color != 0);
         mTevKColor[idx] = *color;
     }
     /* 80322B64 */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
-        J3D_ASSERT(0x5a3, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x5a3, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
     /* 80322BBC */ virtual J3DGXColor* getTevKColor(u32 idx) {
-        J3D_ASSERT(0x5a8, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x5a8, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
     /* 80322BDC */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
-        J3D_ASSERT(0x5af, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
-        J3D_ASSERT(0x5b0, sel != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x5af, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
+        J3D_ASSERT_NULLPTR(0x5b0, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
     /* 80322BD0 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
-        J3D_ASSERT(0x5b6, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x5b6, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
     /* 80322BEC */ virtual u8 getTevKColorSel(u32 idx) {
-        J3D_ASSERT(0x5bb, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x5bb, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
     /* 80322BF8 */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
     /* 80322C00 */ virtual u32 getTevRegOffset() const { return mTevRegOffset; }
     /* 80322C08 */ virtual void setTevRegOffset(u32 offset) {
-        J3D_ASSERT(0x53b, offset >= 0, "Error : range over.");
+        J3D_ASSERT_RANGE(0x53b, offset >= 0);
         mTevRegOffset = offset;
     }
     /* 80322C10 */ virtual ~J3DTevBlockPatched() {}
@@ -815,58 +821,58 @@ public:
     /* 80322798 */ virtual u32 getType() { return 'TVB1'; }
     /* 80317BBC */ virtual s32 countDLSize();
     /* 803227B4 */ virtual void setTexNo(u32 idx, u16 const* no) {
-        J3D_ASSERT(0x618, idx >= 0 && idx < ARRAY_SIZE(mTexNo), "Error : range over.");
-        J3D_ASSERT(0x619, no != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x618, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
+        J3D_ASSERT_NULLPTR(0x619, no != 0);
         mTexNo[idx] = *no;
     }
     /* 803227A4 */ virtual void setTexNo(u32 idx, u16 no) {
-        J3D_ASSERT(0x61f, idx >= 0 && idx < ARRAY_SIZE(mTexNo), "Error : range over.");
+        J3D_ASSERT_RANGE(0x61f, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = no;
     }
     /* 803227C8 */ virtual u16 getTexNo(u32 idx) const {
-        J3D_ASSERT(1574, idx >= 0 && idx < 1, "Error : range over.");
+        J3D_ASSERT_RANGE(1574, idx >= 0 && idx < 1);
         return mTexNo[idx];
     }
     /* 803227EC */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
-        J3D_ASSERT(0x62d, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
-        J3D_ASSERT(0x62e, order != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x62d, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
+        J3D_ASSERT_NULLPTR(0x62e, order != 0);
         mTevOrder[idx] = *order;
     }
     /* 803227D8 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
-        J3D_ASSERT(0x634, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0x634, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
     /* 80322800 */ virtual J3DTevOrder* getTevOrder(u32 idx) {
-        J3D_ASSERT(0x639, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0x639, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
     /* 80322818 */ virtual void setTevStageNum(u8 const* num) {}
     /* 80322814 */ virtual void setTevStageNum(u8 num) {}
     /* 8032281C */ virtual u8 getTevStageNum() const { return 1; }
     /* 80322860 */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
-        J3D_ASSERT(0x64b, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
-        J3D_ASSERT(0x64c, stage != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x64b, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
+        J3D_ASSERT_NULLPTR(0x64c, stage != 0);
         mTevStage[idx] = *stage;
     }
     /* 80322824 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
-        J3D_ASSERT(0x652, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x652, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
     /* 8032289C */ virtual J3DTevStage* getTevStage(u32 idx) {
-        J3D_ASSERT(0x657, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x657, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
     /* 803228C4 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
-        J3D_ASSERT(0x65e, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
-        J3D_ASSERT(0x65f, stage != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x65e, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
+        J3D_ASSERT_NULLPTR(0x65f, stage != 0);
         mIndTevStage[idx] = *stage;
     }
     /* 803228B0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
-        J3D_ASSERT(0x665, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x665, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
     /* 803228D8 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
-        J3D_ASSERT(0x66a, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x66a, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
     /* 803228EC */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
@@ -905,135 +911,135 @@ public:
     /* 803223D4 */ virtual u32 getType() { return 'TVB2'; }
     /* 80317BC4 */ virtual s32 countDLSize();
     /* 803223F0 */ virtual void setTexNo(u32 idx, u16 const* texNo) {
-        J3D_ASSERT(0x6b4, idx >= 0 && idx < ARRAY_SIZE(mTexNo), "Error : range over.");
-        J3D_ASSERT(0x6b5, texNo != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x6b4, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
+        J3D_ASSERT_NULLPTR(0x6b5, texNo != 0);
         mTexNo[idx] = *texNo;
     }
     /* 803223E0 */ virtual void setTexNo(u32 idx, u16 texNo) {
-        J3D_ASSERT(0x6bb, idx >= 0 && idx < ARRAY_SIZE(mTexNo), "Error : range over.");
+        J3D_ASSERT_RANGE(0x6bb, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = texNo;
     }
     /* 80322404 */ virtual u16 getTexNo(u32 idx) const {
-        J3D_ASSERT(0x6c2, idx >= 0 && idx < ARRAY_SIZE(mTexNo), "Error : range over.");
+        J3D_ASSERT_RANGE(0x6c2, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         return mTexNo[idx];
     }
     /* 80322428 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
-        J3D_ASSERT(0x6c9, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
-        J3D_ASSERT(0x6ca, order != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x6c9, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
+        J3D_ASSERT_NULLPTR(0x6ca, order != 0);
         mTevOrder[idx] = *order;
     }
     /* 80322414 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
-        J3D_ASSERT(0x6d0, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0x6d0, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
     /* 8032243C */ virtual J3DTevOrder* getTevOrder(u32 idx) {
-        J3D_ASSERT(0x6d5, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0x6d5, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
     /* 8032247C */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
-        J3D_ASSERT(0x6dc, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
-        J3D_ASSERT(0x6dd, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x6dc, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
+        J3D_ASSERT_NULLPTR(0x6dd, color != 0);
         mTevColor[idx] = *color;
     }
     /* 80322450 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
-        J3D_ASSERT(0x6e3, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x6e3, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
     /* 803224A8 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
-        J3D_ASSERT(0x6e8, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x6e8, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
     /* 803224E8 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
-        J3D_ASSERT(0x6ef, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
-        J3D_ASSERT(0x6f0, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x6ef, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
+        J3D_ASSERT_NULLPTR(0x6f0, color != 0);
         mTevKColor[idx] = *color;
     }
     /* 803224BC */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
-        J3D_ASSERT(0x6f6, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x6f6, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
     /* 80322514 */ virtual J3DGXColor* getTevKColor(u32 idx) {
-        J3D_ASSERT(0x6fb, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x6fb, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
     /* 80322534 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
-        J3D_ASSERT(0x702, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
-        J3D_ASSERT(0x703, sel != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x702, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
+        J3D_ASSERT_NULLPTR(0x703, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
     /* 80322528 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
-        J3D_ASSERT(0x709, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x709, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
     /* 80322544 */ virtual u8 getTevKColorSel(u32 idx) {
-        J3D_ASSERT(0x70e, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x70e, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
     /* 8032255C */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
-        J3D_ASSERT(0x715, idx >= 0 && idx < ARRAY_SIZE(mTevKAlphaSel), "Error : range over.");
-        J3D_ASSERT(0x716, sel != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x715, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
+        J3D_ASSERT_NULLPTR(0x716, sel != 0);
         mTevKAlphaSel[idx] = *sel;
     }
     /* 80322550 */ virtual void setTevKAlphaSel(u32 idx, u8 sel) {
-        J3D_ASSERT(0x71c, idx >= 0 && idx < ARRAY_SIZE(mTevKAlphaSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x71c, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         mTevKAlphaSel[idx] = sel;
     }
     /* 8032256C */ virtual u8 getTevKAlphaSel(u32 idx) {
-        J3D_ASSERT(0x721, idx >= 0 && idx < ARRAY_SIZE(mTevKAlphaSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x721, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         return mTevKAlphaSel[idx];
     }
     /* 80322580 */ virtual void setTevStageNum(u8 const* num) {
-        J3D_ASSERT(0x727, num != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x727, num != 0);
         mTevStageNum = *num;
     }
     /* 80322578 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
     /* 8032258C */ virtual u8 getTevStageNum() const { return mTevStageNum; }
     /* 803225D0 */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
-        J3D_ASSERT(0x736, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
-        J3D_ASSERT(0x737, stage != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x736, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
+        J3D_ASSERT_NULLPTR(0x737, stage != 0);
         mTevStage[idx] = *stage;
     }
     /* 80322594 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
-        J3D_ASSERT(0x73d, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x73d, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
     /* 8032260C */ virtual J3DTevStage* getTevStage(u32 idx) {
-        J3D_ASSERT(0x742, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x742, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
     /* 80322658 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
-        J3D_ASSERT(0x749, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
-        J3D_ASSERT(0x74a, info != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x749, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
+        J3D_ASSERT_NULLPTR(0x74a, info != 0);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
     /* 80322620 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
-        J3D_ASSERT(0x750, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x750, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx].setTevSwapModeInfo(info);
     }
     /* 803226A0 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
-        J3D_ASSERT(0x757, idx >= 0 && idx < ARRAY_SIZE(mTevSwapModeTable), "Error : range over.");
-        J3D_ASSERT(0x758, table != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x757, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
+        J3D_ASSERT_NULLPTR(0x758, table != 0);
         mTevSwapModeTable[idx] = *table;
     }
     /* 80322690 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
-        J3D_ASSERT(0x75e, idx >= 0 && idx < ARRAY_SIZE(mTevSwapModeTable), "Error : range over.");
+        J3D_ASSERT_RANGE(0x75e, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         mTevSwapModeTable[idx] = table;
     }
     /* 803226B0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
-        J3D_ASSERT(0x763, idx >= 0 && idx < ARRAY_SIZE(mTevSwapModeTable), "Error : range over.");
+        J3D_ASSERT_RANGE(0x763, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         return &mTevSwapModeTable[idx];
     }
     /* 803226D4 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
-        J3D_ASSERT(0x76a, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
-        J3D_ASSERT(0x76b, stage != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x76a, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
+        J3D_ASSERT_NULLPTR(0x76b, stage != 0);
         mIndTevStage[idx] = *stage;
     }
     /* 803226C0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
-        J3D_ASSERT(0x771, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x771, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
     /* 803226E8 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
-        J3D_ASSERT(0x776, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x776, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
     /* 803226FC */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
@@ -1081,135 +1087,135 @@ public:
     /* 80322010 */ virtual u32 getType() { return 'TVB4'; }
     /* 80317BCC */ virtual s32 countDLSize();
     /* 8032202C */ virtual void setTexNo(u32 idx, u16 const* texNo) {
-        J3D_ASSERT(0x7d5, idx >= 0 && idx < ARRAY_SIZE(mTexNo), "Error : range over.");
-        J3D_ASSERT(0x7d6, texNo != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x7d5, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
+        J3D_ASSERT_NULLPTR(0x7d6, texNo != 0);
         mTexNo[idx] = *texNo;
     }
     /* 8032201C */ virtual void setTexNo(u32 idx, u16 texNo) {
-        J3D_ASSERT(0x7dc, idx >= 0 && idx < ARRAY_SIZE(mTexNo), "Error : range over.");
+        J3D_ASSERT_RANGE(0x7dc, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = texNo;
     }
     /* 80322040 */ virtual u16 getTexNo(u32 idx) const {
-        J3D_ASSERT(2019, idx >= 0 && idx < 4, "Error : range over.");
+        J3D_ASSERT_RANGE(2019, idx >= 0 && idx < 4);
         return mTexNo[idx];
     }
     /* 80322064 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
-        J3D_ASSERT(0x7ea, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
-        J3D_ASSERT(0x7eb, order != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x7ea, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
+        J3D_ASSERT_NULLPTR(0x7eb, order != 0);
         mTevOrder[idx] = *order;
     }
     /* 80322050 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
-        J3D_ASSERT(0x7f1, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0x7f1, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
     /* 80322078 */ virtual J3DTevOrder* getTevOrder(u32 idx) {
-        J3D_ASSERT(0x7f6, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0x7f6, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
     /* 803220B8 */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
-        J3D_ASSERT(0x7fd, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
-        J3D_ASSERT(0x7fe, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x7fd, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
+        J3D_ASSERT_NULLPTR(0x7fe, color != 0);
         mTevColor[idx] = *color;
     }
     /* 8032208C */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
-        J3D_ASSERT(0x804, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x804, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
     /* 803220E4 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
-        J3D_ASSERT(0x809, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x809, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
     /* 80322124 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
-        J3D_ASSERT(0x810, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
-        J3D_ASSERT(0x811, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x810, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
+        J3D_ASSERT_NULLPTR(0x811, color != 0);
         mTevKColor[idx] = *color;
     }
     /* 803220F8 */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
-        J3D_ASSERT(0x817, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x817, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
     /* 80322150 */ virtual J3DGXColor* getTevKColor(u32 idx) {
-        J3D_ASSERT(0x81c, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x81c, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
     /* 80322170 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
-        J3D_ASSERT(0x823, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
-        J3D_ASSERT(0x824, sel != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x823, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
+        J3D_ASSERT_NULLPTR(0x824, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
     /* 80322164 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
-        J3D_ASSERT(0x82a, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x82a, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
     /* 80322180 */ virtual u8 getTevKColorSel(u32 idx) {
-        J3D_ASSERT(0x82f, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x82f, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
     /* 80322198 */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
-        J3D_ASSERT(0x836, idx >= 0 && idx < ARRAY_SIZE(mTevKAlphaSel), "Error : range over.");
-        J3D_ASSERT(0x837, sel != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x836, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
+        J3D_ASSERT_NULLPTR(0x837, sel != 0);
         mTevKAlphaSel[idx] = *sel;
     }
     /* 8032218C */ virtual void setTevKAlphaSel(u32 idx, u8 sel) {
-        J3D_ASSERT(0x83d, idx >= 0 && idx < ARRAY_SIZE(mTevKAlphaSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x83d, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         mTevKAlphaSel[idx] = sel;
     }
     /* 803221A8 */ virtual u8 getTevKAlphaSel(u32 idx) {
-        J3D_ASSERT(0x842, idx >= 0 && idx < ARRAY_SIZE(mTevKAlphaSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x842, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         return mTevKAlphaSel[idx];
     }
     /* 803221BC */ virtual void setTevStageNum(u8 const* num) {
-        J3D_ASSERT(0x848, num != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x848, num != 0);
         mTevStageNum = *num;
     }
     /* 803221B4 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
     /* 803221C8 */ virtual u8 getTevStageNum() const { return mTevStageNum; }
     /* 8032220C */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
-        J3D_ASSERT(0x857, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
-        J3D_ASSERT(0x858, stage != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x857, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
+        J3D_ASSERT_NULLPTR(0x858, stage != 0);
         mTevStage[idx] = *stage;
     }
     /* 803221D0 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
-        J3D_ASSERT(0x85e, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x85e, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
     /* 80322248 */ virtual J3DTevStage* getTevStage(u32 idx) {
-        J3D_ASSERT(0x863, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x863, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
     /* 80322294 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
-        J3D_ASSERT(0x86a, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
-        J3D_ASSERT(0x86b, info != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x86a, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
+        J3D_ASSERT_NULLPTR(0x86b, info != 0);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
     /* 8032225C */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
-        J3D_ASSERT(0x871, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x871, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx].setTevSwapModeInfo(info);
     }
     /* 803222DC */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
-        J3D_ASSERT(0x878, idx >= 0 && idx < ARRAY_SIZE(mTevSwapModeTable), "Error : range over.");
-        J3D_ASSERT(0x879, table != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x878, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
+        J3D_ASSERT_NULLPTR(0x879, table != 0);
         mTevSwapModeTable[idx] = *table;
     }
     /* 803222CC */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
-        J3D_ASSERT(0x87f, idx >= 0 && idx < ARRAY_SIZE(mTevSwapModeTable), "Error : range over.");
+        J3D_ASSERT_RANGE(0x87f, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         mTevSwapModeTable[idx] = table;
     }
     /* 803222EC */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
-        J3D_ASSERT(0x884, idx >= 0 && idx < ARRAY_SIZE(mTevSwapModeTable), "Error : range over.");
+        J3D_ASSERT_RANGE(0x884, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         return &mTevSwapModeTable[idx];
     }
     /* 80322310 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
-        J3D_ASSERT(0x88b, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
-        J3D_ASSERT(0x88c, stage != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x88b, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
+        J3D_ASSERT_NULLPTR(0x88c, stage != 0);
         mIndTevStage[idx] = *stage;
     }
     /* 803222FC */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
-        J3D_ASSERT(0x892, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x892, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
     /* 80322324 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
-        J3D_ASSERT(0x897, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x897, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
     /* 80322338 */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
@@ -1257,135 +1263,135 @@ public:
     /* 80321C44 */ virtual u32 getType() { return 'TV16'; }
     /* 80317BD4 */ virtual s32 countDLSize();
     /* 80321C60 */ virtual void setTexNo(u32 idx, u16 const* texNo) {
-        J3D_ASSERT(0x8f6, idx >= 0 && idx < ARRAY_SIZE(mTexNo), "Error : range over.");
-        J3D_ASSERT(0x8f7, texNo != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x8f6, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
+        J3D_ASSERT_NULLPTR(0x8f7, texNo != 0);
         mTexNo[idx] = *texNo;
     }
     /* 80321C50 */ virtual void setTexNo(u32 idx, u16 texNo) {
-        J3D_ASSERT(0x8fd, idx >= 0 && idx < 8, "Error : range over.");
+        J3D_ASSERT_RANGE(0x8fd, idx >= 0 && idx < 8);
         mTexNo[idx] = texNo;
     }
     /* 80321C74 */ virtual u16 getTexNo(u32 idx) const {
-        J3D_ASSERT(2308, idx >= 0 && idx < 8, "Error : range over.");
+        J3D_ASSERT_RANGE(2308, idx >= 0 && idx < 8);
         return mTexNo[idx];
     }
     /* 80321C98 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
-        J3D_ASSERT(0x90b, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
-        J3D_ASSERT(0x90c, order != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x90b, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
+        J3D_ASSERT_NULLPTR(0x90c, order != 0);
         mTevOrder[idx] = *order;
     }
     /* 80321C84 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
-        J3D_ASSERT(0x912, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0x912, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
     /* 80321CAC */ virtual J3DTevOrder* getTevOrder(u32 idx) {
-        J3D_ASSERT(0x917, idx >= 0 && idx < ARRAY_SIZE(mTevOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0x917, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
     /* 80321CEC */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
-        J3D_ASSERT(0x91e, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
-        J3D_ASSERT(0x91f, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x91e, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
+        J3D_ASSERT_NULLPTR(0x91f, color != 0);
         mTevColor[idx] = *color;
     }
     /* 80321CC0 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
-        J3D_ASSERT(0x925, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x925, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
     /* 80321D18 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
-        J3D_ASSERT(0x92a, idx >= 0 && idx < ARRAY_SIZE(mTevColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x92a, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
     /* 80321D58 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
-        J3D_ASSERT(0x931, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
-        J3D_ASSERT(0x932, color != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x931, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
+        J3D_ASSERT_NULLPTR(0x932, color != 0);
         mTevKColor[idx] = *color;
     }
     /* 80321D2C */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
-        J3D_ASSERT(0x938, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x938, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
     /* 80321D84 */ virtual J3DGXColor* getTevKColor(u32 idx) {
-        J3D_ASSERT(0x93d, idx >= 0 && idx < ARRAY_SIZE(mTevKColor), "Error : range over.");
+        J3D_ASSERT_RANGE(0x93d, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
     /* 80321DA4 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
-        J3D_ASSERT(0x944, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
-        J3D_ASSERT(0x945, sel != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x944, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
+        J3D_ASSERT_NULLPTR(0x945, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
     /* 80321D98 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
-        J3D_ASSERT(0x94b, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x94b, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
     /* 80321DB4 */ virtual u8 getTevKColorSel(u32 idx) {
-        J3D_ASSERT(0x950, idx >= 0 && idx < ARRAY_SIZE(mTevKColorSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x950, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
     /* 80321DCC */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
-        J3D_ASSERT(0x957, idx >= 0 && idx < ARRAY_SIZE(mTevKAlphaSel), "Error : range over.");
-        J3D_ASSERT(0x958, sel != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x957, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
+        J3D_ASSERT_NULLPTR(0x958, sel != 0);
         mTevKAlphaSel[idx] = *sel;
     }
     /* 80321DC0 */ virtual void setTevKAlphaSel(u32 idx, u8 sel) {
-        J3D_ASSERT(0x95e, idx >= 0 && idx < ARRAY_SIZE(mTevKAlphaSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x95e, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         mTevKAlphaSel[idx] = sel;
     }
     /* 80321DDC */ virtual u8 getTevKAlphaSel(u32 idx) {
-        J3D_ASSERT(0x963, idx >= 0 && idx < ARRAY_SIZE(mTevKAlphaSel), "Error : range over.");
+        J3D_ASSERT_RANGE(0x963, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         return mTevKAlphaSel[idx];
     }
     /* 80321DF0 */ virtual void setTevStageNum(u8 const* num) {
-        J3D_ASSERT(0x969, num != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0x969, num != 0);
         mTevStageNum = *num;
     }
     /* 80321DE8 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
     /* 80321DFC */ virtual u8 getTevStageNum() const { return mTevStageNum; }
     /* 80321E40 */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
-        J3D_ASSERT(0x978, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
-        J3D_ASSERT(0x979, stage != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x978, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
+        J3D_ASSERT_NULLPTR(0x979, stage != 0);
         mTevStage[idx] = *stage;
     }
     /* 80321E04 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
-        J3D_ASSERT(0x97f, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x97f, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
     /* 80321E7C */ virtual J3DTevStage* getTevStage(u32 idx) {
-        J3D_ASSERT(0x984, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x984, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
     /* 80321EC8 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
-        J3D_ASSERT(0x98b, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
-        J3D_ASSERT(0x98c, info != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x98b, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
+        J3D_ASSERT_NULLPTR(0x98c, info != 0);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
     /* 80321E90 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
-        J3D_ASSERT(0x992, idx >= 0 && idx < ARRAY_SIZE(mTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x992, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx].setTevSwapModeInfo(info);
     }
     /* 80321F10 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
-        J3D_ASSERT(0x999, idx >= 0 && idx < ARRAY_SIZE(mTevSwapModeTable), "Error : range over.");
-        J3D_ASSERT(0x99a, table != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x999, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
+        J3D_ASSERT_NULLPTR(0x99a, table != 0);
         mTevSwapModeTable[idx] = *table;
     }
     /* 80321F00 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
-        J3D_ASSERT(0x9a0, idx >= 0 && idx < ARRAY_SIZE(mTevSwapModeTable), "Error : range over.");
+        J3D_ASSERT_RANGE(0x9a0, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         mTevSwapModeTable[idx] = table;
     }
     /* 80321F20 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
-        J3D_ASSERT(0x9a5, idx >= 0 && idx < ARRAY_SIZE(mTevSwapModeTable), "Error : range over.");
+        J3D_ASSERT_RANGE(0x9a5, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         return &mTevSwapModeTable[idx];
     }
     /* 80321F44 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
-        J3D_ASSERT(0x9ac, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
-        J3D_ASSERT(0x9ad, stage != 0, "Error : null pointer.");
+        J3D_ASSERT_RANGE(0x9ac, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
+        J3D_ASSERT_NULLPTR(0x9ad, stage != 0);
         mIndTevStage[idx] = *stage;
     }
     /* 80321F30 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
-        J3D_ASSERT(0x9b3, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x9b3, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
     /* 80321F58 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
-        J3D_ASSERT(0x9b8, idx >= 0 && idx < ARRAY_SIZE(mIndTevStage), "Error : range over.");
+        J3D_ASSERT_RANGE(0x9b8, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
     /* 80321F6C */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
@@ -1568,20 +1574,27 @@ struct J3DAlphaComp {
         return *this;
     }
 
+    J3DAlphaComp& operator=(J3DAlphaComp& rhs) {
+        mID = rhs.mID;
+        mRef0 = rhs.mRef0;
+        mRef1 = rhs.mRef1;
+        return *this;
+    }
+
     void setAlphaCompInfo(const J3DAlphaCompInfo& info) {
         mRef0 = info.mRef0;
         mRef1 = info.mRef1;
         mID = calcAlphaCmpID(info.mComp0, info.mOp, info.mComp1);
     }
 
-    GXCompare getComp0() const { return GXCompare(*(&j3dAlphaCmpTable[mID * 3] + 0)); }
-    GXAlphaOp getOp() const { return GXAlphaOp(*(&j3dAlphaCmpTable[mID * 3] + 1)); }
-    GXCompare getComp1() const { return GXCompare(*(&j3dAlphaCmpTable[mID * 3] + 2)); }
+    u8 getComp0() const { return *(&j3dAlphaCmpTable[mID * 3] + 0); }
+    u8 getOp() const { return *(&j3dAlphaCmpTable[mID * 3] + 1); }
+    u8 getComp1() const { return *(&j3dAlphaCmpTable[mID * 3] + 2); }
     u8 getRef0() const { return mRef0; }
     u8 getRef1() const { return mRef1; }
 
     void load() const {
-        J3DGDSetAlphaCompare(getComp0(), mRef0, getOp(), getComp1(), mRef1);
+        J3DGDSetAlphaCompare((GXCompare)getComp0(), mRef0, (GXAlphaOp)getOp(), (GXCompare)getComp1(), mRef1);
     }
 
     /* 0x00 */ u16 mID;
@@ -1720,42 +1733,42 @@ public:
     /* 8032339C */ virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
     /* 803233A4 */ virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
     /* 803233C0 */ virtual void setIndTexOrder(u32 idx, J3DIndTexOrder const* order) {
-        J3D_ASSERT(0xa94, order != 0, "Error : null pointer.");
-        J3D_ASSERT(0xa95, idx >= 0 && idx < ARRAY_SIZE(mIndTexOrder), "Error : range over.");
+        J3D_ASSERT_NULLPTR(0xa94, order != 0);
+        J3D_ASSERT_RANGE(0xa95, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder));
         mIndTexOrder[idx] = *order;
     }
     /* 803233AC */ virtual void setIndTexOrder(u32 idx, J3DIndTexOrder order) {
-        J3D_ASSERT(0xa9b, idx >= 0 && idx < ARRAY_SIZE(mIndTexOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0xa9b, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder));
         mIndTexOrder[idx] = order;
     }
     /* 803233D4 */ virtual J3DIndTexOrder* getIndTexOrder(u32 idx) {
-        J3D_ASSERT(0xaa0, idx >= 0 && idx < ARRAY_SIZE(mIndTexOrder), "Error : range over.");
+        J3D_ASSERT_RANGE(0xaa0, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder));
         return &mIndTexOrder[idx];
     }
     /* 8032341C */ virtual void setIndTexMtx(u32 idx, J3DIndTexMtx const* mtx) {
-        J3D_ASSERT(0xaa7, mtx != 0, "Error : null pointer.");
-        J3D_ASSERT(0xaa8, idx >= 0 && idx < ARRAY_SIZE(mIndTexMtx), "Error : range over.");
+        J3D_ASSERT_NULLPTR(0xaa7, mtx != 0);
+        J3D_ASSERT_RANGE(0xaa8, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx));
         mIndTexMtx[idx] = *mtx;
     }
     /* 803233E8 */ virtual void setIndTexMtx(u32 idx, J3DIndTexMtx mtx) {
-        J3D_ASSERT(0xaae, idx >= 0 && idx < ARRAY_SIZE(mIndTexMtx), "Error : range over.");
+        J3D_ASSERT_RANGE(0xaae, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx));
         mIndTexMtx[idx] = mtx;
     }
     /* 80323450 */ virtual J3DIndTexMtx* getIndTexMtx(u32 idx) {
-        J3D_ASSERT(0xab3, idx >= 0 && idx < ARRAY_SIZE(mIndTexMtx), "Error : range over.");
+        J3D_ASSERT_RANGE(0xab3, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx));
         return &mIndTexMtx[idx];
     }
     /* 80323478 */ virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale const* scale) {
-        J3D_ASSERT(0xaba, scale != 0, "Error : null pointer.");
-        J3D_ASSERT(0xabb, idx >= 0 && idx < ARRAY_SIZE(mIndTexCoordScale), "Error : range over.");
+        J3D_ASSERT_NULLPTR(0xaba, scale != 0);
+        J3D_ASSERT_RANGE(0xabb, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale));
         mIndTexCoordScale[idx] = *scale;
     }
     /* 80323464 */ virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale scale) {
-        J3D_ASSERT(0xac1, idx >= 0 && idx < ARRAY_SIZE(mIndTexCoordScale), "Error : range over.");
+        J3D_ASSERT_RANGE(0xac1, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale));
         mIndTexCoordScale[idx] = scale;
     }
     /* 8032348C */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32 idx) {
-        J3D_ASSERT(0xac6, idx >= 0 && idx < ARRAY_SIZE(mIndTexCoordScale), "Error : range over.");
+        J3D_ASSERT_RANGE(0xac6, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale));
         return &mIndTexCoordScale[idx];
     }
     /* 803234A0 */ virtual ~J3DIndBlockFull() {}
@@ -1867,31 +1880,31 @@ public:
     /* 80317BFC */ virtual s32 countDLSize();
     /* 80321B00 */ virtual u32 getType() { return 'PEFG'; }
     /* 80321B28 */ virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
-        J3D_ASSERT(0xbf9, alphaComp != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0xbf9, alphaComp != 0);
         mAlphaComp = *alphaComp;
     }
     /* 80321B0C */ virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
     /* 80321B44 */ virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
     /* 80321B58 */ virtual void setBlend(J3DBlend const* blend) {
-        J3D_ASSERT(0xc07, blend != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0xc07, blend != 0);
         mBlend = *blend;
     }
     /* 80321B4C */ virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
     /* 80321B64 */ virtual J3DBlend* getBlend() { return &mBlend; }
     /* 80321B78 */ virtual void setZMode(J3DZMode const* zMode) {
-        J3D_ASSERT(0xc15, zMode != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0xc15, zMode != 0);
         mZMode = *zMode;
     }
     /* 80321B6C */ virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
     /* 80321B84 */ virtual J3DZMode* getZMode() { return &mZMode; }
     /* 80321B94 */ virtual void setZCompLoc(u8 const* zCompLoc) {
-        J3D_ASSERT(0xc23, zCompLoc != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0xc23, zCompLoc != 0);
         mZCompLoc = *zCompLoc;
     }
     /* 80321B8C */ virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
     /* 80321BA0 */ virtual u8 getZCompLoc() const { return mZCompLoc; }
     /* 80321BB0 */ virtual void setDither(u8 const* dither) {
-        J3D_ASSERT(0xc31, dither != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0xc31, dither != 0);
         mDither = *dither;
     }
     /* 80321BA8 */ virtual void setDither(u8 dither) { mDither = dither; }
@@ -1928,31 +1941,31 @@ public:
     /* 80321958 */ virtual void setFog(J3DFog* pFog) { mFog.setFogInfo(pFog->getFogInfo()); }
     /* 803219A0 */ virtual J3DFog* getFog() { return &mFog; }
     /* 803219C4 */ virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
-        J3D_ASSERT(0xc7d, alphaComp != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0xc7d, alphaComp != 0);
         mAlphaComp = *alphaComp;
     }
     /* 803219A8 */ virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
     /* 803219E0 */ virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
     /* 803219F4 */ virtual void setBlend(J3DBlend const* blend) {
-        J3D_ASSERT(0xc8b, blend != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0xc8b, blend != 0);
         mBlend = *blend;
     }
     /* 803219E8 */ virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
     /* 80321A00 */ virtual J3DBlend* getBlend() { return &mBlend; }
     /* 80321A14 */ virtual void setZMode(J3DZMode const* zMode) {
-        J3D_ASSERT(0xc99, zMode != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0xc99, zMode != 0);
         mZMode = *zMode;
     }
     /* 80321A08 */ virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
     /* 80321A20 */ virtual J3DZMode* getZMode() { return &mZMode; }
     /* 80321A30 */ virtual void setZCompLoc(u8 const* zCompLoc) {
-        J3D_ASSERT(0xca7, zCompLoc != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0xca7, zCompLoc != 0);
         mZCompLoc = *zCompLoc;
     }
     /* 80321A28 */ virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
     /* 80321A3C */ virtual u8 getZCompLoc() const { return mZCompLoc; }
     /* 80321A4C */ virtual void setDither(u8 const* dither) {
-        J3D_ASSERT(0xcb5, dither != 0, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(0xcb5, dither != 0);
         mDither = *dither;
     }
     /* 80321A44 */ virtual void setDither(u8 dither) { mDither = dither; }
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index b32bac6ff1..e3f7e7dab8 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DShape.h"
-#include "dolphin/types.h"
+#include <stdint.h>
 
 class J3DJoint;
 class J3DMaterialAnm;
@@ -56,7 +56,7 @@ public:
     J3DIndBlock* getIndBlock() { return mIndBlock; }
     J3DJoint* getJoint() { return mJoint; }
     J3DMaterialAnm* getMaterialAnm() {
-        if ((u32)mMaterialAnm < 0xC0000000) {
+        if ((uintptr_t)mMaterialAnm < 0xC0000000) {
             return mMaterialAnm;
         } else {
             return NULL;
@@ -89,6 +89,21 @@ public:
     void setZCompLoc(u8 i_comploc) { mPEBlock->setZCompLoc(i_comploc); }
     void setMaterialMode(u32 i_mode) { mMaterialMode = i_mode; }
 
+    void addShape(J3DShape* pShape) {
+        J3D_ASSERT_NULLPTR(618, pShape != NULL);
+        mShape = pShape;
+    }
+
+    void setNext(J3DMaterial* pMaterial) {
+        J3D_ASSERT_NULLPTR(623, pMaterial != NULL);
+        mNext = pMaterial;
+    }
+
+    void setJoint(J3DJoint* pJoint) {
+        J3D_ASSERT_NULLPTR(628, pJoint != NULL);
+        mJoint = pJoint;
+    }
+
 public:
     /* 0x04 */ J3DMaterial* mNext;
     /* 0x08 */ J3DShape* mShape;
diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h
index ce01c85b1e..177c8de837 100644
--- a/include/JSystem/J3DGraphBase/J3DPacket.h
+++ b/include/JSystem/J3DGraphBase/J3DPacket.h
@@ -3,6 +3,7 @@
 
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "dolphin/gd/GDBase.h"
+#include <stdint.h>
 
 class J3DMatPacket;
 
@@ -16,27 +17,42 @@ class J3DTexMtx;
 class J3DTexMtxObj;
 class J3DTexture;
 
-inline u32 getDiffFlag_LightObjNum(u32 param_1) {
-    return (param_1 & 0xf0) >> 4;
+enum J3DDiffFlag {
+    J3DDiffFlag_MatColor         = 0x1,
+    J3DDiffFlag_ColorChan        = 0x2,
+    J3DDiffFlag_AmbColor         = 0x4,
+    J3DDiffFlag_TexGen           = 0x1000,
+    J3DDiffFlag_TevReg           = 0x1000000,
+    J3DDiffFlag_KonstColor       = 0x2000000,  // is this right?
+    J3DDiffFlag_TexCoordScale    = 0x4000000,
+    J3DDiffFlag_TevStageIndirect = 0x8000000,
+    J3DDiffFlag_Fog              = 0x10000000,
+    J3DDiffFlag_Blend            = 0x20000000,
+    J3DDiffFlag_Unk40000000      = 0x40000000,
+    J3DDiffFlag_Changed          = 0x80000000,
+};
+
+inline u32 getDiffFlag_LightObjNum(u32 diffFlags) {
+    return (diffFlags & 0xf0) >> 4;
 }
 
-inline u32 getDiffFlag_TexGenNum(u32 param_1) {
-    return (param_1 & 0xf00) >> 8;
+inline u32 getDiffFlag_TexGenNum(u32 diffFlags) {
+    return (diffFlags & 0xf00) >> 8;
 }
 
-inline int calcDifferedBufferSize_TexMtxSize(int param_1) {
+inline int calcDifferedBufferSize_TexMtxSize(u32 param_1) {
   return param_1 * 0x35;
 }
 
-inline int calcDifferedBufferSize_TexGenSize(int param_1) {
+inline int calcDifferedBufferSize_TexGenSize(u32 param_1) {
     return param_1 * 0x3d + 10;
 }
 
-inline u32 getDiffFlag_TexNoNum(u32 param_1) {
-    return (param_1 & 0xf0000) >> 0x10;
+inline u32 getDiffFlag_TexNoNum(u32 diffFlags) {
+    return (diffFlags & 0xf0000) >> 0x10;
 }
 
-inline int calcDifferedBufferSize_TexNoSize(int param_1) {
+inline int calcDifferedBufferSize_TexNoSize(u32 param_1) {
     return param_1 * 0x37;
 }
 
@@ -46,15 +62,15 @@ inline u32 calcDifferedBufferSize_TexNoAndTexCoordScaleSize(u32 param_1) {
     return res;
 }
 
-inline u32 getDiffFlag_TevStageNum(u32 param_1) {
-    return (param_1 & 0xf00000) >> 0x14;
+inline u32 getDiffFlag_TevStageNum(u32 diffFlags) {
+    return (diffFlags & 0xf00000) >> 0x14;
 }
 
-inline int calcDifferedBufferSize_TevStageSize(int param_1) {
+inline int calcDifferedBufferSize_TevStageSize(u32 param_1) {
     return param_1 * 10;
 }
 
-inline int calcDifferedBufferSize_TevStageDirectSize(int param_1) {
+inline int calcDifferedBufferSize_TevStageDirectSize(u32 param_1) {
     return param_1 * 5;
 }
 
@@ -65,15 +81,15 @@ inline int calcDifferedBufferSize_TevStageDirectSize(int param_1) {
 class J3DDisplayListObj {
 public:
     J3DDisplayListObj() {
-        mpData[0] = NULL;
-        mpData[1] = NULL;
+        mpDisplayList[0] = NULL;
+        mpDisplayList[1] = NULL;
         mSize = 0;
-        mCapacity = 0;
+        mMaxSize = 0;
     }
 
     J3DError newDisplayList(u32);
     J3DError newSingleDisplayList(u32);
-    J3DError single_To_Double();
+    int single_To_Double();
     void setSingleDisplayList(void*, u32);
     void swapBuffer();
     void callDL() const;
@@ -82,15 +98,15 @@ public:
     void beginPatch();
     u32 endPatch();
 
-    u8* getDisplayList(int idx) const { return (u8*)mpData[idx]; }
-    u32 getDisplayListSize() const { return mSize; }
+    u8* getDisplayList(int idx) { return (u8*)mpDisplayList[idx]; }
+    u32 getDisplayListSize() { return mSize; }
 
     static GDLObj sGDLObj;
     static s32 sInterruptFlag;
 
-    /* 0x0 */ void* mpData[2];
+    /* 0x0 */ void* mpDisplayList[2];
     /* 0x8 */ u32 mSize;
-    /* 0xC */ u32 mCapacity;
+    /* 0xC */ u32 mMaxSize;
 };  // Size: 0x10
 
 /**
@@ -102,7 +118,7 @@ public:
     J3DPacket() {
         mpNextPacket = NULL;
         mpFirstChild = NULL;
-        mpUserData = NULL;
+        mpUserArea = NULL;
     }
 
     void addChildPacket(J3DPacket*);
@@ -115,8 +131,8 @@ public:
         mpFirstChild = NULL;
     }
 
-    void* getUserArea() { return mpUserData; }
-    void setUserArea(u32 area) { mpUserData = (void*)area; }
+    void* getUserArea() const { return mpUserArea; }
+    void setUserArea(uintptr_t area) { mpUserArea = (void*)area; }
 
     virtual int entry(J3DDrawBuffer*);
     virtual void draw();
@@ -125,7 +141,7 @@ public:
 public:
     /* 0x04 */ J3DPacket* mpNextPacket;
     /* 0x08 */ J3DPacket* mpFirstChild;
-    /* 0x0C */ void* mpUserData;
+    /* 0x0C */ void* mpUserArea;
 };  // Size: 0x10
 
 /**
@@ -140,29 +156,34 @@ public:
     J3DError newSingleDisplayList(u32);
     virtual void draw();
 
-    J3DDisplayListObj* getDisplayListObj() const { return mpDisplayListObj; }
+    J3DDisplayListObj* getDisplayListObj() { return mpDisplayListObj; }
     void setDisplayListObj(J3DDisplayListObj* pObj) { mpDisplayListObj = pObj; }
 
     void beginPatch() { mpDisplayListObj->beginPatch(); }
     void endPatch() { mpDisplayListObj->endPatch(); }
 
-    void callDL() const { getDisplayListObj()->callDL(); }
+    void callDL() const { mpDisplayListObj->callDL(); }
+    void beginDL() { mpDisplayListObj->beginDL(); }
+    void endDL() { mpDisplayListObj->endDL(); }
+
+    void* getDisplayList(int i) { return mpDisplayListObj->mpDisplayList[i]; }
+    u32 getDisplayListSize() const { return mpDisplayListObj->mSize; } 
 
     enum {
         LOCKED = 0x01,
     };
 
-    bool checkFlag(u32 flag) const { return (mFlags & flag) != 0; }
+    bool checkFlag(u32 flag) const { return (mFlags & flag) ? true : false; }
     void onFlag(u32 flag) { mFlags |= flag; }
     void offFlag(u32 flag) { mFlags &= ~flag; }
     void lock() { onFlag(LOCKED); }
     void unlock() { offFlag(LOCKED); }
-    J3DTexMtxObj* getTexMtxObj() const { return mpTexMtxObj; }
+    J3DTexMtxObj* getTexMtxObj() { return mpTexMtxObj; }
     bool isLocked() const { return checkFlag(1); }
 
 public:
     /* 0x10 */ u32 mFlags;
-    /* 0x14 */ char mPad0[0x0C];  // unk
+    /* 0x14 */ char unk_0x14[0x20 - 0x14];
     /* 0x20 */ J3DDisplayListObj* mpDisplayListObj;
     /* 0x24 */ J3DTexMtxObj* mpTexMtxObj;
 };  // Size: 0x28
@@ -175,15 +196,23 @@ class J3DShapePacket : public J3DDrawPacket {
 public:
     J3DShapePacket();
     u32 calcDifferedBufferSize(u32);
-    J3DError newDifferedDisplayList(u32);
+    int newDifferedDisplayList(u32);
     void prepareDraw() const;
     void drawFast();
 
     virtual ~J3DShapePacket();
     virtual void draw();
 
-    void setShape(J3DShape* pShape) { mpShape = pShape; }
-    void setModel(J3DModel* pModel) { mpModel = pModel; }
+    void setShape(J3DShape* pShape) {
+        J3D_ASSERT_NULLPTR(523, pShape != NULL);
+        mpShape = pShape;
+    }
+
+    void setModel(J3DModel* pModel) {
+        J3D_ASSERT_NULLPTR(533, pModel != NULL);
+        mpModel = pModel;
+    }
+
     void setMtxBuffer(J3DMtxBuffer* pMtxBuffer) { mpMtxBuffer = pMtxBuffer; }
     void setBaseMtxPtr(Mtx* pMtx) { mpBaseMtxPtr = pMtx; }
 
@@ -214,13 +243,22 @@ public:
     J3DMaterial* getMaterial() const { return mpMaterial; }
     J3DShapePacket* getShapePacket() const { return mpShapePacket; }
     void setShapePacket(J3DShapePacket* packet) { mpShapePacket = packet; }
-    void setMaterial(J3DMaterial* pMaterial) { mpMaterial = pMaterial; }
-    void setTexture(J3DTexture* pTexture) { mpTexture = pTexture; }
+
+    void setMaterial(J3DMaterial* pMaterial) {
+        J3D_ASSERT_NULLPTR(646, pMaterial != NULL);
+        mpMaterial = pMaterial;
+    }
+
+    void setTexture(J3DTexture* pTexture) {
+        J3D_ASSERT_NULLPTR(651, pTexture != NULL);
+        mpTexture = pTexture;
+    }
+
     void setInitShapePacket(J3DShapePacket* packet) { mpInitShapePacket = packet; }
     void setMaterialID(u32 id) { mDiffFlag = id; }
     void setMaterialAnmID(J3DMaterialAnm* materialAnm) { mpMaterialAnm = materialAnm; }
-    bool isChanged() const { return mDiffFlag & 0x80000000; }
-    bool isEnabled_Diff() const { return mpInitShapePacket->getDisplayListObj() != NULL; }
+    BOOL isChanged() { return mDiffFlag & J3DDiffFlag_Changed; }
+    bool isEnabled_Diff() { return mpInitShapePacket->getDisplayListObj() != NULL; }
 
     virtual ~J3DMatPacket();
     virtual int entry(J3DDrawBuffer*);
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 383afb3703..8524af4cf9 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -2,9 +2,9 @@
 #define J3DSHAPE_H
 
 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"
-#include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/gx.h"
-#include "mtx.h"
+#include "JSystem/J3DAssert.h"
+#include "JSystem/J3DGraphBase/J3DFifo.h"
+#include <dolphin/mtx.h>
 
 class J3DShapeMtx;
 
@@ -18,18 +18,6 @@ public:
     u32 mMtxIdxRegB;
 };
 
-static inline void J3DFifoWriteCPCmd(u8 cmd, u32 param) {
-    GXWGFifo.u8 = GX_LOAD_CP_REG;
-    GXWGFifo.u8 = cmd;
-    GXWGFifo.u32 = param;
-}
-
-static inline void J3DFifoWriteXFCmd(u16 cmd, u16 len) {
-    GXWGFifo.u8 = GX_LOAD_XF_REG;
-    GXWGFifo.u16 = (len - 1);
-    GXWGFifo.u16 = cmd;
-}
-
 /**
  * @ingroup jsystem-j3d
  * 
@@ -50,10 +38,10 @@ public:
     u32 getMtxIdxRegA() const { return mMtxIdxRegA; }
     u32 getMtxIdxRegB() const { return mMtxIdxRegB; }
 
-    inline void load() const {
-        J3DFifoWriteCPCmd(0x30, mMtxIdxRegA);  // CP_MATINDEX_A
-        J3DFifoWriteCPCmd(0x40, mMtxIdxRegB);  // CP_MATINDEX_B
-        J3DFifoWriteXFCmd(0x1018, 2);
+    void load() const {
+        J3DFifoLoadCPCmd(CP_REG_MTXIDXA_ID, mMtxIdxRegA);
+        J3DFifoLoadCPCmd(CP_REG_MTXIDXB_ID, mMtxIdxRegB);
+        J3DFifoLoadXFCmdHdr(GX_XF_REG_MATRIXINDEX0, 2);
         GXCmd1u32(mMtxIdxRegA);
         GXCmd1u32(mMtxIdxRegB);
     }
@@ -65,110 +53,6 @@ public:
     }
 };
 
-class J3DMaterial;
-class J3DVertexData;
-class J3DDrawMtxData;
-
-enum J3DShpFlag {
-    J3DShpFlag_Visible = 0x0001,
-    J3DShpFlag_SkinPosCpu = 0x0004,
-    J3DShpFlag_SkinNrmCpu = 0x0008,
-    J3DShpFlag_Hidden = 0x0010,
-    J3DShpFlag_EnableLod = 0x0100,
-    J3DShpFlag_NoMtx = 0x0200,
-};
-
-/**
- * @ingroup jsystem-j3d
- * 
- */
-class J3DShape {
-public:
-    J3DShape() {
-        initialize();
-    }
-
-    enum {
-        kVcdVatDLSize = 0xC0,
-    };
-
-    /* 80314B48 */ void initialize();
-    /* 80314BB8 */ void addTexMtxIndexInDL(_GXAttr, u32);
-    /* 80314CBC */ void addTexMtxIndexInVcd(_GXAttr);
-    /* 80314DA8 */ void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
-    /* 80314E28 */ u16 countBumpMtxNum() const;
-    /* 80314EEC */ void loadVtxArray() const;
-    /* 80314F5C */ bool isSameVcdVatCmd(J3DShape*);
-    /* 80314F98 */ void makeVtxArrayCmd();
-    /* 80315260 */ void makeVcdVatCmd();
-    /* 80315300 */ void loadPreDrawSetting() const;
-    /* 80315398 */ void setArrayAndBindPipeline() const;
-
-    /* 803155E0 */ virtual void draw() const;
-    /* 8031544C */ virtual void drawFast() const;
-    /* 80315628 */ virtual void simpleDraw() const;
-    /* 803156AC */ virtual void simpleDrawCache() const;
-
-    void onFlag(u32 flag) { mFlags |= flag; }
-    void offFlag(u32 flag) { mFlags &= ~flag; }
-    bool checkFlag(u32 flag) const { return !!(mFlags & flag); }
-    void setDrawMtxDataPointer(J3DDrawMtxData* pMtxData) { mDrawMtxData = pMtxData; }
-    void setVertexDataPointer(J3DVertexData* pVtxData) { mVertexData = pVtxData; }
-    void* getVcdVatCmd() { return mVcdVatCmd; }
-    void setVcdVatCmd(void* pVatCmd) { mVcdVatCmd = (u8*)pVatCmd; }
-    void show() { offFlag(J3DShpFlag_Visible); }
-    void hide() { onFlag(J3DShpFlag_Visible); }
-    void setCurrentViewNoPtr(u32* pViewNoPtr) { mCurrentViewNo = pViewNoPtr; }
-    void setCurrentMtx(J3DCurrentMtx& mtx) { mCurrentMtx = mtx; }
-    void setScaleFlagArray(u8* pScaleFlagArray) { mScaleFlagArray = pScaleFlagArray; }
-    void setDrawMtx(Mtx** pDrawMtx) { mDrawMtx = pDrawMtx; }
-    void setNrmMtx(Mtx33** pNrmMtx) { mNrmMtx = pNrmMtx; }
-    void setTexMtxLoadType(u32 type) { mFlags = (mFlags & 0xFFFF0FFF) | type; }
-    bool getNBTFlag() const { return mHasNBT; }
-    u32 getBumpMtxOffset() const { return mBumpMtxOffset; }
-    void setBumpMtxOffset(u32 offset) { mBumpMtxOffset = offset; }
-    GXVtxDescList* getVtxDesc() { return mVtxDesc; }
-
-    J3DMaterial* getMaterial() const { return mMaterial; }
-    u16 getIndex() const { return mIndex; }
-    u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
-    u32 getMtxGroupNum() const { return mMtxGroupNum; }
-    J3DShapeDraw* getShapeDraw(u16 idx) { return mShapeDraw[idx]; }
-    J3DShapeMtx* getShapeMtx(u16 idx) { return mShapeMtx[idx]; }
-    Vec* getMin() { return &mMin; }
-    Vec* getMax() { return &mMax; }
-
-    static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }
-
-    static void* sOldVcdVatCmd;
-
-private:
-    friend struct J3DShapeFactory;
-    friend class J3DJointTree;
-
-    /* 0x04 */ J3DMaterial* mMaterial;
-    /* 0x08 */ u16 mIndex;
-    /* 0x0A */ u16 mMtxGroupNum;
-    /* 0x0C */ u32 mFlags;
-    /* 0x10 */ f32 mRadius;
-    /* 0x14 */ Vec mMin;
-    /* 0x20 */ Vec mMax;
-    /* 0x2C */ u8* mVcdVatCmd;
-    /* 0x30 */ GXVtxDescList* mVtxDesc;
-    /* 0x34 */ bool mHasNBT;
-    /* 0x38 */ J3DShapeMtx** mShapeMtx;
-    /* 0x3C */ J3DShapeDraw** mShapeDraw;
-    /* 0x40 */ J3DCurrentMtx mCurrentMtx;
-    /* 0x48 */ bool mHasPNMTXIdx;
-    /* 0x4C */ J3DVertexData* mVertexData;
-    /* 0x50 */ J3DDrawMtxData* mDrawMtxData;
-    /* 0x54 */ u8* mScaleFlagArray;
-    /* 0x58 */ Mtx** mDrawMtx;
-    /* 0x5C */ Mtx33** mNrmMtx;
-    /* 0x60 */ u32* mCurrentViewNo;
-    /* 0x64 */ u32 mBumpMtxOffset;
-};
-
 typedef void (J3DShapeMtx::*J3DShapeMtx_LoadFunc)(int, u16) const;
 
 /**
@@ -197,15 +81,16 @@ public:
     static u16 sMtxLoadCache[10];
     static u32 sCurrentPipeline;
     static u8* sCurrentScaleFlag;
-    static u8 sNBTFlag;
-    static u8 sLODFlag;
+    static bool sNBTFlag;
+    static bool sLODFlag;
     static u32 sTexMtxLoadType;
 
     static void setCurrentPipeline(u32 pipeline) {
-        J3D_ASSERT(91, pipeline < 4, "Error : range over.");
+        J3D_ASSERT_RANGE(91, pipeline < 4);
         sCurrentPipeline = pipeline;
     }
-    static void setLODFlag(u8 flag) { sLODFlag = flag; }
+
+    static void setLODFlag(bool flag) { sLODFlag = flag; }
     static u32 getLODFlag() { return sLODFlag; }
     static void resetMtxLoadCache();
 
@@ -213,4 +98,133 @@ protected:
     /* 0x04 */ u16 mUseMtxIndex;
 };
 
+class J3DMaterial;
+class J3DVertexData;
+class J3DDrawMtxData;
+
+enum J3DShpFlag {
+    J3DShpFlag_Visible    = 0x0001,
+    J3DShpFlag_SkinPosCpu = 0x0004,
+    J3DShpFlag_SkinNrmCpu = 0x0008,
+    J3DShpFlag_Hidden     = 0x0010,
+    J3DShpFlag_EnableLod  = 0x0100,
+    J3DShpFlag_NoMtx      = 0x0200,
+};
+
+/**
+ * @ingroup jsystem-j3d
+ * 
+ */
+class J3DShape {
+public:
+    J3DShape() {
+        initialize();
+    }
+
+    static const int kVcdVatDLSize = 0xC0;
+
+    /* 80314B48 */ void initialize();
+    /* 80314BB8 */ void addTexMtxIndexInDL(_GXAttr, u32);
+    /* 80314CBC */ void addTexMtxIndexInVcd(_GXAttr);
+    /* 80314DA8 */ void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
+    /* 80314E28 */ u16 countBumpMtxNum() const;
+    /* 80314EEC */ void loadVtxArray() const;
+    /* 80314F5C */ bool isSameVcdVatCmd(J3DShape*);
+    /* 80314F98 */ void makeVtxArrayCmd();
+    /* 80315260 */ void makeVcdVatCmd();
+    /* 80315300 */ void loadPreDrawSetting() const;
+    /* 80315398 */ void setArrayAndBindPipeline() const;
+
+    /* 803155E0 */ virtual void draw() const;
+    /* 8031544C */ virtual void drawFast() const;
+    /* 80315628 */ virtual void simpleDraw() const;
+    /* 803156AC */ virtual void simpleDrawCache() const;
+
+    void loadCurrentMtx() const;
+
+    void onFlag(u32 flag) { mFlags |= flag; }
+    void offFlag(u32 flag) { mFlags &= ~flag; }
+    bool checkFlag(u32 flag) const { return (mFlags & flag) != 0; }
+
+    void setMaterial(J3DMaterial* pMaterial) {
+        J3D_ASSERT_NULLPTR(509, pMaterial != NULL);
+        mMaterial = pMaterial;
+    }
+
+    void setDrawMtxDataPointer(J3DDrawMtxData* pMtxData) {
+        J3D_ASSERT_NULLPTR(554, pMtxData != NULL);
+        mDrawMtxData = pMtxData;
+    }
+
+    void setVertexDataPointer(J3DVertexData* pVtxData) {
+        J3D_ASSERT_NULLPTR(657, pVtxData != NULL);
+        mVertexData = pVtxData;
+    }
+
+    void* getVcdVatCmd() { return mVcdVatCmd; }
+    void setVcdVatCmd(void* pVatCmd) { mVcdVatCmd = (u8*)pVatCmd; }
+    void show() { offFlag(J3DShpFlag_Visible); }
+    void hide() { onFlag(J3DShpFlag_Visible); }
+
+    void setCurrentViewNoPtr(u32* pViewNoPtr) {
+        J3D_ASSERT_NULLPTR(584, pViewNoPtr != NULL);
+        mCurrentViewNo = pViewNoPtr;
+    }
+
+    void setCurrentMtx(J3DCurrentMtx& mtx) { mCurrentMtx = mtx; }
+
+    void setScaleFlagArray(u8* pScaleFlagArray) {
+        J3D_ASSERT_NULLPTR(595, pScaleFlagArray != NULL);
+        mScaleFlagArray = pScaleFlagArray;
+    }
+
+    void setDrawMtx(Mtx** pDrawMtx) { mDrawMtx = pDrawMtx; }
+    void setNrmMtx(Mtx33** pNrmMtx) { mNrmMtx = pNrmMtx; }
+    void setTexMtxLoadType(u32 type) { mFlags = (mFlags & 0xFFFF0FFF) | type; }
+    bool getNBTFlag() const { return mHasNBT; }
+    u32 getBumpMtxOffset() const { return mBumpMtxOffset; }
+    void setBumpMtxOffset(u32 offset) { mBumpMtxOffset = offset; }
+    GXVtxDescList* getVtxDesc() { return mVtxDesc; }
+
+    J3DMaterial* getMaterial() const { return mMaterial; }
+    u16 getIndex() const { return mIndex; }
+    u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
+    u32 getMtxGroupNum() const { return mMtxGroupNum; }
+    J3DShapeDraw* getShapeDraw(u16 idx) { return mShapeDraw[idx]; }
+    J3DShapeMtx* getShapeMtx(u16 idx) { return mShapeMtx[idx]; }
+    Vec* getMin() { return &mMin; }
+    Vec* getMax() { return &mMax; }
+
+    static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }
+
+    static void* sOldVcdVatCmd;
+    static bool sEnvelopeFlag;
+
+private:
+    friend struct J3DShapeFactory;
+    friend class J3DJointTree;
+
+    /* 0x04 */ J3DMaterial* mMaterial;
+    /* 0x08 */ u16 mIndex;
+    /* 0x0A */ u16 mMtxGroupNum;
+    /* 0x0C */ u32 mFlags;
+    /* 0x10 */ f32 mRadius;
+    /* 0x14 */ Vec mMin;
+    /* 0x20 */ Vec mMax;
+    /* 0x2C */ u8* mVcdVatCmd;
+    /* 0x30 */ GXVtxDescList* mVtxDesc;
+    /* 0x34 */ bool mHasNBT;
+    /* 0x38 */ J3DShapeMtx** mShapeMtx;
+    /* 0x3C */ J3DShapeDraw** mShapeDraw;
+    /* 0x40 */ J3DCurrentMtx mCurrentMtx;
+    /* 0x48 */ bool mHasPNMTXIdx;
+    /* 0x4C */ J3DVertexData* mVertexData;
+    /* 0x50 */ J3DDrawMtxData* mDrawMtxData;
+    /* 0x54 */ u8* mScaleFlagArray;
+    /* 0x58 */ Mtx** mDrawMtx;
+    /* 0x5C */ Mtx33** mNrmMtx;
+    /* 0x60 */ u32* mCurrentViewNo;
+    /* 0x64 */ u32 mBumpMtxOffset;
+};
+
 #endif /* J3DSHAPE_H */
diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
index bf15ff84e4..f269c0594b 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
@@ -2,6 +2,7 @@
 #define J3DSHAPEMTX_H
 
 #include "JSystem/J3DGraphBase/J3DShape.h"
+#include "JSystem/J3DAssert.h"
 #include "dolphin/mtx.h"
 
 class J3DTexMtx;
@@ -14,15 +15,21 @@ class J3DTexGenBlock;
 class J3DTexMtxObj {
 public:
     Mtx& getMtx(u16 idx) {
-        J3D_ASSERT(0x113, idx <= mTexMtxNum, "Error : range over");
+        J3D_ASSERT_RANGE(275, idx < mTexMtxNum);
         return mpTexMtx[idx];
     }
+
+    void setMtx(u16 idx, const Mtx mtx) {
+        J3D_ASSERT_RANGE(288, idx < mTexMtxNum);
+        MTXCopy(mtx, mpTexMtx[idx]);
+    }
+
     Mtx44& getEffectMtx(u16 idx) {
-        J3D_ASSERT(0x125, idx <= mTexMtxNum, "Error : range over");
+        J3D_ASSERT_RANGE(293, idx < mTexMtxNum);
         return mpEffectMtx[idx];
     }
+
     u16 getNumTexMtx() const { return mTexMtxNum; }
-    void setMtx(u16 idx, Mtx const* mtx) { MTXCopy(*mtx, mpTexMtx[idx]); }
 
     /* 0x00 */ Mtx* mpTexMtx;
     /* 0x04 */ Mtx44* mpEffectMtx;
@@ -37,7 +44,7 @@ class J3DDifferedTexMtx {
 public:
     /* 8031322C */ static void loadExecute(f32 const (*)[4]);
 
-    static inline void load(Mtx m) {
+    static inline void load(const Mtx m) {
         if (sTexGenBlock != NULL)
             loadExecute(m);
     }
diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h
index 4e483ddb11..c8bff4d49f 100644
--- a/include/JSystem/J3DGraphBase/J3DStruct.h
+++ b/include/JSystem/J3DGraphBase/J3DStruct.h
@@ -142,7 +142,7 @@ struct J3DFogInfo {
 struct J3DNBTScaleInfo {
     /* 8032587C */ J3DNBTScaleInfo& operator=(J3DNBTScaleInfo const&);
 
-    /* 0x0 */ bool mbHasScale;
+    /* 0x0 */ u8 mbHasScale;
     /* 0x4 */ Vec mScale;
 };  // Size: 0x10
 
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index 61609050c5..141ec0296e 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -3,7 +3,7 @@
 
 #include <dolphin/gx.h>
 #include <dolphin/mtx.h>
-#include "JSystem/JUtility/JUTAssert.h"
+#include "JSystem/J3DAssert.h"
 
 // Perhaps move to a new J3DEnum.h?
 enum J3DError {
@@ -11,9 +11,11 @@ enum J3DError {
     kJ3DError_Alloc = 4,
 };
 
-enum J3DSysDrawBuffer {
-    /* 0x0 */ J3DSys_OPA_BUFFER_e,
-    /* 0x1 */ J3DSys_XLU_BUFFER_e
+enum J3DSysDrawBuf {
+    /* 0x0 */ J3DSysDrawBuf_Opa,
+    /* 0x1 */ J3DSysDrawBuf_Xlu,
+
+    /* 0x2 */ J3DSysDrawBuf_MAX
 };
 
 class J3DMtxCalc;
@@ -53,25 +55,25 @@ struct J3DSys {
     /* 0x03C */ J3DMatPacket* mMatPacket;
     /* 0x040 */ J3DShapePacket* mShapePacket;
     /* 0x044 */ J3DShape* mShape;
-    /* 0x048 */ J3DDrawBuffer* mDrawBuffer[2];
+    /* 0x048 */ J3DDrawBuffer* mDrawBuffer[J3DSysDrawBuf_MAX];
     /* 0x050 */ u32 mDrawMode;
     /* 0x054 */ u32 mMaterialMode;
     /* 0x058 */ J3DTexture* mTexture;
-    /* 0x05C */ u8 field_0x5c[0x04];
+    /* 0x05C */ u8 unk_0x5c[0x60 - 0x5C];
     /* 0x060 */ u32 mTexCacheRegionNum;
     /* 0x064 */ GXTexRegion mTexCacheRegion[8];
-    /* 0x0E4 */ u8 field_0xe4[0x20];
+    /* 0x0E4 */ u8 unk_0xe4[0x104 - 0xE4];
     /* 0x104 */ Mtx* mModelDrawMtx;
     /* 0x108 */ Mtx33* mModelNrmMtx;
     /* 0x10C */ void* mVtxPos;
     /* 0x110 */ void* mVtxNrm;
-    /* 0x114 */ _GXColor* mVtxCol;
+    /* 0x114 */ GXColor* mVtxCol;
     /* 0x118 */ Vec* mNBTScale;
 
     /* 8030FDE8 */ J3DSys();
     /* 8030FEC0 */ void loadPosMtxIndx(int, u16) const;
     /* 8030FEE4 */ void loadNrmMtxIndx(int, u16) const;
-    /* 8030FF0C */ void setTexCacheRegion(_GXTexCacheSize);
+    /* 8030FF0C */ void setTexCacheRegion(GXTexCacheSize);
     /* 803100BC */ void drawInit();
     /* 8031073C */ void reinitGX();
     /* 8031079C */ void reinitGenMode();
@@ -82,16 +84,15 @@ struct J3DSys {
     /* 80310D44 */ void reinitIndStages();
     /* 80310E3C */ void reinitPixelProc();
 
-    enum DrawMode {
-        /* 0x3 */ OPA_TEX_EDGE = 3,
-        /* 0x4 */ XLU,
+    enum J3DSysDrawMode {
+        J3DSysDrawMode_OpaTexEdge = 3,
+        J3DSysDrawMode_Xlu
     };
 
     MtxP getViewMtx() { return mViewMtx; }
 
-    void setDrawModeOpaTexEdge() { mDrawMode = OPA_TEX_EDGE; }
-
-    void setDrawModeXlu() { mDrawMode = XLU; }
+    void setDrawModeOpaTexEdge() { mDrawMode = J3DSysDrawMode_OpaTexEdge; }
+    void setDrawModeXlu() { mDrawMode = J3DSysDrawMode_Xlu; }
 
     void* getVtxPos() { return mVtxPos; }
     void setVtxPos(void* pVtxPos) { mVtxPos = pVtxPos; }
@@ -99,15 +100,35 @@ struct J3DSys {
     void* getVtxNrm() { return mVtxNrm; }
     void setVtxNrm(void* pVtxNrm) { mVtxNrm = pVtxNrm; }
 
-    void* getVtxCol() const { return mVtxCol; }
-    void setVtxCol(_GXColor* pVtxCol) { mVtxCol = pVtxCol; }
+    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);
+        mDrawBuffer[type] = buffer;
+    }
+
+    J3DDrawBuffer* getDrawBuffer(int type) {
+        J3D_ASSERT_RANGE(121, type >= 0 && type < J3DSysDrawBuf_MAX);
+        return mDrawBuffer[type];
+    }
+
+    void setMatPacket(J3DMatPacket* pPacket) {
+        J3D_ASSERT_NULLPTR(162, pPacket != NULL);
+        mMatPacket = pPacket;
+    }
+
+    void setShapePacket(J3DShapePacket* pPacket) {
+        J3D_ASSERT_NULLPTR(172, pPacket != NULL);
+        mShapePacket = pPacket;
+    }
 
     void setModel(J3DModel* pModel) {
-        J3D_ASSERT(200, pModel, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(200, pModel != NULL);
         mModel = pModel;
     }
-    void setShapePacket(J3DShapePacket* pPacket) { mShapePacket = pPacket; }
-    void setMatPacket(J3DMatPacket* pPacket) { mMatPacket = pPacket; }
+
     J3DMatPacket* getMatPacket() { return mMatPacket; }
     void setMaterialMode(u32 mode) { mMaterialMode = mode; }
 
@@ -124,34 +145,20 @@ struct J3DSys {
 
     void offFlag(u32 flag) { mFlags &= ~flag; }
 
-    bool checkFlag(u32 flag) { return mFlags & flag; }
+    bool checkFlag(u32 flag) { return mFlags & flag ? true : false; }
 
     void setModelDrawMtx(Mtx* pMtxArr) {
+        J3D_ASSERT_NULLPTR(230, pMtxArr);
         mModelDrawMtx = pMtxArr;
         GXSetArray(GX_POS_MTX_ARRAY, mModelDrawMtx, sizeof(*mModelDrawMtx));
     }
 
     void setModelNrmMtx(Mtx33* pMtxArr) {
-        JUT_ASSERT_MSG(241, pMtxArr, "Error : null pointer.");
+        J3D_ASSERT_NULLPTR(241, pMtxArr);
         mModelNrmMtx = pMtxArr;
         GXSetArray(GX_NRM_MTX_ARRAY, mModelNrmMtx, sizeof(*mModelNrmMtx));
     }
 
-    // Type 0: Opa Buffer
-    // Type 1: Xlu Buffer
-    void setDrawBuffer(J3DDrawBuffer* buffer, int type) {
-        J3D_ASSERT(114, type >= 0 && type < 2, "Error : range over.");
-        J3D_ASSERT(115, buffer, "Error : null pointer.");
-        mDrawBuffer[type] = buffer;
-    }
-
-    // Type 0: Opa Buffer
-    // Type 1: Xlu Buffer
-    J3DDrawBuffer* getDrawBuffer(int type) {
-        J3D_ASSERT(121, type >= 0 && type < 2, "Error : range over.");
-        return mDrawBuffer[type];
-    }
-
     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 23ddda86de..e5c06c97c7 100644
--- a/include/JSystem/J3DGraphBase/J3DTevs.h
+++ b/include/JSystem/J3DGraphBase/J3DTevs.h
@@ -153,6 +153,16 @@ struct J3DTevStage {
         return *this;
     }
 
+    J3DTevStage& operator=(J3DTevStage& other) {
+        mTevColorOp = other.mTevColorOp;
+        mTevColorAB = other.mTevColorAB;
+        mTevColorCD = other.mTevColorCD;
+        mTevAlphaOp = other.mTevAlphaOp;
+        mTevAlphaAB = other.mTevAlphaAB;
+        mTevSwapModeInfo = other.mTevSwapModeInfo;
+        return *this;
+    }
+
     /* 0x0 */ u8 field_0x0;
     /* 0x1 */ u8 mTevColorOp;
     /* 0x2 */ u8 mTevColorAB;
@@ -214,6 +224,16 @@ struct J3DIndTevStage {
         J3DGDWriteBPCmd(mInfo | (param_1 + 0x10) * 0x1000000);
     }
 
+    J3DIndTevStage& operator=(const J3DIndTevStage& other) {
+        mInfo = other.mInfo;
+        return *this;
+    }
+
+    J3DIndTevStage& operator=(J3DIndTevStage& other) {
+        mInfo = other.mInfo;
+        return *this;
+    }
+
     /* 0x0 */ u32 mInfo;
 };
 
@@ -264,6 +284,11 @@ struct J3DTevSwapModeTable {
         return *this;
     }
 
+    J3DTevSwapModeTable& operator=(J3DTevSwapModeTable& other) {
+        mIdx = other.mIdx;
+        return *this;
+    }
+
     u8 calcTevSwapTableID(u8 param_0, u8 param_1, u8 param_2, u8 param_3) {
         return 0x40 * param_0 + 0x10 * param_1 + 4 * param_2 + param_3;
     }
@@ -281,6 +306,7 @@ extern const GXColor j3dDefaultAmbInfo;
 extern const GXColorS10 j3dDefaultTevColor;
 extern const GXColor j3dDefaultTevKColor;
 extern u8 j3dAlphaCmpTable[768];
+extern const u8 j3dDefaultNumChans;
 
 struct J3DNBTScale;
 struct J3DTexCoord;
@@ -290,5 +316,9 @@ void loadTexNo(u32 param_0, u16 const& param_1);
 void patchTexNo_PtrToIdx(u32 texID, u16 const& idx);
 bool isTexNoReg(void* param_0);
 u16 getTexNoReg(void* param_0);
+void makeTexCoordTable();
+void makeAlphaCmpTable();
+void makeZModeTable();
+void makeTevSwapTable();
 
 #endif /* J3DTEVS_H */
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 98b1a92295..66b6df3a40 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -2,9 +2,9 @@
 #define J3DTEXTURE_H
 
 #include "JSystem/J3DGraphBase/J3DStruct.h"
-#include "JSystem/JUtility/JUTAssert.h"
+#include "JSystem/J3DAssert.h"
 #include "JSystem/JUtility/JUTTexture.h"
-#include "dolphin/types.h"
+#include <stdint.h>
 
 /**
  * @ingroup jsystem-j3d
@@ -13,25 +13,28 @@
 class J3DTexture {
 private:
     /* 0x0 */ u16 mNum;
-    /* 0x2 */ u16 field_0x2;
+    /* 0x2 */ u16 unk_0x2;
     /* 0x4 */ ResTIMG* mpRes;
 
 public:
-    J3DTexture(u16 num, ResTIMG* res) : mNum(num), field_0x2(0), mpRes(res) {}
-    /* 8031204C */ void loadGX(u16, _GXTexMapID) const;
+    J3DTexture(u16 num, ResTIMG* res) : mNum(num), unk_0x2(0), mpRes(res) {}
+
+    /* 8031204C */ void loadGX(u16, GXTexMapID) const;
     /* 803121A4 */ void entryNum(u16);
     /* 8031221C */ void addResTIMG(u16, ResTIMG const*);
     /* 803366A4 */ virtual ~J3DTexture() {}
 
     u16 getNum() const { return mNum; }
-    ResTIMG* getResTIMG(u16 entry) const {
-        J3D_ASSERT(72, entry < mNum, "Error : range over.");
-        return &mpRes[entry];   
+
+    ResTIMG* getResTIMG(u16 index) const {
+        J3D_ASSERT_RANGE(72, index < mNum);
+        return &mpRes[index];   
     }
-    void setResTIMG(u16 entry, const ResTIMG& timg) {
-        mpRes[entry] = timg;
-        mpRes[entry].imageOffset = ((mpRes[entry].imageOffset + (u32)&timg - (u32)(mpRes + entry)));
-        mpRes[entry].paletteOffset = ((mpRes[entry].paletteOffset + (u32)&timg - (u32)(mpRes + entry)));
+
+    void setResTIMG(u16 index, const ResTIMG& timg) {
+        mpRes[index] = timg;
+        mpRes[index].imageOffset = ((mpRes[index].imageOffset + (uintptr_t)&timg - (uintptr_t)(mpRes + index)));
+        mpRes[index].paletteOffset = ((mpRes[index].paletteOffset + (uintptr_t)&timg - (uintptr_t)(mpRes + index)));
     }
 };
 
@@ -46,9 +49,11 @@ public:
     J3DTexMtx() {
         mTexMtxInfo = j3dDefaultTexMtxInfo;
     }
+
     J3DTexMtx(const J3DTexMtxInfo& info) {
         mTexMtxInfo = info;
     }
+
     /* 803238C4 */ void load(u32) const;
     /* 80323900 */ void calc(const Mtx);
     /* 80323920 */ void calcTexMtx(const Mtx);
@@ -103,7 +108,7 @@ struct J3DTexCoord : public J3DTexCoordInfo {
     void setTexMtxReg(u16 reg) { mTexMtxReg = reg; }
     J3DTexCoord& operator=(const J3DTexCoord& other) {
         // Fake match (__memcpy or = doesn't match)
-        *(u32*)this = *(u32*)&other;
+        *(uintptr_t*)this = *(uintptr_t*)&other;
         return *this;
     }
 
diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h
index 384e132385..45e79de06f 100644
--- a/include/JSystem/J3DGraphBase/J3DTransform.h
+++ b/include/JSystem/J3DGraphBase/J3DTransform.h
@@ -1,8 +1,7 @@
 #ifndef J3DTRANSFORM_H
 #define J3DTRANSFORM_H
 
-#include "JSystem/JGeometry.h"
-#include "dolphin/mtx.h"
+#include <dolphin/mtx.h>
 
 struct J3DTextureSRTInfo;
 
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index 7c46b38a61..38b969f730 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -29,6 +29,7 @@ struct J3DVtxColorCalc {
 class J3DVertexData {
 public:
     J3DVertexData();
+    ~J3DVertexData() {}
 
     void* getVtxPosArray() const { return mVtxPosArray; }
     void* getVtxNrmArray() const { return mVtxNrmArray; }
@@ -38,10 +39,10 @@ public:
     u32 getNrmNum() const { return mNrmNum; }
     u32 getVtxNum() const { return mVtxNum; }
     GXVtxAttrFmtList* getVtxAttrFmtList() const { return mVtxAttrFmtList; }
-    u8 getVtxPosFrac() { return mVtxPosFrac; }
-    u8 getVtxNrmFrac() { return mVtxNrmFrac; }
-    int getVtxPosType() { return mVtxPosType; }
-    int getVtxNrmType() { return mVtxNrmType; }
+    u8 getVtxPosFrac() const { return mVtxPosFrac; }
+    u8 getVtxNrmFrac() const { return mVtxNrmFrac; }
+    int getVtxPosType() const { return mVtxPosType; }
+    int getVtxNrmType() const { return mVtxNrmType; }
 
     void setVtxPosFrac(u8 frac) { mVtxPosFrac = frac; }
     void setVtxPosType(GXCompType type) { mVtxPosType = type; }
@@ -148,8 +149,4 @@ private:
     /* 0x34 */ GXColor* mCurrentVtxCol;
 };  // Size: 0x38
 
-struct VertexNormal {
-    Vec data;
-};
-
 #endif /* J3DVERTEX_H */
diff --git a/include/JSystem/JAudio2/JAISeqDataMgr.h b/include/JSystem/JAudio2/JAISeqDataMgr.h
index bc6e1de468..d4118ffd94 100644
--- a/include/JSystem/JAudio2/JAISeqDataMgr.h
+++ b/include/JSystem/JAudio2/JAISeqDataMgr.h
@@ -2,6 +2,7 @@
 #define JAISEQDATAMGR_H
 
 #include "JSystem/JAudio2/JAISound.h"
+#include <stdint.h>
 
 /**
  * @ingroup jsystem-jaudio
@@ -28,10 +29,10 @@ struct JAISeqData {
  */
 struct JAISeqDataRegion {
     bool intersects(JAISeqData& seqData) const {
-        if ((u32)addr + size < (u32)seqData.field_0x0) {
+        if ((uintptr_t)addr + size < (uintptr_t)seqData.field_0x0) {
             return false;
         }
-        if ((u32)seqData.field_0x0 + seqData.field_0x4 < (u32)addr) {
+        if ((uintptr_t)seqData.field_0x0 + seqData.field_0x4 < (uintptr_t)addr) {
             return false;
         }
         return true;
diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/include/JSystem/JAudio2/JAUStreamAramMgr.h
index 86324e7601..9ce6f094c1 100644
--- a/include/JSystem/JAudio2/JAUStreamAramMgr.h
+++ b/include/JSystem/JAudio2/JAUStreamAramMgr.h
@@ -64,7 +64,7 @@ public:
             if (!this->field_0x4.test(i)) {
                 continue;
             }
-            if ((u32)this->mHeaps[i].getBase() != param_0) {
+            if ((uintptr_t)this->mHeaps[i].getBase() != param_0) {
                 continue;
             }
             this->field_0x4.reset(i);
diff --git a/include/JSystem/JGadget/std-vector.h b/include/JSystem/JGadget/std-vector.h
index 95fb777644..7732a2861d 100644
--- a/include/JSystem/JGadget/std-vector.h
+++ b/include/JSystem/JGadget/std-vector.h
@@ -4,6 +4,7 @@
 #include "JSystem/JGadget/std-memory.h"
 #include <algorithm.h>
 #include <msl_memory.h>
+#include <stdint.h>
 
 namespace JGadget {
 namespace vector {
@@ -105,7 +106,7 @@ struct TVector {
     }
 
     T* insert(T* pos, const T& val) {
-        u32 diff = (int)((u32)pos - (u32)begin()) / 4;
+        u32 diff = (int)((uintptr_t)pos - (uintptr_t)begin()) / 4;
         insert(pos, 1, val);
         return pBegin_ + diff;
     }
@@ -118,7 +119,7 @@ struct TVector {
         if (pBegin_ == 0) {
             return 0;
         }
-        return (int)((u32)pEnd_ - (u32)pBegin_) / 4;
+        return (int)((uintptr_t)pEnd_ - (uintptr_t)pBegin_) / 4;
     }
 
     u32 capacity() { return mCapacity; }
diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h
index 930e66b2d8..f7d68c9776 100644
--- a/include/JSystem/JHostIO/JORMContext.h
+++ b/include/JSystem/JHostIO/JORMContext.h
@@ -4,6 +4,7 @@
 #include <dolphin.h>
 #include "JSystem/JSupport/JSUMemoryStream.h"
 #include "JSystem/JHostIO/JORReflexible.h"
+#include <stdint.h>
 
 #define MCTX_MSG_RESET 0
 #define MCTX_MSG_GET_ROOT_OBJ 2
@@ -29,7 +30,7 @@
 #define DEFINE_GEN_CHECKBOX(T, kind)                                                               \
     void genCheckBox(const char* label, T* pSrc, T mask, u32 style, JOREventListener* pListener,   \
                      u16 posX, u16 posY, u16 width, u16 height) {                                  \
-        genCheckBoxSub(kind, label, (u32)pSrc, style, *pSrc, mask, pListener, posX, posY, width,   \
+        genCheckBoxSub(kind, label, (uintptr_t)pSrc, style, *pSrc, mask, pListener, posX, posY, width,   \
                        height);                                                                    \
     }
 
@@ -43,7 +44,7 @@
 #define DEFINE_GEN_SLIDER(T, kind)                                                                 \
     void genSlider(const char* label, T* pSrc, T rangeMin, T rangeMax, u32 style,                  \
                    JOREventListener* pListener, u16 posX, u16 posY, u16 width, u16 height) {       \
-        genSliderSub(kind, label, (u32)pSrc, style, *pSrc, rangeMin, rangeMax, pListener, posX,    \
+        genSliderSub(kind, label, (uintptr_t)pSrc, style, *pSrc, rangeMin, rangeMax, pListener, posX,    \
                      posY, width, height);                                                         \
     }
 
@@ -57,7 +58,7 @@
 #define DEFINE_START_COMBO_BOX(T, kind)                                                                 \
     void startComboBox(const char* label, T* pSrc, u32 style,                  \
                    JOREventListener* pListener, u16 posX, u16 posY, u16 width, u16 height) {       \
-        startSelectorSub('CMBX', kind, label, (u32)pSrc, style, *pSrc, pListener, posX,    \
+        startSelectorSub('CMBX', kind, label, (uintptr_t)pSrc, style, *pSrc, pListener, posX,    \
                          posY, width, height);                                                         \
     }
 
@@ -70,7 +71,7 @@
 
 #define DEFINE_UPDATE_SLIDER(T)                                                              \
     void updateSlider(u32 mode, T* pSrc, T rangeMin, T rangeMax, u32 param_5) {     \
-        updateSliderSub(mode, (u32) pSrc, *pSrc, rangeMin, rangeMax, param_5);                                                               \
+        updateSliderSub(mode, (uintptr_t)pSrc, *pSrc, rangeMin, rangeMax, param_5);                                                               \
     }
 
 #define DEFINE_UPDATE_SLIDER_ID(T)                                                              \
@@ -252,7 +253,7 @@ public:
     void updateEditBoxID(u32 mode, u32 id, const char* string, u32 param_3, u16 length);
 
     void updateCheckBox(u32 mode, u8* pSrc, u8 mask, u32 param_4) {
-        updateCheckBoxSub(mode, (u32) pSrc, *pSrc, mask, param_4);
+        updateCheckBoxSub(mode, (uintptr_t)pSrc, *pSrc, mask, param_4);
     }
 
     void updateCheckBoxID(u32 mode, u32 id, u8 value, u8 mask, u32 param_4) {
diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h
index 5ef7b026f7..59b914dc2d 100644
--- a/include/JSystem/JKernel/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap.h
@@ -2,6 +2,7 @@
 #define JKREXPHEAP_H
 
 #include "JSystem/JKernel/JKRHeap.h"
+#include <stdint.h>
 
 /**
  * @ingroup jsystem-jkernel
@@ -34,7 +35,7 @@ public:
         CMemBlock* getNextBlock() const { return mNext; }
         u32 getSize() const { return size; }
         u8 getGroupId() const { return mGroupId; }
-        static CMemBlock* getBlock(void* data) { return (CMemBlock*)((u32)data + -0x10); }
+        static CMemBlock* getBlock(void* data) { return (CMemBlock*)((uintptr_t)data + -0x10); }
 
     private:
         /* 0x0 */ u16 mMagic;
diff --git a/include/JSystem/JMath/JMATrigonometric.h b/include/JSystem/JMath/JMATrigonometric.h
index 1b88975794..25b79a72dc 100644
--- a/include/JSystem/JMath/JMATrigonometric.h
+++ b/include/JSystem/JMath/JMATrigonometric.h
@@ -2,8 +2,9 @@
 #define JMATRIGONOMETRIC_H
 
 #include "dolphin/types.h"
-#include "utility.h"
+#include <utility.h>
 
+namespace JMath {
 template<typename T>
 struct TAngleConstant_;
 
@@ -19,7 +20,6 @@ struct TAngleConstant_<f32> {
     static f32 RADIAN_TO_DEGREE_FACTOR() { return 180.0f / RADIAN_DEG180(); }
 };
 
-namespace JMath {
 /**
  * @ingroup jsystem-jmath
  * 
@@ -73,30 +73,31 @@ struct TAtanTable {
  * @ingroup jsystem-jmath
  * 
  */
+template<int N, typename T>
 struct TAsinAcosTable {
-    f32 table[1025];
+    T table[1025];
     u8 pad[0x1C];
 
-    f32 acos_(f32 x) {
+    T acos_(T x) const {
         if (x >= 1.0f) {
             return 0.0f;
         } else if (x <= -1.0f) {
-            return TAngleConstant_<f32>::RADIAN_DEG180();
+            return TAngleConstant_<T>::RADIAN_DEG180();
         } else if (x < 0.0f) {
-            return table[(u32)(-x * 1023.5f)] + TAngleConstant_<f32>::RADIAN_DEG090();
+            return table[(u32)(-x * 1023.5f)] + TAngleConstant_<T>::RADIAN_DEG090();
         } else {
-            return TAngleConstant_<f32>::RADIAN_DEG090() - table[(u32)(x * 1023.5f)];
+            return TAngleConstant_<T>::RADIAN_DEG090() - table[(u32)(x * 1023.5f)];
         }
     }
 
-    f32 acosDegree(f32 x) {
-        return acos_(x) * TAngleConstant_<f32>::RADIAN_TO_DEGREE_FACTOR();
+    T acosDegree(T x) const {
+        return acos_(x) * TAngleConstant_<T>::RADIAN_TO_DEGREE_FACTOR();
     }
 };
 
 extern TSinCosTable<13, f32> sincosTable_;
 extern TAtanTable atanTable_;
-extern TAsinAcosTable asinAcosTable_;
+extern TAsinAcosTable<1024, f32> asinAcosTable_;
 
 inline f32 acosDegree(f32 x) {
     return asinAcosTable_.acosDegree(x);
diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h
index eb7932e848..4d9dd66608 100644
--- a/include/JSystem/JMath/JMath.h
+++ b/include/JSystem/JMath/JMath.h
@@ -80,6 +80,11 @@ inline f32 JMAHermiteInterpolation(register f32 p1, register f32 p2, register f3
 
 namespace JMath {
 
+template <typename T>
+inline T fastSqrt(T value) {
+    return JMAFastSqrt(value);
+}
+
 inline f32 fastReciprocal(f32 value) {
     return JMAFastReciprocal(value);
 }
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h
index fec8d3128c..21a2f590ad 100644
--- a/include/JSystem/JParticle/JPAEmitter.h
+++ b/include/JSystem/JParticle/JPAEmitter.h
@@ -2,6 +2,7 @@
 #define JPAEMITTER_H
 
 #include <dolphin/gx.h>
+#include <stdint.h>
 #include "JSystem/JParticle/JPAResource.h"
 #include "JSystem/JParticle/JPAList.h"
 #include "JSystem/JParticle/JPARandom.h"
@@ -197,8 +198,8 @@ public:
     void stopDrawParticle() { setStatus(JPAEmtrStts_StopDraw); }
     void playDrawParticle() { clearStatus(JPAEmtrStts_StopDraw); }
 
-    u32 getUserWork() { return mpUserWork; }
-    void setUserWork(u32 userWork) { mpUserWork = userWork; }
+    uintptr_t getUserWork() { return mpUserWork; }
+    void setUserWork(uintptr_t userWork) { mpUserWork = userWork; }
     u32 getParticleNumber() const {
         return mAlivePtclBase.getNum() + mAlivePtclChld.getNum();
     }
diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h
index c1f98384d6..a85b8dfb57 100644
--- a/include/JSystem/JStudio/JStudio/jstudio-object.h
+++ b/include/JSystem/JStudio/JStudio/jstudio-object.h
@@ -225,7 +225,7 @@ struct TAdaptor_actor : public TAdaptor {
     };
 
     TAdaptor_actor()
-        : TAdaptor(mValue, ARRAY_SIZE(mValue))
+        : TAdaptor(mValue, ARRAY_SIZEU(mValue))
         , mValue()
     {
     }
diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h
index c4a47c61a9..b3bb337951 100644
--- a/include/JSystem/JSupport/JSupport.h
+++ b/include/JSystem/JSupport/JSupport.h
@@ -2,17 +2,18 @@
 #define JSUPPORT_H
 
 #include <dolphin.h>
+#include <stdint.h>
 
 /**
 * @ingroup jsystem-jsupport
 * 
 */
 template <typename T>
-T* JSUConvertOffsetToPtr(const void* ptr, u32 offset) {
+T* JSUConvertOffsetToPtr(const void* ptr, uintptr_t offset) {
     if (offset == 0) {
         return NULL;
     } else {
-        return (T*)((s32)ptr + (s32)offset);
+        return (T*)((intptr_t)ptr + (intptr_t)offset);
     }
 }
 
@@ -25,7 +26,7 @@ T* JSUConvertOffsetToPtr(const void* ptr, const void* offset) {
     if (offset == NULL) {
         return NULL;
     } else {
-        return (T*)((s32)ptr + (s32)offset);
+        return (T*)((intptr_t)ptr + (intptr_t)offset);
     }
 }
 
diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h
index 2e7b126dc0..c33f590944 100644
--- a/include/JSystem/JUtility/JUTAssert.h
+++ b/include/JSystem/JUtility/JUTAssert.h
@@ -13,7 +13,6 @@
 #define JUT_ASSERT_MSG_F(LINE, COND, MSG, ...) \
     (COND) ? (void)0 : (JUTAssertion::showAssert_f(JUTAssertion::getSDevice(), __FILE__, LINE, MSG, __VA_ARGS__), OSPanic(__FILE__, LINE, "Halt"));
 
-#define J3D_ASSERT(LINE, COND, MSG) JUT_ASSERT_MSG(LINE, (COND) != 0, MSG)
 #define J3D_PANIC(LINE, COND, MSG) ((COND) != 0 || (OSPanic(__FILE__, LINE, MSG), 0));
 
 #define JUT_PANIC(LINE, TEXT)                                                                      \
@@ -36,7 +35,6 @@
 #define JUT_ASSERT(...) (void)0;
 #define JUT_ASSERT_MSG(...) (void)0;
 #define JUT_ASSERT_MSG_F(...) (void)0;
-#define J3D_ASSERT(...) (void)0;
 #define J3D_PANIC(...) (void)0;
 #define JUT_PANIC(...)
 #define JUT_WARN(...)
diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h
index 606cd5811c..c42bc09b1f 100644
--- a/include/JSystem/JUtility/JUTTexture.h
+++ b/include/JSystem/JUtility/JUTTexture.h
@@ -2,6 +2,7 @@
 #define JUTTEXTURE_H
 
 #include <dolphin/gx.h>
+#include <stdint.h>
 
 class JUTPalette;
 
@@ -24,7 +25,7 @@ struct ResTIMG {
     /* 0x08 */ u8 indexTexture;
     /* 0x09 */ u8 colorFormat;
     /* 0x0A */ u16 numColors;
-    /* 0x0C */ u32 paletteOffset;
+    /* 0x0C */ uintptr_t paletteOffset;
     /* 0x10 */ u8 mipmapEnabled;
     /* 0x11 */ u8 doEdgeLOD;
     /* 0x12 */ u8 biasClamp;
@@ -36,7 +37,7 @@ struct ResTIMG {
     /* 0x18 */ u8 mipmapCount;
     /* 0x19 */ u8 unknown;
     /* 0x1A */ s16 LODBias;
-    /* 0x1C */ u32 imageOffset;
+    /* 0x1C */ uintptr_t imageOffset;
 };  // Size: 0x20
 
 /**
diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h
index b57d959b4c..91815f9d58 100644
--- a/include/d/actor/d_a_alink.h
+++ b/include/d/actor/d_a_alink.h
@@ -4332,7 +4332,7 @@ public:
     /* 0x032C0 */ s16 field_0x32c0[2];
     /* 0x032C4 */ u16 field_0x32c4[2];
     /* 0x032C8 */ u32 field_0x32c8;
-    /* 0x032CC */ u32 field_0x32cc;
+    /* 0x032CC */ uintptr_t field_0x32cc;
     /* 0x032D0 */ u32 field_0x32d0;
     /* 0x032D4 */ u32 field_0x32d4;
     /* 0x032D8 */ firePointEff_c field_0x32d8[4];
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index 3daf9c5724..ed2ba1cb40 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -192,7 +192,7 @@ public:
 class dDlst_shadowRealPoly_c : public dDlst_shadowPoly_c {
 public:
     /* 800569A0 */ virtual dDlst_shadowTri_c* getTri() { return mShadowTri; }
-    /* 800569A8 */ virtual s32 getTriMax() { return ARRAY_SIZE(mShadowTri); }
+    /* 800569A8 */ virtual s32 getTriMax() { return ARRAY_SIZEU(mShadowTri); }
 
     /* 0x8 */ dDlst_shadowTri_c mShadowTri[256];
 };
@@ -346,8 +346,8 @@ public:
     J3DDrawBuffer* getOpaListBG() { return mDrawBuffers[DB_OPA_LIST_BG]; }
     J3DDrawBuffer* getOpaListDark() { return mDrawBuffers[DB_OPA_LIST_DARK]; }
     J3DDrawBuffer* getXluListBG() { return mDrawBuffers[DB_XLU_LIST_BG]; }
-    void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, J3DSys_XLU_BUFFER_e); }
-    void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, J3DSys_OPA_BUFFER_e); }
+    void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, J3DSysDrawBuf_Xlu); }
+    void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, J3DSysDrawBuf_Opa); }
     void setXluListSky() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_SKY]); }
     void setOpaListSky() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_SKY]); }
     void setXluListDark() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK]); }
diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h
index 5ce6322755..9da681c3f0 100644
--- a/include/d/d_resorce.h
+++ b/include/d/d_resorce.h
@@ -81,50 +81,50 @@ public:
     static int syncAllRes(dRes_info_c* i_resInfo, int i_infoNum);
 
     int setObjectRes(const char* i_arcName, u8 i_mountDirection, JKRHeap* i_heap) {
-        return setRes(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo), "/res/Object/", i_mountDirection,
+        return setRes(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo), "/res/Object/", i_mountDirection,
                       i_heap);
     }
 
     void* getObjectRes(const char* i_arcName, const char* resName) {
-        return getRes(i_arcName, resName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
+        return getRes(i_arcName, resName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
     }
 
     void* getObjectRes(const char* i_arcName, s32 i_index) {
-        return getRes(i_arcName, i_index, mObjectInfo, ARRAY_SIZE(mObjectInfo));
+        return getRes(i_arcName, i_index, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
     }
 
     void* getObjectIDRes(const char* i_arcName, u16 i_resID) {
-        return getIDRes(i_arcName, i_resID, mObjectInfo, ARRAY_SIZE(mObjectInfo));
+        return getIDRes(i_arcName, i_resID, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
     }
 
     int syncObjectRes(const char* i_arcName) {
-        return syncRes(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
+        return syncRes(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
     }
 
     int syncStageRes(const char* i_arcName) {
-        return syncRes(i_arcName, mStageInfo, ARRAY_SIZE(mStageInfo));
+        return syncRes(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
     }
 
-    int syncAllObjectRes() { return syncAllRes(mObjectInfo, ARRAY_SIZE(mObjectInfo)); }
+    int syncAllObjectRes() { return syncAllRes(mObjectInfo, ARRAY_SIZEU(mObjectInfo)); }
 
     int deleteObjectRes(const char* i_arcName) {
-        return deleteRes(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
+        return deleteRes(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
     }
 
     int deleteStageRes(const char* i_arcName) {
-        return deleteRes(i_arcName, mStageInfo, ARRAY_SIZE(mStageInfo));
+        return deleteRes(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
     }
 
     void* getStageRes(const char* i_arcName, const char* i_resName) {
-        return getRes(i_arcName, i_resName, mStageInfo, ARRAY_SIZE(mStageInfo));
+        return getRes(i_arcName, i_resName, mStageInfo, ARRAY_SIZEU(mStageInfo));
     }
 
     dRes_info_c* getObjectResInfo(const char* i_arcName) {
-        return getResInfo(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
+        return getResInfo(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
     }
 
     dRes_info_c* getStageResInfo(const char* i_arcName) {
-        return getResInfo(i_arcName, mStageInfo, ARRAY_SIZE(mStageInfo));
+        return getResInfo(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
     }
 
     /* 0x0000 */ dRes_info_c mObjectInfo[128];
diff --git a/include/global.h b/include/global.h
index 81afcd5f47..7f725ba12c 100644
--- a/include/global.h
+++ b/include/global.h
@@ -23,7 +23,8 @@
 
 #define ALIGN_DECL(ALIGNMENT) __attribute__((aligned(ALIGNMENT)))
 
-#define ARRAY_SIZE(o) (sizeof((o)) / sizeof(*(o)))
+#define ARRAY_SIZE(o) (s32)(sizeof((o)) / sizeof(*(o)))
+#define ARRAY_SIZEU(o) (sizeof((o)) / sizeof(*(o)))
 
 // Align X to the previous N bytes (N must be power of two)
 #define ALIGN_PREV(X, N) ((X) & ~((N)-1))
diff --git a/src/JSystem/J2DGraph/J2DPictureEx.cpp b/src/JSystem/J2DGraph/J2DPictureEx.cpp
index 8d45c40a70..56b77ccf6f 100644
--- a/src/JSystem/J2DGraph/J2DPictureEx.cpp
+++ b/src/JSystem/J2DGraph/J2DPictureEx.cpp
@@ -1217,7 +1217,7 @@ void J2DPictureEx::setAnimation(J2DAnmVtxColor* anm) {
             if (field_0x158[i] != 0xffff) {
                 for (u16 j = 0; j < anm_table_num; j++) {
                     J3DAnmVtxColorIndexData* data = anm->getAnmVtxColorIndexData(0, j);
-                    u16* index = anm->getVtxColorIndexPointer(0) + (u32)data->mpData;
+                    u16* index = anm->getVtxColorIndexPointer(0) + (uintptr_t)data->mpData;
                     for (u16 k = 0; k < data->mNum; k++) {
                         if (index[k] == field_0x158[i]) {
                             field_0x198 = anm;
@@ -1255,7 +1255,7 @@ const J2DAnmTransform* J2DPictureEx::animationPane(J2DAnmTransform const* anm) {
             if (field_0x19c & (1 << i)) {
                 for (u16 j = 0; j < anm_table_num; j++) {
                     J3DAnmVtxColorIndexData* data = field_0x198->getAnmVtxColorIndexData(0, j);
-                    u16* index = field_0x198->getVtxColorIndexPointer(0) + (u32)data->mpData;
+                    u16* index = field_0x198->getVtxColorIndexPointer(0) + (uintptr_t)data->mpData;
                     for (u16 k = 0; k < data->mNum; k++) {
                         if (index[k] == field_0x158[i]) {
                             field_0x198->getColor(0, j, &mCornerColor[i]);
diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp
index d1bc81352c..18c2e2d9b2 100644
--- a/src/JSystem/J2DGraph/J2DPrint.cpp
+++ b/src/JSystem/J2DGraph/J2DPrint.cpp
@@ -237,7 +237,7 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3,
             b2ByteCharacter = true;
         }
 
-        if (iCharacter == 0 || ((u32)pString - (u32)pStringStart) > length) {
+        if (iCharacter == 0 || ((uintptr_t)pString - (uintptr_t)pStringStart) > length) {
             if (!param_6 && param_3 != NULL) {
                 param_3[someIndex] = 0.5f + f31;
             }
@@ -284,7 +284,7 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3,
                         f31 = 0.0f;
                     }
                 }
-            } else if (b2ByteCharacter && ((u32)pString - (u32)pStringStart > (u32)length)) {
+            } else if (b2ByteCharacter && ((uintptr_t)pString - (uintptr_t)pStringStart > (u32)length)) {
                 if (!param_6 && param_3 != NULL) {
                     param_3[someIndex] = 0.5f + f31;
                 }
@@ -560,8 +560,8 @@ s32 J2DPrint::getNumberS32(const u8** ppu8String, s32 defaultValue, s32 errorVal
         number = strtol((char*)*ppu8String, &pEnd, base);
     } else if (base == 16) {
         number = strtoul((char*)*ppu8String, &pEnd, base);
-        if ((u32)pEnd - (u32)*ppu8String != 8) {
-            if ((u32)pEnd - (u32)*ppu8String == 6) {
+        if ((uintptr_t)pEnd - (uintptr_t)*ppu8String != 8) {
+            if ((uintptr_t)pEnd - (uintptr_t)*ppu8String == 6) {
                 number = (number << 8) | 0xFF;
             } else {
                 *ppu8String = pStringStart;
@@ -600,8 +600,8 @@ f32 J2DPrint::getNumberF32(const u8** ppu8String, f32 defaultValue, f32 errorVal
         number = strtol((char*)*ppu8String, &pEnd, base);
     } else if (base == 16) {
         number = strtoul((char*)*ppu8String, &pEnd, base);
-        if ((u32)pEnd - (u32)*ppu8String != 8) {
-            if ((u32)pEnd - (u32)*ppu8String == 6) {
+        if ((uintptr_t)pEnd - (uintptr_t)*ppu8String != 8) {
+            if ((uintptr_t)pEnd - (uintptr_t)*ppu8String == 6) {
                 number = (number << 8) | 0xFF;
             } else {
                 *ppu8String = pStringStart;
diff --git a/src/JSystem/J2DGraph/J2DWindowEx.cpp b/src/JSystem/J2DGraph/J2DWindowEx.cpp
index 7bf755fdd2..238130c634 100644
--- a/src/JSystem/J2DGraph/J2DWindowEx.cpp
+++ b/src/JSystem/J2DGraph/J2DWindowEx.cpp
@@ -920,7 +920,7 @@ void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) {
                 for (u16 j = 0; j < uVar3; j++) {
                     J3DAnmVtxColorIndexData* puVar1 = param_0->getAnmVtxColorIndexData(0, j);
                     u16* indexPointer = param_0->getVtxColorIndexPointer(0);
-                    u16* indexPointer2 = indexPointer + (u32)puVar1->mpData;
+                    u16* indexPointer2 = indexPointer + (uintptr_t)puVar1->mpData;
                     for (u16 k = 0; k < puVar1->mNum; k++) {
                         if (indexPointer2[k] == field_0x168[i]) {
                             mAnmVtxColor = param_0;
@@ -964,7 +964,7 @@ const J2DAnmTransform* J2DWindowEx::animationPane(J2DAnmTransform const* param_0
                 for (u16 j = 0; j < uVar3; j++) {
                     J3DAnmVtxColorIndexData* puVar1 = mAnmVtxColor->getAnmVtxColorIndexData(0, j);
                     u16* indexPointer = mAnmVtxColor->getVtxColorIndexPointer(0);
-                    u16* indexPointer2 = indexPointer + (u32)puVar1->mpData;
+                    u16* indexPointer2 = indexPointer + (uintptr_t)puVar1->mpData;
                     for (u16 k = 0; k < puVar1->mNum; k++) {
                         if (indexPointer2[k] == field_0x168[i]) {
                             mAnmVtxColor->getColor(0, j, local_38[i]);
diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
index 78f0cd70ab..caf7a91a91 100644
--- a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
@@ -1,19 +1,13 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DAnimation
-//
-
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "JSystem/J3DGraphBase/J3DStruct.h"
 #include "JSystem/JMath/JMath.h"
-#include "dolphin/os.h"
 
 /* 803283FC-8032842C 322D3C 0030+00 0/0 25/25 285/285 .text            init__12J3DFrameCtrlFs */
-void J3DFrameCtrl::init(s16 i_end) {
-    mAttribute = 2;
+void J3DFrameCtrl::init(s16 endFrame) {
+    mAttribute = EMode_LOOP;
     mState = 0;
     mStart = 0;
-    mEnd = i_end;
+    mEnd = endFrame;
     mLoop = 0;
     mRate = 1.0f;
     mFrame = 0.0f;
@@ -21,9 +15,8 @@ void J3DFrameCtrl::init(s16 i_end) {
 
 /* 8032842C-803289CC 322D6C 05A0+00 0/0 92/92 382/382 .text            checkPass__12J3DFrameCtrlFf
  */
-int J3DFrameCtrl::checkPass(f32 pass_frame) {
-    f32 cur_frame = mFrame;
-    f32 next_frame = cur_frame + mRate;
+int J3DFrameCtrl::checkPass(f32 passFrame) {
+    f32 next_frame = mFrame + mRate;
 
     switch (mAttribute) {
     case 0:
@@ -36,20 +29,20 @@ int J3DFrameCtrl::checkPass(f32 pass_frame) {
             next_frame = mEnd - 0.001f;
         }
 
-        if (cur_frame <= next_frame) {
-            if (cur_frame <= pass_frame && pass_frame < next_frame) {
+        if (mFrame <= next_frame) {
+            if (mFrame <= passFrame && passFrame < next_frame) {
                 return true;
             } else {
                 return false;
             }
         }
 
-        if (next_frame <= pass_frame && pass_frame < cur_frame) {
+        if (next_frame <= passFrame && passFrame < mFrame) {
             return true;
         }
         return false;
     case 2:
-        if (cur_frame < mStart) {
+        if (mFrame < mStart) {
             while (next_frame < mStart) {
                 if (mLoop - mStart <= 0.0f) {
                     break;
@@ -57,12 +50,12 @@ int J3DFrameCtrl::checkPass(f32 pass_frame) {
                 next_frame += mLoop - mStart;
             }
 
-            if (next_frame <= pass_frame && pass_frame < mLoop) {
+            if (next_frame <= passFrame && passFrame < mLoop) {
                 return true;
             } else {
                 return false;
             }
-        } else if (mEnd <= cur_frame) {
+        } else if (mEnd <= mFrame) {
             while (next_frame >= mEnd) {            
                 if (mEnd - mLoop <= 0.0f) {
                     break;
@@ -70,7 +63,7 @@ int J3DFrameCtrl::checkPass(f32 pass_frame) {
                 next_frame -= mEnd - mLoop;
             }
 
-            if (mLoop <= pass_frame && pass_frame < next_frame) {
+            if (mLoop <= passFrame && passFrame < next_frame) {
                 return true;
             } else {
                 return false;
@@ -83,7 +76,7 @@ int J3DFrameCtrl::checkPass(f32 pass_frame) {
                 next_frame += mLoop - mStart;
             }
 
-            if ((mStart <= pass_frame && pass_frame < cur_frame) || (next_frame <= pass_frame && pass_frame < mLoop)) {
+            if ((mStart <= passFrame && passFrame < mFrame) || (next_frame <= passFrame && passFrame < mLoop)) {
                 return true;
             } else {
                 return false;
@@ -97,18 +90,18 @@ int J3DFrameCtrl::checkPass(f32 pass_frame) {
                 next_frame -= mEnd - mLoop;
             }
 
-            if ((cur_frame <= pass_frame && pass_frame < mEnd) || (mLoop <= pass_frame && pass_frame < next_frame)) {
+            if ((mFrame <= passFrame && passFrame < mEnd) || (mLoop <= passFrame && passFrame < next_frame)) {
                 return true;
             } else {
                 return false;
             }
-        } else if (cur_frame <= next_frame) {
-            if (cur_frame <= pass_frame && pass_frame < next_frame) {
+        } else if (mFrame <= next_frame) {
+            if (mFrame <= passFrame && passFrame < next_frame) {
                 return true;
             } else {
                 return false;
             }
-        } else if (next_frame <= pass_frame && pass_frame < cur_frame) {
+        } else if (next_frame <= passFrame && passFrame < mFrame) {
             return true;
         }
         return false;
@@ -122,15 +115,15 @@ int J3DFrameCtrl::checkPass(f32 pass_frame) {
             next_frame = mStart;
         }
 
-        if (cur_frame <= next_frame) {
-            if (cur_frame <= pass_frame && pass_frame < next_frame) {
+        if (mFrame <= next_frame) {
+            if (mFrame <= passFrame && passFrame < next_frame) {
                 return true;
             } else {
                 return false;
             }
         }
 
-        if (next_frame <= pass_frame && pass_frame < cur_frame) {
+        if (next_frame <= passFrame && passFrame < mFrame) {
             return true;
         }
         return false;
@@ -144,48 +137,49 @@ int J3DFrameCtrl::checkPass(f32 pass_frame) {
 void J3DFrameCtrl::update() {
     mState = 0;
     mFrame += mRate;
+
     switch (mAttribute) {
-    case 0:
+    case EMode_NONE:
         if (mFrame < mStart) {
             mFrame = mStart;
             mRate = 0.0f;
-            mState |= 1;
+            mState |= (u8)1;
         }
         if (mFrame >= mEnd) {
             mFrame = mEnd - 0.001f;
             mRate = 0.0f;
-            mState |= 1;
+            mState |= (u8)1;
         }
         break;
-    case 1:
+    case EMode_RESET:
         if (mFrame < mStart) {
             mFrame = mStart;
             mRate = 0.0f;
-            mState |= 1;
+            mState |= (u8)1;
         }
         if (mFrame >= mEnd) {
             mFrame = mStart;
             mRate = 0.0f;
-            mState |= 1;
+            mState |= (u8)1;
         }
         break;
-    case 2:
+    case EMode_LOOP:
         while (mFrame < mStart) {
-            mState |= 2;
+            mState |= (u8)2;
             if (mLoop - mStart <= 0.0f) {
                 break;
             }
             mFrame += mLoop - mStart;
         }
         while (mFrame >= mEnd) {
-            mState |= 2;
+            mState |= (u8)2;
             if (mEnd - mLoop <= 0.0f) {
                 break;
             }
             mFrame -= mEnd - mLoop;
         }
         break;
-    case 3:
+    case EMode_REVERSE:
         if (mFrame >= mEnd) {
             mFrame = mEnd - (mFrame - mEnd);
             mRate = -mRate;
@@ -193,10 +187,10 @@ void J3DFrameCtrl::update() {
         if (mFrame < mStart) {
             mFrame = mStart - (mFrame - mStart);
             mRate = 0.0f;
-            mState |= 1;
+            mState |= (u8)1;
         }
         break;
-    case 4:
+    case EMode_LOOP_REVERSE:
         if (mFrame >= mEnd - 1.0f) {
             mFrame = (mEnd - 1.0f) - (mFrame - (mEnd - 1.0f));
             mRate = -mRate;
@@ -204,19 +198,18 @@ void J3DFrameCtrl::update() {
         if (mFrame < mStart) {
             mFrame = mStart - (mFrame - mStart);
             mRate = -mRate;
-            mState |= 2;
+            mState |= (u8)2;
         }
         break;
     }
 }
 
-
 /* 80328E40-80328E90 323780 0050+00 0/0 3/3 0/0 .text            __ct__15J3DAnmTransformFsPfPsPf */
-J3DAnmTransform::J3DAnmTransform(s16 param_0, f32* param_1, s16* param_2, f32* param_3)
- : J3DAnmBase(param_0) {
-    mScaleData = param_1;
-    mRotData = param_2;
-    mTransData = param_3;
+J3DAnmTransform::J3DAnmTransform(s16 frameMax, f32* pScaleData, s16* pRotData, f32* pTransData)
+ : J3DAnmBase(frameMax) {
+    mScaleData = pScaleData;
+    mRotData = pRotData;
+    mTransData = pTransData;
     field_0x18 = 0;
     field_0x1a = 0;
     field_0x1c = 0;
@@ -225,169 +218,207 @@ J3DAnmTransform::J3DAnmTransform(s16 param_0, f32* param_1, s16* param_2, f32* p
 
 /* 80328E90-803291F0 3237D0 0360+00 1/0 0/0 0/0 .text
  * getTransform__19J3DAnmTransformFullCFUsP16J3DTransformInfo   */
-void J3DAnmTransformFull::getTransform(u16 i_index, J3DTransformInfo* o_transform) const {
-    u16 idx = i_index * 3;
+void J3DAnmTransformFull::getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
+    J3D_ASSERT_RANGE(317, jointNo >= 0 && jointNo < field_0x1e);
+    J3D_ASSERT_NULLPTR(318, pTransform != NULL);
+
+    u16 idx = jointNo * 3;
     J3DAnmTransformFullTable* entryX = &mAnmTable[idx];
     J3DAnmTransformFullTable* entryY = &mAnmTable[idx + 1];
     J3DAnmTransformFullTable* entryZ = &mAnmTable[idx + 2];
+
     if (mFrame < 0.0f) {
-        o_transform->mScale.x = mScaleData[entryX->mScaleOffset];
-        o_transform->mScale.y = mScaleData[entryY->mScaleOffset];
-        o_transform->mScale.z = mScaleData[entryZ->mScaleOffset];
-        o_transform->mRotation.x = mRotData[entryX->mRotationOffset];
-        o_transform->mRotation.y = mRotData[entryY->mRotationOffset];
-        o_transform->mRotation.z = mRotData[entryZ->mRotationOffset];
-        o_transform->mTranslate.x = mTransData[entryX->mTranslateOffset];
-        o_transform->mTranslate.y = mTransData[entryY->mTranslateOffset];
-        o_transform->mTranslate.z = mTransData[entryZ->mTranslateOffset];
+        pTransform->mScale.x = mScaleData[entryX->mScaleOffset];
+        pTransform->mScale.y = mScaleData[entryY->mScaleOffset];
+        pTransform->mScale.z = mScaleData[entryZ->mScaleOffset];
+
+        pTransform->mRotation.x = mRotData[entryX->mRotationOffset];
+        pTransform->mRotation.y = mRotData[entryY->mRotationOffset];
+        pTransform->mRotation.z = mRotData[entryZ->mRotationOffset];
+
+        pTransform->mTranslate.x = mTransData[entryX->mTranslateOffset];
+        pTransform->mTranslate.y = mTransData[entryY->mTranslateOffset];
+        pTransform->mTranslate.z = mTransData[entryZ->mTranslateOffset];
     } else {
+        u32 frame_max;
         u32 frame = (int)(mFrame + 0.5f);
-        if (frame >= entryX->mScaleMaxFrame) {
-            o_transform->mScale.x = mScaleData[entryX->mScaleOffset + (entryX->mScaleMaxFrame - 1)];
+
+        frame_max = entryX->mScaleMaxFrame;
+        if (frame >= frame_max) {
+            pTransform->mScale.x = mScaleData[entryX->mScaleOffset + (frame_max - 1)];
         } else {
-            o_transform->mScale.x = mScaleData[entryX->mScaleOffset + frame];
+            pTransform->mScale.x = mScaleData[entryX->mScaleOffset + frame];
         }
-        if (frame >= entryX->mRotationMaxFrame) {
-            o_transform->mRotation.x =
-                mRotData[entryX->mRotationOffset + (entryX->mRotationMaxFrame - 1)];
+
+        frame_max = entryX->mRotationMaxFrame;
+        if (frame >= frame_max) {
+            pTransform->mRotation.x = mRotData[entryX->mRotationOffset + (frame_max - 1)];
         } else {
-            o_transform->mRotation.x = mRotData[entryX->mRotationOffset + frame];
+            pTransform->mRotation.x = mRotData[entryX->mRotationOffset + frame];
         }
-        if (frame >= entryX->mTranslateMaxFrame) {
-            o_transform->mTranslate.x =
-                mTransData[entryX->mTranslateOffset + (entryX->mTranslateMaxFrame - 1)];
+
+        frame_max = entryX->mTranslateMaxFrame;
+        if (frame >= frame_max) {
+            pTransform->mTranslate.x = mTransData[entryX->mTranslateOffset + (frame_max - 1)];
         } else {
-            o_transform->mTranslate.x = mTransData[entryX->mTranslateOffset + frame];
+            pTransform->mTranslate.x = mTransData[entryX->mTranslateOffset + frame];
         }
-        if (frame >= entryY->mScaleMaxFrame) {
-            o_transform->mScale.y = mScaleData[entryY->mScaleOffset + (entryY->mScaleMaxFrame - 1)];
+
+        frame_max = entryY->mScaleMaxFrame;
+        if (frame >= frame_max) {
+            pTransform->mScale.y = mScaleData[entryY->mScaleOffset + (frame_max - 1)];
         } else {
-            o_transform->mScale.y = mScaleData[entryY->mScaleOffset + frame];
+            pTransform->mScale.y = mScaleData[entryY->mScaleOffset + frame];
         }
-        if (frame >= entryY->mRotationMaxFrame) {
-            o_transform->mRotation.y =
-                mRotData[entryY->mRotationOffset + (entryY->mRotationMaxFrame - 1)];
+
+        frame_max = entryY->mRotationMaxFrame;
+        if (frame >= frame_max) {
+            pTransform->mRotation.y = mRotData[entryY->mRotationOffset + (frame_max - 1)];
         } else {
-            o_transform->mRotation.y = mRotData[entryY->mRotationOffset + frame];
+            pTransform->mRotation.y = mRotData[entryY->mRotationOffset + frame];
         }
-        if (frame >= entryY->mTranslateMaxFrame) {
-            o_transform->mTranslate.y =
-                mTransData[entryY->mTranslateOffset + (entryY->mTranslateMaxFrame - 1)];
+
+        frame_max = entryY->mTranslateMaxFrame;
+        if (frame >= frame_max) {
+            pTransform->mTranslate.y = mTransData[entryY->mTranslateOffset + (frame_max - 1)];
         } else {
-            o_transform->mTranslate.y = mTransData[entryY->mTranslateOffset + frame];
+            pTransform->mTranslate.y = mTransData[entryY->mTranslateOffset + frame];
         }
-        if (frame >= entryZ->mScaleMaxFrame) {
-            o_transform->mScale.z = mScaleData[entryZ->mScaleOffset + (entryZ->mScaleMaxFrame - 1)];
+
+        frame_max = entryZ->mScaleMaxFrame;
+        if (frame >= frame_max) {
+            pTransform->mScale.z = mScaleData[entryZ->mScaleOffset + (frame_max - 1)];
         } else {
-            o_transform->mScale.z = mScaleData[entryZ->mScaleOffset + frame];
+            pTransform->mScale.z = mScaleData[entryZ->mScaleOffset + frame];
         }
-        if (frame >= entryZ->mRotationMaxFrame) {
-            o_transform->mRotation.z =
-                mRotData[entryZ->mRotationOffset + (entryZ->mRotationMaxFrame - 1)];
+
+        frame_max = entryZ->mRotationMaxFrame;
+        if (frame >= frame_max) {
+            pTransform->mRotation.z = mRotData[entryZ->mRotationOffset + (frame_max - 1)];
         } else {
-            o_transform->mRotation.z = mRotData[entryZ->mRotationOffset + frame];
+            pTransform->mRotation.z = mRotData[entryZ->mRotationOffset + frame];
         }
-        if (frame >= entryZ->mTranslateMaxFrame) {
-            o_transform->mTranslate.z =
-                mTransData[entryZ->mTranslateOffset + (entryZ->mTranslateMaxFrame - 1)];
+
+        frame_max = entryZ->mTranslateMaxFrame;
+        if (frame >= frame_max) {
+            pTransform->mTranslate.z = mTransData[entryZ->mTranslateOffset + (frame_max - 1)];
         } else {
-            o_transform->mTranslate.z = mTransData[entryZ->mTranslateOffset + frame];
+            pTransform->mTranslate.z = mTransData[entryZ->mTranslateOffset + frame];
         }
     }
 }
 
 /* 803291F0-80329A34 323B30 0844+00 1/0 0/0 0/0 .text
  * getTransform__27J3DAnmTransformFullWithLerpCFUsP16J3DTransformInfo */
-void J3DAnmTransformFullWithLerp::getTransform(u16 i_index, J3DTransformInfo* o_transform) const {
-    u16 idx = i_index * 3;
+void J3DAnmTransformFullWithLerp::getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
+    J3D_ASSERT_RANGE(421, jointNo >= 0 && jointNo < field_0x1e);
+    J3D_ASSERT_NULLPTR(422, pTransform != NULL);
+
+    u16 idx = jointNo * 3;
     J3DAnmTransformFullTable* entryX = &mAnmTable[idx];
     J3DAnmTransformFullTable* entryY = &mAnmTable[idx + 1];
     J3DAnmTransformFullTable* entryZ = &mAnmTable[idx + 2];
+
     if (mFrame < 0.0f) {
-        o_transform->mScale.x = mScaleData[entryX->mScaleOffset];
-        o_transform->mScale.y = mScaleData[entryY->mScaleOffset];
-        o_transform->mScale.z = mScaleData[entryZ->mScaleOffset];
-        o_transform->mRotation.x = mRotData[entryX->mRotationOffset];
-        o_transform->mRotation.y = mRotData[entryY->mRotationOffset];
-        o_transform->mRotation.z = mRotData[entryZ->mRotationOffset];
-        o_transform->mTranslate.x = mTransData[entryX->mTranslateOffset];
-        o_transform->mTranslate.y = mTransData[entryY->mTranslateOffset];
-        o_transform->mTranslate.z = mTransData[entryZ->mTranslateOffset];
+        pTransform->mScale.x = mScaleData[entryX->mScaleOffset];
+        pTransform->mScale.y = mScaleData[entryY->mScaleOffset];
+        pTransform->mScale.z = mScaleData[entryZ->mScaleOffset];
+
+        pTransform->mRotation.x = mRotData[entryX->mRotationOffset];
+        pTransform->mRotation.y = mRotData[entryY->mRotationOffset];
+        pTransform->mRotation.z = mRotData[entryZ->mRotationOffset];
+
+        pTransform->mTranslate.x = mTransData[entryX->mTranslateOffset];
+        pTransform->mTranslate.y = mTransData[entryY->mTranslateOffset];
+        pTransform->mTranslate.z = mTransData[entryZ->mTranslateOffset];
     } else {
-        int frame_ = (int)mFrame;
-        u32 frame = frame_;
-        if (frame_ == mFrame) {
-            if (frame >= entryX->mScaleMaxFrame) {
-                o_transform->mScale.x =
-                    mScaleData[entryX->mScaleOffset + (entryX->mScaleMaxFrame - 1)];
+        u32 frame_max;
+        int frame = (int)mFrame;
+
+        if (frame == mFrame) {
+            frame_max = entryX->mScaleMaxFrame;
+            if (frame >= frame_max) {
+                pTransform->mScale.x = mScaleData[entryX->mScaleOffset + (frame_max - 1)];
             } else {
-                o_transform->mScale.x = mScaleData[entryX->mScaleOffset + frame];
+                pTransform->mScale.x = mScaleData[entryX->mScaleOffset + frame];
             }
-            if (frame >= entryX->mRotationMaxFrame) {
-                o_transform->mRotation.x =
-                    mRotData[entryX->mRotationOffset + (entryX->mRotationMaxFrame - 1)];
+
+            frame_max = entryX->mRotationMaxFrame;
+            if (frame >= frame_max) {
+                pTransform->mRotation.x = mRotData[entryX->mRotationOffset + (frame_max - 1)];
             } else {
-                o_transform->mRotation.x = mRotData[entryX->mRotationOffset + frame];
+                pTransform->mRotation.x = mRotData[entryX->mRotationOffset + frame];
             }
-            if (frame >= entryX->mTranslateMaxFrame) {
-                o_transform->mTranslate.x =
-                    mTransData[entryX->mTranslateOffset + (entryX->mTranslateMaxFrame - 1)];
+
+            frame_max = entryX->mTranslateMaxFrame;
+            if (frame >= frame_max) {
+                pTransform->mTranslate.x = mTransData[entryX->mTranslateOffset + (frame_max - 1)];
             } else {
-                o_transform->mTranslate.x = mTransData[entryX->mTranslateOffset + frame];
+                pTransform->mTranslate.x = mTransData[entryX->mTranslateOffset + frame];
             }
-            if (frame >= entryY->mScaleMaxFrame) {
-                o_transform->mScale.y =
-                    mScaleData[entryY->mScaleOffset + (entryY->mScaleMaxFrame - 1)];
+
+            frame_max = entryY->mScaleMaxFrame;
+            if (frame >= frame_max) {
+                pTransform->mScale.y = mScaleData[entryY->mScaleOffset + (frame_max - 1)];
             } else {
-                o_transform->mScale.y = mScaleData[entryY->mScaleOffset + frame];
+                pTransform->mScale.y = mScaleData[entryY->mScaleOffset + frame];
             }
-            if (frame >= entryY->mRotationMaxFrame) {
-                o_transform->mRotation.y =
-                    mRotData[entryY->mRotationOffset + (entryY->mRotationMaxFrame - 1)];
+
+            frame_max = entryY->mRotationMaxFrame;
+            if (frame >= frame_max) {
+                pTransform->mRotation.y = mRotData[entryY->mRotationOffset + (frame_max - 1)];
             } else {
-                o_transform->mRotation.y = mRotData[entryY->mRotationOffset + frame];
+                pTransform->mRotation.y = mRotData[entryY->mRotationOffset + frame];
             }
-            if (frame >= entryY->mTranslateMaxFrame) {
-                o_transform->mTranslate.y =
-                    mTransData[entryY->mTranslateOffset + (entryY->mTranslateMaxFrame - 1)];
+
+            frame_max = entryY->mTranslateMaxFrame;
+            if (frame >= frame_max) {
+                pTransform->mTranslate.y = mTransData[entryY->mTranslateOffset + (frame_max - 1)];
             } else {
-                o_transform->mTranslate.y = mTransData[entryY->mTranslateOffset + frame];
+                pTransform->mTranslate.y = mTransData[entryY->mTranslateOffset + frame];
             }
-            if (frame >= entryZ->mScaleMaxFrame) {
-                o_transform->mScale.z =
-                    mScaleData[entryZ->mScaleOffset + (entryZ->mScaleMaxFrame - 1)];
+
+            frame_max = entryZ->mScaleMaxFrame;
+            if (frame >= frame_max) {
+                pTransform->mScale.z = mScaleData[entryZ->mScaleOffset + (frame_max - 1)];
             } else {
-                o_transform->mScale.z = mScaleData[entryZ->mScaleOffset + frame];
+                pTransform->mScale.z = mScaleData[entryZ->mScaleOffset + frame];
             }
-            if (frame >= entryZ->mRotationMaxFrame) {
-                o_transform->mRotation.z =
-                    mRotData[entryZ->mRotationOffset + (entryZ->mRotationMaxFrame - 1)];
+
+            frame_max = entryZ->mRotationMaxFrame;
+            if (frame >= frame_max) {
+                pTransform->mRotation.z = mRotData[entryZ->mRotationOffset + (frame_max - 1)];
             } else {
-                o_transform->mRotation.z = mRotData[entryZ->mRotationOffset + frame];
+                pTransform->mRotation.z = mRotData[entryZ->mRotationOffset + frame];
             }
-            if (frame >= entryZ->mTranslateMaxFrame) {
-                o_transform->mTranslate.z =
-                    mTransData[entryZ->mTranslateOffset + (entryZ->mTranslateMaxFrame - 1)];
+
+            frame_max = entryZ->mTranslateMaxFrame;
+            if (frame >= frame_max) {
+                pTransform->mTranslate.z = mTransData[entryZ->mTranslateOffset + (frame_max - 1)];
             } else {
-                o_transform->mTranslate.z = mTransData[entryZ->mTranslateOffset + frame];
+                pTransform->mTranslate.z = mTransData[entryZ->mTranslateOffset + frame];
             }
         } else {
-            f32 rate = mFrame - frame_;
-            u32 frame2 = frame + 1;
-            if (frame2 >= entryX->mScaleMaxFrame) {
-                o_transform->mScale.x =
-                    mScaleData[entryX->mScaleOffset + (entryX->mScaleMaxFrame - 1)];
+            f32 rate = mFrame - frame;
+            f32 var_f30 = 1.0f - rate;
+
+            u32 next_frame = frame + 1;
+
+            frame_max = entryX->mScaleMaxFrame;
+            if (next_frame >= frame_max) {
+                pTransform->mScale.x = mScaleData[entryX->mScaleOffset + (frame_max - 1)];
             } else {
-                o_transform->mScale.x = mScaleData[entryX->mScaleOffset + frame]
-                    + rate * (mScaleData[entryX->mScaleOffset + frame2]
+                pTransform->mScale.x = mScaleData[entryX->mScaleOffset + frame]
+                    + rate * (mScaleData[entryX->mScaleOffset + next_frame]
                             - mScaleData[entryX->mScaleOffset + frame]);
             }
-            if (frame2 >= entryX->mRotationMaxFrame) {
-                o_transform->mRotation.x =
-                    mRotData[entryX->mRotationOffset + (entryX->mRotationMaxFrame - 1)];
+
+            frame_max = entryX->mRotationMaxFrame;
+            if (next_frame >= frame_max) {
+                pTransform->mRotation.x = mRotData[entryX->mRotationOffset + (frame_max - 1)];
             } else {
                 u32 rot1 = (u16)mRotData[entryX->mRotationOffset + frame];
-                u32 rot2 = (u16)mRotData[entryX->mRotationOffset + frame2];
+                u32 rot2 = (u16)mRotData[entryX->mRotationOffset + next_frame];
                 int delta = rot2 - rot1;
                 if (delta > 0x8000) {
                     rot1 += 0x10000;
@@ -395,30 +426,33 @@ void J3DAnmTransformFullWithLerp::getTransform(u16 i_index, J3DTransformInfo* o_
                 } else if (-delta > 0x8000) {
                     delta += 0x10000;
                 }
-                o_transform->mRotation.x = (u32)((f32)rot1 + rate * (f32)delta);
+                pTransform->mRotation.x = (u32)((f32)rot1 + rate * (f32)delta);
             }
-            if (frame2 >= entryX->mTranslateMaxFrame) {
-                o_transform->mTranslate.x =
-                    mTransData[entryX->mTranslateOffset + (entryX->mTranslateMaxFrame - 1)];
+
+            frame_max = entryX->mTranslateMaxFrame;
+            if (next_frame >= frame_max) {
+                pTransform->mTranslate.x = mTransData[entryX->mTranslateOffset + (frame_max - 1)];
             } else {
-                o_transform->mTranslate.x = mTransData[entryX->mTranslateOffset + frame]
-                    + rate * (mTransData[entryX->mTranslateOffset + frame2]
+                pTransform->mTranslate.x = mTransData[entryX->mTranslateOffset + frame]
+                    + rate * (mTransData[entryX->mTranslateOffset + next_frame]
                             - mTransData[entryX->mTranslateOffset + frame]);
             }
-            if (frame2 >= entryY->mScaleMaxFrame) {
-                o_transform->mScale.y =
-                    mScaleData[entryY->mScaleOffset + (entryY->mScaleMaxFrame - 1)];
+
+            frame_max = entryY->mScaleMaxFrame;
+            if (next_frame >= frame_max) {
+                pTransform->mScale.y = mScaleData[entryY->mScaleOffset + (frame_max - 1)];
             } else {
-                o_transform->mScale.y = mScaleData[entryY->mScaleOffset + frame]
-                    + rate * (mScaleData[entryY->mScaleOffset + frame2]
+                pTransform->mScale.y = mScaleData[entryY->mScaleOffset + frame]
+                    + rate * (mScaleData[entryY->mScaleOffset + next_frame]
                             - mScaleData[entryY->mScaleOffset + frame]);
             }
-            if (frame2 >= entryY->mRotationMaxFrame) {
-                o_transform->mRotation.y =
-                    mRotData[entryY->mRotationOffset + (entryY->mRotationMaxFrame - 1)];
+
+            frame_max = entryY->mRotationMaxFrame;
+            if (next_frame >= frame_max) {
+                pTransform->mRotation.y = mRotData[entryY->mRotationOffset + (frame_max - 1)];
             } else {
                 u32 rot1 = (u16)mRotData[entryY->mRotationOffset + frame];
-                u32 rot2 = (u16)mRotData[entryY->mRotationOffset + frame2];
+                u32 rot2 = (u16)mRotData[entryY->mRotationOffset + next_frame];
                 int delta = rot2 - rot1;
                 if (delta > 0x8000) {
                     rot1 += 0x10000;
@@ -426,30 +460,33 @@ void J3DAnmTransformFullWithLerp::getTransform(u16 i_index, J3DTransformInfo* o_
                 } else if (-delta > 0x8000) {
                     delta += 0x10000;
                 }
-                o_transform->mRotation.y = (u32)((f32)rot1 + rate * (f32)delta);
+                pTransform->mRotation.y = (u32)((f32)rot1 + rate * (f32)delta);
             }
-            if (frame2 >= entryY->mTranslateMaxFrame) {
-                o_transform->mTranslate.y =
-                    mTransData[entryY->mTranslateOffset + (entryY->mTranslateMaxFrame - 1)];
+
+            frame_max = entryY->mTranslateMaxFrame;
+            if (next_frame >= frame_max) {
+                pTransform->mTranslate.y = mTransData[entryY->mTranslateOffset + (frame_max - 1)];
             } else {
-                o_transform->mTranslate.y = mTransData[entryY->mTranslateOffset + frame]
-                    + rate * (mTransData[entryY->mTranslateOffset + frame2]
+                pTransform->mTranslate.y = mTransData[entryY->mTranslateOffset + frame]
+                    + rate * (mTransData[entryY->mTranslateOffset + next_frame]
                             - mTransData[entryY->mTranslateOffset + frame]);
             }
-            if (frame2 >= entryZ->mScaleMaxFrame) {
-                o_transform->mScale.z =
-                    mScaleData[entryZ->mScaleOffset + (entryZ->mScaleMaxFrame - 1)];
+
+            frame_max = entryZ->mScaleMaxFrame;
+            if (next_frame >= frame_max) {
+                pTransform->mScale.z = mScaleData[entryZ->mScaleOffset + (frame_max - 1)];
             } else {
-                o_transform->mScale.z = mScaleData[entryZ->mScaleOffset + frame]
-                    + rate * (mScaleData[entryZ->mScaleOffset + frame2]
+                pTransform->mScale.z = mScaleData[entryZ->mScaleOffset + frame]
+                    + rate * (mScaleData[entryZ->mScaleOffset + next_frame]
                             - mScaleData[entryZ->mScaleOffset + frame]);
             }
-            if (frame2 >= entryZ->mRotationMaxFrame) {
-                o_transform->mRotation.z =
-                    mRotData[entryZ->mRotationOffset + (entryZ->mRotationMaxFrame - 1)];
+
+            frame_max = entryZ->mRotationMaxFrame;
+            if (next_frame >= frame_max) {
+                pTransform->mRotation.z = mRotData[entryZ->mRotationOffset + (frame_max - 1)];
             } else {
                 u32 rot1 = (u16)mRotData[entryZ->mRotationOffset + frame];
-                u32 rot2 = (u16)mRotData[entryZ->mRotationOffset + frame2];
+                u32 rot2 = (u16)mRotData[entryZ->mRotationOffset + next_frame];
                 int delta = rot2 - rot1;
                 if (delta > 0x8000) {
                     rot1 += 0x10000;
@@ -457,14 +494,15 @@ void J3DAnmTransformFullWithLerp::getTransform(u16 i_index, J3DTransformInfo* o_
                 } else if (-delta > 0x8000) {
                     delta += 0x10000;
                 }
-                o_transform->mRotation.z = (u32)((f32)rot1 + rate * (f32)delta);
+                pTransform->mRotation.z = (u32)((f32)rot1 + rate * (f32)delta);
             }
-            if (frame2 >= entryZ->mTranslateMaxFrame) {
-                o_transform->mTranslate.z =
-                    mTransData[entryZ->mTranslateOffset + (entryZ->mTranslateMaxFrame - 1)];
+
+            frame_max = entryZ->mTranslateMaxFrame;
+            if (next_frame >= frame_max) {
+                pTransform->mTranslate.z = mTransData[entryZ->mTranslateOffset + (frame_max - 1)];
             } else {
-                o_transform->mTranslate.z = mTransData[entryZ->mTranslateOffset + frame]
-                    + rate * (mTransData[entryZ->mTranslateOffset + frame2]
+                pTransform->mTranslate.z = mTransData[entryZ->mTranslateOffset + frame]
+                    + rate * (mTransData[entryZ->mTranslateOffset + next_frame]
                             - mTransData[entryZ->mTranslateOffset + frame]);
             }
         }
@@ -524,275 +562,294 @@ inline f32 J3DHermiteInterpolation(register f32 pp1, register s16 const* pp2,
 }
 
 template<typename T>
-f32 J3DGetKeyFrameInterpolation(f32 i_frame, J3DAnmKeyTableBase* i_entry, T* i_data) {
-    if (i_frame < i_data[0]) {
-        return i_data[1];
+f32 J3DGetKeyFrameInterpolation(f32 frame, J3DAnmKeyTableBase* pKeyTable, T* pData) {
+    J3D_ASSERT_NULLPTR(740, pData != NULL);
+
+    if (frame < pData[0]) {
+        return pData[1];
     }
-    if (i_entry->mType == 0) {
-        u32 idx = i_entry->mMaxFrame - 1;
-        if (i_data[idx * 3] <= i_frame) {
-            return i_data[idx * 3 + 1];
+
+    if (pKeyTable->mType == 0) {
+        u32 idx = pKeyTable->mMaxFrame - 1;
+        if (pData[idx * 3] <= frame) {
+            return pData[idx * 3 + 1];
         }
-        u32 uVar7 = i_entry->mMaxFrame;
+
+        u32 uVar7 = pKeyTable->mMaxFrame;
         while (uVar7 > 1) {
             u32 uVar2 = uVar7 >> 1;
             u32 tmp = uVar2 * 3;
-            if (i_frame >= i_data[tmp]) {
-                i_data += tmp;
+            if (frame >= pData[tmp]) {
+                pData += tmp;
                 uVar7 = uVar7 - uVar2;
             } else {
                 uVar7 = uVar2;
             }
         }
-        return J3DHermiteInterpolation(i_frame, &i_data[0], &i_data[1], &i_data[2],
-                                       &i_data[3], &i_data[4], &i_data[5]);
+
+        f32 interpolated = J3DHermiteInterpolation(frame, &pData[0], &pData[1], &pData[2], &pData[3], &pData[4], &pData[5]);
+        return interpolated;
     } else {
-        u32 idx = i_entry->mMaxFrame - 1;
-        if (i_data[idx * 4] <= i_frame) {
-            return i_data[idx * 4 + 1];
+        u32 idx = pKeyTable->mMaxFrame - 1;
+        if (pData[idx * 4] <= frame) {
+            return pData[idx * 4 + 1];
         }
-        u32 uVar7 = i_entry->mMaxFrame;
-        while (uVar7 > 1) {
-            u32 uVar2 = uVar7 >> 1;
-            if (i_frame >= i_data[uVar2 * 4]) {
-                i_data += uVar2 * 4;
-                uVar7 = uVar7 - uVar2;
+
+        u32 var_r27 = pKeyTable->mMaxFrame;
+        while (var_r27 > 1) {
+            u32 var_r25 = var_r27 >> 1;
+            u32 var_r23 = var_r25 * 4;
+            if (frame >= pData[var_r23]) {
+                pData += var_r23;
+                var_r27 = var_r27 - var_r25;
             } else {
-                uVar7 = uVar2;
+                var_r27 = var_r25;
             }
         }
-        return J3DHermiteInterpolation(i_frame, &i_data[0], &i_data[1], &i_data[3],
-                                       &i_data[4], &i_data[5], &i_data[6]);
+
+        f32 interpolated = J3DHermiteInterpolation(frame, &pData[0], &pData[1], &pData[3], &pData[4], &pData[5], &pData[6]);
+        return interpolated;
     }
 }
 
 /* 80329A34-80329E5C 324374 0428+00 0/0 1/1 0/0 .text
  * calcTransform__18J3DAnmTransformKeyCFfUsP16J3DTransformInfo  */
-void J3DAnmTransformKey::calcTransform(f32 i_frame, u16 i_index,
-                                       J3DTransformInfo* o_transform) const {
-    u16 idx = i_index * 3;
+void J3DAnmTransformKey::calcTransform(f32 frame, u16 jointNo, J3DTransformInfo* pTransform) const {
+    J3D_ASSERT_RANGE(829, jointNo >= 0 && jointNo < field_0x1e);
+    J3D_ASSERT_NULLPTR(830, pTransform != NULL);
+
+    u16 idx = jointNo * 3;
     J3DAnmTransformKeyTable* entryX = &mAnmTable[idx];
     J3DAnmTransformKeyTable* entryY = &mAnmTable[idx + 1];
     J3DAnmTransformKeyTable* entryZ = &mAnmTable[idx + 2];
+
     switch (entryX->mScaleInfo.mMaxFrame) {
     case 0:
-        o_transform->mScale.x = 1.0f;
+        pTransform->mScale.x = 1.0f;
         break;
     case 1:
-        o_transform->mScale.x = mScaleData[entryX->mScaleInfo.mOffset];
+        pTransform->mScale.x = mScaleData[entryX->mScaleInfo.mOffset];
         break;
     default:
-        o_transform->mScale.x = J3DGetKeyFrameInterpolation(i_frame, &entryX->mScaleInfo,
+        pTransform->mScale.x = J3DGetKeyFrameInterpolation(frame, &entryX->mScaleInfo,
                                                 &mScaleData[entryX->mScaleInfo.mOffset]);
     }
+
     switch (entryY->mScaleInfo.mMaxFrame) {
     case 0:
-        o_transform->mScale.y = 1.0f;
+        pTransform->mScale.y = 1.0f;
         break;
     case 1:
-        o_transform->mScale.y = mScaleData[entryY->mScaleInfo.mOffset];
+        pTransform->mScale.y = mScaleData[entryY->mScaleInfo.mOffset];
         break;
     default:
-        o_transform->mScale.y = J3DGetKeyFrameInterpolation(i_frame, &entryY->mScaleInfo,
+        pTransform->mScale.y = J3DGetKeyFrameInterpolation(frame, &entryY->mScaleInfo,
                                                 &mScaleData[entryY->mScaleInfo.mOffset]);
     }
+
     switch (entryZ->mScaleInfo.mMaxFrame) {
     case 0:
-        o_transform->mScale.z = 1.0f;
+        pTransform->mScale.z = 1.0f;
         break;
     case 1:
-        o_transform->mScale.z = mScaleData[entryZ->mScaleInfo.mOffset];
+        pTransform->mScale.z = mScaleData[entryZ->mScaleInfo.mOffset];
         break;
     default:
-        o_transform->mScale.z = J3DGetKeyFrameInterpolation(i_frame, &entryZ->mScaleInfo,
+        pTransform->mScale.z = J3DGetKeyFrameInterpolation(frame, &entryZ->mScaleInfo,
                                                 &mScaleData[entryZ->mScaleInfo.mOffset]);
     }
+
     switch (entryX->mRotationInfo.mMaxFrame) {
     case 0:
-        o_transform->mRotation.x = 0;
+        pTransform->mRotation.x = 0;
         break;
     case 1:
-        o_transform->mRotation.x = mRotData[entryX->mRotationInfo.mOffset] << mDecShift;
+        pTransform->mRotation.x = mRotData[entryX->mRotationInfo.mOffset] << mDecShift;
         break;
     default:
-        o_transform->mRotation.x = (int)J3DGetKeyFrameInterpolation(i_frame, &entryX->mRotationInfo,
+        pTransform->mRotation.x = (int)J3DGetKeyFrameInterpolation(frame, &entryX->mRotationInfo,
                                             &mRotData[entryX->mRotationInfo.mOffset]) << mDecShift;
     }
+
     switch (entryY->mRotationInfo.mMaxFrame) {
     case 0:
-        o_transform->mRotation.y = 0;
+        pTransform->mRotation.y = 0;
         break;
     case 1:
-        o_transform->mRotation.y = mRotData[entryY->mRotationInfo.mOffset] << mDecShift;
+        pTransform->mRotation.y = mRotData[entryY->mRotationInfo.mOffset] << mDecShift;
         break;
     default:
-        o_transform->mRotation.y = (int)J3DGetKeyFrameInterpolation(i_frame, &entryY->mRotationInfo,
+        pTransform->mRotation.y = (int)J3DGetKeyFrameInterpolation(frame, &entryY->mRotationInfo,
                                             &mRotData[entryY->mRotationInfo.mOffset]) << mDecShift;
     }
+
     switch (entryZ->mRotationInfo.mMaxFrame) {
     case 0:
-        o_transform->mRotation.z = 0;
+        pTransform->mRotation.z = 0;
         break;
     case 1:
-        o_transform->mRotation.z = mRotData[entryZ->mRotationInfo.mOffset] << mDecShift;
+        pTransform->mRotation.z = mRotData[entryZ->mRotationInfo.mOffset] << mDecShift;
         break;
     default:
-        o_transform->mRotation.z = (int)J3DGetKeyFrameInterpolation(i_frame, &entryZ->mRotationInfo,
+        pTransform->mRotation.z = (int)J3DGetKeyFrameInterpolation(frame, &entryZ->mRotationInfo,
                                             &mRotData[entryZ->mRotationInfo.mOffset]) << mDecShift;
     }
+
     switch (entryX->mTranslateInfo.mMaxFrame) {
     case 0:
-        o_transform->mTranslate.x = 0.0f;
+        pTransform->mTranslate.x = 0.0f;
         break;
     case 1:
-        o_transform->mTranslate.x = mTransData[entryX->mTranslateInfo.mOffset];
+        pTransform->mTranslate.x = mTransData[entryX->mTranslateInfo.mOffset];
         break;
     default:
-        o_transform->mTranslate.x = J3DGetKeyFrameInterpolation(i_frame, &entryX->mTranslateInfo,
+        pTransform->mTranslate.x = J3DGetKeyFrameInterpolation(frame, &entryX->mTranslateInfo,
                                                     &mTransData[entryX->mTranslateInfo.mOffset]);
     }
+
     switch (entryY->mTranslateInfo.mMaxFrame) {
     case 0:
-        o_transform->mTranslate.y = 0.0f;
+        pTransform->mTranslate.y = 0.0f;
         break;
     case 1:
-        o_transform->mTranslate.y = mTransData[entryY->mTranslateInfo.mOffset];
+        pTransform->mTranslate.y = mTransData[entryY->mTranslateInfo.mOffset];
         break;
     default:
-        o_transform->mTranslate.y = J3DGetKeyFrameInterpolation(i_frame, &entryY->mTranslateInfo,
+        pTransform->mTranslate.y = J3DGetKeyFrameInterpolation(frame, &entryY->mTranslateInfo,
                                                     &mTransData[entryY->mTranslateInfo.mOffset]);
     }
+
     switch (entryZ->mTranslateInfo.mMaxFrame) {
     case 0:
-        o_transform->mTranslate.z = 0.0f;
+        pTransform->mTranslate.z = 0.0f;
         break;
     case 1:
-        o_transform->mTranslate.z = mTransData[entryZ->mTranslateInfo.mOffset];
+        pTransform->mTranslate.z = mTransData[entryZ->mTranslateInfo.mOffset];
         break;
     default:
-        o_transform->mTranslate.z = J3DGetKeyFrameInterpolation(i_frame, &entryZ->mTranslateInfo,
+        pTransform->mTranslate.z = J3DGetKeyFrameInterpolation(frame, &entryZ->mTranslateInfo,
                                                     &mTransData[entryZ->mTranslateInfo.mOffset]);
     }
 }
 
 /* 80329E5C-80329F14 32479C 00B8+00 0/0 2/2 0/0 .text            __ct__19J3DAnmTextureSRTKeyFv */
-J3DAnmTextureSRTKey::J3DAnmTextureSRTKey() : J3DAnmBase(0) {
+J3DAnmTextureSRTKey::J3DAnmTextureSRTKey() {
     mDecShift = 0;
-    mTransNum = 0;
-    mRotNum = 0;
-    mScaleNum = 0;
-    mTrackNum = 0;
+    mTrackNum = mScaleNum = mRotNum = mTransNum = 0;
     mAnmTable = NULL;
-    mTransData = NULL;
-    mScaleData = NULL;
+    mScaleData = mTransData = NULL;
     mRotData = NULL;
-    field_0x48 = 0;
-    field_0x46 = 0;
-    field_0x44 = 0;
-    field_0x4a = 0;
+    field_0x4a = field_0x44 = field_0x46 = field_0x48 = 0;
     field_0x58 = NULL;
-    field_0x54 = NULL;
-    field_0x4c = NULL;
+    field_0x4c = field_0x54 = NULL;
     field_0x50 = NULL;
     mTexMtxCalcType = 0;
 }
 
-
 /* 80329F14-8032A184 324854 0270+00 0/0 1/1 0/0 .text
  * calcTransform__19J3DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo */
-void J3DAnmTextureSRTKey::calcTransform(f32 i_frame, u16 i_index,
-                                        J3DTextureSRTInfo* o_texinfo) const {
-    u16 idx = i_index * 3;
+void J3DAnmTextureSRTKey::calcTransform(f32 frame, u16 jointNo, J3DTextureSRTInfo* pTexSRTInfo) const {
+    J3D_ASSERT_RANGE(992, jointNo >= 0 && jointNo < mTrackNum);
+    J3D_ASSERT_NULLPTR(993, pTexSRTInfo != NULL);
+
+    u16 idx = jointNo * 3;
     J3DAnmTransformKeyTable* entryX = &mAnmTable[idx];
     J3DAnmTransformKeyTable* entryY = &mAnmTable[idx + 1];
     J3DAnmTransformKeyTable* entryRot = &mAnmTable[idx + 2];
+
     switch (entryX->mScaleInfo.mMaxFrame) {
     case 0:
-        o_texinfo->mScaleX = 1.0f;
+        pTexSRTInfo->mScaleX = 1.0f;
         break;
     case 1:
-        o_texinfo->mScaleX = mScaleData[entryX->mScaleInfo.mOffset];
+        pTexSRTInfo->mScaleX = mScaleData[entryX->mScaleInfo.mOffset];
         break;
     default:
-        o_texinfo->mScaleX = J3DGetKeyFrameInterpolation(i_frame, &entryX->mScaleInfo,
+        pTexSRTInfo->mScaleX = J3DGetKeyFrameInterpolation(frame, &entryX->mScaleInfo,
                                                 &mScaleData[entryX->mScaleInfo.mOffset]);
     }
+
     switch (entryY->mScaleInfo.mMaxFrame) {
     case 0:
-        o_texinfo->mScaleY = 1.0f;
+        pTexSRTInfo->mScaleY = 1.0f;
         break;
     case 1:
-        o_texinfo->mScaleY = mScaleData[entryY->mScaleInfo.mOffset];
+        pTexSRTInfo->mScaleY = mScaleData[entryY->mScaleInfo.mOffset];
         break;
     default:
-        o_texinfo->mScaleY = J3DGetKeyFrameInterpolation(i_frame, &entryY->mScaleInfo,
+        pTexSRTInfo->mScaleY = J3DGetKeyFrameInterpolation(frame, &entryY->mScaleInfo,
                                                 &mScaleData[entryY->mScaleInfo.mOffset]);
     }
+
     switch (entryRot->mRotationInfo.mMaxFrame) {
     case 0:
-        o_texinfo->mRotation = 0;
+        pTexSRTInfo->mRotation = 0;
         break;
     case 1:
-        o_texinfo->mRotation = mRotData[entryRot->mRotationInfo.mOffset] << mDecShift;
+        pTexSRTInfo->mRotation = mRotData[entryRot->mRotationInfo.mOffset] << mDecShift;
         break;
     default:
-        o_texinfo->mRotation = (int)J3DGetKeyFrameInterpolation(i_frame, &entryRot->mRotationInfo,
+        pTexSRTInfo->mRotation = (int)J3DGetKeyFrameInterpolation(frame, &entryRot->mRotationInfo,
                                         &mRotData[entryRot->mRotationInfo.mOffset]) << mDecShift;
     }
+
     switch (entryX->mTranslateInfo.mMaxFrame) {
     case 0:
-        o_texinfo->mTranslationX = 0.0f;
+        pTexSRTInfo->mTranslationX = 0.0f;
         break;
     case 1:
-        o_texinfo->mTranslationX = mTransData[entryX->mTranslateInfo.mOffset];
+        pTexSRTInfo->mTranslationX = mTransData[entryX->mTranslateInfo.mOffset];
         break;
     default:
-        o_texinfo->mTranslationX = J3DGetKeyFrameInterpolation(i_frame, &entryX->mTranslateInfo,
+        pTexSRTInfo->mTranslationX = J3DGetKeyFrameInterpolation(frame, &entryX->mTranslateInfo,
                                                     &mTransData[entryX->mTranslateInfo.mOffset]);
     }
+
     switch (entryY->mTranslateInfo.mMaxFrame) {
     case 0:
-        o_texinfo->mTranslationY = 0.0f;
+        pTexSRTInfo->mTranslationY = 0.0f;
         break;
     case 1:
-        o_texinfo->mTranslationY = mTransData[entryY->mTranslateInfo.mOffset];
+        pTexSRTInfo->mTranslationY = mTransData[entryY->mTranslateInfo.mOffset];
         break;
     default:
-        o_texinfo->mTranslationY = J3DGetKeyFrameInterpolation(i_frame, &entryY->mTranslateInfo,
+        pTexSRTInfo->mTranslationY = J3DGetKeyFrameInterpolation(frame, &entryY->mTranslateInfo,
                                                     &mTransData[entryY->mTranslateInfo.mOffset]);
     }
 }
 
 /* 8032A184-8032A218 324AC4 0094+00 1/0 0/0 0/0 .text            getWeight__17J3DAnmClusterFullCFUs
  */
-f32 J3DAnmClusterFull::getWeight(u16 i_index) const {
-    int maxFrame = mAnmTable[i_index].mMaxFrame;
+f32 J3DAnmClusterFull::getWeight(u16 index) const {
+    int maxFrame = mAnmTable[index].mMaxFrame;
     int frame = (int)(mFrame + 0.5f);
+
     if (mFrame < 0.0f) {
-        return mWeight[mAnmTable[i_index].mOffset];
-    } else if (frame >= maxFrame) {
-        return mWeight[mAnmTable[i_index].mOffset + (maxFrame - 1)];
+        return mWeight[mAnmTable[index].mOffset];
+    } else if (frame >= (u16)maxFrame) {
+        return mWeight[mAnmTable[index].mOffset + ((u16)maxFrame - 1)];
     } else {
-        return mWeight[mAnmTable[i_index].mOffset + frame];
+        return mWeight[mAnmTable[index].mOffset + frame];
     }
 }
 
 /* 8032A218-8032A29C 324B58 0084+00 1/0 0/0 0/0 .text            getWeight__16J3DAnmClusterKeyCFUs
  */
-f32 J3DAnmClusterKey::getWeight(u16 i_index) const {
-    switch (mAnmTable[i_index].mWeightTable.mMaxFrame) {
+f32 J3DAnmClusterKey::getWeight(u16 index) const {
+    int maxFrame = (u16)mAnmTable[index].mWeightTable.mMaxFrame;
+    switch (maxFrame) {
     case 0:
         return 1.0f;
     case 1:
-        return mWeight[mAnmTable[i_index].mWeightTable.mOffset];
+        return mWeight[mAnmTable[index].mWeightTable.mOffset];
     default:
-        return J3DGetKeyFrameInterpolation(mFrame, &mAnmTable[i_index].mWeightTable,
-                                           &mWeight[mAnmTable[i_index].mWeightTable.mOffset]);
+        return J3DGetKeyFrameInterpolation(mFrame, &mAnmTable[index].mWeightTable,
+                                           &mWeight[mAnmTable[index].mWeightTable.mOffset]);
     }
 }
 
 /* 8032A29C-8032A30C 324BDC 0070+00 2/2 0/0 0/0 .text            __ct__14J3DAnmVtxColorFv */
-J3DAnmVtxColor::J3DAnmVtxColor() : J3DAnmBase(0) {
+J3DAnmVtxColor::J3DAnmVtxColor() {
     for (int i = 0; i < 2; i++) {
         mAnmTableNum[i] = 0;
     }
@@ -801,7 +858,6 @@ J3DAnmVtxColor::J3DAnmVtxColor() : J3DAnmBase(0) {
     }
 }
 
-
 /* 8032A30C-8032A368 324C4C 005C+00 0/0 1/1 0/0 .text            __ct__18J3DAnmVtxColorFullFv */
 J3DAnmVtxColorFull::J3DAnmVtxColorFull() {
     for (int i = 0; i < 2; i++) {
@@ -811,34 +867,45 @@ J3DAnmVtxColorFull::J3DAnmVtxColorFull() {
 
 /* 8032A368-8032A4E0 324CA8 0178+00 1/0 0/0 0/0 .text
  * getColor__18J3DAnmVtxColorFullCFUcUsP8_GXColor               */
-void J3DAnmVtxColorFull::getColor(u8 i_table, u16 i_index, GXColor* o_color) const {
-    J3DAnmColorFullTable* entry = &mpTable[i_table][i_index];
+void J3DAnmVtxColorFull::getColor(u8 tableNo, u16 index, GXColor* pColor) const {
+    J3D_ASSERT_NULLPTR(1254, pColor != NULL);
+    J3DAnmColorFullTable* entry = &mpTable[tableNo][index];
+
     if (mFrame < 0.0f) {
-        o_color->r = mColorR[entry->mROffset];
-        o_color->g = mColorG[entry->mGOffset];
-        o_color->b = mColorB[entry->mBOffset];
-        o_color->a = mColorA[entry->mAOffset];
+        pColor->r = mColorR[entry->mROffset];
+        pColor->g = mColorG[entry->mGOffset];
+        pColor->b = mColorB[entry->mBOffset];
+        pColor->a = mColorA[entry->mAOffset];
     } else {
         int frame = (int)(mFrame + 0.5f);
-        if (frame >= entry->mRMaxFrame) {
-            o_color->r = mColorR[entry->mROffset + (entry->mRMaxFrame - 1)];
+        u16 maxFrame;
+
+        maxFrame = entry->mRMaxFrame;
+        if (frame >= maxFrame) {
+            pColor->r = mColorR[entry->mROffset + (maxFrame - 1)];
         } else {
-            o_color->r = mColorR[entry->mROffset + frame];
+            pColor->r = mColorR[entry->mROffset + frame];
         }
-        if (frame >= entry->mGMaxFrame) {
-            o_color->g = mColorG[entry->mGOffset + (entry->mGMaxFrame - 1)];
+
+        maxFrame = entry->mGMaxFrame;
+        if (frame >= maxFrame) {
+            pColor->g = mColorG[entry->mGOffset + (maxFrame - 1)];
         } else {
-            o_color->g = mColorG[entry->mGOffset + frame];
+            pColor->g = mColorG[entry->mGOffset + frame];
         }
-        if (frame >= entry->mBMaxFrame) {
-            o_color->b = mColorB[entry->mBOffset + (entry->mBMaxFrame - 1)];
+
+        maxFrame = entry->mBMaxFrame;
+        if (frame >= maxFrame) {
+            pColor->b = mColorB[entry->mBOffset + (maxFrame - 1)];
         } else {
-            o_color->b = mColorB[entry->mBOffset + frame];
+            pColor->b = mColorB[entry->mBOffset + frame];
         }
-        if (frame >= entry->mAMaxFrame) {
-            o_color->a = mColorA[entry->mAOffset + (entry->mAMaxFrame - 1)];
+
+        maxFrame = entry->mAMaxFrame;
+        if (frame >= maxFrame) {
+            pColor->a = mColorA[entry->mAOffset + (maxFrame - 1)];
         } else {
-            o_color->a = mColorA[entry->mAOffset + frame];
+            pColor->a = mColorA[entry->mAOffset + frame];
         }
     }
 }
@@ -852,93 +919,98 @@ J3DAnmVtxColorKey::J3DAnmVtxColorKey() {
 
 /* 8032A53C-8032A828 324E7C 02EC+00 1/0 0/0 0/0 .text
  * getColor__17J3DAnmVtxColorKeyCFUcUsP8_GXColor                */
-void J3DAnmVtxColorKey::getColor(u8 i_table, u16 i_index, GXColor* o_color) const {
-    J3DAnmColorKeyTable* entry = &mpTable[i_table][i_index];
+void J3DAnmVtxColorKey::getColor(u8 tableNo, u16 index, GXColor* pColor) const {
+    J3D_ASSERT_NULLPTR(1338, pColor != NULL);
+    J3DAnmColorKeyTable* entry = &mpTable[tableNo][index];
+
     f32 col;
     switch (entry->mRInfo.mMaxFrame) {
     case 0:
-        o_color->r = 0;
+        pColor->r = 0;
         break;
     case 1:
-        o_color->r = mColorR[entry->mRInfo.mOffset];
+        pColor->r = mColorR[entry->mRInfo.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mRInfo,
                                           &mColorR[entry->mRInfo.mOffset]);
         if (col <= 0.0f) {
-            o_color->r = 0;
+            pColor->r = 0;
         } else if (col <= 255.0f) {
-            OSf32tou8(&col, &o_color->r);
+            OSf32tou8(&col, &pColor->r);
         } else {
-            o_color->r = 255;
+            pColor->r = 255;
         }
     }
+
     switch (entry->mGInfo.mMaxFrame) {
     case 0:
-        o_color->g = 0;
+        pColor->g = 0;
         break;
     case 1:
-        o_color->g = mColorG[entry->mGInfo.mOffset];
+        pColor->g = mColorG[entry->mGInfo.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mGInfo,
                                           &mColorG[entry->mGInfo.mOffset]);
         if (col <= 0.0f) {
-            o_color->g = 0;
+            pColor->g = 0;
         } else if (col <= 255.0f) {
-            OSf32tou8(&col, &o_color->g);
+            OSf32tou8(&col, &pColor->g);
         } else {
-            o_color->g = 255;
+            pColor->g = 255;
         }
     }
+
     switch (entry->mBInfo.mMaxFrame) {
     case 0:
-        o_color->b = 0;
+        pColor->b = 0;
         break;
     case 1:
-        o_color->b = mColorB[entry->mBInfo.mOffset];
+        pColor->b = mColorB[entry->mBInfo.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mBInfo,
                                           &mColorB[entry->mBInfo.mOffset]);
         if (col <= 0.0f) {
-            o_color->b = 0;
+            pColor->b = 0;
         } else if (col <= 255.0f) {
-            OSf32tou8(&col, &o_color->b);
+            OSf32tou8(&col, &pColor->b);
         } else {
-            o_color->b = 255;
+            pColor->b = 255;
         }
     }
+
     switch (entry->mAInfo.mMaxFrame) {
     case 0:
-        o_color->a = 0;
+        pColor->a = 0;
         break;
     case 1:
-        o_color->a = mColorA[entry->mAInfo.mOffset];
+        pColor->a = mColorA[entry->mAInfo.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mAInfo,
                                           &mColorA[entry->mAInfo.mOffset]);
         if (col <= 0.0f) {
-            o_color->a = 0;
+            pColor->a = 0;
         } else if (col <= 255.0f) {
-            OSf32tou8(&col, &o_color->a);
+            OSf32tou8(&col, &pColor->a);
         } else {
-            o_color->a = 255;
+            pColor->a = 255;
         }
     }
 }
 
 /* 8032A828-8032A8A4 325168 007C+00 2/2 0/0 0/0 .text            __ct__11J3DAnmColorFv */
-J3DAnmColor::J3DAnmColor() : J3DAnmBase(0), field_0xc(0), field_0xe(0), field_0x10(0),
+J3DAnmColor::J3DAnmColor() : field_0xc(0), field_0xe(0), field_0x10(0),
     field_0x12(0), mUpdateMaterialNum(0), mUpdateMaterialID(NULL) {}
 
 
 /* 8032A8A4-8032A93C 3251E4 0098+00 0/0 1/1 0/0 .text
  * searchUpdateMaterialID__11J3DAnmColorFP16J3DMaterialTable    */
-void J3DAnmColor::searchUpdateMaterialID(J3DMaterialTable* i_materialTable) {
+void J3DAnmColor::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
     for (u16 i = 0; i < mUpdateMaterialNum; i++) {
-        int index = i_materialTable->getMaterialName()->getIndex(mUpdateMaterialName.getName(i));
+        int index = pMatTable->getMaterialName()->getIndex(mUpdateMaterialName.getName(i));
         if (index != -1) {
             mUpdateMaterialID[i] = index;
         } else {
@@ -957,34 +1029,46 @@ J3DAnmColorFull::J3DAnmColorFull() {
 }
 
 /* 8032A990-8032AB00 3252D0 0170+00 1/0 0/0 0/0 .text getColor__15J3DAnmColorFullCFUsP8_GXColor */
-void J3DAnmColorFull::getColor(u16 i_index, GXColor* o_color) const {
-    J3DAnmColorFullTable* entry = &mAnmTable[i_index];
+void J3DAnmColorFull::getColor(u16 index, GXColor* pColor) const {
+    J3D_ASSERT_RANGE(1537, index >= 0 && index < mUpdateMaterialNum);
+    J3D_ASSERT_NULLPTR(1538, pColor != NULL);
+    J3DAnmColorFullTable* entry = &mAnmTable[index];
+
     if (mFrame < 0.0f) {
-        o_color->r = mColorR[entry->mROffset];
-        o_color->g = mColorG[entry->mGOffset];
-        o_color->b = mColorB[entry->mBOffset];
-        o_color->a = mColorA[entry->mAOffset];
+        pColor->r = mColorR[entry->mROffset];
+        pColor->g = mColorG[entry->mGOffset];
+        pColor->b = mColorB[entry->mBOffset];
+        pColor->a = mColorA[entry->mAOffset];
     } else {
         int frame = (int)(mFrame + 0.5f);
-        if (frame >= entry->mRMaxFrame) {
-            o_color->r = mColorR[entry->mROffset + (entry->mRMaxFrame - 1)];
+        u16 maxFrame;
+
+        maxFrame = entry->mRMaxFrame;
+        if (frame >= maxFrame) {
+            pColor->r = mColorR[entry->mROffset + (maxFrame - 1)];
         } else {
-            o_color->r = mColorR[entry->mROffset + frame];
+            pColor->r = mColorR[entry->mROffset + frame];
         }
-        if (frame >= entry->mGMaxFrame) {
-            o_color->g = mColorG[entry->mGOffset + (entry->mGMaxFrame - 1)];
+
+        maxFrame = entry->mGMaxFrame;
+        if (frame >= maxFrame) {
+            pColor->g = mColorG[entry->mGOffset + (maxFrame - 1)];
         } else {
-            o_color->g = mColorG[entry->mGOffset + frame];
+            pColor->g = mColorG[entry->mGOffset + frame];
         }
-        if (frame >= entry->mBMaxFrame) {
-            o_color->b = mColorB[entry->mBOffset + (entry->mBMaxFrame - 1)];
+
+        maxFrame = entry->mBMaxFrame;
+        if (frame >= maxFrame) {
+            pColor->b = mColorB[entry->mBOffset + (maxFrame - 1)];
         } else {
-            o_color->b = mColorB[entry->mBOffset + frame];
+            pColor->b = mColorB[entry->mBOffset + frame];
         }
-        if (frame >= entry->mAMaxFrame) {
-            o_color->a = mColorA[entry->mAOffset + (entry->mAMaxFrame - 1)];
+
+        maxFrame = entry->mAMaxFrame;
+        if (frame >= maxFrame) {
+            pColor->a = mColorA[entry->mAOffset + (maxFrame - 1)];
         } else {
-            o_color->a = mColorA[entry->mAOffset + frame];
+            pColor->a = mColorA[entry->mAOffset + frame];
         }
     }
 }
@@ -999,130 +1083,143 @@ J3DAnmColorKey::J3DAnmColorKey() {
 }
 
 /* 8032AB54-8032AE18 325494 02C4+00 1/0 0/0 0/0 .text getColor__14J3DAnmColorKeyCFUsP8_GXColor */
-void J3DAnmColorKey::getColor(u16 i_index, GXColor* o_color) const {
-    J3DAnmColorKeyTable* entry = &mAnmTable[i_index];
+void J3DAnmColorKey::getColor(u16 index, GXColor* pColor) const {
+    J3D_ASSERT_RANGE(1614, index >= 0 && index < mUpdateMaterialNum);
+    J3D_ASSERT_NULLPTR(1615, pColor != NULL);
+    J3DAnmColorKeyTable* entry = &mAnmTable[index];
+
     f32 col;
     switch (entry->mRInfo.mMaxFrame) {
     case 0:
-        o_color->r = 0;
+        pColor->r = 0;
         break;
     case 1:
-        o_color->r = mColorR[entry->mRInfo.mOffset];
+        pColor->r = mColorR[entry->mRInfo.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mRInfo,
                                           &mColorR[entry->mRInfo.mOffset]);
         if (col < 0.0f) {
-            o_color->r = 0;
+            pColor->r = 0;
         } else if (col > 255.0f) {
-            o_color->r = 255;
+            pColor->r = 255;
         } else {
-            OSf32tou8(&col, &o_color->r);
+            OSf32tou8(&col, &pColor->r);
         }
     }
+
     switch (entry->mGInfo.mMaxFrame) {
     case 0:
-        o_color->g = 0;
+        pColor->g = 0;
         break;
     case 1:
-        o_color->g = mColorG[entry->mGInfo.mOffset];
+        pColor->g = mColorG[entry->mGInfo.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mGInfo,
                                           &mColorG[entry->mGInfo.mOffset]);
         if (col < 0.0f) {
-            o_color->g = 0;
+            pColor->g = 0;
         } else if (col > 255.0f) {
-            o_color->g = 255;
+            pColor->g = 255;
         } else {
-            OSf32tou8(&col, &o_color->g);
+            OSf32tou8(&col, &pColor->g);
         }
     }
+
     switch (entry->mBInfo.mMaxFrame) {
     case 0:
-        o_color->b = 0;
+        pColor->b = 0;
         break;
     case 1:
-        o_color->b = mColorB[entry->mBInfo.mOffset];
+        pColor->b = mColorB[entry->mBInfo.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mBInfo,
                                           &mColorB[entry->mBInfo.mOffset]);
         if (col < 0.0f) {
-            o_color->b = 0;
+            pColor->b = 0;
         } else if (col > 255.0f) {
-            o_color->b = 255;
+            pColor->b = 255;
         } else {
-            OSf32tou8(&col, &o_color->b);
+            OSf32tou8(&col, &pColor->b);
         }
     }
+
     switch (entry->mAInfo.mMaxFrame) {
     case 0:
-        o_color->a = 0;
+        pColor->a = 0;
         break;
     case 1:
-        o_color->a = mColorA[entry->mAInfo.mOffset];
+        pColor->a = mColorA[entry->mAInfo.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mAInfo,
                                           &mColorA[entry->mAInfo.mOffset]);
         if (col < 0.0f) {
-            o_color->a = 0;
+            pColor->a = 0;
         } else if (col > 255.0f) {
-            o_color->a = 255;
+            pColor->a = 255;
         } else {
-            OSf32tou8(&col, &o_color->a);
+            OSf32tou8(&col, &pColor->a);
         }
     }
 }
 
 /* 8032AE18-8032AED8 325758 00C0+00 0/0 1/1 0/0 .text            __ct__15J3DAnmTevRegKeyFv */
-J3DAnmTevRegKey::J3DAnmTevRegKey() : J3DAnmBase(0) {
-    mKRegUpdateMaterialNum = 0;
-    mCRegUpdateMaterialNum = 0;
+J3DAnmTevRegKey::J3DAnmTevRegKey() {
+    mCRegUpdateMaterialNum = mKRegUpdateMaterialNum = 0;
+
+    mCRegDataCountR =
+    mCRegDataCountG =
+    mCRegDataCountB =
     mCRegDataCountA = 0;
-    mCRegDataCountB = 0;
-    mCRegDataCountG = 0;
-    mCRegDataCountR = 0;
+
+    mKRegDataCountR =
+    mKRegDataCountG =
+    mKRegDataCountB =
     mKRegDataCountA = 0;
-    mKRegDataCountB = 0;
-    mKRegDataCountG = 0;
-    mKRegDataCountR = 0;
-    mKRegUpdateMaterialID = NULL;
-    mCRegUpdateMaterialID = NULL;
+
+    mCRegUpdateMaterialID = mKRegUpdateMaterialID = NULL;
+    
+    mAnmCRegDataR =
+    mAnmCRegDataG =
+    mAnmCRegDataB =
     mAnmCRegDataA = NULL;
-    mAnmCRegDataB = NULL;
-    mAnmCRegDataG = NULL;
-    mAnmCRegDataR = NULL;
+
+    mAnmKRegDataR =
+    mAnmKRegDataG =
+    mAnmKRegDataB =
     mAnmKRegDataA = NULL;
-    mAnmKRegDataB = NULL;
-    mAnmKRegDataG = NULL;
-    mAnmKRegDataR = NULL;
 }
 
 
 /* 8032AED8-8032AF50 325818 0078+00 0/0 2/2 0/0 .text            __ct__16J3DAnmTexPatternFv */
-J3DAnmTexPattern::J3DAnmTexPattern() : J3DAnmBase(0), mTextureIndex(NULL), mAnmTable(NULL),
+J3DAnmTexPattern::J3DAnmTexPattern() : mTextureIndex(NULL), mAnmTable(NULL),
     field_0x14(0), mUpdateMaterialNum(0), mUpdateMaterialID(NULL) {}
 
 /* 8032AF50-8032B004 325890 00B4+00 0/0 1/1 72/72 .text getTexNo__16J3DAnmTexPatternCFUsPUs */
-void J3DAnmTexPattern::getTexNo(u16 i_index, u16* o_texNo) const {
-    u32 maxFrame = mAnmTable[i_index].mMaxFrame;
+void J3DAnmTexPattern::getTexNo(u16 index, u16* pTexNo) const {
+    u32 maxFrame = mAnmTable[index].mMaxFrame;
+    J3D_ASSERT_RANGE(1743, index >= 0 && index < mUpdateMaterialNum);
+    J3D_ASSERT_NULLPTR(1744, pTexNo != NULL);
+
     if (mFrame < 0.0f) {
-        *o_texNo = mTextureIndex[mAnmTable[i_index].mOffset];
-    } else if (mFrame >= maxFrame) {
-        *o_texNo = mTextureIndex[mAnmTable[i_index].mOffset + (maxFrame - 1)];
+        *pTexNo = mTextureIndex[mAnmTable[index].mOffset];
+    } else if (mFrame >= (u16)maxFrame) {
+        *pTexNo = mTextureIndex[mAnmTable[index].mOffset + ((u16)maxFrame - 1)];
     } else {
-        *o_texNo = mTextureIndex[mAnmTable[i_index].mOffset + (int)mFrame];
+        *pTexNo = mTextureIndex[mAnmTable[index].mOffset + (int)mFrame];
     }
 }
 
 /* 8032B004-8032B09C 325944 0098+00 1/1 1/1 0/0 .text
  * searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable */
-void J3DAnmTexPattern::searchUpdateMaterialID(J3DMaterialTable* i_materialTable) {
-    J3D_ASSERT(1790, i_materialTable, "Error : null pointer.");
+void J3DAnmTexPattern::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
+    J3D_ASSERT_NULLPTR(1790, pMatTable != NULL);
+
     for (u16 i = 0; i < mUpdateMaterialNum; i++) {
-        s32 index = i_materialTable->getMaterialName()->getIndex(mUpdateMaterialName.getName(i));
+        s32 index = pMatTable->getMaterialName()->getIndex(mUpdateMaterialName.getName(i));
         if (index != -1) {
             mUpdateMaterialID[i] = index;
         } else {
@@ -1133,25 +1230,27 @@ void J3DAnmTexPattern::searchUpdateMaterialID(J3DMaterialTable* i_materialTable)
 
 /* 8032B09C-8032B0C0 3259DC 0024+00 0/0 4/4 1/1 .text
  * searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData   */
-void J3DAnmTexPattern::searchUpdateMaterialID(J3DModelData* i_modelData) {
-    J3D_ASSERT(1813, i_modelData, "Error : null pointer.");
-    searchUpdateMaterialID(&i_modelData->getMaterialTable());
+void J3DAnmTexPattern::searchUpdateMaterialID(J3DModelData* pModelData) {
+    J3D_ASSERT_NULLPTR(1813, pModelData != NULL);
+    searchUpdateMaterialID(&pModelData->getMaterialTable());
 }
 
 /* 8032B0C0-8032B1D4 325A00 0114+00 1/1 1/1 0/0 .text
  * searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable */
-void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DMaterialTable* i_materialTable) {
-    J3D_ASSERT(1832, i_materialTable, "Error : null pointer.");
+void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
+    J3D_ASSERT_NULLPTR(1832, pMatTable != NULL);
+
     for (u16 i = 0; i < getUpdateMaterialNum(); i++) {
-        s32 index = i_materialTable->getMaterialName()->getIndex(mUpdateMaterialName.getName(i));
+        s32 index = pMatTable->getMaterialName()->getIndex(mUpdateMaterialName.getName(i));
         if (index != -1) {
             mUpdateMaterialID[i] = index;
         } else {
             mUpdateMaterialID[i] = -1;
         }
     }
+
     for (u16 i = 0; i < getPostUpdateMaterialNum(); i++) {
-        s32 index = i_materialTable->getMaterialName()->getIndex(mPostUpdateMaterialName.getName(i));
+        s32 index = pMatTable->getMaterialName()->getIndex(mPostUpdateMaterialName.getName(i));
         if (index != -1) {
             mPostUpdateMaterialID[i] = index;
         } else {
@@ -1162,183 +1261,197 @@ void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DMaterialTable* i_materialTab
 
 /* 8032B1D4-8032B1F8 325B14 0024+00 0/0 8/8 6/6 .text
  * searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData */
-void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DModelData* i_modelData) {
-    J3D_ASSERT(1871, i_modelData, "Error : null pointer.");
-    searchUpdateMaterialID(&i_modelData->getMaterialTable());
+void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DModelData* pModelData) {
+    J3D_ASSERT_NULLPTR(1871, pModelData != NULL);
+    searchUpdateMaterialID(&pModelData->getMaterialTable());
 }
 
 /* 8032B1F8-8032B4BC 325B38 02C4+00 0/0 2/2 1/1 .text
  * getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10          */
-void J3DAnmTevRegKey::getTevColorReg(u16 i_index, GXColorS10* o_color) const {
-    J3DAnmCRegKeyTable* entry = &mAnmCRegKeyTable[i_index];
+void J3DAnmTevRegKey::getTevColorReg(u16 index, GXColorS10* pColor) const {
+    J3D_ASSERT_RANGE(1887, index >= 0 && index < mCRegUpdateMaterialNum);
+    J3D_ASSERT_NULLPTR(1888, pColor != NULL);
+    J3DAnmCRegKeyTable* entry = &mAnmCRegKeyTable[index];
+
     f32 col;
     switch (entry->mRTable.mMaxFrame) {
     case 0:
-        o_color->r = 0;
+        pColor->r = 0;
         break;
     case 1:
-        o_color->r = mAnmCRegDataR[entry->mRTable.mOffset];
+        pColor->r = mAnmCRegDataR[entry->mRTable.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mRTable,
                                           &mAnmCRegDataR[entry->mRTable.mOffset]);
         if (col < -0x400) {
-            o_color->r = -0x400;
+            pColor->r = -0x400;
         } else if (col > 0x3FF) {
-            o_color->r = 0x3FF;
+            pColor->r = 0x3FF;
         } else {
-            OSf32tos16(&col, &o_color->r);
+            OSf32tos16(&col, &pColor->r);
         }
     }
+
     switch (entry->mGTable.mMaxFrame) {
     case 0:
-        o_color->g = 0;
+        pColor->g = 0;
         break;
     case 1:
-        o_color->g = mAnmCRegDataG[entry->mGTable.mOffset];
+        pColor->g = mAnmCRegDataG[entry->mGTable.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mGTable,
                                           &mAnmCRegDataG[entry->mGTable.mOffset]);
         if (col < -0x400) {
-            o_color->g = -0x400;
+            pColor->g = -0x400;
         } else if (col > 0x3FF) {
-            o_color->g = 0x3FF;
+            pColor->g = 0x3FF;
         } else {
-            OSf32tos16(&col, &o_color->g);
+            OSf32tos16(&col, &pColor->g);
         }
     }
+
     switch (entry->mBTable.mMaxFrame) {
     case 0:
-        o_color->b = 0;
+        pColor->b = 0;
         break;
     case 1:
-        o_color->b = mAnmCRegDataB[entry->mBTable.mOffset];
+        pColor->b = mAnmCRegDataB[entry->mBTable.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mBTable,
                                           &mAnmCRegDataB[entry->mBTable.mOffset]);
         if (col < -0x400) {
-            o_color->b = -0x400;
+            pColor->b = -0x400;
         } else if (col > 0x3FF) {
-            o_color->b = 0x3FF;
+            pColor->b = 0x3FF;
         } else {
-            OSf32tos16(&col, &o_color->b);
+            OSf32tos16(&col, &pColor->b);
         }
     }
+
     switch (entry->mATable.mMaxFrame) {
     case 0:
-        o_color->a = 0;
+        pColor->a = 0;
         break;
     case 1:
-        o_color->a = mAnmCRegDataA[entry->mATable.mOffset];
+        pColor->a = mAnmCRegDataA[entry->mATable.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mATable,
                                           &mAnmCRegDataA[entry->mATable.mOffset]);
         if (col < -0x400) {
-            o_color->a = -0x400;
+            pColor->a = -0x400;
         } else if (col > 0x3FF) {
-            o_color->a = 0x3FF;
+            pColor->a = 0x3FF;
         } else {
-            OSf32tos16(&col, &o_color->a);
+            OSf32tos16(&col, &pColor->a);
         }
     }
 }
 
 /* 8032B4BC-8032B780 325DFC 02C4+00 0/0 1/1 1/1 .text
  * getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor              */
-void J3DAnmTevRegKey::getTevKonstReg(u16 i_index, GXColor* o_color) const {
-    J3DAnmKRegKeyTable* entry = &mAnmKRegKeyTable[i_index];
+void J3DAnmTevRegKey::getTevKonstReg(u16 index, GXColor* pColor) const {
+    J3D_ASSERT_RANGE(1989, index >= 0 && index < mKRegUpdateMaterialNum);
+    J3D_ASSERT_NULLPTR(1990, pColor != NULL);
+    J3DAnmKRegKeyTable* entry = &mAnmKRegKeyTable[index];
+
     f32 col;
     switch (entry->mRTable.mMaxFrame) {
     case 0:
-        o_color->r = 0;
+        pColor->r = 0;
         break;
     case 1:
-        o_color->r = mAnmKRegDataR[entry->mRTable.mOffset];
+        pColor->r = mAnmKRegDataR[entry->mRTable.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mRTable,
                                           &mAnmKRegDataR[entry->mRTable.mOffset]);
         if (col < 0) {
-            o_color->r = 0;
+            pColor->r = 0;
         } else if (col > 0xFF) {
-            o_color->r = 0xFF;
+            pColor->r = 0xFF;
         } else {
-            OSf32tou8(&col, &o_color->r);
+            OSf32tou8(&col, &pColor->r);
         }
     }
+
     switch (entry->mGTable.mMaxFrame) {
     case 0:
-        o_color->g = 0;
+        pColor->g = 0;
         break;
     case 1:
-        o_color->g = mAnmKRegDataG[entry->mGTable.mOffset];
+        pColor->g = mAnmKRegDataG[entry->mGTable.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mGTable,
                                           &mAnmKRegDataG[entry->mGTable.mOffset]);
         if (col < 0) {
-            o_color->g = 0;
+            pColor->g = 0;
         } else if (col > 0xFF) {
-            o_color->g = 0xFF;
+            pColor->g = 0xFF;
         } else {
-            OSf32tou8(&col, &o_color->g);
+            OSf32tou8(&col, &pColor->g);
         }
     }
+
     switch (entry->mBTable.mMaxFrame) {
     case 0:
-        o_color->b = 0;
+        pColor->b = 0;
         break;
     case 1:
-        o_color->b = mAnmKRegDataB[entry->mBTable.mOffset];
+        pColor->b = mAnmKRegDataB[entry->mBTable.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mBTable,
                                           &mAnmKRegDataB[entry->mBTable.mOffset]);
         if (col < 0) {
-            o_color->b = 0;
+            pColor->b = 0;
         } else if (col > 0xFF) {
-            o_color->b = 0xFF;
+            pColor->b = 0xFF;
         } else {
-            OSf32tou8(&col, &o_color->b);
+            OSf32tou8(&col, &pColor->b);
         }
     }
+
     switch (entry->mATable.mMaxFrame) {
     case 0:
-        o_color->a = 0;
+        pColor->a = 0;
         break;
     case 1:
-        o_color->a = mAnmKRegDataA[entry->mATable.mOffset];
+        pColor->a = mAnmKRegDataA[entry->mATable.mOffset];
         break;
     default:
         col = J3DGetKeyFrameInterpolation(mFrame, &entry->mATable,
                                           &mAnmKRegDataA[entry->mATable.mOffset]);
         if (col < 0) {
-            o_color->a = 0;
+            pColor->a = 0;
         } else if (col > 0xFF) {
-            o_color->a = 0xFF;
+            pColor->a = 0xFF;
         } else {
-            OSf32tou8(&col, &o_color->a);
+            OSf32tou8(&col, &pColor->a);
         }
     }
 }
 
 /* 8032B780-8032B87C 3260C0 00FC+00 1/1 1/1 0/0 .text
  * searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable */
-void J3DAnmTevRegKey::searchUpdateMaterialID(J3DMaterialTable* i_materialTable) {
-    J3D_ASSERT(2083, i_materialTable, "Error : null pointer.");
+void J3DAnmTevRegKey::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
+    J3D_ASSERT_NULLPTR(2083, pMatTable != NULL);
+
     for (u16 i = 0; i < mCRegUpdateMaterialNum; i++) {
-        s32 index = i_materialTable->getMaterialName()->getIndex(mCRegUpdateMaterialName.getName(i));
+        s32 index = pMatTable->getMaterialName()->getIndex(mCRegUpdateMaterialName.getName(i));
         if (index != -1) {
             mCRegUpdateMaterialID[i] = index;
         } else {
             mCRegUpdateMaterialID[i] = -1;
         }
     }
+
     for (u16 i = 0; i < mKRegUpdateMaterialNum; i++) {
-        s32 index = i_materialTable->getMaterialName()->getIndex(mKRegUpdateMaterialName.getName(i));
+        s32 index = pMatTable->getMaterialName()->getIndex(mKRegUpdateMaterialName.getName(i));
         if (index != -1) {
             mKRegUpdateMaterialID[i] = index;
         } else {
@@ -1349,7 +1462,7 @@ void J3DAnmTevRegKey::searchUpdateMaterialID(J3DMaterialTable* i_materialTable)
 
 /* 8032B87C-8032B8A0 3261BC 0024+00 0/0 9/9 4/4 .text
  * searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData    */
-void J3DAnmTevRegKey::searchUpdateMaterialID(J3DModelData* i_modelData) {
-    J3D_ASSERT(2119, i_modelData, "Error : null pointer.");
-    searchUpdateMaterialID(&i_modelData->getMaterialTable());
+void J3DAnmTevRegKey::searchUpdateMaterialID(J3DModelData* pModelData) {
+    J3D_ASSERT_NULLPTR(2119, pModelData != NULL);
+    searchUpdateMaterialID(&pModelData->getMaterialTable());
 }
diff --git a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
index b4e8f6780b..97b45a3c8d 100644
--- a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
@@ -1,15 +1,8 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DCluster
-//
-
 #include "JSystem/J3DGraphAnimator/J3DCluster.h"
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/JMath/JMATrigonometric.h"
-#include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/base/PPCArch.h"
-#include "dolphin/os.h"
 
 /* 8032E1F8-8032E230 328B38 0038+00 0/0 1/1 0/0 .text            __ct__13J3DDeformDataFv */
 J3DDeformData::J3DDeformData() {
@@ -37,7 +30,7 @@ void J3DDeformData::offAllFlag(u32 i_flag) {
 /* 8032E274-8032E298 328BB4 0024+00 0/0 1/1 0/0 .text            deform__13J3DDeformDataFP8J3DModel
  */
 void J3DDeformData::deform(J3DModel* model) {
-    J3D_ASSERT(110, model, "Error : null pointer");
+    J3D_ASSERT_NULLPTR(110, model);
 
     deform(model->getVertexBuffer());
 }
@@ -45,7 +38,7 @@ void J3DDeformData::deform(J3DModel* model) {
 /* 8032E298-8032E364 328BD8 00CC+00 1/1 0/0 0/0 .text deform__13J3DDeformDataFP15J3DVertexBuffer
  */
 void J3DDeformData::deform(J3DVertexBuffer* buffer) {
-    J3D_ASSERT(141, buffer, "Error : null pointer");
+    J3D_ASSERT_NULLPTR(141, buffer);
 
     buffer->swapVtxPosArrayPointer();
     buffer->swapVtxNrmArrayPointer();
@@ -83,7 +76,7 @@ J3DDeformer::J3DDeformer(J3DDeformData* data) {
 /* 8032E3BC-8032E4A4 328CFC 00E8+00 1/1 0/0 0/0 .text deform__11J3DDeformerFP15J3DVertexBufferUs
  */
 void J3DDeformer::deform(J3DVertexBuffer* buffer, u16 param_1) {
-    J3D_ASSERT(222, buffer, "Error : null pointer");
+    J3D_ASSERT_NULLPTR(222, buffer);
 
     u16 var_r31 = 0;
     if (mAnmCluster != NULL) {
@@ -246,19 +239,29 @@ void J3DDeformer::deform_VtxNrmF32(J3DVertexBuffer* i_buffer, J3DCluster* i_clus
 /* 8032EAB4-8032EBCC 3293F4 0118+00 1/1 0/0 0/0 .text deform__11J3DDeformerFP15J3DVertexBufferUsPf
  */
 void J3DDeformer::deform(J3DVertexBuffer* i_buffer, u16 param_1, f32* i_weights) {
-    if (checkFlag(2) && i_buffer->getVertexData()->getVtxPosType() == 4) {
-        J3DCluster* cluster = mDeformData->getClusterPointer(param_1);
-        u16 offset = 0;
-        for (u16 i = 0; i < param_1; i++) {
-            offset += mDeformData->getClusterPointer(i)->mKeyNum + 1;
-        }
-        J3DClusterKey* clusterKey = mDeformData->getClusterKeyPointer(offset);
-        
-        normalizeWeight(cluster->mKeyNum, i_weights);
-        deform_VtxPosF32(i_buffer, cluster, clusterKey, i_weights);
-        if (checkFlag(1) && cluster->mFlags != 0 && i_buffer->getVertexData()->getVtxNrmType() == 4)
-        {
-            deform_VtxNrmF32(i_buffer, cluster, clusterKey, i_weights);
+    J3D_ASSERT_NULLPTR(505, i_buffer != NULL);
+
+    if (checkFlag(2)) {
+        JUT_ASSERT_MSG(512, i_buffer->getVertexData()->getVtxPosType() == 4, "Error : Invalid Verex Format");
+        if (i_buffer->getVertexData()->getVtxPosType() == 4) {
+            J3DCluster* cluster = mDeformData->getClusterPointer(param_1);
+            u16 offset = 0;
+            J3DClusterKey* clusterKey = NULL;
+
+            for (u16 i = 0; i < param_1; i++) {
+                offset += mDeformData->getClusterPointer(i)->mKeyNum + 1;
+            }
+
+            clusterKey = mDeformData->getClusterKeyPointer(offset);
+            
+            int var_r23 = cluster->mKeyNum;
+            normalizeWeight(var_r23, i_weights);
+            deform_VtxPosF32(i_buffer, cluster, clusterKey, i_weights);
+
+            if (checkFlag(1) && cluster->mFlags != 0 && i_buffer->getVertexData()->getVtxNrmType() == 4)
+            {
+                deform_VtxNrmF32(i_buffer, cluster, clusterKey, i_weights);
+            }
         }
     }
 }
@@ -270,6 +273,7 @@ void J3DDeformer::normalizeWeight(int i_keyNum, f32* i_weights) {
     for (u16 i = 0; i < i_keyNum; i++) {
         totalWeight += i_weights[i];
     }
+
     f32 scale = 1.0f / totalWeight;
     for (u16 i = 0; i < i_keyNum; i++) {
         i_weights[i] *= scale;
diff --git a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp
index 900edf00f4..5d18acb4c7 100644
--- a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp
@@ -24,7 +24,6 @@ void J3DMtxCalcJ3DSysInitMaya::init(Vec const& scale, Mtx const& mtx) {
                      J3DSys::mCurrentS.z);
 }
 
-/* ############################################################################################## */
 /* 804515F0-804515F4 000AF0 0004+00 3/3 1/1 0/0 .sbss            mMtxBuffer__10J3DMtxCalc */
 J3DMtxBuffer* J3DMtxCalc::mMtxBuffer;
 
@@ -180,7 +179,7 @@ void J3DJoint::entryIn() {
     j3dSys.getDrawBuffer(0)->setZMtx(anmMtx);
     j3dSys.getDrawBuffer(1)->setZMtx(anmMtx);
     for (J3DMaterial* mesh = mMesh; mesh != NULL;) {
-        if (mesh->getShape()->checkFlag(1)) {
+        if (mesh->getShape()->checkFlag(J3DShpFlag_Visible)) {
             mesh = mesh->getNext();
         } else {
             J3DMatPacket* matPacket = j3dSys.getModel()->getMatPacket(mesh->getIndex());
@@ -207,7 +206,6 @@ void J3DJoint::entryIn() {
     }
 }
 
-/* ############################################################################################## */
 /* 804515F8-80451600 000AF8 0004+04 1/1 1/1 0/0 .sbss            mCurrentMtxCalc__8J3DJoint */
 J3DMtxCalc* J3DJoint::mCurrentMtxCalc;
 
@@ -265,4 +263,4 @@ void J3DJoint::recursiveCalc() {
     if (younger != NULL) {
         younger->recursiveCalc();
     }
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp
index b9aaa4618b..9b6cae0b3b 100644
--- a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp
@@ -3,6 +3,15 @@
 #include "JSystem/J3DGraphAnimator/J3DShapeTable.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 
+enum {
+    kTypeEnd        = 0x00,
+    kTypeBeginChild = 0x01,
+    kTypeEndChild   = 0x02,
+    kTypeJoint      = 0x10,
+    kTypeMaterial   = 0x11,
+    kTypeShape      = 0x12,
+};
+
 /* 80325A18-80325A9C 320358 0084+00 0/0 1/1 0/0 .text            __ct__12J3DJointTreeFv */
 J3DJointTree::J3DJointTree()
     : mHierarchy(NULL), mFlags(0), mModelDataType(0), mRootNode(NULL), mBasicMtxCalc(NULL),
@@ -13,52 +22,34 @@ J3DJointTree::J3DJointTree()
 /* 80325A9C-80325C00 3203DC 0164+00 1/0 2/2 0/0 .text
  * makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTableP13J3DShapeTable
  */
-void J3DJointTree::makeHierarchy(J3DJoint* pJoint, J3DModelHierarchy const** pHierarchy,
+void J3DJointTree::makeHierarchy(J3DJoint* pJoint, const J3DModelHierarchy** pHierarchy,
                                  J3DMaterialTable* pMaterialTable, J3DShapeTable* pShapeTable) {
-    enum {
-        kTypeEnd        = 0x00,
-        kTypeBeginChild = 0x01,
-        kTypeEndChild   = 0x02,
-        kTypeJoint      = 0x10,
-        kTypeMaterial   = 0x11,
-        kTypeShape      = 0x12,
-    };
-
-    J3DJoint * curJoint = pJoint;
+    J3D_ASSERT_NULLPTR(95, pHierarchy != NULL);
+    J3DJoint* curJoint = pJoint;
 
     while (true) {
-        J3DJoint * newJoint = NULL;
-        J3DMaterial * newMaterial = NULL;
-        J3DShape * newShape = NULL;
-        const J3DModelHierarchy * inf = *pHierarchy;
-        u16 val;
+        J3DJoint* newJoint = NULL;
+        J3DMaterial* newMaterial = NULL;
+        J3DShape* newShape = NULL;
 
-        switch (inf->mType) {
+        switch ((*pHierarchy)->mType) {
         case kTypeBeginChild:
-            *pHierarchy = inf + 1;
+            (*pHierarchy)++;
             makeHierarchy(curJoint, pHierarchy, pMaterialTable, pShapeTable);
             break;
         case kTypeEndChild:
-            *pHierarchy = inf + 1; 
+            (*pHierarchy)++; 
             return;
         case kTypeEnd:
             return;
         case kTypeJoint:
-            {
-                J3DJoint ** jointNodePointer = mJointNodePointer;
-                *pHierarchy = inf + 1;
-                newJoint = jointNodePointer[inf->mValue];
-            }
+            newJoint = mJointNodePointer[((*pHierarchy)++)->mValue];
             break;
         case kTypeMaterial:
-            *pHierarchy = inf + 1;
-            val = inf->mValue;
-            newMaterial = pMaterialTable->getMaterialNodePointer(val);
+            newMaterial = pMaterialTable->getMaterialNodePointer(((*pHierarchy)++)->mValue);
             break;
         case kTypeShape:
-            *pHierarchy = inf + 1;
-            val = inf->mValue;
-            newShape = pShapeTable->getShapeNodePointer(val);
+            newShape = pShapeTable->getShapeNodePointer(((*pHierarchy)++)->mValue);
             break;
         }
 
@@ -68,31 +59,29 @@ void J3DJointTree::makeHierarchy(J3DJoint* pJoint, J3DModelHierarchy const** pHi
                 mRootNode = newJoint;
             else
                 pJoint->appendChild(newJoint);
-        } else if (newMaterial != NULL) {
-            if (pJoint->getMesh() != NULL)
-                newMaterial->mNext = pJoint->getMesh();
-            pJoint->mMesh = newMaterial;
-            newMaterial->mJoint = pJoint;
-        } else if (newShape != NULL) {
-            newMaterial = pJoint->getMesh();
-            newMaterial->mShape = newShape;
-            newShape->mMaterial = newMaterial;
+        } else if (newMaterial != NULL && pJoint->getType() == 'NJNT') {
+            pJoint->addMesh(newMaterial);
+            newMaterial->setJoint(pJoint);
+        } else if (newShape != NULL && pJoint->getType() == 'NJNT') {
+            J3DMaterial* newMaterial = pJoint->getMesh();
+            newMaterial->addShape(newShape);
+            newShape->setMaterial(newMaterial);
         }
     }
 }
 
 /* 80325C00-80325CAC 320540 00AC+00 0/0 2/2 0/0 .text findImportantMtxIndex__12J3DJointTreeFv */
 void J3DJointTree::findImportantMtxIndex() {
-    const s32 wEvlpMtxNum = getWEvlpMtxNum();
+    s32 wEvlpMtxNum = getWEvlpMtxNum();
     u32 tableIdx = 0;
-    const u16 drawFullWgtMtxNum = getDrawFullWgtMtxNum();
-    const u16 * wEvlpMixIndex = getWEvlpMixMtxIndex();
-    const f32 * wEvlpMixWeight = getWEvlpMixWeight();
-    u16 * wEvlpImportantMtxIdx = getWEvlpImportantMtxIndex();
+    u16 drawFullWgtMtxNum = getDrawFullWgtMtxNum();
+    u16* wEvlpMixIndex = getWEvlpMixMtxIndex();
+    f32* wEvlpMixWeight = getWEvlpMixWeight();
+    u16* wEvlpImportantMtxIdx = getWEvlpImportantMtxIndex();
 
     // Rigid matrices are easy.
     for (u16 i = 0; i < drawFullWgtMtxNum; i++)
-        wEvlpImportantMtxIdx[i] = mDrawMtxData.mDrawMtxIndex[i];
+        wEvlpImportantMtxIdx[i] = getDrawMtxIndex(i);
 
     // For envelope matrices, we need to find the matrix with the most contribution.
     for (s32 i = 0; i < wEvlpMtxNum; i++) {
@@ -100,26 +89,25 @@ void J3DJointTree::findImportantMtxIndex() {
         u16 bestIdx = 0;
         f32 bestWeight = -0.1f;
 
-        for (s32 j = 0; j < mixNum; j++) {
+        for (s32 j = 0; j < mixNum; j++, tableIdx++) {
             if (bestWeight < wEvlpMixWeight[tableIdx]) {
                 bestWeight = wEvlpMixWeight[tableIdx];
                 bestIdx = wEvlpMixIndex[tableIdx];
             }
-
-            tableIdx++;
         }
 
-        wEvlpImportantMtxIdx[i + mDrawMtxData.mDrawFullWgtMtxNum] = bestIdx;
+        wEvlpImportantMtxIdx[i + getDrawFullWgtMtxNum()] = bestIdx;
     }
 }
 
 /* 80325CAC-80325D1C 3205EC 0070+00 1/0 0/0 0/0 .text
  * calc__12J3DJointTreeFP12J3DMtxBufferRC3VecRA3_A4_Cf          */
 void J3DJointTree::calc(J3DMtxBuffer* pMtxBuffer, Vec const& scale, f32 const (&mtx)[3][4]) {
+    J3D_ASSERT_NULLPTR(217, pMtxBuffer != NULL);
     getBasicMtxCalc()->init(scale, mtx);
-    J3DMtxCalc::setMtxBuffer(pMtxBuffer);
-    J3DJoint* root = getRootNode();
+    getBasicMtxCalc()->setMtxBuffer(pMtxBuffer);
 
+    J3DJoint* root = getRootNode();
     if (root == NULL)
         return;
 
diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp b/src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp
index bb4f0931ae..a05ae6e6e1 100644
--- a/src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp
@@ -1,22 +1,5 @@
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "dol2asm.h"
-
-//
-// Forward References:
-//
-
-extern "C" void calc__14J3DMaterialAnmCFP11J3DMaterial();
-
-//
-// External References:
-//
-
-extern "C" void __dt__14J3DMaterialAnmFv();
-
-//
-// Declarations:
-//
 
 void J3DMaterialAnm::initialize() {
     for (int i = 0; i < ARRAY_SIZE(mMatColorAnm); i++) {
@@ -40,10 +23,12 @@ void J3DMaterialAnm::initialize() {
     }
 }
 
-void J3DMaterialAnm::calc(J3DMaterial* pMat) const {
+void J3DMaterialAnm::calc(J3DMaterial* pMaterial) const {
+    J3D_ASSERT_NULLPTR(54, pMaterial != NULL);
+
     for (u32 i = 0; i < ARRAY_SIZE(mMatColorAnm); i++) {
         if (mMatColorAnm[i].getAnmFlag()) {
-            _GXColor* color = pMat->getColorBlock()->getMatColor(i);
+            GXColor* color = pMaterial->mColorBlock->getMatColor(i);
             mMatColorAnm[i].calc(color);
         }
     }
@@ -52,77 +37,78 @@ void J3DMaterialAnm::calc(J3DMaterial* pMat) const {
     for (u32 i = 0; i < ARRAY_SIZE(mTexNoAnm); i++) {
         if (mTexNoAnm[i].getAnmFlag()) {
             mTexNoAnm[i].calc(&tmp);
-            pMat->getTevBlock()->setTexNo(i, tmp);
+            pMaterial->mTevBlock->setTexNo(i, tmp);
         }
     }
 
     for (u32 i = 0; i < 3; i++) {
         if (mTevColorAnm[i].getAnmFlag()) {
-            _GXColorS10* color = pMat->getTevBlock()->getTevColor(i);
+            GXColorS10* color = pMaterial->mTevBlock->getTevColor(i);
             mTevColorAnm[i].calc(color);
         }
     }
 
     for (u32 i = 0; i < ARRAY_SIZE(mTevKColorAnm); i++) {
         if (mTevKColorAnm[i].getAnmFlag()) {
-            _GXColor* color = pMat->getTevBlock()->getTevKColor(i);
+            GXColor* color = pMaterial->mTevBlock->getTevKColor(i);
             mTevKColorAnm[i].calc(color);
         }
     }
 
     for (u32 i = 0; i < ARRAY_SIZE(mTexMtxAnm); i++) {
         if (mTexMtxAnm[i].getAnmFlag()) {
-            J3DTexMtx* texMtx = pMat->getTexGenBlock()->getTexMtx(i);
-            mTexMtxAnm[i].calc(&texMtx->getTexMtxInfo().mSRT);
+            J3DTextureSRTInfo* pSRT = &pMaterial->mTexGenBlock->getTexMtx(i)->getTexMtxInfo().mSRT;
+            mTexMtxAnm[i].calc(pSRT);
         }
     }
 }
 
-void J3DMaterialAnm::setMatColorAnm(int idx, J3DMatColorAnm* p_matColorAnm) {
-    if (p_matColorAnm == NULL) {
+void J3DMaterialAnm::setMatColorAnm(int idx, J3DMatColorAnm* pMatColorAnm) {
+    J3D_ASSERT_RANGE(106, idx >= 0 && idx < 2);
+
+    if (pMatColorAnm == NULL) {
         mMatColorAnm[idx].setAnmFlag(false);
     } else {
-        mMatColorAnm[idx] = *p_matColorAnm;
+        mMatColorAnm[idx] = *pMatColorAnm;
     }
 }
 
-void J3DMaterialAnm::setTexMtxAnm(int idx, J3DTexMtxAnm* p_texMtxAnm) {
-    if (p_texMtxAnm == NULL) {
+void J3DMaterialAnm::setTexMtxAnm(int idx, J3DTexMtxAnm* pTexMtxAnm) {
+    J3D_ASSERT_RANGE(117, idx >= 0 && idx < 8);
+
+    if (pTexMtxAnm == NULL) {
         mTexMtxAnm[idx].setAnmFlag(false);
     } else {
-        mTexMtxAnm[idx] = *p_texMtxAnm;
+        mTexMtxAnm[idx] = *pTexMtxAnm;
     }
 }
 
-void J3DMaterialAnm::setTexNoAnm(int idx, J3DTexNoAnm* p_texNoAnm) {
-    if (p_texNoAnm == NULL) {
+void J3DMaterialAnm::setTexNoAnm(int idx, J3DTexNoAnm* pTexNoAnm) {
+    J3D_ASSERT_RANGE(128, idx >= 0 && idx < 8);
+
+    if (pTexNoAnm == NULL) {
         mTexNoAnm[idx].setAnmFlag(false);
     } else {
-        mTexNoAnm[idx] = *p_texNoAnm;
+        mTexNoAnm[idx] = *pTexNoAnm;
     }
 }
 
-void J3DMaterialAnm::setTevColorAnm(int idx, J3DTevColorAnm* p_tevColorAnm) {
-    if (p_tevColorAnm == NULL) {
+void J3DMaterialAnm::setTevColorAnm(int idx, J3DTevColorAnm* pTevColorAnm) {
+    J3D_ASSERT_RANGE(139, idx >= 0 && idx < 4);
+
+    if (pTevColorAnm == NULL) {
         mTevColorAnm[idx].setAnmFlag(false);
     } else {
-        mTevColorAnm[idx] = *p_tevColorAnm;
+        mTevColorAnm[idx] = *pTevColorAnm;
     }
 }
 
-void J3DMaterialAnm::setTevKColorAnm(int idx, J3DTevKColorAnm* p_tevKColorAnm) {
-    if (p_tevKColorAnm == NULL) {
+void J3DMaterialAnm::setTevKColorAnm(int idx, J3DTevKColorAnm* pTevKColorAnm) {
+    J3D_ASSERT_RANGE(150, idx >= 0 && idx < 4);
+
+    if (pTevKColorAnm == NULL) {
         mTevKColorAnm[idx].setAnmFlag(false);
     } else {
-        mTevKColorAnm[idx] = *p_tevKColorAnm;
+        mTevKColorAnm[idx] = *pTevKColorAnm;
     }
 }
-
-/* ############################################################################################## */
-/* 803CEE60-803CEE70 02BF80 0010+00 0/0 10/10 74/74 .data            __vt__14J3DMaterialAnm */
-SECTION_DATA extern void* __vt__14J3DMaterialAnm[4] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__14J3DMaterialAnmFv,
-    (void*)calc__14J3DMaterialAnmCFP11J3DMaterial,
-};
\ No newline at end of file
diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
index 4bac6a28d4..b0f1232d52 100644
--- a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DMaterialAttach
-//
-
 #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -38,13 +33,14 @@ J3DMaterialTable::~J3DMaterialTable() {}
 /* 8032F64C-8032F6F8 329F8C 00AC+00 0/0 1/1 5/5 .text
  * removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor    */
 int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor* pAnmColor) {
-    JUT_ASSERT_MSG(208, pAnmColor != NULL, "Error : null pointer.")
+    J3D_ASSERT_NULLPTR(208, pAnmColor != NULL);
     int ret = false;
+
     u16 updateMatNum = pAnmColor->getUpdateMaterialNum();
     for (u16 i = 0; i < updateMatNum; i++) {
         if (pAnmColor->isValidUpdateMaterialID(i)) {
-            u16 materialUpdateId = pAnmColor->getUpdateMaterialID(i);
-            J3DMaterialAnm* materialAnm = getMaterialNodePointer(materialUpdateId)->getMaterialAnm();
+            u16 matNo = pAnmColor->getUpdateMaterialID(i);
+            J3DMaterialAnm* materialAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
             if (materialAnm == NULL) {
                 ret = true;
             } else {
@@ -52,22 +48,23 @@ int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor* pAnmColor) {
             }
         }
     }
+
     return ret;
 }
 
 /* 8032F6F8-8032F7B4 32A038 00BC+00 0/0 5/5 10/10 .text
  * removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern  */
-int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern* anm) {
-    JUT_ASSERT_MSG(242, anm != NULL, "Error : null pointer.")
+int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
+    J3D_ASSERT_NULLPTR(242, pAnmTexPattern != NULL);
     int ret = 0;
-    u16 materialNum = anm->getUpdateMaterialNum();
-    J3DAnmTexPatternFullTable* anm_table = (J3DAnmTexPatternFullTable*)anm->getAnmTable();
+
+    u16 materialNum = pAnmTexPattern->getUpdateMaterialNum();
+    J3DAnmTexPatternFullTable* anm_table = (J3DAnmTexPatternFullTable*)pAnmTexPattern->getAnmTable();
 
     for (u16 i = 0; i < materialNum; i++) {
-        if (anm->isValidUpdateMaterialID(i)) {
-            u16 materialID = anm->getUpdateMaterialID(i);
-
-            J3DMaterialAnm* pMatAnm = getMaterialNodePointer(materialID)->getMaterialAnm();
+        if (pAnmTexPattern->isValidUpdateMaterialID(i)) {
+            u16 matNo = pAnmTexPattern->getUpdateMaterialID(i);
+            J3DMaterialAnm* pMatAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
             u8 texNo = anm_table[i].mTexNo;
             if (pMatAnm == NULL)
                 ret = 1;
@@ -81,19 +78,20 @@ int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern* anm) {
 
 /* 8032F7B4-8032F880 32A0F4 00CC+00 0/0 4/4 26/26 .text
  * removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
-int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey* pAnm) {
-    JUT_ASSERT_MSG(278, pAnm != NULL, "Error : null pointer.")
+int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
+    J3D_ASSERT_NULLPTR(278, pAnmTexSRTKey != NULL);
     s32 ret = 0;
-    u16 materialNum = pAnm->getUpdateMaterialNum();
+
+    u16 materialNum = pAnmTexSRTKey->getUpdateMaterialNum();
     u16 postUpdateMaterialNum[1];
-    postUpdateMaterialNum[0] = pAnm->getPostUpdateMaterialNum();
+    postUpdateMaterialNum[0] = pAnmTexSRTKey->getPostUpdateMaterialNum();
 
     for (u16 i = 0; i < materialNum; i++) {
-        if (pAnm->isValidUpdateMaterialID(i)) {
-            u16 updateMaterial = pAnm->getUpdateMaterialID(i);
-            J3DMaterial* pMaterial = getMaterialNodePointer(updateMaterial);
+        if (pAnmTexSRTKey->isValidUpdateMaterialID(i)) {
+            u16 matNo = pAnmTexSRTKey->getUpdateMaterialID(i);
+            J3DMaterial* pMaterial = getMaterialNodePointer(matNo);
             J3DMaterialAnm* pMatAnm = pMaterial->getMaterialAnm();
-            u8 texMtxID = pAnm->getUpdateTexMtxID(i);
+            u8 texMtxID = pAnmTexSRTKey->getUpdateTexMtxID(i);
             if (pMatAnm == NULL) {
                 ret = 1;
             } else if (texMtxID != 0xFF) {
@@ -107,15 +105,19 @@ int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey* pAnm) {
 
 /* 8032F880-8032F9C0 32A1C0 0140+00 0/0 7/7 24/24 .text
  * removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey  */
-int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnm) {
+int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnmTevRegKey) {
+    J3D_ASSERT_NULLPTR(320, pAnmTevRegKey != NULL);
     s32 ret = 0;
-    u16 cRegMaterialNum = pAnm->getCRegUpdateMaterialNum();
-    u16 kRegMaterialNum = pAnm->getKRegUpdateMaterialNum();
+
+    u16 cRegMaterialNum = pAnmTevRegKey->getCRegUpdateMaterialNum();
+    u16 kRegMaterialNum = pAnmTevRegKey->getKRegUpdateMaterialNum();
 
     for (u16 i = 0; i < cRegMaterialNum; i++) {
-        if (pAnm->getCRegUpdateMaterialID(i) != 0xFFFF) {
-            J3DMaterialAnm * pMatAnm = getMaterialNodePointer(pAnm->getCRegUpdateMaterialID(i))->getMaterialAnm();
-            u32 colorId = pAnm->getAnmCRegKeyTable()[i].mColorId;
+        if (pAnmTevRegKey->isValidCRegUpdateMaterialID(i)) {
+            const u16 spC = pAnmTevRegKey->getCRegUpdateMaterialID(i);
+            J3DMaterialAnm* pMatAnm = getMaterialNodePointer(spC)->getMaterialAnm();
+            const J3DAnmCRegKeyTable* table = pAnmTevRegKey->getAnmCRegKeyTable();
+            const u8 colorId = table[i].mColorId;
             if (pMatAnm == NULL)
                 ret = 1;
             else
@@ -124,9 +126,11 @@ int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnm) {
     }
 
     for (u16 i = 0; i < kRegMaterialNum; i++) {
-        if (pAnm->getKRegUpdateMaterialID(i) != 0xFFFF) {
-            J3DMaterialAnm * pMatAnm = getMaterialNodePointer(pAnm->getKRegUpdateMaterialID(i))->getMaterialAnm();
-            u32 colorId = pAnm->getAnmKRegKeyTable()[i].mColorId;
+        if (pAnmTevRegKey->isValidKRegUpdateMaterialID(i)) {
+            const u16 spA = pAnmTevRegKey->getKRegUpdateMaterialID(i);
+            J3DMaterialAnm* pMatAnm = getMaterialNodePointer(spA)->getMaterialAnm();
+            const J3DAnmKRegKeyTable* table = pAnmTevRegKey->getAnmKRegKeyTable();
+            const u8 colorId = table[i].mColorId;
             if (pMatAnm == NULL) {
                 ret = 1;
             } else {
@@ -140,99 +144,117 @@ int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnm) {
 
 /* 8032F9C0-8032FAF4 32A300 0134+00 1/1 0/0 0/0 .text
  * createTexMtxForAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
-int J3DMaterialTable::createTexMtxForAnimator(J3DAnmTextureSRTKey* param_1) {
+int J3DMaterialTable::createTexMtxForAnimator(J3DAnmTextureSRTKey* pTexSRTKey) {
+    J3D_ASSERT_NULLPTR(382, pTexSRTKey != NULL);
     int rv = 0;
-    u16 materialNum = param_1->getUpdateMaterialNum();
+
+    u16 materialNum = pTexSRTKey->getUpdateMaterialNum();
     if (isLocked()) {
         return 2;
     }
+
     for (u16 i = 0; i < materialNum; i++) {
-        if (param_1->isValidUpdateMaterialID(i)) {
-            J3DMaterial* material = getMaterialNodePointer(param_1->getUpdateMaterialID(i));
-            u8 mtxId = param_1->getUpdateTexMtxID(i);
-            if (material->getMaterialAnm() == 0) {
+        if (pTexSRTKey->isValidUpdateMaterialID(i)) {
+            const u16 matNo = pTexSRTKey->getUpdateMaterialID(i);
+            J3DMaterial* material = getMaterialNodePointer(matNo);
+            u8 texMtx = pTexSRTKey->getUpdateTexMtxID(i);
+
+            J3DMaterialAnm* pMaterialAnm = material->getMaterialAnm();
+            if (pMaterialAnm == NULL) {
                 rv = 1;
             } else {
-                u32 mtxId2 = mtxId;
-                if (mtxId2 != 0xff && material->getTexMtx(mtxId2) == 0) {
+                if (texMtx != 0xff && material->getTexMtx(texMtx) == NULL) {
                     J3DTexMtx* mtx = new J3DTexMtx();
                     rv = 4;
-                    material->setTexMtx(mtxId2, mtx);
-                    JUT_WARN(420, "matNo<%d> : texMtx%d nothing !\n", i, mtxId);
+                    material->setTexMtx(texMtx, mtx);
+                    JUT_WARN(420, "matNo<%d> : texMtx%d nothing !\n", matNo, texMtx);
                 }
             }
         }
     }
+
     return rv;
 }
 
 /* 8032FAF4-8032FBC8 32A434 00D4+00 0/0 1/1 0/0 .text
  * entryMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor     */
-int J3DMaterialTable::entryMatColorAnimator(J3DAnmColor* param_1) {
+int J3DMaterialTable::entryMatColorAnimator(J3DAnmColor* pAnmColor) {
+    J3D_ASSERT_NULLPTR(450, pAnmColor != NULL);
     int rv = 0;
-    u16 materialNum = param_1->getUpdateMaterialNum();
+
+    u16 materialNum = pAnmColor->getUpdateMaterialNum();
     if (isLocked()) {
         return 2;
     }
+
     for (u16 i = 0; i < materialNum; i++) {
-        if (param_1->isValidUpdateMaterialID(i)) {
-            J3DMaterial* material = getMaterialNodePointer(param_1->getUpdateMaterialID(i));
-            J3DMaterialAnm* materialAnm = material->getMaterialAnm();
-            if (materialAnm == 0) {
+        if (pAnmColor->isValidUpdateMaterialID(i)) {
+            const u16 matNo = pAnmColor->getUpdateMaterialID(i);
+            J3DMaterialAnm* materialAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
+            if (materialAnm == NULL) {
                 rv = 1;
             } else {
-                J3DMatColorAnm matColorAnm(i, param_1);
+                J3DMatColorAnm matColorAnm(i, pAnmColor);
                 materialAnm->setMatColorAnm(0, &matColorAnm);
             }
         }
     }
+
     return rv;
 }
 
 /* 8032FBC8-8032FCC4 32A508 00FC+00 0/0 7/7 1/1 .text
  * entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern   */
-int J3DMaterialTable::entryTexNoAnimator(J3DAnmTexPattern* param_1) {
+int J3DMaterialTable::entryTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
+    J3D_ASSERT_NULLPTR(489, pAnmTexPattern != NULL);
     int rv = 0;
-    u16 materialNum = param_1->getUpdateMaterialNum();
+
+    u16 materialNum = pAnmTexPattern->getUpdateMaterialNum();
     if (isLocked()) {
         return 2;
     }
+
     for (u16 i = 0; i < materialNum; i++) {
-        if (param_1->isValidUpdateMaterialID(i)) {
-            J3DMaterial* material = getMaterialNodePointer(param_1->getUpdateMaterialID(i));
-            J3DMaterialAnm* materialAnm = material->getMaterialAnm();
-            u8 texNo = param_1->getAnmTable()[i].mTexNo;
-            if (materialAnm == 0) {
+        if (pAnmTexPattern->isValidUpdateMaterialID(i)) {
+            const u16 matNo = pAnmTexPattern->getUpdateMaterialID(i);
+            J3DMaterialAnm* materialAnm =  getMaterialNodePointer(matNo)->getMaterialAnm();
+            const J3DAnmTexPatternFullTable* table = pAnmTexPattern->getAnmTable();
+            const u8 texNo = table[i].mTexNo;
+            if (materialAnm == NULL) {
                 rv = 1;
             } else {
-                J3DTexNoAnm texNoAnm(i, param_1);
+                J3DTexNoAnm texNoAnm(i, pAnmTexPattern);
                 materialAnm->setTexNoAnm(texNo, &texNoAnm);
             }
         }
     }
+
     return rv;
 }
 
 /* 8032FCC4-8032FE70 32A604 01AC+00 0/0 14/14 6/6 .text
  * entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
-int J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* btk) {
-    JUT_ASSERT_MSG(532, btk != NULL, "Error : null pointer.")
+int J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
+    J3D_ASSERT_NULLPTR(532, pAnmTexSRTKey != NULL);
     int rv = 0;
-    u16 materialNum = btk->getUpdateMaterialNum();
-    rv = createTexMtxForAnimator(btk);
+    u16 materialNum = pAnmTexSRTKey->getUpdateMaterialNum();
+
+    rv = createTexMtxForAnimator(pAnmTexSRTKey);
     if (rv != 0) {
         return rv;
     }
+
     if (isLocked()) {
         return 2;
     }
+
     for (u16 no = 0; no < materialNum; no++) {
-        if (btk->isValidUpdateMaterialID(no)) {
-            u16 updateMaterialId = btk->getUpdateMaterialID(no);
-            J3DMaterial* material = getMaterialNodePointer((u16)updateMaterialId);
+        if (pAnmTexSRTKey->isValidUpdateMaterialID(no)) {
+            const u16 matNo = pAnmTexSRTKey->getUpdateMaterialID(no);
+            J3DMaterial* material = getMaterialNodePointer(matNo);
             J3DMaterialAnm* materialAnm = material->getMaterialAnm();
-            u8 texMtxID = btk->getUpdateTexMtxID(no);
-            if (materialAnm == 0) {
+            u8 texMtxID = pAnmTexSRTKey->getUpdateTexMtxID(no);
+            if (materialAnm == NULL) {
                 rv = 1;
             } else {
                 if (texMtxID != 0xff) {
@@ -240,53 +262,61 @@ int J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* btk) {
                         material->getTexCoord(texMtxID)->setTexGenMtx((u8)texMtxID * 3 + 30);
                     }
                     J3DTexMtxInfo& tmtxinfo = material->getTexMtx(texMtxID)->getTexMtxInfo();
-                    tmtxinfo.mInfo = (tmtxinfo.mInfo & 0x3f) | (btk->getTexMtxCalcType() << 7);
-                    tmtxinfo.mCenter.x = btk->getSRTCenter(no)->x;
-                    tmtxinfo.mCenter.y = btk->getSRTCenter(no)->y;
-                    tmtxinfo.mCenter.z = btk->getSRTCenter(no)->z;
-                    J3DTexMtxAnm texMtxAnm(no, btk);
+                    tmtxinfo.mInfo = (tmtxinfo.mInfo & 0x3f) | (pAnmTexSRTKey->getTexMtxCalcType() << 7);
+                    tmtxinfo.mCenter.x = pAnmTexSRTKey->getSRTCenter(no)->x;
+                    tmtxinfo.mCenter.y = pAnmTexSRTKey->getSRTCenter(no)->y;
+                    tmtxinfo.mCenter.z = pAnmTexSRTKey->getSRTCenter(no)->z;
+                    J3DTexMtxAnm texMtxAnm(no, pAnmTexSRTKey);
                     materialAnm->setTexMtxAnm(texMtxID, &texMtxAnm);
                 }
             }
         }
     }
+
     return rv;
 }
 
 /* 8032FE70-8032FFEC 32A7B0 017C+00 0/0 10/10 4/4 .text
  * entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey   */
-int J3DMaterialTable::entryTevRegAnimator(J3DAnmTevRegKey* param_1) {
+int J3DMaterialTable::entryTevRegAnimator(J3DAnmTevRegKey* pAnmTevRegKey) {
+    J3D_ASSERT_NULLPTR(599, pAnmTevRegKey != NULL);
     int rv = 0;
-    u16 cRegNum = param_1->getCRegUpdateMaterialNum();
-    u16 kRegNum = param_1->getKRegUpdateMaterialNum();
+
+    u16 cRegNum = pAnmTevRegKey->getCRegUpdateMaterialNum();
+    u16 kRegNum = pAnmTevRegKey->getKRegUpdateMaterialNum();
     if (isLocked()) {
         return 2;
     }
+
     for (u16 i = 0; i < cRegNum; i++) {
-        if (param_1->isValidCRegUpdateMaterialID(i)) {
-            J3DMaterial* material = getMaterialNodePointer(param_1->getCRegUpdateMaterialID(i));
-            J3DMaterialAnm* materialAnm = material->getMaterialAnm();
-            u8 colorId = param_1->getAnmCRegKeyTable()[i].mColorId;
+        if (pAnmTevRegKey->isValidCRegUpdateMaterialID(i)) {
+            const u16 matNo = pAnmTevRegKey->getCRegUpdateMaterialID(i);
+            J3DMaterialAnm* materialAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
+            const J3DAnmCRegKeyTable* table = pAnmTevRegKey->getAnmCRegKeyTable();
+            u8 colorId = table[i].mColorId;
             if (materialAnm == NULL) {
                 rv = 1;
             } else {
-                J3DTevColorAnm tevColorAnm(i, param_1);
+                J3DTevColorAnm tevColorAnm(i, pAnmTevRegKey);
                 materialAnm->setTevColorAnm(colorId, &tevColorAnm);
             }
         }
     }
+
     for (u16 i = 0; i < kRegNum; i++) {
-        if (param_1->isValidKRegUpdateMaterialID(i)) {
-            J3DMaterial* material = getMaterialNodePointer(param_1->getKRegUpdateMaterialID(i));
-            J3DMaterialAnm* materialAnm = material->getMaterialAnm();
-            u32 colorId = param_1->getAnmKRegKeyTable()[i].mColorId;
+        if (pAnmTevRegKey->isValidKRegUpdateMaterialID(i)) {
+            const u16 matNo = pAnmTevRegKey->getKRegUpdateMaterialID(i);
+            J3DMaterialAnm* materialAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
+            const J3DAnmKRegKeyTable* table = pAnmTevRegKey->getAnmKRegKeyTable();
+            const u8 colorId = table[i].mColorId;
             if (materialAnm == NULL) {
                 rv = 1;
             } else {
-                J3DTevKColorAnm tevKColorAnm(i, param_1);
+                J3DTevKColorAnm tevKColorAnm(i, pAnmTevRegKey);
                 materialAnm->setTevKColorAnm(colorId, &tevKColorAnm);
             }
         }
     }
+
     return rv;
 }
diff --git a/src/JSystem/J3DGraphAnimator/J3DModel.cpp b/src/JSystem/J3DGraphAnimator/J3DModel.cpp
index 7632bfe58a..92879e4e89 100644
--- a/src/JSystem/J3DGraphAnimator/J3DModel.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DModel.cpp
@@ -1,13 +1,10 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DModel
-//
-
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphBase/J3DShapeMtx.h"
-#include "dolphin/os.h"
+
+#define J3D_ASSERTMSG(LINE, COND, MSG) JUT_ASSERT_MSG(LINE, (COND) != 0, MSG)
+#define J3D_WARN1(LINE, MSG, ARG1) JUT_WARN(LINE, MSG, ARG1)
 
 /* 80327100-80327184 321A40 0084+00 0/0 3/3 0/0 .text            initialize__8J3DModelFv */
 void J3DModel::initialize() {
@@ -36,72 +33,80 @@ void J3DModel::initialize() {
 
 /* 80327184-80327300 321AC4 017C+00 0/0 3/3 0/0 .text
  * entryModelData__8J3DModelFP12J3DModelDataUlUl                */
-s32 J3DModel::entryModelData(J3DModelData* p_modelData, u32 modelFlag, u32 mtxBufferFlag) {
-    mModelData = p_modelData;
+s32 J3DModel::entryModelData(J3DModelData* pModelData, u32 mdlFlags, u32 mtxNum) {
+    J3D_ASSERTMSG(83, pModelData != NULL, "Error : null pointer.");
+    J3D_ASSERTMSG(84, mtxNum != 0, "Error : non-zero argument is specified 0.");
+    int ret = kJ3DError_Success;
+
+    mModelData = pModelData;
     mMtxBuffer = new J3DMtxBuffer();
 
     if (mMtxBuffer == NULL) {
-        return 4;
+        return kJ3DError_Alloc;
     }
 
-    s32 ret = mMtxBuffer->create(p_modelData, mtxBufferFlag);
-    if (ret) {
-        return ret;
-    }
-    ret = createShapePacket(p_modelData);
-    if (ret) {
-        return ret;
-    }
-    ret = createMatPacket(p_modelData, modelFlag);
-    if (ret) {
+    ret = mMtxBuffer->create(pModelData, mtxNum);
+    if (ret != kJ3DError_Success) {
         return ret;
     }
 
-    mVertexBuffer.setVertexData(&p_modelData->getVertexData());
+    ret = createShapePacket(pModelData);
+    if (ret != kJ3DError_Success) {
+        return ret;
+    }
+
+    ret = createMatPacket(pModelData, mdlFlags);
+    if (ret != kJ3DError_Success) {
+        return ret;
+    }
+
+    mVertexBuffer.setVertexData(&pModelData->getVertexData());
     prepareShapePackets();
 
-    if (modelFlag & J3DMdlFlag_Unk00001) {
-        onFlag(J3DMdlFlag_Unk00001);
+    if (mdlFlags & J3DMdlFlag_Unk1) {
+        onFlag(J3DMdlFlag_Unk1);
     }
-    if (modelFlag & J3DMdlFlag_Unk00002) {
-        onFlag(J3DMdlFlag_Unk00002);
+    if (mdlFlags & J3DMdlFlag_UseDefaultJ3D) {
+        onFlag(J3DMdlFlag_UseDefaultJ3D);
     }
-    if (modelFlag & J3DMdlFlag_Unk00010) {
-        onFlag(J3DMdlFlag_Unk00010);
+    if (mdlFlags & J3DMdlFlag_EnableLOD) {
+        onFlag(J3DMdlFlag_EnableLOD);
     }
-    if (modelFlag & J3DMdlFlag_Unk20000) {
-        onFlag(J3DMdlFlag_Unk20000);
+    if (mdlFlags & J3DMdlFlag_UseSharedDL) {
+        onFlag(J3DMdlFlag_UseSharedDL);
     }
-    if (modelFlag & J3DMdlFlag_Unk40000) {
-        onFlag(J3DMdlFlag_Unk40000);
+    if (mdlFlags & J3DMdlFlag_UseSingleDL) {
+        onFlag(J3DMdlFlag_UseSingleDL);
     }
-    if (modelFlag & J3DMdlFlag_Unk80000) {
-        onFlag(J3DMdlFlag_Unk80000);
+    if (mdlFlags & J3DMdlFlag_DifferedDLBuffer) {
+        onFlag(J3DMdlFlag_DifferedDLBuffer);
     }
-    if (modelFlag & J3DMdlFlag_SkinPosCpu) {
+    if (mdlFlags & J3DMdlFlag_SkinPosCpu) {
+        J3D_WARN1(149, "%s", "Don't forget to call J3DModel::setSkinDeform\n if you set J3DMdlFlag_SkinPosCpu.");
         onFlag(J3DMdlFlag_SkinPosCpu);
     }
-    if (modelFlag & J3DMdlFlag_SkinNrmCpu) {
+    if (mdlFlags & J3DMdlFlag_SkinNrmCpu) {
+        J3D_WARN1(154, "%s", "Don't forget to call J3DModel::setSkinDeform\n if you set J3DMdlFlag_SkinNrmCpu.");
         onFlag(J3DMdlFlag_SkinNrmCpu);
     }
-    return 0;
+
+    return kJ3DError_Success;
 }
 
 /* 80327300-803273CC 321C40 00CC+00 1/1 0/0 0/0 .text createShapePacket__8J3DModelFP12J3DModelData
  */
-s32 J3DModel::createShapePacket(J3DModelData* p_modelData) {
-    if (p_modelData->getShapeNum() != 0) {
-        u16 shapeNum = p_modelData->getShapeNum();
+s32 J3DModel::createShapePacket(J3DModelData* pModelData) {
+    J3D_ASSERTMSG(173, pModelData != NULL, "Error : null pointer.");
 
-        mShapePacket = new J3DShapePacket[shapeNum];
+    if (pModelData->getShapeNum() != 0) {
+        mShapePacket = new J3DShapePacket[pModelData->getShapeNum()];
 
         if (mShapePacket == NULL) {
             return kJ3DError_Alloc;
         }
 
-        for (int i = 0; i < p_modelData->getShapeNum(); i++) {
-            J3DShape* shapeNode = p_modelData->getShapeNodePointer(i);
-            mShapePacket[i].setShape(shapeNode);
+        for (int i = 0; i < pModelData->getShapeNum(); i++) {
+            mShapePacket[i].setShape(pModelData->getShapeNodePointer(i));
             mShapePacket[i].setModel(this);
         }
     }
@@ -111,76 +116,78 @@ s32 J3DModel::createShapePacket(J3DModelData* p_modelData) {
 
 /* 803273CC-803275FC 321D0C 0230+00 1/1 0/0 0/0 .text createMatPacket__8J3DModelFP12J3DModelDataUl
  */
-s32 J3DModel::createMatPacket(J3DModelData* p_modelData, u32 flag) {
-    if (p_modelData->getMaterialNum() != 0) {
-        mMatPacket = new J3DMatPacket[p_modelData->getMaterialNum()];
+s32 J3DModel::createMatPacket(J3DModelData* pModelData, u32 mdlFlags) {
+    J3D_ASSERTMSG(207, pModelData != NULL, "Error : null pointer.");
+    s32 ret = 0;
+
+    if (pModelData->getMaterialNum() != 0) {
+        mMatPacket = new J3DMatPacket[pModelData->getMaterialNum()];
 
         if (mMatPacket == NULL) {
             return kJ3DError_Alloc;
         }
     }
-
-    s32 ret;
-    u16 matNum = p_modelData->getMaterialNum();
-
-    u32 singleDLFlag = flag & 0x40000;
+    
+    u16 matNum = pModelData->getMaterialNum();
     for (u16 i = 0; i < matNum; i++) {
-        J3DMaterial* materialNode = p_modelData->getMaterialNodePointer(i);
-        J3DMatPacket* pkt = mMatPacket + i;
+        J3DMaterial* materialNode = pModelData->getMaterialNodePointer(i);
+        J3DMatPacket* matPacket = mMatPacket + i;
+        J3DShapePacket* shapePacket = mShapePacket + materialNode->getShape()->getIndex();
 
-        u16 shapeIndex = materialNode->getShape()->getIndex();
-        J3DShapePacket* shapePacket = mShapePacket + shapeIndex;
+        matPacket->setMaterial(materialNode);
+        matPacket->setInitShapePacket(shapePacket);
+        matPacket->addShapePacket(shapePacket);
+        matPacket->setTexture(pModelData->getTexture());
+        matPacket->setMaterialID(materialNode->mDiffFlag);
 
-        pkt->setMaterial(materialNode);
-        pkt->setInitShapePacket(shapePacket);
-        pkt->addShapePacket(shapePacket);
-        pkt->setTexture(p_modelData->getTexture());
-        pkt->setMaterialID(materialNode->mDiffFlag);
-
-        if (p_modelData->getModelDataType() == 1) {
-            pkt->mFlags |= 0x01;
+        if (pModelData->getModelDataType() == 1) {
+            matPacket->lock();
         }
 
-        if (!!(flag & 0x80000)) {
-            pkt->mpDisplayListObj = materialNode->getSharedDisplayListObj();
+        if (mdlFlags & J3DMdlFlag_DifferedDLBuffer) {
+            J3DDisplayListObj* dlobj = materialNode->getSharedDisplayListObj();
+            J3D_ASSERTMSG(253, dlobj != NULL, "Error : User need to call J3DModelData::newSharedDisplayList()  before using DifferedDLBuffer.");
+            matPacket->setDisplayListObj(dlobj);
         } else {
-            if (p_modelData->getModelDataType() == 1) {
-                if (!!(flag & 0x40000)) {
-                    pkt->mpDisplayListObj = materialNode->getSharedDisplayListObj();
+            if (pModelData->getModelDataType() == 1) {
+                if (mdlFlags & J3DMdlFlag_UseSingleDL) {
+                    matPacket->mpDisplayListObj = materialNode->getSharedDisplayListObj();
+                    matPacket->setDisplayListObj(matPacket->mpDisplayListObj);
                 } else {
-                    J3DDisplayListObj* sharedDL = materialNode->getSharedDisplayListObj();
-                    ret = sharedDL->single_To_Double();
+                    J3DDisplayListObj* dlobj = materialNode->getSharedDisplayListObj();
+                    ret = dlobj->single_To_Double();
                     if (ret != kJ3DError_Success)
                         return ret;
 
-                    pkt->mpDisplayListObj = sharedDL;
+                    matPacket->setDisplayListObj(dlobj);
                 }
-            } else if (!!(flag & 0x20000)) {
-                if (!!(flag & 0x40000)) {
+            } else if (mdlFlags & J3DMdlFlag_UseSharedDL) {
+                if (mdlFlags & J3DMdlFlag_UseSingleDL) {
                     ret = materialNode->newSingleSharedDisplayList(materialNode->countDLSize());
                     if (ret != kJ3DError_Success)
                         return ret;
 
-                    pkt->mpDisplayListObj = materialNode->getSharedDisplayListObj();
+                    J3DDisplayListObj* dlobj = materialNode->getSharedDisplayListObj();
+                    matPacket->setDisplayListObj(dlobj);
                 } else {
                     ret = materialNode->newSharedDisplayList(materialNode->countDLSize());
                     if (ret != kJ3DError_Success)
                         return ret;
 
-                    J3DDisplayListObj* sharedDL = materialNode->getSharedDisplayListObj();
-                    ret = sharedDL->single_To_Double();
+                    J3DDisplayListObj* dlobj = materialNode->getSharedDisplayListObj();
+                    ret = dlobj->single_To_Double();
                     if (ret != kJ3DError_Success)
                         return ret;
 
-                    pkt->mpDisplayListObj = sharedDL;
+                    matPacket->setDisplayListObj(dlobj);
                 }
             } else {
-                if (!!(flag & 0x40000)) {
-                    ret = pkt->newSingleDisplayList(materialNode->countDLSize());
+                if (mdlFlags & J3DMdlFlag_UseSingleDL) {
+                    ret = matPacket->newSingleDisplayList(materialNode->countDLSize());
                     if (ret != kJ3DError_Success)
                         return ret;
                 } else {
-                    ret = pkt->newDisplayList(materialNode->countDLSize());
+                    ret = matPacket->newDisplayList(materialNode->countDLSize());
                     if (ret != kJ3DError_Success)
                         return ret;
                 }
@@ -192,21 +199,40 @@ s32 J3DModel::createMatPacket(J3DModelData* p_modelData, u32 flag) {
 }
 
 /* 803275FC-8032767C 321F3C 0080+00 0/0 1/1 0/0 .text newDifferedDisplayList__8J3DModelFUl */
-s32 J3DModel::newDifferedDisplayList(u32 flag) {
-    mDiffFlag = flag;
+s32 J3DModel::newDifferedDisplayList(u32 diffFlags) {
+    mDiffFlag = diffFlags;
+
     u16 shapeNum = getModelData()->getShapeNum();
     for (u16 i = 0; i < shapeNum; i++) {
-        s32 ret = mShapePacket[i].newDifferedDisplayList(flag);
+        s32 ret = getShapePacket(i)->newDifferedDisplayList(diffFlags);
         if (ret != kJ3DError_Success)
             return ret;
     }
+
     return kJ3DError_Success;
 }
 
+void J3DModel::ptrToIndex() {
+    j3dSys.setModel(this);
+    j3dSys.setTexture(mModelData->getTexture());
+
+    u16 matNum = mModelData->getMaterialNum();
+    for (u16 i = 0; i < matNum; i++) {
+        J3DMatPacket* matPacket = getMatPacket(i);
+
+        GDLObj dlobj;
+        GDInitGDLObj(&dlobj, matPacket->getDisplayList(0), matPacket->getDisplayListSize());
+        GDSetCurrent(&dlobj);
+
+        mModelData->getMaterialNodePointer(i)->getTevBlock()->ptrToIndex();
+
+        GDSetCurrent(NULL);
+    }
+}
+
 /* 8032767C-803276B4 321FBC 0038+00 0/0 4/4 0/0 .text            lock__8J3DModelFv */
 void J3DModel::lock() {
-    u16 matNum = mModelData->getMaterialNum();
-
+    int matNum = mModelData->getMaterialNum();
     for (int i = 0; i < matNum; i++) {
         mMatPacket[i].lock();
     }
@@ -214,24 +240,34 @@ void J3DModel::lock() {
 
 /* 803276B4-803276EC 321FF4 0038+00 0/0 2/2 0/0 .text            unlock__8J3DModelFv */
 void J3DModel::unlock() {
-    u16 matNum = mModelData->getMaterialNum();
-
+    int matNum = mModelData->getMaterialNum();
     for (int i = 0; i < matNum; i++) {
         mMatPacket[i].unlock();
     }
 }
 
+void J3DModel::makeDL() {
+    j3dSys.setModel(this);
+    j3dSys.setTexture(mModelData->getTexture());
+
+    u16 matNum = mModelData->getMaterialNum();
+    for (u16 i = 0; i < matNum; i++) {
+        j3dSys.setMatPacket(&mMatPacket[i]);
+        mModelData->getMaterialNodePointer(i)->makeDisplayList();
+    }
+}
+
 /* 803276EC-80327858 32202C 016C+00 1/0 0/0 0/0 .text            calcMaterial__8J3DModelFv */
 void J3DModel::calcMaterial() {
     j3dSys.setModel(this);
 
-    if (checkFlag(4)) {
+    if (checkFlag(J3DMdlFlag_SkinPosCpu)) {
         j3dSys.onFlag(4);
     } else {
         j3dSys.offFlag(4);
     }
 
-    if (checkFlag(8)) {
+    if (checkFlag(J3DMdlFlag_SkinNrmCpu)) {
         j3dSys.onFlag(8);
     } else {
         j3dSys.offFlag(8);
@@ -249,31 +285,31 @@ void J3DModel::calcMaterial() {
             material->getMaterialAnm()->calc(material);
         }
 
-        int jntNo = material->getJoint()->getJntNo();
-        material->calc(getAnmMtx(jntNo));
+        material->calc(getAnmMtx(material->getJoint()->getJntNo()));
     }
 }
 
 /* 80327858-803279A0 322198 0148+00 1/0 0/0 0/0 .text            calcDiffTexMtx__8J3DModelFv */
-// NONMATCHING regalloc
 void J3DModel::calcDiffTexMtx() {
     j3dSys.setModel(this);
 
-    for (u16 num = mModelData->getMaterialNum(), i = 0; i < num; i++) {
+    u16 matNum =  mModelData->getMaterialNum();
+    for (u16 i = 0; i < matNum; i++) {
         j3dSys.setMatPacket(&mMatPacket[i]);
         J3DMaterial* materialNode = mModelData->getMaterialNodePointer(i);
         materialNode->calcDiffTexMtx(getAnmMtx(materialNode->getJoint()->getJntNo()));
     }
 
-    for (u16 num = mModelData->getShapeNum(), i = 0; i < num; i++) {
+    u16 shapeNum = getModelData()->getShapeNum();
+    for (u16 i = 0; i < shapeNum; i++) {
         J3DShapePacket* shapePacket = getShapePacket(i);
-        J3DTexGenBlock* texGenBlock =
-            mModelData->getShapeNodePointer(i)->getMaterial()->getTexGenBlock();
+        J3DTexGenBlock* texGenBlock = mModelData->getShapeNodePointer(i)->getMaterial()->getTexGenBlock();
+
         for (u16 j = 0; (int)j < 8; j++) {
             J3DTexMtx* texMtxNode = texGenBlock->getTexMtx(j);
             J3DTexMtxObj* texMtxObj = shapePacket->getTexMtxObj();
             if (texMtxNode != NULL && texMtxObj != NULL) {
-                texMtxObj->setMtx(j, &texMtxNode->getMtx());
+                texMtxObj->setMtx(j, texMtxNode->getMtx());
             }
         }
     }
@@ -281,9 +317,10 @@ void J3DModel::calcDiffTexMtx() {
 
 /* 803279A0-80327A2C 3222E0 008C+00 0/0 2/2 0/0 .text            diff__8J3DModelFv */
 void J3DModel::diff() {
-    for (u16 n = getModelData()->getMaterialNum(), i = 0; i < n; i++) {
+    u16 matNum = mModelData->getMaterialNum();
+    for (u16 i = 0; i < matNum; i++) {
         j3dSys.setMatPacket(&mMatPacket[i]);
-        getModelData()->getMaterialNodePointer(i)->diff(mDiffFlag);
+        mModelData->getMaterialNodePointer(i)->diff(mDiffFlag);
     }
 }
 
@@ -293,17 +330,19 @@ s32 J3DModel::setDeformData(J3DDeformData* p_deformData, u32 param_1) {
     mDeformData = p_deformData;
 
     if (p_deformData == NULL) {
-        return 0;
+        return kJ3DError_Success;
     }
 
     s32 ret = mVertexBuffer.copyLocalVtxArray(param_1);
     if (ret) {
         return ret;
     }
+
     if (param_1 & 4) {
         p_deformData->offAllFlag(1);
     }
-    return 0;
+
+    return kJ3DError_Success;
 }
 
 /* 80327AA0-80327BD4 3223E0 0134+00 0/0 0/0 2/2 .text setSkinDeform__8J3DModelFP13J3DSkinDeformUl
@@ -311,46 +350,43 @@ s32 J3DModel::setDeformData(J3DDeformData* p_deformData, u32 param_1) {
 s32 J3DModel::setSkinDeform(J3DSkinDeform* p_skinDeform, u32 flags) {
     mSkinDeform = p_skinDeform;
 
-    s32 ret = kJ3DError_Success;
-
     if (p_skinDeform == NULL) {
         offFlag(J3DMdlFlag_SkinPosCpu);
         offFlag(J3DMdlFlag_SkinNrmCpu);
         return 5;
-    } else {
-        mSkinDeform->initMtxIndexArray(mModelData);
+    }
 
-        ret = mModelData->checkFlag(0x100);
+    mSkinDeform->initMtxIndexArray(mModelData);
+
+    if (mModelData->checkFlag(0x100)) {
+        mSkinDeform->changeFastSkinDL(mModelData);
+        flags &= ~2;
+        flags &= ~4;
+        mSkinDeform->transformVtxPosNrm(mModelData);
+        mSkinDeform->initSkinInfo(mModelData);
+    }
+
+    s32 ret = kJ3DError_Success;
+    if ((~flags & 2)) {
+        ret = mVertexBuffer.allocTransformedVtxPosArray();
         if (ret != kJ3DError_Success) {
-            mSkinDeform->changeFastSkinDL(mModelData);
-            flags &= ~2;
-            flags &= ~4;
-            mSkinDeform->transformVtxPosNrm(mModelData);
-            mSkinDeform->initSkinInfo(mModelData);
-        }
-
-        ret = 0;
-        if ((~flags & 2)) {
-            ret = mVertexBuffer.allocTransformedVtxPosArray();
-            if (ret != kJ3DError_Success) {
-                offFlag(J3DMdlFlag_SkinPosCpu);
-                return ret;
-            }
-            onFlag(J3DMdlFlag_SkinPosCpu);
-        } else {
             offFlag(J3DMdlFlag_SkinPosCpu);
+            return ret;
         }
+        onFlag(J3DMdlFlag_SkinPosCpu);
+    } else {
+        offFlag(J3DMdlFlag_SkinPosCpu);
+    }
 
-        if ((~flags & 4)) {
-            ret = mVertexBuffer.allocTransformedVtxNrmArray();
-            if (ret != kJ3DError_Success) {
-                offFlag(J3DMdlFlag_SkinNrmCpu);
-                return ret;
-            }
-            onFlag(J3DMdlFlag_SkinNrmCpu);
-        } else {
+    if ((~flags & 4)) {
+        ret = mVertexBuffer.allocTransformedVtxNrmArray();
+        if (ret != kJ3DError_Success) {
             offFlag(J3DMdlFlag_SkinNrmCpu);
+            return ret;
         }
+        onFlag(J3DMdlFlag_SkinNrmCpu);
+    } else {
+        offFlag(J3DMdlFlag_SkinNrmCpu);
     }
 
     return ret;
@@ -360,7 +396,7 @@ s32 J3DModel::setSkinDeform(J3DSkinDeform* p_skinDeform, u32 flags) {
 void J3DModel::calcAnmMtx() {
     j3dSys.setModel(this);
 
-    if (checkFlag(2)) {
+    if (checkFlag(J3DMdlFlag_UseDefaultJ3D)) {
         getModelData()->getJointTree().calc(mMtxBuffer, j3dDefaultScale, j3dDefaultMtx);
     } else {
         getModelData()->getJointTree().calc(mMtxBuffer, mBaseScale, mBaseTransformMtx);
@@ -370,7 +406,7 @@ void J3DModel::calcAnmMtx() {
 /* 80327C58-80327CA4 322598 004C+00 1/1 1/1 1/1 .text            calcWeightEnvelopeMtx__8J3DModelFv
  */
 void J3DModel::calcWeightEnvelopeMtx() {
-    if (getModelData()->getWEvlpMtxNum() != 0 && !checkFlag(0x10)) {
+    if (getModelData()->getWEvlpMtxNum() != 0 && !checkFlag(J3DMdlFlag_EnableLOD)) {
         if (!getModelData()->checkFlag(0x100)) {
             mMtxBuffer->calcWeightEnvelopeMtx();
         }
@@ -383,7 +419,6 @@ void J3DModel::update() {
     entry();
 }
 
-
 /* 80327CF0-80327E4C 322630 015C+00 1/0 0/0 0/0 .text            calc__8J3DModelFv */
 void J3DModel::calc() {
     j3dSys.setModel(this);
@@ -400,11 +435,11 @@ void J3DModel::calc() {
         j3dSys.offFlag(J3DSysFlag_SkinNrmCpu);
     }
 
-    getModelData()->syncJ3DSysFlags();
+    mModelData->syncJ3DSysFlags();
     mVertexBuffer.frameInit();
 
     if (mUnkCalc2 != NULL) {
-        mUnkCalc2->calc(getModelData());
+        mUnkCalc2->calc(mModelData);
     }
 
     if (mDeformData != NULL) {
@@ -447,11 +482,11 @@ void J3DModel::entry() {
         j3dSys.offFlag(J3DSysFlag_SkinNrmCpu);
     }
 
-    getModelData()->syncJ3DSysFlags();
-    j3dSys.setTexture(getModelData()->getTexture());
+    mModelData->syncJ3DSysFlags();
+    j3dSys.setTexture(mModelData->getTexture());
 
-    for (u16 i = 0; i < getModelData()->getJointNum(); i++) {
-        J3DJoint* joint = getModelData()->getJointNodePointer(i);
+    for (u16 i = 0; i < mModelData->getJointNum(); i++) {
+        J3DJoint* joint = mModelData->getJointNodePointer(i);
         if (joint->getMesh() != NULL) {
             joint->entryIn();
         }
@@ -463,7 +498,7 @@ void J3DModel::viewCalc() {
     mMtxBuffer->swapDrawMtx();
     mMtxBuffer->swapNrmMtx();
 
-    if (mModelData->checkFlag(0x10)) {
+    if (getModelData()->checkFlag(0x10)) {
         if (getMtxCalcMode() == 2) {
             J3DCalcViewBaseMtx(j3dSys.getViewMtx(), mBaseScale, mBaseTransformMtx,
                                (MtxP)&mInternalView);
@@ -502,17 +537,16 @@ void J3DModel::calcNrmMtx() {
 
 /* 803281B4-803282B8 322AF4 0104+00 1/1 0/0 0/0 .text            calcBumpMtx__8J3DModelFv */
 void J3DModel::calcBumpMtx() {
-    if (getModelData()->checkBumpFlag() == 1) {
+    if (getModelData()->checkBumpFlag()) {
         u32 bumpMtxIdx = 0;
         u16 materialNum = getModelData()->getMaterialNum();
-        u16 i = 0;
 
-        for (; i < materialNum; i++) {
+        for (u16 i = 0; i < materialNum; i++) {
             J3DMaterial* material = getModelData()->getMaterialNodePointer(i);
-            if (material->getNBTScale()->mbHasScale == 1) {
+            if (material->getNBTScale()->mbHasScale == TRUE) {
                 material->getShape()->calcNBTScale(*material->getNBTScale()->getScale(),
                                                    getNrmMtxPtr(), getBumpMtxPtr(bumpMtxIdx));
-                DCStoreRange(getBumpMtxPtr(bumpMtxIdx), getModelData()->getDrawMtxNum() * 0x24);
+                DCStoreRange(getBumpMtxPtr(bumpMtxIdx), mModelData->getDrawMtxNum() * sizeof(Mtx33));
                 bumpMtxIdx++;
             }
         }
@@ -521,23 +555,24 @@ void J3DModel::calcBumpMtx() {
 
 /* 803282B8-803282EC 322BF8 0034+00 1/1 0/0 0/0 .text            calcBBoardMtx__8J3DModelFv */
 void J3DModel::calcBBoardMtx() {
-    if (mModelData->checkBBoardFlag()) {
+    if (getModelData()->checkBBoardFlag()) {
         mMtxBuffer->calcBBoardMtx();
     }
 }
 
 /* 803282EC-80328350 322C2C 0064+00 2/2 0/0 0/0 .text            prepareShapePackets__8J3DModelFv */
 void J3DModel::prepareShapePackets() {
-    u16 shapeNum = getModelData()->getShapeNum();
+    u16 shapeNum = mModelData->getShapeNum();
 
     for (u16 i = 0; i < shapeNum; i++) {
-        J3DShape* xx = mModelData->getShapeNodePointer(i);
-        J3DShapePacket* pkt = getShapePacket(i);
-        pkt->setMtxBuffer(mMtxBuffer);
+        J3DShape* shapeNode = mModelData->getShapeNodePointer(i);
+        J3DShapePacket* shapePacket = &mShapePacket[i];
+        shapePacket->setMtxBuffer(mMtxBuffer);
+
         if (getMtxCalcMode() == 2) {
-            pkt->setBaseMtxPtr(&mInternalView);
+            shapePacket->setBaseMtxPtr(&mInternalView);
         } else {
-            pkt->setBaseMtxPtr(&j3dSys.mViewMtx);
+            shapePacket->setBaseMtxPtr((Mtx*)j3dSys.getViewMtx());
         }
     }
 }
diff --git a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp b/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
index 5f3572ade2..bab3b416a7 100644
--- a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
@@ -5,7 +5,7 @@
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "dolphin/os.h"
+#include "JSystem/J3DGraphAnimator/J3DModel.h"
 
 /* 80325D88-80325DA0 3206C8 0018+00 1/1 2/2 0/0 .text            clear__12J3DModelDataFv */
 void J3DModelData::clear() {
@@ -21,16 +21,17 @@ J3DModelData::J3DModelData() {
 }
 
 /* 80325E14-80325EC8 320754 00B4+00 0/0 2/2 0/0 .text newSharedDisplayList__12J3DModelDataFUl */
-s32 J3DModelData::newSharedDisplayList(u32 flag) {
+s32 J3DModelData::newSharedDisplayList(u32 mdlFlags) {
     u16 matNum = getMaterialNum();
 
     for (u16 i = 0; i < matNum; i++) {
-        if (!!(flag & 0x40000)) {
-            s32 ret = getMaterialNodePointer(i)->newSingleSharedDisplayList(getMaterialNodePointer(i)->countDLSize());
+        s32 ret;
+        if (mdlFlags & J3DMdlFlag_UseSingleDL) {
+            ret = getMaterialNodePointer(i)->newSingleSharedDisplayList(getMaterialNodePointer(i)->countDLSize());
             if (ret != kJ3DError_Success)
                 return ret;
         } else {
-            s32 ret = getMaterialNodePointer(i)->newSharedDisplayList(getMaterialNodePointer(i)->countDLSize());
+            ret = getMaterialNodePointer(i)->newSharedDisplayList(getMaterialNodePointer(i)->countDLSize());
             if (ret != kJ3DError_Success)
                 return ret;
         }
@@ -39,22 +40,11 @@ s32 J3DModelData::newSharedDisplayList(u32 flag) {
     return kJ3DError_Success;
 }
 
-/* ############################################################################################## */
-/* 804515E8-804515EC 000AE8 0004+00 1/1 0/0 0/0 .sbss            sInterruptFlag$965 */
-static s32 sInterruptFlag;
-
-/* 804515EC-804515F0 000AEC 0004+00 1/1 0/0 0/0 .sbss            None */
-static s8 sInitInterruptFlag;
-
 /* 80325EC8-80325F94 320808 00CC+00 0/0 1/1 0/0 .text            indexToPtr__12J3DModelDataFv */
 void J3DModelData::indexToPtr() {
-    J3DTexture* tex = getTexture();
-    j3dSys.setTexture(tex);
+    j3dSys.setTexture(getTexture());
 
-    if (!sInitInterruptFlag) {
-        sInterruptFlag = OSDisableInterrupts();
-        sInitInterruptFlag = true;
-    }
+    static BOOL sInterruptFlag = OSDisableInterrupts();
     OSDisableScheduler();
 
     GDLObj gdl_obj;
@@ -67,6 +57,7 @@ void J3DModelData::indexToPtr() {
         GDSetCurrent(&gdl_obj);
         matNode->getTevBlock()->indexToPtr();
     }
+
     GDSetCurrent(NULL);
     OSEnableScheduler();
     OSRestoreInterrupts(sInterruptFlag);
@@ -74,8 +65,7 @@ void J3DModelData::indexToPtr() {
 
 /* 80325F94-8032600C 3208D4 0078+00 0/0 2/2 0/0 .text            makeSharedDL__12J3DModelDataFv */
 void J3DModelData::makeSharedDL() {
-    J3DTexture* tex = getTexture();
-    j3dSys.setTexture(tex);
+    j3dSys.setTexture(getTexture());
 
     u16 matNum = getMaterialNum();
     for (u16 i = 0; i < matNum; i++) {
@@ -88,8 +78,9 @@ void J3DModelData::makeSharedDL() {
 void J3DModelData::simpleCalcMaterial(u16 idx, Mtx param_1) {
     syncJ3DSysFlags();
 
+    J3DMaterial* mat;
     J3DJoint* jointNode = getJointNodePointer(idx);
-    for (J3DMaterial* mat = jointNode->getMesh(); mat != NULL; mat = mat->getNext()) {
+    for (mat = jointNode->getMesh(); mat != NULL; mat = mat->getNext()) {
         if (mat->getMaterialAnm() != NULL) {
             mat->getMaterialAnm()->calc(mat);
         }
diff --git a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
index ab4bdc7937..f1382d196d 100644
--- a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
@@ -1,13 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DMtxBuffer
-//
-
 #include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "JSystem/JUtility/JUTAssert.h"
 
 /* 804371C0-804371F0 063EE0 0030+00 1/0 0/0 0/0 .bss             sNoUseDrawMtx__12J3DMtxBuffer */
 Mtx J3DMtxBuffer::sNoUseDrawMtx;
@@ -43,7 +37,7 @@ void J3DMtxBuffer::initialize() {
     mpNrmMtxArr[1] = NULL;
     mpBumpMtxArr[0] = NULL;
     mpBumpMtxArr[1] = NULL;
-    mFlags = 1;
+    mMtxNum = 1;
     mCurrentViewNo = 0;
     mpUserAnmMtx = NULL;
 }
@@ -54,33 +48,33 @@ enum {
     J3DMdlDataFlag_NoAnimation = 0x100,
 };
 
-s32 J3DMtxBuffer::create(J3DModelData* p_modelData, u32 flag) {
-    J3D_ASSERT(76, p_modelData, "Error : null pointer.");
-    J3D_ASSERT(77, flag, "Error : non-zero argument is specified 0.");
+s32 J3DMtxBuffer::create(J3DModelData* pModelData, u32 mtxNum) {
+    J3D_ASSERT_NULLPTR(76, pModelData != NULL);
+    J3D_ASSERT_NONZEROARG(77, mtxNum != 0);
     
-    s32 ret = 0;
-    mFlags = flag;
-    mJointTree = &p_modelData->getJointTree();
+    s32 ret = kJ3DError_Success;
+    mMtxNum = mtxNum;
+    mJointTree = &pModelData->getJointTree();
 
-    ret = createAnmMtx(p_modelData);
+    ret = createAnmMtx(pModelData);
     if (ret != kJ3DError_Success)
         return ret;
 
-    ret = createWeightEnvelopeMtx(p_modelData);
+    ret = createWeightEnvelopeMtx(pModelData);
     if (ret != kJ3DError_Success)
         return ret;
 
-    if (p_modelData->checkFlag(J3DMdlDataFlag_NoAnimation)) {
+    if (pModelData->checkFlag(J3DMdlDataFlag_NoAnimation)) {
         setNoUseDrawMtx();
     } else {
-        u32 loadType = getMdlDataFlag_MtxLoadType(p_modelData->getFlag());
+        u32 loadType = getMdlDataFlag_MtxLoadType(pModelData->getFlag());
         switch (loadType) {
         case J3DMdlDataFlag_ConcatView:
             ret = setNoUseDrawMtx();
             break;
         case 0:
         default:
-            ret = createDoubleDrawMtx(p_modelData, flag);
+            ret = createDoubleDrawMtx(pModelData, mtxNum);
             break;
         }
     }
@@ -88,10 +82,10 @@ s32 J3DMtxBuffer::create(J3DModelData* p_modelData, u32 flag) {
     if (ret != kJ3DError_Success)
         return ret;
 
-    if (p_modelData->getFlag() & J3DMdlDataFlag_ConcatView) {
-        p_modelData->setBumpFlag(0);
+    if (pModelData->getFlag() & J3DMdlDataFlag_ConcatView) {
+        pModelData->setBumpFlag(0);
     } else {
-        ret = createBumpMtxArray(p_modelData, flag);
+        ret = createBumpMtxArray(pModelData, mtxNum);
 
         if (ret != kJ3DError_Success)
             return ret;
@@ -102,10 +96,10 @@ s32 J3DMtxBuffer::create(J3DModelData* p_modelData, u32 flag) {
 
 /* 80326364-803263F0 320CA4 008C+00 1/1 0/0 0/0 .text createAnmMtx__12J3DMtxBufferFP12J3DModelData
  */
- J3DError J3DMtxBuffer::createAnmMtx(J3DModelData* p_modelData) {
-    if (p_modelData->getJointNum() != 0) {
-        mpScaleFlagArr = new u8[p_modelData->getJointNum()];
-        mpAnmMtx = new Mtx[p_modelData->getJointNum()];
+J3DError J3DMtxBuffer::createAnmMtx(J3DModelData* pModelData) {
+    if (pModelData->getJointNum() != 0) {
+        mpScaleFlagArr = new u8[pModelData->getJointNum()];
+        mpAnmMtx = new Mtx[pModelData->getJointNum()];
         mpUserAnmMtx = mpAnmMtx;
     }
 
@@ -115,20 +109,21 @@ s32 J3DMtxBuffer::create(J3DModelData* p_modelData, u32 flag) {
     if (mpAnmMtx == NULL) {
         return kJ3DError_Alloc;
     }
+
     return kJ3DError_Success;
 }
 
 /* 803263F0-8032648C 320D30 009C+00 1/1 0/0 0/0 .text
  * createWeightEnvelopeMtx__12J3DMtxBufferFP12J3DModelData      */
-s32 J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* p_modelData) {
-    if (p_modelData->getWEvlpMtxNum() != 0) {
-        mpEvlpScaleFlagArr = new u8[p_modelData->getWEvlpMtxNum()];
-        mpWeightEvlpMtx = new Mtx[p_modelData->getWEvlpMtxNum()];
+s32 J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* pModelData) {
+    if (pModelData->getWEvlpMtxNum() != 0) {
+        mpEvlpScaleFlagArr = new u8[pModelData->getWEvlpMtxNum()];
+        mpWeightEvlpMtx = new Mtx[pModelData->getWEvlpMtxNum()];
     }
 
-    if (p_modelData->getWEvlpMtxNum() != 0 && mpEvlpScaleFlagArr == NULL)
+    if (pModelData->getWEvlpMtxNum() != 0 && mpEvlpScaleFlagArr == NULL)
         return kJ3DError_Alloc;
-    if (p_modelData->getWEvlpMtxNum() != 0 && mpWeightEvlpMtx == NULL)
+    if (pModelData->getWEvlpMtxNum() != 0 && mpWeightEvlpMtx == NULL)
         return kJ3DError_Alloc;
 
     return kJ3DError_Success;
@@ -145,16 +140,16 @@ s32 J3DMtxBuffer::setNoUseDrawMtx() {
 
 /* 803264B8-80326664 320DF8 01AC+00 1/1 0/0 0/0 .text
  * createDoubleDrawMtx__12J3DMtxBufferFP12J3DModelDataUl        */
-s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* p_modelData, u32 num) {
-    if (num != 0) {
+s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* pModelData, u32 mtxNum) {
+    if (mtxNum != 0) {
         for (s32 i = 0; i < 2; i++) {
-            mpDrawMtxArr[i] = new Mtx*[num];
-            mpNrmMtxArr[i] = new Mtx33*[num];
+            mpDrawMtxArr[i] = new Mtx*[mtxNum];
+            mpNrmMtxArr[i] = new Mtx33*[mtxNum];
             mpBumpMtxArr[i] = NULL;
         }
     }
 
-    if (num != 0) {
+    if (mtxNum != 0) {
         for (s32 i = 0; i < 2; i++) {
             if (mpDrawMtxArr[i] == NULL)
                 return kJ3DError_Alloc;
@@ -164,17 +159,17 @@ s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* p_modelData, u32 num) {
     }
 
     for (s32 i = 0; i < 2; i++) {
-        for (u32 j = 0; j < num; j++) {
-            if (p_modelData->getDrawMtxNum() != 0) {
-                mpDrawMtxArr[i][j] = new (0x20) Mtx[p_modelData->getDrawMtxNum()];
-                mpNrmMtxArr[i][j] = new (0x20) Mtx33[p_modelData->getDrawMtxNum()];
+        for (u32 j = 0; j < mtxNum; j++) {
+            if (pModelData->getDrawMtxNum() != 0) {
+                mpDrawMtxArr[i][j] = new (0x20) Mtx[pModelData->getDrawMtxNum()];
+                mpNrmMtxArr[i][j] = new (0x20) Mtx33[pModelData->getDrawMtxNum()];
             }
         }
     }
 
     for (s32 i = 0; i < 2; i++) {
-        for (u32 j = 0; j < num; j++) {
-            if (p_modelData->getDrawMtxNum() != 0) {
+        for (u32 j = 0; j < mtxNum; j++) {
+            if (pModelData->getDrawMtxNum() != 0) {
                 if (mpDrawMtxArr[i][j] == NULL)
                     return kJ3DError_Alloc;
                 if (mpNrmMtxArr[i][j] == NULL)
@@ -188,8 +183,9 @@ s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* p_modelData, u32 num) {
 
 /* 80326664-803268D4 320FA4 0270+00 1/1 0/0 0/0 .text
  * createBumpMtxArray__12J3DMtxBufferFP12J3DModelDataUl         */
-s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 param_1) {
-    J3D_ASSERT(295, i_modelData, "Error : null pointer.");
+s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) {
+    J3D_ASSERT_NULLPTR(295, i_modelData != NULL);
+
     if (i_modelData->getModelDataType() == 0) {
         u16 bumpMtxNum = 0;
         u16 materialCount = 0;
@@ -202,7 +198,7 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 param_1) {
             }
         }
 
-        if (bumpMtxNum != 0 && param_1 != 0) {
+        if (bumpMtxNum != 0 && mtxNum != 0) {
             for (int i = 0; i < 2; i++) {
                 mpBumpMtxArr[i] = new Mtx33**[(u16)materialCount];
                 if (mpBumpMtxArr[i] == NULL) {
@@ -217,7 +213,7 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 param_1) {
             for (u16 j = 0; j < materialNum; j++) {
                 J3DMaterial* material = i_modelData->getMaterialNodePointer(j);
                 if (material->getNBTScale()->mbHasScale == true) {
-                    mpBumpMtxArr[i][offset] = new Mtx33*[param_1];
+                    mpBumpMtxArr[i][offset] = new Mtx33*[mtxNum];
                     if (mpBumpMtxArr[i][offset] == NULL) {
                         return kJ3DError_Alloc;
                     }
@@ -233,7 +229,7 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 param_1) {
             for (u16 j = 0; j < materialNum; j++) {
                 J3DMaterial* material = i_modelData->getMaterialNodePointer((u16)j);
                 if (material->getNBTScale()->mbHasScale == true) {
-                    for (int k = 0; k < param_1; k++) {
+                    for (int k = 0; k < mtxNum; k++) {
                         mpBumpMtxArr[i][offset][k] = new (0x20) Mtx33[i_modelData->getDrawMtxNum()];
                         if (mpBumpMtxArr[i][offset][k] == NULL) {
                             return kJ3DError_Alloc;
@@ -273,10 +269,12 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() {
     f32* weights;
     u8* pScale;
     Mtx mtx;
+
     i = -1;
     max = mJointTree->getWEvlpMtxNum();
 	indices = mJointTree->getWEvlpMixMtxIndex() - 1;
 	weights = mJointTree->getWEvlpMixWeight() - 1;
+
 	while (++i < max) {
 		pScale = &mpEvlpScaleFlagArr[i];
         *pScale = 1;
@@ -284,6 +282,7 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() {
         weightAnmMtx[0][0] = weightAnmMtx[0][1] = weightAnmMtx[0][2] = weightAnmMtx[0][3] = 
         weightAnmMtx[1][0] = weightAnmMtx[1][1] = weightAnmMtx[1][2] = weightAnmMtx[1][3] = 
         weightAnmMtx[2][0] = weightAnmMtx[2][1] = weightAnmMtx[2][2] = weightAnmMtx[2][3] = 0.0f;
+
         j = 0;
 		mixNum = mJointTree->getWEvlpMixMtxNum(i);
 		do {
@@ -291,6 +290,7 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() {
 			worldMtx = &mpAnmMtx[idx];
 			invMtx = &mJointTree->getInvJointMtx((u16)idx);
 			MTXConcat(*worldMtx, *invMtx, mtx);
+
             weight = *++weights;
             weightAnmMtx[0][0] += mtx[0][0] * weight;
             weightAnmMtx[0][1] += mtx[0][1] * weight;
@@ -304,6 +304,7 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() {
             weightAnmMtx[2][1] += mtx[2][1] * weight;
             weightAnmMtx[2][2] += mtx[2][2] * weight;
             weightAnmMtx[2][3] += mtx[2][3] * weight;
+
 			*pScale &= mpScaleFlagArr[idx];
 		} while (++j < mixNum);
 	}
@@ -311,12 +312,17 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() {
 
 /* 80326ACC-80326D3C 32140C 0270+00 0/0 1/1 0/0 .text
  * calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf                */
-void J3DMtxBuffer::calcDrawMtx(u32 param_0, Vec const& param_1, Mtx const& param_2) {
+void J3DMtxBuffer::calcDrawMtx(u32 mdlFlag, Vec const& param_1, Mtx const& param_2) {
+    Mtx* sp24, *sp20;
+    int sp1C = 0;
+    sp20 = mpAnmMtx;
+    sp24 = mpWeightEvlpMtx;
+
     MtxP viewMtx;
     Mtx viewBaseMtx;
     u16 fullWgtNum;
 
-    switch (param_0) {
+    switch (mdlFlag) {
     case 0:
         viewMtx = j3dSys.getViewMtx();
         fullWgtNum = mJointTree->getDrawFullWgtMtxNum();
@@ -327,8 +333,7 @@ void J3DMtxBuffer::calcDrawMtx(u32 param_0, Vec const& param_1, Mtx const& param
             J3DPSMtxArrayConcat(viewMtx, *mpWeightEvlpMtx, *getDrawMtx(fullWgtNum),
                                 mJointTree->getWEvlpMtxNum());
         }
-        break;
-
+        return;
     case 1:
         fullWgtNum = mJointTree->getDrawFullWgtMtxNum();
         for (u16 i = 0; i < fullWgtNum; i++) {
@@ -339,7 +344,6 @@ void J3DMtxBuffer::calcDrawMtx(u32 param_0, Vec const& param_1, Mtx const& param
             MTXCopy(getWeightAnmMtx(i), *getDrawMtx(mJointTree->getDrawFullWgtMtxNum() + i));
         }
         break;
-
     case 2:
         J3DCalcViewBaseMtx(j3dSys.getViewMtx(), param_1, param_2, viewBaseMtx);
         fullWgtNum = mJointTree->getDrawFullWgtMtxNum();
@@ -351,25 +355,25 @@ void J3DMtxBuffer::calcDrawMtx(u32 param_0, Vec const& param_1, Mtx const& param
                                 *getDrawMtx(mJointTree->getDrawFullWgtMtxNum()),
                                 mJointTree->getWEvlpMtxNum());
         }
-        break;
+        return;
+    default:
+        JUT_ASSERT_MSG(778, 0, "Error : model flag is invalid.")
     }
 }
 
-extern void J3DPSCalcInverseTranspose(Mtx p1, Mtx33 p2);
-
 /* 80326D3C-80326EF0 32167C 01B4+00 0/0 1/1 0/0 .text            calcNrmMtx__12J3DMtxBufferFv */
 void J3DMtxBuffer::calcNrmMtx() {
     u16 drawMtxNum = mJointTree->getDrawMtxNum();
     for (u16 i = 0; i < drawMtxNum; i++) {
         if (mJointTree->getDrawMtxFlag(i) == 0) {
             if (getScaleFlag(mJointTree->getDrawMtxIndex(i)) == 1) {
-                setNrmMtx(i, getDrawMtx(i));
+                setNrmMtx(i, *getDrawMtx(i));
             } else {
                 J3DPSCalcInverseTranspose(*getDrawMtx(i), *getNrmMtx(i));
             }
         } else {
             if (getEnvScaleFlag(mJointTree->getDrawMtxIndex(i)) == 1) {
-                setNrmMtx(i, getDrawMtx(i));
+                setNrmMtx(i, *getDrawMtx(i));
             } else {
                 J3DPSCalcInverseTranspose(*getDrawMtx(i), *getNrmMtx(i));
             }
@@ -386,6 +390,7 @@ void J3DMtxBuffer::calcBBoardMtx() {
             if (mJointTree->getJointNodePointer(index)->getMtxType() == 1) {
                 MtxP drawMtx = *getDrawMtx(i);
                 J3DCalcBBoardMtx(drawMtx);
+
                 Mtx33* nrmMtx = getNrmMtx(i);
                 (*nrmMtx)[0][0] = 1.0f / drawMtx[0][0];
                 (*nrmMtx)[0][1] = 0.0f;
diff --git a/src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp b/src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp
index 29357ff035..044161ecad 100644
--- a/src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp
@@ -30,9 +30,8 @@ void J3DShapeTable::sortVcdVatCmd() {
     for (u16 next = 0; next < shapeNum; next++) {
         for (u16 prev = 0; prev < next; prev++) {
             if (mShapeNodePointer[next]->isSameVcdVatCmd(mShapeNodePointer[prev])) {
-                void* nodeVatCmd = mShapeNodePointer[prev]->getVcdVatCmd();
-                mShapeNodePointer[next]->setVcdVatCmd(nodeVatCmd);
+                mShapeNodePointer[next]->setVcdVatCmd(mShapeNodePointer[prev]->getVcdVatCmd());
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
index fe9a21ebb3..4731c10415 100644
--- a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
@@ -1,14 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DSkinDeform
-//
-
 #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "dol2asm.h"
-#include "dolphin/os.h"
-#include "string.h"
+#include <string.h>
 
 /* 8032C6E4-8032C704 327024 0020+00 1/1 0/0 0/0 .text            __ct__12J3DSkinNListFv */
 J3DSkinNList::J3DSkinNList() {
@@ -78,8 +71,6 @@ void J3DSkinNList::calcSkin_VtxNrmF32(f32 (*param_0)[4], void* param_1, void* pa
     }
 }
 
-/* ############################################################################################## */
-
 /* 8032C96C-8032C9B0 3272AC 0044+00 0/0 0/0 2/2 .text            __ct__13J3DSkinDeformFv */
 J3DSkinDeform::J3DSkinDeform() {
     mPosData = NULL;
@@ -94,7 +85,6 @@ J3DSkinDeform::J3DSkinDeform() {
     mSkinNList = NULL;
 }
 
-/* ############################################################################################## */
 /* 80437218-80438218 063F38 1000+00 1/1 0/0 0/0 .bss sWorkArea_WEvlpMixMtx__13J3DSkinDeform */
 u16* J3DSkinDeform::sWorkArea_WEvlpMixMtx[1024];
 
@@ -103,32 +93,34 @@ f32* J3DSkinDeform::sWorkArea_WEvlpMixWeight[1024];
 
 /* 8032C9B0-8032CF44 3272F0 0594+00 0/0 1/1 0/0 .text
  * initSkinInfo__13J3DSkinDeformFP12J3DModelData                */
-void J3DSkinDeform::initSkinInfo(J3DModelData* param_0) {
-    J3D_ASSERT(322, param_0, "Error : null pointer.");
-    int vtxNum = param_0->getVtxNum();
-    int wevlpMtxNum = param_0->getWEvlpMtxNum();
-    u16* wevlpMtxIndex = param_0->getWEvlpMixMtxIndex();
-    f32* wevlpMixWeights = param_0->getWEvlpMixWeight();
+void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) {
+    J3D_ASSERT_NULLPTR(322, pModelData != NULL);
+
+    int vtxNum = pModelData->getVtxNum();
+    int wevlpMtxNum = pModelData->getWEvlpMtxNum();
+    u16* wevlpMtxIndex = pModelData->getWEvlpMixMtxIndex();
+    f32* wevlpMixWeights = pModelData->getWEvlpMixWeight();
     int currentOffset = 0;
+
     for (int i = 0; i < wevlpMtxNum; i++) {
         sWorkArea_WEvlpMixMtx[i] = wevlpMtxIndex + currentOffset;
         sWorkArea_WEvlpMixWeight[i] = wevlpMixWeights + currentOffset;
-        currentOffset += param_0->getWEvlpMixMtxNum(i);
+        currentOffset += pModelData->getWEvlpMixMtxNum(i);
     }
 
-    if (param_0->getJointNum() != 0) {
-        mSkinNList = new J3DSkinNList[param_0->getJointNum()];
+    if (pModelData->getJointNum() != 0) {
+        mSkinNList = new J3DSkinNList[pModelData->getJointNum()];
     }
 
-    for (int i = 0; i < param_0->getVtxNum(); i++) {
+    for (int i = 0; i < pModelData->getVtxNum(); i++) {
         u16 uVar8 = mPosData[i];
         if (uVar8 != 0xffff) {
-            if (param_0->getDrawMtxFlag(uVar8) == 0) {
-                u16 drawMtxIndex = param_0->getDrawMtxIndex(uVar8);
+            if (!pModelData->getDrawMtxFlag(uVar8)) {
+                u16 drawMtxIndex = pModelData->getDrawMtxIndex(uVar8);
                 mSkinNList[drawMtxIndex].field_0x10++;
             } else {
-                u16 drawMtxIndex = param_0->getDrawMtxIndex(uVar8);
-                int wevlpMtxNum = param_0->getWEvlpMixMtxNum(drawMtxIndex);
+                u16 drawMtxIndex = pModelData->getDrawMtxIndex(uVar8);
+                int wevlpMtxNum = pModelData->getWEvlpMixMtxNum(drawMtxIndex);
                 u16* indices = sWorkArea_WEvlpMixMtx[drawMtxIndex];
                 for (int j = 0; j < wevlpMtxNum; j++) {
                     mSkinNList[indices[j]].field_0x10++;
@@ -136,15 +128,16 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* param_0) {
             }
         }
     }
-    for (int i = 0; i < param_0->getNrmNum(); i++) {
+
+    for (int i = 0; i < pModelData->getNrmNum(); i++) {
         u16 uVar8 = mNrmData[i];
         if (uVar8 != 0xffff) {
-            if (param_0->getDrawMtxFlag(uVar8) == 0) {
-                u16 drawMtxIndex = param_0->getDrawMtxIndex(uVar8);
+            if (!pModelData->getDrawMtxFlag(uVar8)) {
+                u16 drawMtxIndex = pModelData->getDrawMtxIndex(uVar8);
                 mSkinNList[drawMtxIndex].field_0x12++;
             } else {
-                u16 drawMtxIndex = param_0->getDrawMtxIndex(uVar8);
-                int wevlpMtxNum = param_0->getWEvlpMixMtxNum(drawMtxIndex);
+                u16 drawMtxIndex = pModelData->getDrawMtxIndex(uVar8);
+                int wevlpMtxNum = pModelData->getWEvlpMixMtxNum(drawMtxIndex);
                 u16* indices = sWorkArea_WEvlpMixMtx[drawMtxIndex];
                 for (int j = 0; j < wevlpMtxNum; j++) {
                     mSkinNList[indices[j]].field_0x12++;
@@ -152,7 +145,8 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* param_0) {
             }
         }
     }
-    for (u16 i = 0; i < param_0->getJointNum(); i++) {
+
+    for (u16 i = 0; i < pModelData->getJointNum(); i++) {
         if (mSkinNList[i].field_0x10) {
             mSkinNList[i].field_0x0 = new u16[mSkinNList[i].field_0x10];
             mSkinNList[i].field_0x8 = new f32[mSkinNList[i].field_0x10];
@@ -164,17 +158,18 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* param_0) {
             mSkinNList[i].field_0x12 = 0;
         }
     }
-    for (int i = 0; i < param_0->getVtxNum(); i++) {
+
+    for (int i = 0; i < pModelData->getVtxNum(); i++) {
         u16 uVar8 = mPosData[i];
         if (uVar8 != 0xffff) {
-            if (param_0->getDrawMtxFlag(uVar8) == 0) {
-                u16 drawMtxIndex = param_0->getDrawMtxIndex(uVar8);
+            if (!pModelData->getDrawMtxFlag(uVar8)) {
+                u16 drawMtxIndex = pModelData->getDrawMtxIndex(uVar8);
                 int uVar9 = mSkinNList[drawMtxIndex].field_0x10++;
                 mSkinNList[drawMtxIndex].field_0x0[uVar9] = i;
                 mSkinNList[drawMtxIndex].field_0x8[uVar9] = 1.0f;
             } else {
-                u16 drawMtxIndex = param_0->getDrawMtxIndex(uVar8);
-                int wevlpMtxNum = param_0->getWEvlpMixMtxNum(drawMtxIndex);
+                u16 drawMtxIndex = pModelData->getDrawMtxIndex(uVar8);
+                int wevlpMtxNum = pModelData->getWEvlpMixMtxNum(drawMtxIndex);
                 u16* indices = sWorkArea_WEvlpMixMtx[drawMtxIndex];
                 f32* weights = sWorkArea_WEvlpMixWeight[drawMtxIndex];
                 for (int j = 0; j < wevlpMtxNum; j++) {
@@ -185,17 +180,18 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* param_0) {
             }
         }
     }
-    for (int i = 0; i < param_0->getNrmNum(); i++) {
+
+    for (int i = 0; i < pModelData->getNrmNum(); i++) {
         u16 uVar8 = mNrmData[i];
         if (uVar8 != 0xffff) {
-            if (param_0->getDrawMtxFlag(uVar8) == 0) {
-                u16 drawMtxIndex = param_0->getDrawMtxIndex(uVar8);
+            if (!pModelData->getDrawMtxFlag(uVar8)) {
+                u16 drawMtxIndex = pModelData->getDrawMtxIndex(uVar8);
                 int uVar9 = mSkinNList[drawMtxIndex].field_0x12++;
                 mSkinNList[drawMtxIndex].field_0x4[uVar9] = i;
                 mSkinNList[drawMtxIndex].field_0xc[uVar9] = 1.0f;
             } else {
-                u16 drawMtxIndex = param_0->getDrawMtxIndex(uVar8);
-                int wevlpMtxNum = param_0->getWEvlpMixMtxNum(drawMtxIndex);
+                u16 drawMtxIndex = pModelData->getDrawMtxIndex(uVar8);
+                int wevlpMtxNum = pModelData->getWEvlpMixMtxNum(drawMtxIndex);
                 u16* indices = sWorkArea_WEvlpMixMtx[drawMtxIndex];
                 f32* weights = sWorkArea_WEvlpMixWeight[drawMtxIndex];
                 for (int j = 0; j < wevlpMtxNum; j++) {
@@ -210,128 +206,133 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* param_0) {
 
 /* 80439218-80439A20 065F38 0800+08 1/1 0/0 0/0 .bss             sWorkArea_MtxReg__13J3DSkinDeform
  */
-u16 J3DSkinDeform::sWorkArea_MtxReg[1024 + 4 /* padding */];
+u16 J3DSkinDeform::sWorkArea_MtxReg[1024];
 
 /* 8032CF44-8032D378 327884 0434+00 0/0 1/1 0/0 .text
  * initMtxIndexArray__13J3DSkinDeformFP12J3DModelData           */
-// NONMATCHING - local_58 issue
-int J3DSkinDeform::initMtxIndexArray(J3DModelData* param_0) {
-    J3D_ASSERT(507, param_0, "Error : null pointer.");
+// NONMATCHING - matches debug, not retail
+int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) {
+    J3D_ASSERT_NULLPTR(507, pModelData != NULL);
     if (mPosData != NULL && mNrmData != NULL) {
-        return 0;
+        return kJ3DError_Success;
     }
 
-    mPosData = new u16[param_0->getVtxNum()];
+    mPosData = new u16[pModelData->getVtxNum()];
     if (mPosData == NULL) {
-        return 4;
+        return kJ3DError_Alloc;
     }
 
-    for (int i = 0; i < param_0->getVtxNum(); i++) {
+    for (int i = 0; i < pModelData->getVtxNum(); i++) {
         mPosData[i] = 0xffff;
     }
 
-    if (param_0->getNrmNum()) {
-        mNrmData = new u16[param_0->getNrmNum()];
+    if (pModelData->getNrmNum()) {
+        mNrmData = new u16[pModelData->getNrmNum()];
         if (mNrmData == NULL) {
-            return 4;
+            return kJ3DError_Alloc;
         }
-        for (int i = 0; i < param_0->getNrmNum(); i++) {
+        for (int i = 0; i < pModelData->getNrmNum(); i++) {
             mNrmData[i] = 0;
         }
     } else {
         mNrmData = NULL;
     }
 
-    mPosMtx = new Mtx[param_0->getJointNum()];
-    mNrmMtx = new (32) Mtx33[param_0->getDrawMtxNum()];
+    mPosMtx = new Mtx[pModelData->getJointNum()];
+    mNrmMtx = new (32) Mtx33[pModelData->getDrawMtxNum()];
     if (mPosMtx == NULL) {
-        return 4;
+        return kJ3DError_Alloc;
     }
     if (mNrmMtx == NULL) {
-        return 4;
+        return kJ3DError_Alloc;
     }
 
-    for (u16 local_6c = 0; local_6c < param_0->getShapeNum(); local_6c++) {
-        u32 local_28[4] = {0,1,1,2};
-        int r26 = -1;
-        int r25 = -1;
-        int r24 = -1;
-        int stack_3c = -1;
+    for (u16 i = 0; i < pModelData->getShapeNum(); i++) {
+        u32 kSize[4] = {0, 1, 1, 2};
+        int pnmtx_num = -1;
+        int vtx_num = -1;
+        int nrm_num = -1;
+        int tex_num = -1;
         int r23 = 0;
-        for (GXVtxDescList* local_4c = param_0->getShapeNodePointer(local_6c)->getVtxDesc(); local_4c->attr != 0xff; local_4c++) {
-            switch (local_4c->attr) {
+        for (GXVtxDescList* vtxDesc = pModelData->getShapeNodePointer(i)->getVtxDesc(); vtxDesc->attr != 0xff; vtxDesc++) {
+            switch (vtxDesc->attr) {
             case GX_VA_PNMTXIDX:
-                r26 = r23;
+                pnmtx_num = r23;
                 break;
             case GX_VA_POS:
-                r25 = r23;
-                if (local_4c->type != GX_INDEX16) {
+                vtx_num = r23;
+                if (vtxDesc->type != GX_INDEX16) {
                     OSReport(" Invlid Data : CPU Pipeline process GX_INDEX16 Data Only\n");
                     return 6;
                 }
                 break;
             case GX_VA_NRM:
-                r24 = r23;
-                if (local_4c->type != GX_INDEX16) {
+                nrm_num = r23;
+                if (vtxDesc->type != GX_INDEX16) {
                     OSReport(" Invlid Data : CPU Pipeline process GX_INDEX16 Data Only\n");
                     return 6;
                 }
                 break;
             case GX_VA_TEX0:
-                stack_3c = r23;
-                if (local_4c->type != GX_INDEX16) {
+                tex_num = r23;
+                if (vtxDesc->type != GX_INDEX16) {
                     OSReport(" Invlid Data : CPU Pipeline process GX_INDEX16 Data Only\n");
                     return 6;
                 }
                 break;
             }
-            r23 += local_28[(int)local_4c->type];
+            r23 += kSize[(int)vtxDesc->type];
         }
-        for (u16 local_6e = 0; local_6e < param_0->getShapeNodePointer(local_6c)->getMtxGroupNum(); local_6e++) {
-            J3DShapeMtx* piVar8 = param_0->getShapeNodePointer(local_6c)->getShapeMtx(local_6e);
-            u8* pcVar10 = param_0->getShapeNodePointer(local_6c)->getShapeDraw(local_6e)->getDisplayList();
-            u8* local_58 = pcVar10;
+
+        for (u16 j = 0; j < (u16)pModelData->getShapeNodePointer(i)->getMtxGroupNum(); j++) {
+            J3DShapeMtx* pShapeMtx = pModelData->getShapeNodePointer(i)->getShapeMtx(j);
+            u8* pDList = pModelData->getShapeNodePointer(i)->getShapeDraw(j)->getDisplayList();
+            u8* pDListPos = pDList;
             int uVar13;
             for (;
-                (int)local_58 - (int)pcVar10 < param_0->getShapeNodePointer(local_6c)->getShapeDraw(local_6e)->getDisplayListSize();
-                local_58 += r23 * uVar13) {
-                u8 uVar1 = *local_58;
-                local_58++;
-                if (uVar1 != 0xA0 && uVar1 != 0x98) {
+                (int)pDListPos - (int)pDList < pModelData->getShapeNodePointer(i)->getShapeDraw(j)->getDisplayListSize();
+                pDListPos += r23 * uVar13)
+            {
+                u8 command = *pDListPos;
+                pDListPos++;
+                if (command != GX_TRIANGLEFAN && command != GX_TRIANGLESTRIP) {
                     break;
                 }
                 
-                uVar13 = *(u16*)local_58;
-                local_58 += 2;
+                uVar13 = *(u16*)pDListPos;
+                pDListPos += 2;
                 for (int local_60 = 0; local_60 < uVar13; local_60++) {
-                    u8* iVar5 = local_58 + r23 * local_60;
-                    u8 bVar3 = *(iVar5 + r26) / 3U;
-                    u16 uVar1 = *(u16*)(iVar5 + r25);
-                    u16 uVar2 = *(u16*)(iVar5 + r24);
-                    u16 uVar3 = *(u16*)(iVar5 + stack_3c);
-                    u16 local_76 = piVar8->getUseMtxIndex(bVar3);
+                    u8* iVar5 = pDListPos + r23 * local_60;
+                    u8 bVar3 = *(iVar5 + pnmtx_num) / 3U;
+                    u16 vtx_idx = *(u16*)(iVar5 + vtx_num);
+                    u16 nrm_idx = *(u16*)(iVar5 + nrm_num);
+                    u16 uVar3 = *(u16*)(iVar5 + tex_num);
+                    u16 local_76 = pShapeMtx->getUseMtxIndex(bVar3);
                     if (local_76 == 0xffff) {
                         local_76 = sWorkArea_MtxReg[bVar3];
-                    } else if (r26 != -1) {
+                    } else if (pnmtx_num != -1) {
                         sWorkArea_MtxReg[bVar3] = local_76;
                     }
-                    J3D_ASSERT(673, local_76 < param_0->getDrawMtxNum(), "Error : range over.");
-                    J3D_ASSERT(674, uVar1 < param_0->getVtxNum(), "Error : range over.");
-                    mPosData[uVar1] = local_76;
-                    if (r24 != -1) {
-                        J3D_ASSERT(680, uVar2 < param_0->getNrmNum(), "Error : range over.");
-                        mNrmData[uVar2] = local_76;
+
+                    J3D_ASSERT_RANGE(673, local_76 < pModelData->getDrawMtxNum());
+                    J3D_ASSERT_RANGE(674, vtx_idx < pModelData->getVtxNum());
+                    mPosData[vtx_idx] = local_76;
+
+                    if (nrm_num != -1) {
+                        J3D_ASSERT_RANGE(680, nrm_idx < pModelData->getNrmNum());
+                        mNrmData[nrm_idx] = local_76;
                     }
                 }
             }
-            if (r24 == -1) {
-                param_0->getShapeNodePointer(local_6c)->onFlag(0x100);
-                param_0->getShapeNodePointer(local_6c)->offFlag(8);
+
+            if (nrm_num == -1) {
+                pModelData->getShapeNodePointer(i)->onFlag(J3DShpFlag_EnableLod);
+                pModelData->getShapeNodePointer(i)->offFlag(J3DShpFlag_SkinNrmCpu);
             }
         }
     }
 
-    for (int i = 0; i < param_0->getVtxNum(); i++) {
+    for (int i = 0; i < pModelData->getVtxNum(); i++) {
         if (mPosData[i] == 0xffff) {
             field_0x18 = 0x0;
             mPosData[i] = 0;
@@ -340,36 +341,38 @@ int J3DSkinDeform::initMtxIndexArray(J3DModelData* param_0) {
         }
     }
 
-    return 0;
+    return kJ3DError_Success;
 }
 
 /* 8032D378-8032D5C4 327CB8 024C+00 0/0 1/1 0/0 .text
  * changeFastSkinDL__13J3DSkinDeformFP12J3DModelData            */
 // NONMATCHING - regalloc, display list access issues
-void J3DSkinDeform::changeFastSkinDL(J3DModelData* param_0) {
-    J3D_ASSERT(740, param_0, "Error : null pointer.");
-    for (u16 i = 0; i < param_0->getShapeNum(); i++) {
-        u32 local_28[4] = {0,1,1,2};
+void J3DSkinDeform::changeFastSkinDL(J3DModelData* pModelData) {
+    J3D_ASSERT_NULLPTR(740, pModelData != NULL);
+    for (u16 i = 0; i < pModelData->getShapeNum(); i++) {
+        u32 kSize[4] = {0,1,1,2};
         int local_30 = -1;
         int local_34 = 0;
-        J3DShape* pShapeNode = param_0->getShapeNodePointer(i);
-        for (GXVtxDescList* local_3c = pShapeNode->getVtxDesc(); local_3c->attr != GX_VA_NULL; local_3c++) {
-            if (local_3c->attr == GX_VA_PNMTXIDX) {
+        J3DShape* pShapeNode = pModelData->getShapeNodePointer(i);
+        for (GXVtxDescList* vtxDesc = pShapeNode->getVtxDesc(); vtxDesc->attr != GX_VA_NULL; vtxDesc++) {
+            if (vtxDesc->attr == GX_VA_PNMTXIDX) {
                 local_30 = local_34;
             }
-            local_34 += local_28[local_3c->type];
+            local_34 += kSize[vtxDesc->type];
         }
+
         if (local_30 != -1) {
-            for (u16 j = 0; j < pShapeNode->getMtxGroupNum(); j++) {
-                u8* puVar5 = pShapeNode->getShapeDraw(j)->getDisplayList();
-                u8* local_44 = puVar5;
-                u8* puVar10 = puVar5;
-                while (local_44 - puVar5 < pShapeNode->getShapeDraw(j)->getDisplayListSize()) {
-                    u8 cVar1 = *local_44;
+            for (u16 j = 0; j < (u16)pShapeNode->getMtxGroupNum(); j++) {
+                u8* pDList = pShapeNode->getShapeDraw(j)->getDisplayList();
+                u8* local_44 = pDList;
+                u8* puVar10 = pDList;
+                while (local_44 - pDList < pShapeNode->getShapeDraw(j)->getDisplayListSize()) {
+                    u8 command = *local_44;
                     local_44++;
-                    *puVar10++ = cVar1;
-                    if ((cVar1 != 0xA0) && (cVar1 != 0x98))
+                    *puVar10++ = command;
+                    if (command != GX_TRIANGLEFAN && command != GX_TRIANGLESTRIP)
                         break;
+
                     int uVar9 = *(u16*)local_44;
                     local_44 += 2;
                     *(u16*)puVar10 = uVar9;
@@ -381,19 +384,20 @@ void J3DSkinDeform::changeFastSkinDL(J3DModelData* param_0) {
                     }
                     local_44 += local_34 * uVar9;
                 }
-                int pcVar2 = ((int)puVar10 - (int)puVar5 + 0x1f) & ~0x1f;
-                while ((int)puVar10 - (int)puVar5 < pShapeNode->getShapeDraw(j)->getDisplayListSize()) {
+
+                int dlistSize = ((int)puVar10 - (int)pDList + 0x1f) & ~0x1f;
+                while ((int)puVar10 - (int)pDList < pShapeNode->getShapeDraw(j)->getDisplayListSize()) {
                     *puVar10++ = 0;
                 }
-                pShapeNode->getShapeDraw(j)->setDisplayListSize(pcVar2);
-                DCStoreRange(puVar5, pShapeNode->getShapeDraw(j)->getDisplayListSize());
+
+                pShapeNode->getShapeDraw(j)->setDisplayListSize(dlistSize);
+                DCStoreRange(pDList, pShapeNode->getShapeDraw(j)->getDisplayListSize());
             }
         }
     }
-    ;
-    ;
-    for (u16 i = 0; i < param_0->getShapeNum(); i++) {
-        J3DShape* pShape = param_0->getShapeNodePointer(i);
+
+    for (u16 i = 0; i < pModelData->getShapeNum(); i++) {
+        J3DShape* pShape = pModelData->getShapeNodePointer(i);
         GXVtxDescList* local_5c = pShape->getVtxDesc();
         GXVtxDescList* local_60 = local_5c;
         for (; local_5c->attr != GX_VA_NULL; local_5c++) {
@@ -411,21 +415,21 @@ void J3DSkinDeform::changeFastSkinDL(J3DModelData* param_0) {
 
 /* 8032D5C4-8032D738 327F04 0174+00 1/1 0/0 0/0 .text calcNrmMtx__13J3DSkinDeformFP12J3DMtxBuffer
  */
-void J3DSkinDeform::calcNrmMtx(J3DMtxBuffer* param_0) {
-    J3DJointTree* jointTree = param_0->getJointTree();
+void J3DSkinDeform::calcNrmMtx(J3DMtxBuffer* pMtxBuffer) {
+    J3DJointTree* jointTree = pMtxBuffer->getJointTree();
     u16 drawMtxNum = jointTree->getDrawMtxNum();
     for (u16 i = 0; i < drawMtxNum; i++) {
         if (jointTree->getDrawMtxFlag(i) == 0) {
-            if (param_0->getScaleFlag(jointTree->getDrawMtxIndex(i)) == 1) {
-                setNrmMtx(i, param_0->getAnmMtx(jointTree->getDrawMtxIndex(i)));
+            if (pMtxBuffer->getScaleFlag(jointTree->getDrawMtxIndex(i)) == 1) {
+                setNrmMtx(i, pMtxBuffer->getAnmMtx(jointTree->getDrawMtxIndex(i)));
             } else {
-                J3DPSCalcInverseTranspose(param_0->getAnmMtx(jointTree->getDrawMtxIndex(i)), getNrmMtx(i));
+                J3DPSCalcInverseTranspose(pMtxBuffer->getAnmMtx(jointTree->getDrawMtxIndex(i)), getNrmMtx(i));
             }
         } else {
-            if (param_0->getEnvScaleFlag(jointTree->getDrawMtxIndex(i)) == 1) {
-                setNrmMtx(i, param_0->getWeightAnmMtx(jointTree->getDrawMtxIndex(i)));
+            if (pMtxBuffer->getEnvScaleFlag(jointTree->getDrawMtxIndex(i)) == 1) {
+                setNrmMtx(i, pMtxBuffer->getWeightAnmMtx(jointTree->getDrawMtxIndex(i)));
             } else {
-                J3DPSCalcInverseTranspose(param_0->getWeightAnmMtx(jointTree->getDrawMtxIndex(i)), getNrmMtx(i));
+                J3DPSCalcInverseTranspose(pMtxBuffer->getWeightAnmMtx(jointTree->getDrawMtxIndex(i)), getNrmMtx(i));
             }
         }
     }
@@ -433,41 +437,46 @@ void J3DSkinDeform::calcNrmMtx(J3DMtxBuffer* param_0) {
 
 /* 8032D738-8032D87C 328078 0144+00 0/0 1/1 0/0 .text
  * transformVtxPosNrm__13J3DSkinDeformFP12J3DModelData          */
-void J3DSkinDeform::transformVtxPosNrm(J3DModelData* param_0) {
-    if (param_0->getWEvlpMtxNum() != 0 && field_0x19 == 0) {
-        int vtmNum = param_0->getVtxNum();
-        int nrmNum = param_0->getNrmNum();
+void J3DSkinDeform::transformVtxPosNrm(J3DModelData* pModelData) {
+    if (pModelData->getWEvlpMtxNum() != 0 && field_0x19 == 0) {
+        int vtmNum = pModelData->getVtxNum();
+        int nrmNum = pModelData->getNrmNum();
+
         for (int i = 0; i < vtmNum; i++) {
             u16 posIndex = mPosData[i];
-            if (param_0->getDrawMtxFlag(posIndex) == 0) {
-                u16 drawMtxIndex = param_0->getDrawMtxIndex(posIndex);
-                Vec* pos = ((Vec*)param_0->getVtxPosArray()) + i;
+            if (pModelData->getDrawMtxFlag(posIndex) == 0) {
+                u16 drawMtxIndex = pModelData->getDrawMtxIndex(posIndex);
+                Vec* pos = ((Vec*)pModelData->getVtxPosArray()) + i;
                 Mtx invMtx;
-                MTXInverse(param_0->getInvJointMtx(drawMtxIndex), invMtx);
+                MTXInverse(pModelData->getInvJointMtx(drawMtxIndex), invMtx);
                 MTXMultVec(invMtx, pos, pos);
             }
         }
+
         for (int i = 0; i < nrmNum; i++) {
             u16 nrmIndex = mNrmData[i];
-            if (param_0->getDrawMtxFlag(nrmIndex) == 0) {
-                u16 drawMtxIndex = param_0->getDrawMtxIndex(nrmIndex);
-                Vec* nrm = ((Vec*)param_0->getVtxNrmArray()) + i;
+            if (pModelData->getDrawMtxFlag(nrmIndex) == 0) {
+                u16 drawMtxIndex = pModelData->getDrawMtxIndex(nrmIndex);
+                Vec* nrm = ((Vec*)pModelData->getVtxNrmArray()) + i;
                 Mtx invMtx;
-                MTXInverse(param_0->getInvJointMtx(drawMtxIndex), invMtx);
+                MTXInverse(pModelData->getInvJointMtx(drawMtxIndex), invMtx);
                 MTXMultVecSR(invMtx, nrm, nrm);
             }
         }
+
         field_0x19 = 1;
     }
 }
 
 /* 8032D87C-8032D8F4 3281BC 0078+00 1/1 0/0 0/0 .text
  * calcAnmInvJointMtx__13J3DSkinDeformFP12J3DMtxBuffer          */
-void J3DSkinDeform::calcAnmInvJointMtx(J3DMtxBuffer* param_0) {
-    if (param_0->getJointTree()->getWEvlpMtxNum() != 0) {
-        u16 jointNum = param_0->getJointTree()->getJointNum();
-        Mtx* anmMtx = (Mtx*)param_0->getAnmMtx(0);
-        Mtx* invJointMtx = &param_0->getJointTree()->getInvJointMtx(0);
+void J3DSkinDeform::calcAnmInvJointMtx(J3DMtxBuffer* pMtxBuffer) {
+    J3D_ASSERT_NULLPTR(978, pMtxBuffer != NULL);
+
+    if (pMtxBuffer->getJointTree()->getWEvlpMtxNum() != 0) {
+        int jointNum = pMtxBuffer->getJointTree()->getJointNum();
+        Mtx* anmMtx = (Mtx*)pMtxBuffer->getAnmMtx(0);
+        Mtx* invJointMtx = &pMtxBuffer->getJointTree()->getInvJointMtx(0);
         Mtx* posMtx = mPosMtx;
         for (int i = 0; i < jointNum; i++) {
             MTXConcat(anmMtx[i], invJointMtx[i], posMtx[i]);
@@ -477,177 +486,208 @@ void J3DSkinDeform::calcAnmInvJointMtx(J3DMtxBuffer* param_0) {
 
 /* 8032D8F4-8032DA1C 328234 0128+00 1/1 0/0 0/0 .text
  * deformFastVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
-void J3DSkinDeform::deformFastVtxPos_F32(J3DVertexBuffer* param_0, J3DMtxBuffer* param_1) const {
-    param_0->swapTransformedVtxPos();
-    J3DJointTree* jointTree = param_1->getJointTree();
-    u32 vtxNum = param_0->getVertexData()->getVtxNum();
-    void* currentVtxPos = param_0->getCurrentVtxPos();
-    void* transformedVtxPos = param_0->getTransformedVtxPos(0);
-    J3DFillZero32B(transformedVtxPos, (vtxNum * sizeof(Vec) + 0x1f) & ~0x1f);
+void J3DSkinDeform::deformFastVtxPos_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
+    pVtxBuffer->swapTransformedVtxPos();
+    J3DJointTree* jointTree = pMtxBuffer->getJointTree();
+    u32 vtxNum = pVtxBuffer->getVertexData()->getVtxNum();
+    int sp14 = jointTree->getDrawMtxNum();
+    void* currentVtxPos = pVtxBuffer->getCurrentVtxPos();
+    void* transformedVtxPos = pVtxBuffer->getTransformedVtxPos(0);
+
+    J3DFillZero32B(transformedVtxPos, OSRoundUp32B(vtxNum * sizeof(Vec)));
+
     if (jointTree->getWEvlpMtxNum() != 0) {
         u16 jointNum = jointTree->getJointNum();
         for (u16 i = 0; i < jointNum; i++) {
-            mSkinNList[i].calcSkin_VtxPosF32(mPosMtx[i], currentVtxPos, transformedVtxPos);
+            J3DSkinNList* skinList = mSkinNList + i;
+            skinList->calcSkin_VtxPosF32(mPosMtx[i], currentVtxPos, transformedVtxPos);
         }
     } else {
         u16 jointNum = jointTree->getJointNum();
         for (u16 i = 0; i < jointNum; i++) {
             J3DSkinNList* skinList = mSkinNList + i;
-            skinList->calcSkin_VtxPosF32(param_1->getAnmMtx(i), currentVtxPos, transformedVtxPos);
+            skinList->calcSkin_VtxPosF32(pMtxBuffer->getAnmMtx(i), currentVtxPos, transformedVtxPos);
         }
     }
-    DCStoreRange(param_0->getTransformedVtxPos(0), param_0->getVertexData()->getVtxNum() * sizeof(Vec));
-    param_0->setCurrentVtxPos(transformedVtxPos);
-}
 
-/* ############################################################################################## */
+    DCStoreRange(pVtxBuffer->getTransformedVtxPos(0), pVtxBuffer->getVertexData()->getVtxNum() * sizeof(Vec));
+    pVtxBuffer->setCurrentVtxPos(transformedVtxPos);
+}
 
 /* 8032DA1C-8032DB50 32835C 0134+00 1/1 0/0 0/0 .text
  * deformFastVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
-void J3DSkinDeform::deformFastVtxNrm_F32(J3DVertexBuffer* param_0, J3DMtxBuffer* param_1) const {
-    param_0->swapTransformedVtxNrm();
-    J3DJointTree* jointTree = param_1->getJointTree();
-    int nrmNum = param_0->getVertexData()->getNrmNum();
-    void* currentVtxNrm = param_0->getCurrentVtxNrm();
-    void* transformedVtxNrm = param_0->getTransformedVtxNrm(0);
+void J3DSkinDeform::deformFastVtxNrm_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
+    pVtxBuffer->swapTransformedVtxNrm();
+    J3DJointTree* jointTree = pMtxBuffer->getJointTree();
+    int nrmNum = pVtxBuffer->getVertexData()->getNrmNum();
+    int sp18 = jointTree->getDrawMtxNum();
+    void* currentVtxNrm = pVtxBuffer->getCurrentVtxNrm();
+    void* transformedVtxNrm = pVtxBuffer->getTransformedVtxNrm(0);
+
     for (int i = 0; i < nrmNum; i++) {
-        ((Vec*)transformedVtxNrm)[i].x = 0.0f;
-        ((Vec*)transformedVtxNrm)[i].y = 0.0f;
-        ((Vec*)transformedVtxNrm)[i].z = 0.0f;
+        ((f32*)transformedVtxNrm)[(i * 3) + 0] = 0.0f;
+        ((f32*)transformedVtxNrm)[(i * 3) + 1] = 0.0f;
+        ((f32*)transformedVtxNrm)[(i * 3) + 2] = 0.0f;
     }
+
     if (jointTree->getWEvlpMtxNum() != 0) {
         u16 jointNum = jointTree->getJointNum();
         for (u16 i = 0; i < jointNum; i++) {
-            mSkinNList[i].calcSkin_VtxNrmF32(mPosMtx[i], currentVtxNrm, transformedVtxNrm);
+            J3DSkinNList* skinList = mSkinNList + i;
+            skinList->calcSkin_VtxNrmF32(mPosMtx[i], currentVtxNrm, transformedVtxNrm);
         }
     } else {
         u16 jointNum = jointTree->getJointNum();
         for (u16 i = 0; i < jointNum; i++) {
             J3DSkinNList* skinList = mSkinNList + i;
-            skinList->calcSkin_VtxNrmF32(param_1->getAnmMtx(i), currentVtxNrm, transformedVtxNrm);
+            skinList->calcSkin_VtxNrmF32(pMtxBuffer->getAnmMtx(i), currentVtxNrm, transformedVtxNrm);
         }
     }
-    DCStoreRange(param_0->getTransformedVtxNrm(0), param_0->getVertexData()->getNrmNum() * sizeof(Vec));
-    param_0->setCurrentVtxNrm(transformedVtxNrm);
+
+    DCStoreRange(pVtxBuffer->getTransformedVtxNrm(0), pVtxBuffer->getVertexData()->getNrmNum() * sizeof(Vec));
+    pVtxBuffer->setCurrentVtxNrm(transformedVtxNrm);
 }
 
 /* 8032DB50-8032DC74 328490 0124+00 1/1 0/0 0/0 .text
  * deformVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
 // NONMATCHING - J3DPSMulMtxVec regalloc
-void J3DSkinDeform::deformVtxPos_F32(J3DVertexBuffer* param_0, J3DMtxBuffer* param_1) const {
+void J3DSkinDeform::deformVtxPos_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
+    Mtx* anmMtx = NULL;
     Mtx* anmMtxs[2];
-    anmMtxs[0] = (Mtx*)param_1->getAnmMtx(0);
-    anmMtxs[1] = (Mtx*)param_1->getWeightAnmMtx(0);
-    param_0->swapTransformedVtxPos();
-    J3DJointTree* jointTree = param_1->getJointTree();
-    int vtxNum = param_0->getVertexData()->getVtxNum();
-    void* currentVtxPos = param_0->getCurrentVtxPos();
-    void* transformedVtxPos = param_0->getTransformedVtxPos(0);
+    anmMtxs[0] = (Mtx*)pMtxBuffer->getAnmMtx(0);
+    anmMtxs[1] = (Mtx*)pMtxBuffer->getWeightAnmMtx(0);
+    pVtxBuffer->swapTransformedVtxPos();
+
+    J3DJointTree* jointTree = pMtxBuffer->getJointTree();
+    int vtxNum = pVtxBuffer->getVertexData()->getVtxNum();
+    int sp8 = jointTree->getDrawMtxNum();
+    void* currentVtxPos = pVtxBuffer->getCurrentVtxPos();
+    void* transformedVtxPos = pVtxBuffer->getTransformedVtxPos(0);
+
     for (int i = 0; i < vtxNum; i++) {
-        Mtx* anmMtx = anmMtxs[jointTree->getDrawMtxFlag(mPosData[i])];
-        J3DPSMulMtxVec(anmMtx[jointTree->getDrawMtxIndex(mPosData[i])], ((Vec*)currentVtxPos) + i, ((Vec*)transformedVtxPos) + i);
+        anmMtx = anmMtxs[jointTree->getDrawMtxFlag(mPosData[i])];
+        J3DPSMulMtxVec(anmMtx[jointTree->getDrawMtxIndex(mPosData[i])], (Vec*)(((f32*)currentVtxPos) + (i * 3)), (Vec*)(((f32*)transformedVtxPos) + (i * 3)));
     }
-    DCStoreRange(param_0->getTransformedVtxPos(0), param_0->getVertexData()->getVtxNum() * sizeof(Vec));
-    param_0->setCurrentVtxPos(transformedVtxPos);
+
+    DCStoreRange(pVtxBuffer->getTransformedVtxPos(0), pVtxBuffer->getVertexData()->getVtxNum() * sizeof(Vec));
+    pVtxBuffer->setCurrentVtxPos(transformedVtxPos);
 }
 
 /* 8032DC74-8032DDB8 3285B4 0144+00 1/1 0/0 0/0 .text
  * deformVtxPos_S16__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
 // NONMATCHING - J3DPSMulMtxVec regalloc
-void J3DSkinDeform::deformVtxPos_S16(J3DVertexBuffer* param_0, J3DMtxBuffer* param_1) const {
+void J3DSkinDeform::deformVtxPos_S16(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
+    Mtx* anmMtx = NULL;
     Mtx* anmMtxs[2];
-    anmMtxs[0] = (Mtx*)param_1->getAnmMtx(0);
-    anmMtxs[1] = (Mtx*)param_1->getWeightAnmMtx(0);
-    u8 vtxPosFrac = param_0->getVertexData()->getVtxPosFrac();
+    anmMtxs[0] = (Mtx*)pMtxBuffer->getAnmMtx(0);
+    anmMtxs[1] = (Mtx*)pMtxBuffer->getWeightAnmMtx(0);
+    int vtxPosFrac = pVtxBuffer->getVertexData()->getVtxPosFrac();
     J3DGQRSetup7(vtxPosFrac, 7, vtxPosFrac, 7);
-    param_0->swapTransformedVtxPos();
-    J3DJointTree* jointTree = param_1->getJointTree();
-    int vtxNum = param_0->getVertexData()->getVtxNum();
-    void* currentVtxPos = param_0->getCurrentVtxPos();
-    void* transformedVtxPos = param_0->getTransformedVtxPos(0);
+    pVtxBuffer->swapTransformedVtxPos();
+
+    J3DJointTree* jointTree = pMtxBuffer->getJointTree();
+    int vtxNum = pVtxBuffer->getVertexData()->getVtxNum();
+    int sp8 = jointTree->getDrawMtxNum();
+    void* currentVtxPos = pVtxBuffer->getCurrentVtxPos();
+    void* transformedVtxPos = pVtxBuffer->getTransformedVtxPos(0);
+
     for (int i = 0; i < vtxNum; i++) {
-        Mtx* anmMtx = anmMtxs[jointTree->getDrawMtxFlag(mPosData[i])];
-        J3DPSMulMtxVec(anmMtx[jointTree->getDrawMtxIndex(mPosData[i])], ((S16Vec*)currentVtxPos) + i, ((S16Vec*)transformedVtxPos) + i);
+        anmMtx = anmMtxs[jointTree->getDrawMtxFlag(mPosData[i])];
+        J3DPSMulMtxVec(anmMtx[jointTree->getDrawMtxIndex(mPosData[i])], (S16Vec*)(((s16*)currentVtxPos) + (i * 3)), (S16Vec*)(((s16*)transformedVtxPos) + (i * 3)));
     }
-    DCStoreRange(param_0->getTransformedVtxPos(0), param_0->getVertexData()->getVtxNum() * sizeof(S16Vec));
-    param_0->setCurrentVtxPos(transformedVtxPos);
+
+    DCStoreRange(pVtxBuffer->getTransformedVtxPos(0), pVtxBuffer->getVertexData()->getVtxNum() * sizeof(S16Vec));
+    pVtxBuffer->setCurrentVtxPos(transformedVtxPos);
 }
 
 /* 8032DDB8-8032DEBC 3286F8 0104+00 1/1 0/0 0/0 .text
  * deformVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBuffer        */
 // NONMATCHING - J3DPSMulMtxVec regalloc
-void J3DSkinDeform::deformVtxNrm_F32(J3DVertexBuffer* param_0) const {
-    param_0->swapTransformedVtxNrm();
-    int nrmNum = param_0->getVertexData()->getNrmNum();
-    void* currentVtxNrm = param_0->getCurrentVtxNrm();
-    void* transformedVtxNrm = param_0->getTransformedVtxNrm(0);
+void J3DSkinDeform::deformVtxNrm_F32(J3DVertexBuffer* pVtxBuffer) const {
+    pVtxBuffer->swapTransformedVtxNrm();
+    int nrmNum = pVtxBuffer->getVertexData()->getNrmNum();
+    void* currentVtxNrm = pVtxBuffer->getCurrentVtxNrm();
+    void* transformedVtxNrm = pVtxBuffer->getTransformedVtxNrm(0);
+
     for (int i = 0; i < nrmNum; i++) {
         J3DPSMulMtxVec(mNrmMtx[mNrmData[i]], (Vec*)((u8*)currentVtxNrm + i * 3 * 4), (Vec*)((u8*)transformedVtxNrm + i * 3 * 4));
     }
-    DCStoreRange(param_0->getTransformedVtxNrm(0), param_0->getVertexData()->getNrmNum() * sizeof(Vec));
-    param_0->setCurrentVtxNrm(transformedVtxNrm);
+
+    DCStoreRange(pVtxBuffer->getTransformedVtxNrm(0), pVtxBuffer->getVertexData()->getNrmNum() * sizeof(Vec));
+    pVtxBuffer->setCurrentVtxNrm(transformedVtxNrm);
 }
 
 /* 8032DEBC-8032DFDC 3287FC 0120+00 1/1 0/0 0/0 .text
  * deformVtxNrm_S16__13J3DSkinDeformCFP15J3DVertexBuffer        */
 // NONMATCHING - J3DPSMulMtxVec regalloc
-void J3DSkinDeform::deformVtxNrm_S16(J3DVertexBuffer* param_0) const {
-    u8 vtxNrmFrac = param_0->getVertexData()->getVtxNrmFrac();
+void J3DSkinDeform::deformVtxNrm_S16(J3DVertexBuffer* pVtxBuffer) const {
+    int vtxNrmFrac = pVtxBuffer->getVertexData()->getVtxNrmFrac();
     J3DGQRSetup7(vtxNrmFrac, 7, vtxNrmFrac, 7);
-    param_0->swapTransformedVtxNrm();
-    int nrmNum = param_0->getVertexData()->getNrmNum();
-    void* currentVtxNrm = param_0->getCurrentVtxNrm();
-    void* transformedVtxNrm = param_0->getTransformedVtxNrm(0);
+    pVtxBuffer->swapTransformedVtxNrm();
+
+    int nrmNum = pVtxBuffer->getVertexData()->getNrmNum();
+    void* currentVtxNrm = pVtxBuffer->getCurrentVtxNrm();
+    void* transformedVtxNrm = pVtxBuffer->getTransformedVtxNrm(0);
+
     for (int i = 0; i < nrmNum; i++) {
-        J3DPSMulMtxVec(mNrmMtx[mNrmData[i]], ((S16Vec*)currentVtxNrm) + i, ((S16Vec*)transformedVtxNrm) + i);
+        J3DPSMulMtxVec(mNrmMtx[mNrmData[i]], (S16Vec*)(((s16*)currentVtxNrm) + (i * 3)), (S16Vec*)(((s16*)transformedVtxNrm) + (i * 3)));
     }
-    DCStoreRange(param_0->getTransformedVtxNrm(0), param_0->getVertexData()->getNrmNum() * sizeof(S16Vec));
-    param_0->setCurrentVtxNrm(transformedVtxNrm);
+
+    DCStoreRange(pVtxBuffer->getTransformedVtxNrm(0), pVtxBuffer->getVertexData()->getNrmNum() * sizeof(S16Vec));
+    pVtxBuffer->setCurrentVtxNrm(transformedVtxNrm);
 }
 
 /* 8032DFDC-8032E064 32891C 0088+00 0/0 1/1 0/0 .text            deform__13J3DSkinDeformFP8J3DModel
  */
-void J3DSkinDeform::deform(J3DModel* param_0) {
-    if (param_0->checkFlag(4)) {
+void J3DSkinDeform::deform(J3DModel* pModel) {
+    J3D_ASSERT_NULLPTR(1270, pModel != NULL);
+
+    if (pModel->checkFlag(J3DMdlFlag_SkinPosCpu)) {
         onFlag(2);
     } else {
         offFlag(2);
     }
     
-    if (param_0->checkFlag(8)) {
+    if (pModel->checkFlag(J3DMdlFlag_SkinNrmCpu)) {
         onFlag(1);
     } else {
         offFlag(1);
     }
-    deform(param_0->getVertexBuffer(), param_0->getMtxBuffer());
+
+    deform(pModel->getVertexBuffer(), pModel->getMtxBuffer());
 }
 
 /* 8032E064-8032E180 3289A4 011C+00 1/0 0/0 0/0 .text
  * deform__13J3DSkinDeformFP15J3DVertexBufferP12J3DMtxBuffer    */
-void J3DSkinDeform::deform(J3DVertexBuffer* param_0, J3DMtxBuffer* param_1) {
-    if (param_1->getJointTree()->checkFlag(0x100)) {
-        calcAnmInvJointMtx(param_1);
+void J3DSkinDeform::deform(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) {
+    J3D_ASSERT_NULLPTR(1299, pVtxBuffer != NULL);
+    J3D_ASSERT_NULLPTR(1300, pMtxBuffer != NULL);
+
+    if (pMtxBuffer->getJointTree()->checkFlag(0x100)) {
+        calcAnmInvJointMtx(pMtxBuffer);
     }
+
     if (checkFlag(2) != 0) {
-        if (param_1->getJointTree()->checkFlag(0x100)) {
-            deformFastVtxPos_F32(param_0, param_1);
+        if (pMtxBuffer->getJointTree()->checkFlag(0x100)) {
+            deformFastVtxPos_F32(pVtxBuffer, pMtxBuffer);
         } else {
-            if (param_0->getVertexData()->getVtxPosType() == 4) {
-                deformVtxPos_F32(param_0, param_1);
+            if (pVtxBuffer->getVertexData()->getVtxPosType() == 4) {
+                deformVtxPos_F32(pVtxBuffer, pMtxBuffer);
             } else {
-                deformVtxPos_S16(param_0, param_1);
+                deformVtxPos_S16(pVtxBuffer, pMtxBuffer);
             }
         }
     }
-    if (checkFlag(1) != 0) {
-        if (param_1->getJointTree()->checkFlag(0x100)) {
-            deformFastVtxNrm_F32(param_0, param_1);
+
+    if (checkFlag(1)) {
+        if (pMtxBuffer->getJointTree()->checkFlag(0x100)) {
+            deformFastVtxNrm_F32(pVtxBuffer, pMtxBuffer);
         } else {
-            calcNrmMtx(param_1);
-            if (param_0->getVertexData()->getVtxNrmType() == 4) {
-                deformVtxNrm_F32(param_0);
+            calcNrmMtx(pMtxBuffer);
+            if (pVtxBuffer->getVertexData()->getVtxNrmType() == 4) {
+                deformVtxNrm_F32(pVtxBuffer);
             } else {
-                deformVtxNrm_S16(param_0);
+                deformVtxNrm_S16(pVtxBuffer);
             }
         }
     }
@@ -655,11 +695,10 @@ void J3DSkinDeform::deform(J3DVertexBuffer* param_0, J3DMtxBuffer* param_1) {
 
 /* 8032E180-8032E1B0 328AC0 0030+00 0/0 1/1 0/0 .text            calc__15J3DVtxColorCalcFP8J3DModel
  */
-void J3DVtxColorCalc::calc(J3DModel* param_0) {
-    calc(param_0->getVertexBuffer());
+void J3DVtxColorCalc::calc(J3DModel* pModel) {
+    J3D_ASSERT_NULLPTR(1351, pModel != NULL);
+    calc(pModel->getVertexBuffer());
 }
 
 /* 8032E1B0-8032E1F8 328AF0 0048+00 1/0 0/0 0/0 .text            __dt__13J3DSkinDeformFv */
 J3DSkinDeform::~J3DSkinDeform() {}
-
-/* 803A2028-803A2028 02E688 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
index 52a31e0d57..b1321abfb9 100644
--- a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
+++ b/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
@@ -8,26 +8,27 @@
 #include "JSystem/JKernel/JKRHeap.h"
 
 void J3DDrawBuffer::calcZRatio() {
-    mZRatio = (mZFar - mZNear) / (f32)mBufSize;
+    mZRatio = (mZFar - mZNear) / (f32)mEntryTableSize;
 }
 
 void J3DDrawBuffer::initialize() {
-    mDrawType = DRAW_HEAD;
-    mSortType = SORT_MAT;
+    mDrawMode = J3DDrawBufDrawMode_Head;
+    mSortMode = J3DDrawBufSortMode_Mat;
     mZNear = 1.0f;
     mZFar = 10000.0f;
     mpZMtx = NULL;
     mpCallBackPacket = NULL;
-    mBufSize = 0x20;
+    mEntryTableSize = 0x20;
     calcZRatio();
 }
 
-J3DError J3DDrawBuffer::allocBuffer(u32 bufSize) {
-    mpBuf = new (0x20) J3DPacket*[bufSize];
-    if (mpBuf == NULL)
+int J3DDrawBuffer::allocBuffer(u32 size) {
+    mpBuffer = new (0x20) J3DPacket*[size];
+    if (mpBuffer == NULL)
         return kJ3DError_Alloc;
 
-    mBufSize = bufSize;
+    mEntryTableSize = size;
+
     frameInit();
     calcZRatio();
     return kJ3DError_Success;
@@ -36,15 +37,15 @@ J3DError J3DDrawBuffer::allocBuffer(u32 bufSize) {
 J3DDrawBuffer::~J3DDrawBuffer() {
     frameInit();
 
-    delete[] mpBuf;
-    mpBuf = NULL;
+    delete[] mpBuffer;
+    mpBuffer = NULL;
 }
 
 /* 80325068-8032509C 31F9A8 0034+00 2/2 1/1 0/0 .text            frameInit__13J3DDrawBufferFv */
 void J3DDrawBuffer::frameInit() {
-    u32 bufSize = mBufSize;
+    u32 bufSize = mEntryTableSize;
     for (u32 i = 0; i < bufSize; i++)
-        mpBuf[i] = NULL;
+        mpBuffer[i] = NULL;
 
     mpCallBackPacket = NULL;
 }
@@ -52,80 +53,89 @@ void J3DDrawBuffer::frameInit() {
 /* 8032509C-803251E4 31F9DC 0148+00 2/1 0/0 0/0 .text
  * entryMatSort__13J3DDrawBufferFP12J3DMatPacket                */
 int J3DDrawBuffer::entryMatSort(J3DMatPacket* pMatPacket) {
+    J3D_ASSERT_NULLPTR(122, pMatPacket != NULL);
+
     pMatPacket->drawClear();
     pMatPacket->getShapePacket()->drawClear();
 
     if (pMatPacket->isChanged()) {
-        pMatPacket->setNextPacket(mpBuf[0]);
-        mpBuf[0] = pMatPacket;
+        pMatPacket->setNextPacket(mpBuffer[0]);
+        mpBuffer[0] = pMatPacket;
         return 1;
     }
 
-    J3DTexture* texture = j3dSys.getTexture();
-    u32 hash;
+    J3DTexture* pTexture = j3dSys.getTexture();
     u16 texNo = pMatPacket->getMaterial()->getTexNo(0);
+    J3D_ASSERT_NULLPTR(150, pTexture != NULL);
+
+    u32 hash;
     if (texNo == 0xFFFF) {
         hash = 0;
     } else {
-        hash = ((u32)texture->getResTIMG(texNo) + texture->getResTIMG(texNo)->imageOffset) >> 5;
+        hash = ((uintptr_t)pTexture->getResTIMG(texNo) + pTexture->getResTIMG(texNo)->imageOffset) >> 5;
     }
-    u32 slot = hash & (mBufSize - 1);
+    u32 slot = hash & (mEntryTableSize - 1);
 
-    if (mpBuf[slot] == NULL) {
-        mpBuf[slot] = pMatPacket;
+    if (mpBuffer[slot] == NULL) {
+        mpBuffer[slot] = pMatPacket;
         return 1;
-    } else {
-        for (J3DMatPacket* pkt = (J3DMatPacket*)mpBuf[slot]; pkt != NULL;
-             pkt = (J3DMatPacket*)pkt->getNextPacket())
-        {
-            if (pkt->isSame(pMatPacket)) {
-                pkt->addShapePacket(pMatPacket->getShapePacket());
-                return 0;
-            }
+    }
+
+    J3DMatPacket* packet;
+    for (packet = (J3DMatPacket*)mpBuffer[slot]; packet != NULL; packet = (J3DMatPacket*)packet->getNextPacket())
+    {
+        if (packet->isSame(pMatPacket)) {
+            packet->addShapePacket(pMatPacket->getShapePacket());
+            return 0;
         }
-
-        pMatPacket->setNextPacket(mpBuf[slot]);
-        mpBuf[slot] = pMatPacket;
-        return 1;
     }
+
+    pMatPacket->setNextPacket(mpBuffer[slot]);
+    mpBuffer[slot] = pMatPacket;
+    return 1;
 }
 
 /* 803251E4-8032529C 31FB24 00B8+00 1/0 0/0 0/0 .text
  * entryMatAnmSort__13J3DDrawBufferFP12J3DMatPacket             */
 int J3DDrawBuffer::entryMatAnmSort(J3DMatPacket* pMatPacket) {
+    J3D_ASSERT_NULLPTR(199, pMatPacket != NULL);
+
     J3DMaterialAnm* pMaterialAnm = pMatPacket->mpMaterialAnm;
-    u32 slot = (u32)pMaterialAnm & (mBufSize - 1);
+    u32 slot = (uintptr_t)pMaterialAnm & (mEntryTableSize - 1);
 
     if (pMaterialAnm == NULL) {
         return entryMatSort(pMatPacket);
-    } else {
-        pMatPacket->drawClear();
-        pMatPacket->getShapePacket()->drawClear();
-        if (mpBuf[slot] == NULL) {
-            mpBuf[slot] = pMatPacket;
-            return 1;
-        } else {
-            for (J3DMatPacket* pkt = (J3DMatPacket*)mpBuf[slot]; pkt != NULL;
-                 pkt = (J3DMatPacket*)pkt->getNextPacket())
-            {
-                if (pkt->mpMaterialAnm == pMaterialAnm) {
-                    pkt->addShapePacket(pMatPacket->getShapePacket());
-                    return 0;
-                }
-            }
+    }
 
-            pMatPacket->setNextPacket(mpBuf[slot]);
-            mpBuf[slot] = pMatPacket;
-            return 1;
+    pMatPacket->drawClear();
+    pMatPacket->getShapePacket()->drawClear();
+
+    if (mpBuffer[slot] == NULL) {
+        mpBuffer[slot] = pMatPacket;
+        return 1;
+    }
+
+    J3DMatPacket* packet;
+    for (packet = (J3DMatPacket*)mpBuffer[slot]; packet != NULL; packet = (J3DMatPacket*)packet->getNextPacket())
+    {
+        if (packet->mpMaterialAnm == pMaterialAnm) {
+            packet->addShapePacket(pMatPacket->getShapePacket());
+            return 0;
         }
     }
+
+    pMatPacket->setNextPacket(mpBuffer[slot]);
+    mpBuffer[slot] = pMatPacket;
+    return 1;
 }
 
 /* 8032529C-803253B4 31FBDC 0118+00 1/0 0/0 0/0 .text entryZSort__13J3DDrawBufferFP12J3DMatPacket
  */
-int J3DDrawBuffer::entryZSort(J3DMatPacket* i_packet) {
-    i_packet->drawClear();
-    i_packet->getShapePacket()->drawClear();
+int J3DDrawBuffer::entryZSort(J3DMatPacket* pMatPacket) {
+    J3D_ASSERT_NULLPTR(257, pMatPacket != NULL);
+
+    pMatPacket->drawClear();
+    pMatPacket->getShapePacket()->drawClear();
 
     Vec tmp;
     tmp.x = mpZMtx[0][3];
@@ -134,32 +144,33 @@ int J3DDrawBuffer::entryZSort(J3DMatPacket* i_packet) {
 
     f32 value = -J3DCalcZValue(j3dSys.getViewMtx(), tmp);
 
-    u32 uvar4;
+    u32 index;
     if (mZNear + mZRatio < value) {
         if (mZFar - mZRatio > value) {
-            uvar4 = value / mZRatio;
+            index = value / mZRatio;
         } else {
-            uvar4 = mBufSize - 1;
+            index = mEntryTableSize - 1;
         }
     } else {
-        uvar4 = 0;
+        index = 0;
     }
 
-    u32 idx = (mBufSize - 1) - uvar4;
-    i_packet->setNextPacket(mpBuf[idx]);
-    mpBuf[idx] = i_packet;
-
+    index = (mEntryTableSize - 1) - index;
+    pMatPacket->setNextPacket(mpBuffer[index]);
+    mpBuffer[index] = pMatPacket;
     return 1;
 }
 
 /* 803253B4-80325404 31FCF4 0050+00 1/0 0/0 0/0 .text
  * entryModelSort__13J3DDrawBufferFP12J3DMatPacket              */
-int J3DDrawBuffer::entryModelSort(J3DMatPacket* i_packet) {
-    i_packet->drawClear();
-    i_packet->getShapePacket()->drawClear();
+int J3DDrawBuffer::entryModelSort(J3DMatPacket* pMatPacket) {
+    J3D_ASSERT_NULLPTR(316, pMatPacket != NULL);
+
+    pMatPacket->drawClear();
+    pMatPacket->getShapePacket()->drawClear();
 
     if (mpCallBackPacket != NULL) {
-        mpCallBackPacket->addChildPacket(i_packet);
+        mpCallBackPacket->addChildPacket(pMatPacket);
         return 1;
     }
 
@@ -168,57 +179,67 @@ int J3DDrawBuffer::entryModelSort(J3DMatPacket* i_packet) {
 
 /* 80325404-80325458 31FD44 0054+00 1/0 0/0 0/0 .text
  * entryInvalidSort__13J3DDrawBufferFP12J3DMatPacket            */
-int J3DDrawBuffer::entryInvalidSort(J3DMatPacket* i_packet) {
-    i_packet->drawClear();
-    i_packet->getShapePacket()->drawClear();
+int J3DDrawBuffer::entryInvalidSort(J3DMatPacket* pMatPacket) {
+    J3D_ASSERT_NULLPTR(343, pMatPacket != NULL);
+
+    pMatPacket->drawClear();
+    pMatPacket->getShapePacket()->drawClear();
 
     if (mpCallBackPacket != NULL) {
-        mpCallBackPacket->addChildPacket(i_packet->getShapePacket());
+        mpCallBackPacket->addChildPacket(pMatPacket->getShapePacket());
         return 1;
     }
 
     return 0;
 }
 
-int J3DDrawBuffer::entryNonSort(J3DMatPacket* i_packet) {
-    i_packet->drawClear();
-    i_packet->mpShapePacket->drawClear();
+int J3DDrawBuffer::entryNonSort(J3DMatPacket* pMatPacket) {
+    J3D_ASSERT_NULLPTR(370, pMatPacket != NULL);
 
-    i_packet->setNextPacket(mpBuf[0]);
-    mpBuf[0] = i_packet;
+    pMatPacket->drawClear();
+    pMatPacket->getShapePacket()->drawClear();
 
+    pMatPacket->setNextPacket(mpBuffer[0]);
+    mpBuffer[0] = pMatPacket;
     return 1;
 }
 
-int J3DDrawBuffer::entryImm(J3DPacket* i_packet, u16 index) {
-    i_packet->setNextPacket(mpBuf[index]);
-    mpBuf[index] = i_packet;
+int J3DDrawBuffer::entryImm(J3DPacket* pPacket, u16 index) {
+    J3D_ASSERT_NULLPTR(394, pPacket != NULL);
+    J3D_ASSERT_RANGE(395, index < mEntryTableSize);
 
+    pPacket->setNextPacket(mpBuffer[index]);
+    mpBuffer[index] = pPacket;
     return 1;
 }
 
 /* 803CEC30-803CEC78 02BD50 0048+00 0/1 1/1 0/0 .data            sortFuncTable__13J3DDrawBuffer */
-sortFunc J3DDrawBuffer::sortFuncTable[6] = {
+J3DDrawBuffer::sortFunc J3DDrawBuffer::sortFuncTable[6] = {
     &J3DDrawBuffer::entryMatSort,   &J3DDrawBuffer::entryMatAnmSort,  &J3DDrawBuffer::entryZSort,
     &J3DDrawBuffer::entryModelSort, &J3DDrawBuffer::entryInvalidSort, &J3DDrawBuffer::entryNonSort,
 };
 
 /* 803CEC90-803CECA8 02BDB0 0018+00 1/2 0/0 0/0 .data            drawFuncTable__13J3DDrawBuffer */
-drawFunc J3DDrawBuffer::drawFuncTable[2] = {
+J3DDrawBuffer::drawFunc J3DDrawBuffer::drawFuncTable[2] = {
     &J3DDrawBuffer::drawHead,
     &J3DDrawBuffer::drawTail,
 };
 
+/* 804515E0-804515E8 000AE0 0004+04 0/0 1/1 0/0 .sbss            entryNum__13J3DDrawBuffer */
+int J3DDrawBuffer::entryNum;
+
 /* 803254AC-80325500 31FDEC 0054+00 0/0 2/2 0/0 .text            draw__13J3DDrawBufferCFv */
 void J3DDrawBuffer::draw() const {
-    drawFunc func = drawFuncTable[mDrawType];
+    J3D_ASSERT_RANGE(411, mDrawMode < J3DDrawBufDrawMode_MAX);
+
+    drawFunc func = drawFuncTable[mDrawMode];
     (this->*func)();
 }
 
 /* 80325500-80325578 31FE40 0078+00 1/0 0/0 0/0 .text            drawHead__13J3DDrawBufferCFv */
 void J3DDrawBuffer::drawHead() const {
-    u32 size = mBufSize;
-    J3DPacket** buf = mpBuf;
+    u32 size = mEntryTableSize;
+    J3DPacket** buf = mpBuffer;
 
     for (u32 i = 0; i < size; i++) {
         for (J3DPacket* packet = buf[i]; packet != NULL; packet = packet->getNextPacket()) {
@@ -229,15 +250,9 @@ void J3DDrawBuffer::drawHead() const {
 
 /* 80325578-803255F0 31FEB8 0078+00 1/0 0/0 0/0 .text            drawTail__13J3DDrawBufferCFv */
 void J3DDrawBuffer::drawTail() const {
-    int num = mBufSize - 1;
-
-    for (int i = num; i >= 0; i--) {
-        for (J3DPacket* packet = mpBuf[i]; packet != NULL; packet = packet->getNextPacket()) {
+    for (int i = mEntryTableSize - 1; i >= 0; i--) {
+        for (J3DPacket* packet = mpBuffer[i]; packet != NULL; packet = packet->getNextPacket()) {
             packet->draw();
         }
     }
 }
-
-/* ############################################################################################## */
-/* 804515E0-804515E8 000AE0 0004+04 0/0 1/1 0/0 .sbss            entryNum__13J3DDrawBuffer */
-int J3DDrawBuffer::entryNum;
\ No newline at end of file
diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/src/JSystem/J3DGraphBase/J3DGD.cpp
index 2bb4e24c82..018e8d5418 100644
--- a/src/JSystem/J3DGraphBase/J3DGD.cpp
+++ b/src/JSystem/J3DGraphBase/J3DGD.cpp
@@ -3,29 +3,28 @@
 //
 
 #include "JSystem/J3DGraphBase/J3DGD.h"
-#include "dolphin/gd.h"
-#include "dolphin/os.h"
+#include "JSystem/J3DGraphBase/J3DFifo.h"
 
 /* 8030D098-8030D210 3079D8 0178+00 0/0 1/1 0/0 .text J3DGDSetGenMode__FUcUcUcUc11_GXCullMode */
-void J3DGDSetGenMode(u8 texGenNum, u8 colorChanNum, u8 tevStageNum, u8 indTexStageNum,
-                     GXCullMode cullMode) {
-    GDOverflowCheck(0xa);
-    J3DGDWriteBPCmd(0xfe07fc3f);
+void J3DGDSetGenMode(u8 nTexGens, u8 nChans, u8 nTevs, u8 nInds,
+                     GXCullMode cm) {
     static u8 cm2hw[4] = {0, 2, 1, 3};
-    J3DGDWriteBPCmd(texGenNum | colorChanNum << 4 | (tevStageNum - 1) << 0xa |
-                    cm2hw[cullMode] << 0xe | indTexStageNum << 0x10);
+
+    GDOverflowCheck(10);
+    J3DGDWriteBPCmd(0xFE07FC3F);
+    J3DGDWriteBPCmd(BP_GEN_MODE(nTexGens, nChans, nTevs - 1, cm2hw[cm], nInds));
 }
 
 /* 8030D210-8030D364 307B50 0154+00 0/0 1/1 0/0 .text            J3DGDSetGenMode_3Param__FUcUcUc */
-void J3DGDSetGenMode_3Param(u8 texGenNum, u8 tevStageNum, u8 indTexStageNum) {
-    GDOverflowCheck(0xa);
-    J3DGDWriteBPCmd(0xfe073c0f);
-    J3DGDWriteBPCmd(texGenNum | (tevStageNum - 1) << 0xa | indTexStageNum << 0x10);
+void J3DGDSetGenMode_3Param(u8 nTexGens, u8 nTevs, u8 nInds) {
+    GDOverflowCheck(10);
+    J3DGDWriteBPCmd(0xFE073C0F);
+    J3DGDWriteBPCmd(BP_GEN_MODE(nTexGens, 0, nTevs - 1, 0, nInds));
 }
 
 /* 8030D364-8030D65C 307CA4 02F8+00 0/0 1/1 0/0 .text J3DGDSetLightAttn__F10_GXLightIDffffff */
-void J3DGDSetLightAttn(GXLightID id, f32 a0, f32 a1, f32 a2, f32 k0, f32 k1, f32 k2) {
-    J3DGDWriteXFCmdHdr(0x0604 + __GDLightID2Offset(id), 6);
+void J3DGDSetLightAttn(GXLightID light, f32 a0, f32 a1, f32 a2, f32 k0, f32 k1, f32 k2) {
+    J3DGDWriteXFCmdHdr(XF_LIGHT_ATTN_ID + __GDLightID2Offset(light), 6);
     J3DGDWrite_f32(a0);
     J3DGDWrite_f32(a1);
     J3DGDWrite_f32(a2);
@@ -36,15 +35,15 @@ void J3DGDSetLightAttn(GXLightID id, f32 a0, f32 a1, f32 a2, f32 k0, f32 k1, f32
 
 /* 8030D65C-8030D76C 307F9C 0110+00 0/0 1/1 0/0 .text J3DGDSetLightColor__F10_GXLightID8_GXColor
  */
-void J3DGDSetLightColor(GXLightID id, GXColor color) {
-    J3DGDWriteXFCmd(0x0603 + __GDLightID2Offset(id),
+void J3DGDSetLightColor(GXLightID light, GXColor color) {
+    J3DGDWriteXFCmd(XF_LIGHT_COLOR_ID + __GDLightID2Offset(light),
                     (color.r << 24) | (color.g << 16) | (color.b << 8) | (color.a << 0));
 }
 
 /* 8030D76C-8030D938 3080AC 01CC+00 0/0 1/1 0/0 .text            J3DGDSetLightPos__F10_GXLightIDfff
  */
-void J3DGDSetLightPos(GXLightID id, f32 x, f32 y, f32 z) {
-    J3DGDWriteXFCmdHdr(0x060A + __GDLightID2Offset(id), 3);
+void J3DGDSetLightPos(GXLightID light, f32 x, f32 y, f32 z) {
+    J3DGDWriteXFCmdHdr(XF_LIGHT_POS_ID + __GDLightID2Offset(light), 3);
     J3DGDWrite_f32(x);
     J3DGDWrite_f32(y);
     J3DGDWrite_f32(z);
@@ -52,223 +51,241 @@ void J3DGDSetLightPos(GXLightID id, f32 x, f32 y, f32 z) {
 
 /* 8030D938-8030DB04 308278 01CC+00 0/0 1/1 0/0 .text            J3DGDSetLightDir__F10_GXLightIDfff
  */
-void J3DGDSetLightDir(GXLightID id, f32 x, f32 y, f32 z) {
-    J3DGDWriteXFCmdHdr(0x060D + __GDLightID2Offset(id), 3);
-    J3DGDWrite_f32(x);
-    J3DGDWrite_f32(y);
-    J3DGDWrite_f32(z);
+void J3DGDSetLightDir(GXLightID light, f32 nx, f32 ny, f32 nz) {
+    J3DGDWriteXFCmdHdr(XF_LIGHT_DIR_ID + __GDLightID2Offset(light), 3);
+    J3DGDWrite_f32(nx);
+    J3DGDWrite_f32(ny);
+    J3DGDWrite_f32(nz);
 }
 
 /* 8030DB04-8030E064 308444 0560+00 1/0 1/1 0/0 .text
  * J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb       */
-void J3DGDSetVtxAttrFmtv(GXVtxFmt fmt, GXVtxAttrFmtList const* fmtList, bool param_2) {
-    u32 pos_cnt = GX_POS_XYZ;
-    u32 pos_type = GX_F32;
-    u32 pos_shift = 0;
-    u32 nrm_cnt = GX_NRM_XYZ;
-    u32 nrm_type = GX_F32;
-    u32 local_34 = 0;
-    u32 clr0_cnt = GX_CLR_RGBA;
-    u32 clr0_type = GX_RGBA8;
-    u32 clr1_cnt = GX_CLR_RGBA;
-    u32 clr1_type = GX_RGBA8;
-    u32 tex0_cnt = GX_TEX_ST;
-    u32 tex0_type = GX_F32;
-    u32 tex0_shift = 0;
-    u32 tex1_cnt = GX_TEX_ST;
-    u32 tex1_type = GX_F32;
-    u32 tex1_shift = 0;
-    u32 tex2_cnt = GX_TEX_ST;
-    u32 tex2_type = GX_F32;
-    u32 tex2_shift = 0;
-    u32 tex3_cnt = GX_TEX_ST;
-    u32 tex3_type = GX_F32;
-    u32 tex3_shift = 0;
-    u32 tex4_cnt = GX_TEX_ST;
-    u32 tex4_type = GX_F32;
-    u32 tex4_shift = 0;
-    u32 tex5_cnt = GX_TEX_ST;
-    u32 tex5_type = GX_F32;
-    u32 tex5_shift = 0;
-    u32 tex6_cnt = GX_TEX_ST;
-    u32 tex6_type = GX_F32;
-    u32 tex6_shift = 0;
-    u32 tex7_cnt = GX_TEX_ST;
-    u32 tex7_type = GX_F32;
-    u32 tex7_shift = 0;
-    for (; fmtList->attr != GX_VA_NULL; fmtList++) {
-        switch (fmtList->attr) {
+void J3DGDSetVtxAttrFmtv(GXVtxFmt vtxfmt, const GXVtxAttrFmtList* list, bool param_2) {
+    u32 posCnt = GX_POS_XYZ;
+    u32 posType = GX_F32;
+    u32 posFrac = 0;
+
+    u32 nrmCnt = GX_NRM_XYZ;
+    u32 nrmType = GX_F32;
+    u32 nrmIdx3 = 0;
+
+    u32 c0Cnt = GX_CLR_RGBA;
+    u32 c0Type = GX_RGBA8;
+
+    u32 c1Cnt = GX_CLR_RGBA;
+    u32 c1Type = GX_RGBA8;
+
+    u32 tx0Cnt = GX_TEX_ST;
+    u32 tx0Type = GX_F32;
+    u32 tx0Frac = 0;
+
+    u32 tx1Cnt = GX_TEX_ST;
+    u32 tx1Type = GX_F32;
+    u32 tx1Frac = 0;
+
+    u32 tx2Cnt = GX_TEX_ST;
+    u32 tx2Type = GX_F32;
+    u32 tx2Frac = 0;
+
+    u32 tx3Cnt = GX_TEX_ST;
+    u32 tx3Type = GX_F32;
+    u32 tx3Frac = 0;
+
+    u32 tx4Cnt = GX_TEX_ST;
+    u32 tx4Type = GX_F32;
+    u32 tx4Frac = 0;
+
+    u32 tx5Cnt = GX_TEX_ST;
+    u32 tx5Type = GX_F32;
+    u32 tx5Frac = 0;
+
+    u32 tx6Cnt = GX_TEX_ST;
+    u32 tx6Type = GX_F32;
+    u32 tx6Frac = 0;
+
+    u32 tx7Cnt = GX_TEX_ST;
+    u32 tx7Type = GX_F32;
+    u32 tx7Frac = 0;
+
+    ASSERTMSGLINE(240, vtxfmt < GX_MAX_VTXFMT, "GDSetVtxAttrFmtv: invalid vtx fmt");
+
+    for (; list->attr != GX_VA_NULL; ++list) {
+        ASSERTMSGLINE(245, list->attr >= GX_VA_POS && list->attr <= GX_VA_TEX7, "GDSetVtxAttrFmtv: invalid attribute");
+        ASSERTMSGLINE(246, list->frac < 32, "GDSetVtxAttrFmtv: invalid frac value");
+
+        switch (list->attr) {
         case GX_VA_POS:
-            pos_cnt = fmtList->cnt;
-            pos_type = fmtList->type;
-            pos_shift = fmtList->frac;
+            posCnt = list->cnt;
+            posType = list->type;
+            posFrac = list->frac;
             break;
         case GX_VA_NRM:
         case GX_VA_NBT:
-            nrm_type = fmtList->type;
-            if (fmtList->cnt == GX_NRM_NBT3) {
-                nrm_cnt = GX_NRM_NBT;
-                local_34 = 1;
+            nrmType = list->type;
+            if (list->cnt == GX_NRM_NBT3) {
+                nrmCnt = GX_NRM_NBT;
+                nrmIdx3 = 1;
             } else {
                 if (param_2) {
-                    nrm_cnt = GX_NRM_NBT;
+                    nrmCnt = GX_NRM_NBT;
                 } else {
-                    nrm_cnt = fmtList->cnt;
+                    nrmCnt = list->cnt;
                 }
-                local_34 = 0;
+                nrmIdx3 = 0;
             }
             break;
         case GX_VA_CLR0:
-            clr0_cnt = fmtList->cnt;
-            clr0_type = fmtList->type;
+            c0Cnt = list->cnt;
+            c0Type = list->type;
             break;
         case GX_VA_CLR1:
-            clr1_cnt = fmtList->cnt;
-            clr1_type = fmtList->type;
+            c1Cnt = list->cnt;
+            c1Type = list->type;
             break;
         case GX_VA_TEX0:
-            tex0_cnt = fmtList->cnt;
-            tex0_type = fmtList->type;
-            tex0_shift = fmtList->frac;
+            tx0Cnt = list->cnt;
+            tx0Type = list->type;
+            tx0Frac = list->frac;
             break;
         case GX_VA_TEX1:
-            tex1_cnt = fmtList->cnt;
-            tex1_type = fmtList->type;
-            tex1_shift = fmtList->frac;
+            tx1Cnt = list->cnt;
+            tx1Type = list->type;
+            tx1Frac = list->frac;
             break;
         case GX_VA_TEX2:
-            tex2_cnt = fmtList->cnt;
-            tex2_type = fmtList->type;
-            tex2_shift = fmtList->frac;
+            tx2Cnt = list->cnt;
+            tx2Type = list->type;
+            tx2Frac = list->frac;
             break;
         case GX_VA_TEX3:
-            tex3_cnt = fmtList->cnt;
-            tex3_type = fmtList->type;
-            tex3_shift = fmtList->frac;
+            tx3Cnt = list->cnt;
+            tx3Type = list->type;
+            tx3Frac = list->frac;
             break;
         case GX_VA_TEX4:
-            tex4_cnt = fmtList->cnt;
-            tex4_type = fmtList->type;
-            tex4_shift = fmtList->frac;
+            tx4Cnt = list->cnt;
+            tx4Type = list->type;
+            tx4Frac = list->frac;
             break;
         case GX_VA_TEX5:
-            tex5_cnt = fmtList->cnt;
-            tex5_type = fmtList->type;
-            tex5_shift = fmtList->frac;
+            tx5Cnt = list->cnt;
+            tx5Type = list->type;
+            tx5Frac = list->frac;
             break;
         case GX_VA_TEX6:
-            tex6_cnt = fmtList->cnt;
-            tex6_type = fmtList->type;
-            tex6_shift = fmtList->frac;
+            tx6Cnt = list->cnt;
+            tx6Type = list->type;
+            tx6Frac = list->frac;
             break;
         case GX_VA_TEX7:
-            tex7_cnt = fmtList->cnt;
-            tex7_type = fmtList->type;
-            tex7_shift = fmtList->frac;
-            break;
+            tx7Cnt = list->cnt;
+            tx7Type = list->type;
+            tx7Frac = list->frac;
         }
     }
-    GDOverflowCheck(0x12);
-    J3DGDWriteCPCmd(CP_REG_VAT_GRP0_ID + fmt,
-                    pos_cnt | pos_type << 1 | pos_shift << 4 | nrm_cnt << 9 | nrm_type << 0xa |
-                        clr0_cnt << 0xd | clr0_type << 0xe | clr1_cnt << 0x11 | clr1_type << 0x12 |
-                        tex0_cnt << 0x15 | tex0_type << 0x16 | tex0_shift << 0x19 | 0x40000000 |
-                        local_34 << 0x1f);
-    J3DGDWriteCPCmd(CP_REG_VAT_GRP1_ID + fmt,
-                    tex1_cnt | tex1_type << 1 | tex1_shift << 4 | tex2_cnt << 9 | tex2_type << 0xa |
-                        tex2_shift << 0xd | tex3_cnt << 0x12 | tex3_type << 0x13 |
-                        tex3_shift << 0x16 | tex4_cnt << 0x1b | tex4_type << 0x1c | 0x80000000);
-    J3DGDWriteCPCmd(CP_REG_VAT_GRP2_ID + fmt,
-                    tex4_shift | tex5_cnt << 5 | tex5_type << 6 | tex5_shift << 9 |
-                        tex6_cnt << 0xe | tex6_type << 0xf | tex6_shift << 0x12 | tex7_cnt << 0x17 |
-                        tex7_type << 0x18 | tex7_shift << 0x1b);
+
+    GDOverflowCheck(18);
+    J3DGDWriteCPCmd(vtxfmt + CP_REG_VAT_GRP0_ID, CP_REG_VAT_GRP0(posCnt, posType, posFrac, nrmCnt, nrmType, c0Cnt, c0Type, c1Cnt, c1Type, tx0Cnt, tx0Type, tx0Frac, 1, nrmIdx3));
+    J3DGDWriteCPCmd(vtxfmt + CP_REG_VAT_GRP1_ID, CP_REG_VAT_GRP1(tx1Cnt, tx1Type, tx1Frac, tx2Cnt, tx2Type, tx2Frac, tx3Cnt, tx3Type, tx3Frac, tx4Cnt, tx4Type, 1));
+    J3DGDWriteCPCmd(vtxfmt + CP_REG_VAT_GRP2_ID, CP_REG_VAT_GRP2(tx4Frac, tx5Cnt, tx5Type, tx5Frac, tx6Cnt, tx6Type, tx6Frac, tx7Cnt, tx7Type, tx7Frac));
 }
 
 /* 8030E064-8030E234 3089A4 01D0+00 1/0 1/1 0/0 .text
  * J3DGDSetTexCoordGen__F13_GXTexGenType12_GXTexGenSrc          */
-void J3DGDSetTexCoordGen(GXTexGenType texGenType, GXTexGenSrc texGenSrc) {
-    u32 input_form = 0;
-    u32 proj_type = 0;
-    u32 src_row = 5;
-    u32 bump_src_tex = 5;
-    u32 bump_src_light = 0;
-    u32 texgen_type;
-    switch (texGenSrc) {
+void J3DGDSetTexCoordGen(GXTexGenType func, GXTexGenSrc src_param) {
+    u32 tgType;
+    u32 form;
+    u32 proj;
+    u32 row;
+    u32 embossRow;
+    u32 embossLit;
+    
+    form = 0;
+    proj = 0;
+    row = 5;
+    embossRow = 5;
+    embossLit = 0;
+
+    switch(src_param) {
     case GX_TG_POS:
-        src_row = 0;
-        input_form = 1;
+        row = 0;
+        form = 1;
         break;
     case GX_TG_NRM:
-        src_row = 1;
-        input_form = 1;
+        row = 1;
+        form = 1;
         break;
     case GX_TG_BINRM:
-        src_row = 3;
-        input_form = 1;
+        row = 3;
+        form = 1;
         break;
     case GX_TG_TANGENT:
-        src_row = 4;
-        input_form = 1;
+        row = 4;
+        form = 1;
         break;
     case GX_TG_COLOR0:
-        src_row = 2;
+        row = 2;
         break;
     case GX_TG_COLOR1:
-        src_row = 2;
+        row = 2;
         break;
     case GX_TG_TEX0:
-        src_row = 5;
+        row = 5;
         break;
     case GX_TG_TEX1:
-        src_row = 6;
+        row = 6;
         break;
     case GX_TG_TEX2:
-        src_row = 7;
+        row = 7;
         break;
     case GX_TG_TEX3:
-        src_row = 8;
+        row = 8;
         break;
     case GX_TG_TEX4:
-        src_row = 9;
+        row = 9;
         break;
     case GX_TG_TEX5:
-        src_row = 10;
+        row = 10;
         break;
     case GX_TG_TEX6:
-        src_row = 11;
+        row = 11;
         break;
     case GX_TG_TEX7:
-        src_row = 12;
+        row = 12;
         break;
     case GX_TG_TEXCOORD0:
-        bump_src_tex = 0;
+        embossRow = 0;
         break;
     case GX_TG_TEXCOORD1:
-        bump_src_tex = 1;
+        embossRow = 1;
         break;
     case GX_TG_TEXCOORD2:
-        bump_src_tex = 2;
+        embossRow = 2;
         break;
     case GX_TG_TEXCOORD3:
-        bump_src_tex = 3;
+        embossRow = 3;
         break;
     case GX_TG_TEXCOORD4:
-        bump_src_tex = 4;
+        embossRow = 4;
         break;
     case GX_TG_TEXCOORD5:
-        bump_src_tex = 5;
+        embossRow = 5;
         break;
     case GX_TG_TEXCOORD6:
-        bump_src_tex = 6;
+        embossRow = 6;
+        break;
+    default:
+        ASSERTMSGLINE(433, 0, "GDSetTexCoordGen: invalid texgen source");
         break;
     }
-    switch (texGenType) {
+
+    switch (func) {
     case GX_TG_MTX2x4:
-        texgen_type = 0;
+        tgType = 0;
         break;
     case GX_TG_MTX3x4:
-        texgen_type = 0;
-        proj_type = 1;
+        tgType = 0;
+        proj = 1;
         break;
     case GX_TG_BUMP0:
     case GX_TG_BUMP1:
@@ -278,34 +295,33 @@ void J3DGDSetTexCoordGen(GXTexGenType texGenType, GXTexGenSrc texGenSrc) {
     case GX_TG_BUMP5:
     case GX_TG_BUMP6:
     case GX_TG_BUMP7:
-        texgen_type = 1;
-        bump_src_light = texGenType - 2;
+        ASSERTMSGLINE(457, src_param >= GX_TG_TEXCOORD0 && src_param <= GX_TG_TEXCOORD6, "GDSetTexCoordGen: invalid emboss source");
+        tgType = 1;
+        embossLit = func - GX_TG_BUMP0;
         break;
     case GX_TG_SRTG:
-        if (texGenSrc == GX_TG_COLOR0) {
-            texgen_type = 2;
+        if (src_param == GX_TG_COLOR0) {
+            tgType = 2;
         } else {
-            texgen_type = 3;
+            tgType = 3;
         }
         break;
+    default:
+        ASSERTMSGLINE(473, 0, "GDSetTexCoordGen: invalid texgen function");
+        break;
     }
-    J3DGDWrite_u32(
-        proj_type << (31 - GX_XF_TEX_PROJTYPE_END) | input_form << (31 - GX_XF_TEX_INPUTFORM_END) |
-        texgen_type << (31 - GX_XF_TEX_TEXGENTYPE_END) | src_row << (31 - GX_XF_TEX_SRCROW_END) |
-        bump_src_tex << (31 - GX_XF_TEX_BUMPSRCTEX_END) |
-        bump_src_light << (31 - GX_XF_TEX_BUMPSRCLIGHT_END));
+
+    J3DGDWrite_u32(XF_REG_TEX(proj, form, tgType, row, embossRow, embossLit));
 }
 
 /* 8030E234-8030E438 308B74 0204+00 0/0 16/16 0/0 .text
  * J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc         */
-void J3DGDSetTexCoordScale2(GXTexCoordID param_0, u16 param_1, u8 param_2, u8 param_3, u16 param_4,
-                            u8 param_5, u8 param_6) {
-    GDOverflowCheck(0xf);
-    J3DGDWriteBPCmd(0xfe03ffff);
-    J3DGDWriteBPCmd((param_1 - 1) | param_2 << 0x10 | param_3 << 0x11 |
-                    (param_0 * 2 + 0x30) << 0x18);
-    J3DGDWriteBPCmd((param_4 - 1) | param_5 << 0x10 | param_6 << 0x11 |
-                    (param_0 * 2 + 0x31) << 0x18);
+void J3DGDSetTexCoordScale2(GXTexCoordID coord, u16 s_scale, u8 s_bias,
+                            u8 s_wrap, u16 t_scale, u8 t_bias, u8 t_wrap) {
+    GDOverflowCheck(15);
+    J3DGDWriteBPCmd(0xFE03FFFF);
+    J3DGDWriteBPCmd(BP_TEXCOORD_S_SCALE(s_scale - 1, s_bias, s_wrap, 0, 0, coord * 2 + 0x30));
+    J3DGDWriteBPCmd(BP_TEXCOORD_T_SCALE(t_scale - 1, t_bias, t_wrap, coord * 2 + 0x31));
 }
 
 /* 8045090C-80450914 00038C 0008+00 1/1 0/0 0/0 .sdata           J3DGDTexMode0Ids */
@@ -341,228 +357,308 @@ static u8 GX2HWFiltConv[6] = {
 /* 8030E438-8030E5D4 308D78 019C+00 0/0 1/1 0/0 .text
  * J3DGDSetTexLookupMode__F11_GXTexMapID14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilterfffUcUc13_GXAnisotropy
  */
-void J3DGDSetTexLookupMode(GXTexMapID param_0, GXTexWrapMode param_1, GXTexWrapMode param_2,
-                           GXTexFilter param_3, GXTexFilter param_4, f32 param_5, f32 param_6,
-                           f32 param_7, u8 param_8, u8 param_9, GXAnisotropy param_10) {
-    J3DGDWriteBPCmd(param_1 | param_2 << 2 | (param_4 == GX_LINEAR) << 4 |
-                    GX2HWFiltConv[param_3] << 5 | (param_9 == 0) << 8 |
-                    ((int)(param_7 * 32.0f) & 0xff) << 9 | param_10 << 0x13 | param_8 << 0x15 |
-                    J3DGDTexMode0Ids[param_0] << 0x18);
-    J3DGDWriteBPCmd(((int)(param_5 * 16.0f) & 0xff) | ((int)(param_6 * 16.0f) & 0xff) << 8 |
-                    J3DGDTexMode1Ids[param_0] << 0x18);
+void J3DGDSetTexLookupMode(GXTexMapID id, GXTexWrapMode wrap_s,
+                           GXTexWrapMode wrap_t, GXTexFilter min_filt,
+                           GXTexFilter mag_filt, f32 min_lod, f32 max_lod,
+                           f32 lod_bias, u8 bias_clamp, u8 do_edge_lod,
+                           GXAnisotropy max_aniso) {
+    J3DGDWriteBPCmd(BP_TEX_MODE0(wrap_s, wrap_t, mag_filt == TRUE, GX2HWFiltConv[min_filt], !do_edge_lod, (u8)(32.0f * lod_bias), max_aniso, bias_clamp, J3DGDTexMode0Ids[id]));
+    J3DGDWriteBPCmd(BP_TEX_MODE1((u8)(16.0f * min_lod), (u8)(16.0f * max_lod), J3DGDTexMode1Ids[id]));
 }
 
 /* 8030E5D4-8030E67C 308F14 00A8+00 0/0 1/1 0/0 .text
  * J3DGDSetTexImgAttr__F11_GXTexMapIDUsUs9_GXTexFmt             */
-void J3DGDSetTexImgAttr(GXTexMapID param_0, u16 param_1, u16 param_2, GXTexFmt param_3) {
-    J3DGDWriteBPCmd((param_1 - 1) | (param_2 - 1) << 0xa | param_3 << 0x14 |
-                    J3DGDTexImage0Ids[param_0] << 0x18);
+void J3DGDSetTexImgAttr(GXTexMapID id, u16 width, u16 height, GXTexFmt format) {
+    J3DGDWriteBPCmd(BP_IMAGE_ATTR(width - 1, height - 1, format, J3DGDTexImage0Ids[id]));
 }
 
 /* 8030E67C-8030E70C 308FBC 0090+00 0/0 1/1 0/0 .text            J3DGDSetTexImgPtr__F11_GXTexMapIDPv
  */
-void J3DGDSetTexImgPtr(GXTexMapID param_0, void* param_1) {
-    J3DGDWriteBPCmd(OSCachedToPhysical(param_1) >> 5 | J3DGDTexImage3Ids[param_0] << 0x18);
+void J3DGDSetTexImgPtr(GXTexMapID id, void* image_ptr) {
+    J3DGDWriteBPCmd(BP_IMAGE_PTR(OSCachedToPhysical(image_ptr) >> 5, J3DGDTexImage3Ids[id]));
 }
 
 /* 8030E70C-8030E7E0 30904C 00D4+00 0/0 1/1 0/0 .text J3DGDSetTexImgPtrRaw__F11_GXTexMapIDUl */
-void J3DGDSetTexImgPtrRaw(GXTexMapID param_0, u32 param_1) {
+void J3DGDSetTexImgPtrRaw(GXTexMapID id, u32 image_ptr_raw) {
     GDOverflowCheck(5);
-    J3DGDWriteBPCmd(param_1 | J3DGDTexImage3Ids[param_0] << 0x18);
+    J3DGDWriteBPCmd(BP_IMAGE_PTR(image_ptr_raw, J3DGDTexImage3Ids[id]));
 }
 
 /* 8030E7E0-8030E878 309120 0098+00 0/0 1/1 0/0 .text
  * J3DGDSetTexTlut__F11_GXTexMapIDUl10_GXTlutFmt                */
-void J3DGDSetTexTlut(GXTexMapID param_0, u32 param_1, GXTlutFmt param_2) {
-    J3DGDWriteBPCmd((param_1 - 0x80000) >> 9 | param_2 << 0xa | J3DGDTexTlutIds[param_0] << 0x18);
+void J3DGDSetTexTlut(GXTexMapID id, u32 tmem_addr, GXTlutFmt format) {
+    J3DGDWriteBPCmd(BP_TEX_TLUT((tmem_addr - 0x80000) >> 9, format, J3DGDTexTlutIds[id]));
 }
 
 /* 8030E878-8030EB30 3091B8 02B8+00 0/0 1/1 0/0 .text            J3DGDLoadTlut__FPvUl11_GXTlutSize
  */
-void J3DGDLoadTlut(void* param_0, u32 param_1, GXTlutSize param_2) {
-    J3DGDWriteBPCmd(0xfeffff00);
-    J3DGDWriteBPCmd(0x0f000000);
-    J3DGDWriteBPCmd(OSCachedToPhysical(param_0) >> 5 | 0x64000000);
-    J3DGDWriteBPCmd((param_1 - 0x80000) >> 9 | param_2 << 0xa | 0x65000000);
-    J3DGDWriteBPCmd(0xfeffff00);
-    J3DGDWriteBPCmd(0x0f000000);
+void J3DGDLoadTlut(void* tlut_ptr, u32 tmem_addr, GXTlutSize size) {
+    ASSERTMSGLINE(735, !(tmem_addr & 0x1ff), "GDLoadTlut: invalid TMEM pointer");
+    ASSERTMSGLINE(736, size <= 0x400, "GDLoadTlut: invalid TLUT size");
+
+    J3DGDWriteBPCmd(0xFEFFFF00);
+    J3DGDWriteBPCmd(0xF000000);
+    J3DGDWriteBPCmd(BP_LOAD_TLUT0(OSCachedToPhysical(tlut_ptr) >> 5, 0x64));
+    J3DGDWriteBPCmd(BP_LOAD_TLUT1((tmem_addr - 0x80000) >> 9, size, 0x65));
+    J3DGDWriteBPCmd(0xFEFFFF00);
+    J3DGDWriteBPCmd(0xF000000);
 }
 
 /* 8030EB30-8030EE10 309470 02E0+00 0/0 2/2 0/0 .text J3DGDSetIndTexMtx__F14_GXIndTexMtxIDPA3_fSc
  */
-void J3DGDSetIndTexMtx(GXIndTexMtxID id, Mtx3P mtx, s8 exp) {
-    s32 mtx32[6];
-    u32 idx;
+void J3DGDSetIndTexMtx(GXIndTexMtxID mtx_id, f32 offset[2][3], s8 scale_exp) {
+    s32 offsetS32[6];
+    u32 id_offset;
 
-    switch (id) {
+    switch (mtx_id) {
     case GX_ITM_0:
     case GX_ITM_1:
     case GX_ITM_2:
-        idx = (u32)(id - GX_ITM_0);
+        id_offset = (u32)(mtx_id - GX_ITM_0);
         break;
     case GX_ITM_S0:
     case GX_ITM_S1:
     case GX_ITM_S2:
-        idx = (u32)(id - GX_ITM_S0);
+        id_offset = (u32)(mtx_id - GX_ITM_S0);
         break;
     case GX_ITM_T0:
     case GX_ITM_T1:
     case GX_ITM_T2:
-        idx = (u32)(id - GX_ITM_T0);
+        id_offset = (u32)(mtx_id - GX_ITM_T0);
         break;
     default:
-        idx = 0;
+        id_offset = 0;
         break;
     }
 
-    exp += 17;
+    offsetS32[0] = (s32)(offset[0][0] * 0x400) & 0x7FF;
+    offsetS32[1] = (s32)(offset[1][0] * 0x400) & 0x7FF;
 
-    mtx32[0] = (s32)(mtx[0][0] * 1024.0f) & 0x7FF;
-    mtx32[1] = (s32)(mtx[1][0] * 1024.0f) & 0x7FF;
+    offsetS32[2] = (s32)(offset[0][1] * 0x400) & 0x7FF;
+    offsetS32[3] = (s32)(offset[1][1] * 0x400) & 0x7FF;
 
-    mtx32[2] = (s32)(mtx[0][1] * 1024.0f) & 0x7FF;
-    mtx32[3] = (s32)(mtx[1][1] * 1024.0f) & 0x7FF;
-
-    mtx32[4] = (s32)(mtx[0][2] * 1024.0f) & 0x7FF;
-    mtx32[5] = (s32)(mtx[1][2] * 1024.0f) & 0x7FF;
+    offsetS32[4] = (s32)(offset[0][2] * 0x400) & 0x7FF;
+    offsetS32[5] = (s32)(offset[1][2] * 0x400) & 0x7FF;
 
+    scale_exp += (s8)17;
     GDOverflowCheck(15);
 
-    J3DGDWriteBPCmd((mtx32[0] << 0) | (mtx32[1] << 11) | (((exp >> 0) & 0x03) << 22) |
-                    (0x06 + idx * 3) << 24);
-    J3DGDWriteBPCmd((mtx32[2] << 0) | (mtx32[3] << 11) | (((exp >> 2) & 0x03) << 22) |
-                    (0x07 + idx * 3) << 24);
-    J3DGDWriteBPCmd((mtx32[4] << 0) | (mtx32[5] << 11) | (((exp >> 4) & 0x03) << 22) |
-                    (0x08 + idx * 3) << 24);
+    J3DGDWriteBPCmd(BP_IND_MTX(
+        offsetS32[0],
+        offsetS32[1],
+        scale_exp & 3,
+        6 + id_offset * 3
+    ));
+
+    J3DGDWriteBPCmd(BP_IND_MTX(
+        offsetS32[2],
+        offsetS32[3],
+        (scale_exp >> 2) & 3,
+        7 + id_offset * 3
+    ));
+
+    J3DGDWriteBPCmd(BP_IND_MTX(
+        offsetS32[4],
+        offsetS32[5],
+        (scale_exp >> 4) & 3,
+        8 + id_offset * 3
+    ));
 }
 
 /* 8030EE10-8030EF08 309750 00F8+00 0/0 2/2 0/0 .text
  * J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale
  */
-void J3DGDSetIndTexCoordScale(GXIndTexStageID stage, GXIndTexScale scale0, GXIndTexScale scale1,
-                              GXIndTexScale scale2, GXIndTexScale scale3) {
+void J3DGDSetIndTexCoordScale(GXIndTexStageID indStageEven, GXIndTexScale scaleS0,
+                              GXIndTexScale scaleT0, GXIndTexScale scaleS1,
+                              GXIndTexScale scaleT1) {
     GDOverflowCheck(5);
-    J3DGDWriteBPCmd(scale0 | scale1 << 4 | scale2 << 8 | scale3 << 0xc |
-                    ((stage >> 1) + GX_BP_REG_RAS1_SS0) << 0x18);
+    J3DGDWriteBPCmd(BP_IND_TEXCOORD_SCALE(
+        scaleS0,
+        scaleT0,
+        scaleS1,
+        scaleT1,
+        0x25 + (indStageEven >> 1)
+    ));
 }
 
 /* 8030EF08-8030F108 309848 0200+00 0/0 2/2 0/0 .text
  * J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID
  */
-void J3DGDSetIndTexOrder(u32 count, GXTexCoordID coord0, GXTexMapID map0, GXTexCoordID coord1,
-                         GXTexMapID map1, GXTexCoordID coord2, GXTexMapID map2, GXTexCoordID coord3,
-                         GXTexMapID map3) {
-    GDOverflowCheck(0xa);
-    J3DGDWriteBPCmd(map0 & 7 | (coord0 & 7) << 3 | (map1 & 7) << 6 | (coord1 & 7) << 9 |
-                    (map2 & 7) << 0xc | (coord2 & 7) << 0xf | (map3 & 7) << 0x12 |
-                    (coord3 & 7) << 0x15 | GX_BP_REG_RAS1_IREF << 0x18);
-    u32 imask = 0;
+void J3DGDSetIndTexOrder(u32 count, GXTexCoordID texCoord0, GXTexMapID texMap0,
+                         GXTexCoordID texCoord1, GXTexMapID texMap1,
+                         GXTexCoordID texCoord2, GXTexMapID texMap2,
+                         GXTexCoordID texCoord3, GXTexMapID texMap3) {
+    GDOverflowCheck(10);
+    J3DGDWriteBPCmd(BP_IND_TEX_ORDER(
+        texMap0 & 7,
+        texCoord0 & 7,
+        texMap1 & 7,
+        texCoord1 & 7,
+        texMap2 & 7,
+        texCoord2 & 7,
+        texMap3 & 7,
+        texCoord3 & 7,
+        0x27
+    ));
+
+    u32 mask = 0;
     for (u32 i = 0; i < count; i++) {
         switch (i) {
         case 0:
-            imask |= 1 << (map0 & 7);
+            mask |= 1 << (texMap0 & 7);
             break;
         case 1:
-            imask |= 1 << (map1 & 7);
+            mask |= 1 << (texMap1 & 7);
             break;
         case 2:
-            imask |= 1 << (map2 & 7);
+            mask |= 1 << (texMap2 & 7);
             break;
         case 3:
-            imask |= 1 << (map3 & 7);
+            mask |= 1 << (texMap3 & 7);
             break;
         }
     }
-    J3DGDWriteBPCmd(imask | GX_BP_REG_INDIMASK << 0x18);
+
+    J3DGDWriteBPCmd(BP_IND_MASK(mask, 0xF));
 }
 
 /* 8030F108-8030F294 309A48 018C+00 0/0 9/9 0/0 .text
  * J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID
  */
-void J3DGDSetTevOrder(GXTevStageID stage, GXTexCoordID coord0, GXTexMapID map0,
-                      GXChannelID channel0, GXTexCoordID coord1, GXTexMapID map1,
-                      GXChannelID channel1) {
-    coord0 = coord0 >= GX_MAX_TEXCOORD ? GX_TEXCOORD0 : coord0;
-    coord1 = coord1 >= GX_MAX_TEXCOORD ? GX_TEXCOORD0 : coord1;
-    GDOverflowCheck(5);
+void J3DGDSetTevOrder(GXTevStageID evenStage, GXTexCoordID coord0, GXTexMapID map0,
+                      GXChannelID color0, GXTexCoordID coord1, GXTexMapID map1,
+                      GXChannelID color1) {
     static u8 c2r[] = {0, 1, 0, 1, 0, 1, 7, 5, 6, 0, 0, 0, 0, 0, 0, 7};
-    J3DGDWriteBPCmd((map0 & 7) | coord0 << 3 |
-                    (map0 != GX_TEXMAP_NULL && !(map0 & GX_TEX_DISABLE)) << 6 |
-                    c2r[channel0 & 0xf] << 7 | (map1 & 7) << 0xc | coord1 << 0xf |
-                    (map1 != GX_TEXMAP_NULL && !(map1 & GX_TEX_DISABLE)) << 0x12 |
-                    c2r[channel1 & 0xf] << 0x13 | (stage / 2 + GX_BP_REG_RAS1_TREF0) << 0x18);
+
+    GXTexCoordID coord0_ = coord0 >= GX_MAX_TEXCOORD ? GX_TEXCOORD0 : coord0;
+    GXTexCoordID coord1_ = coord1 >= GX_MAX_TEXCOORD ? GX_TEXCOORD0 : coord1;
+    GDOverflowCheck(5);
+    J3DGDWriteBPCmd(BP_TEV_ORDER(
+        map0 & 7,
+        coord0_,
+        map0 != GX_TEXMAP_NULL && !(map0 & GX_TEX_DISABLE),
+        c2r[color0 & 0xF],
+        map1 & 7,
+        coord1_,
+        map1 != GX_TEXMAP_NULL && !(map1 & GX_TEX_DISABLE),
+        c2r[color1 & 0xF],
+        evenStage / 2 + 0x28
+    ));
 }
 
 /* 8030F294-8030F3FC 309BD4 0168+00 0/0 11/11 0/0 .text
  * J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor                */
-void J3DGDSetTevKColor(GXTevKColorID id, GXColor color) {
-    u32 cmd0 = color.r | color.a << 0xc | 0x800000 | (id * 2 + GX_BP_REG_TEVREG0LO) << 0x18;
-    u32 cmd1 = color.b | color.g << 0xc | 0x800000 | (id * 2 + GX_BP_REG_TEVREG0HI) << 0x18;
+void J3DGDSetTevKColor(GXTevKColorID reg, GXColor color) {
+    u32 regRA;
+    u32 regBG;
+
+    regRA = BP_TEV_COLOR_REG_RA(color.r, color.a, 1, 0xE0 + reg * 2);
+    regBG = BP_TEV_COLOR_REG_BG(color.b, color.g, 1, 0xE1 + reg * 2);
+
     GDOverflowCheck(0xa);
-    J3DGDWriteBPCmd(cmd0);
-    J3DGDWriteBPCmd(cmd1);
+    J3DGDWriteBPCmd(regRA);
+    J3DGDWriteBPCmd(regBG);
 }
 
 /* 8030F3FC-8030F630 309D3C 0234+00 0/0 11/11 0/0 .text
  * J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10             */
-void J3DGDSetTevColorS10(GXTevRegID id, GXColorS10 color) {
-    u32 cmd0 =
-        (color.r & 0x7ff) | (color.a & 0x7ff) << 0xc | (id * 2 + GX_BP_REG_TEVREG0LO) << 0x18;
-    u32 cmd1 =
-        (color.b & 0x7ff) | (color.g & 0x7ff) << 0xc | (id * 2 + GX_BP_REG_TEVREG0HI) << 0x18;
+void J3DGDSetTevColorS10(GXTevRegID reg, GXColorS10 color) {
+    u32 regRA;
+    u32 regBG;
+
+    regRA = BP_TEV_COLOR_REG_RA(color.r & 0x7FF, color.a & 0x7FF, 0, 0xE0 + reg * 2);
+    regBG = BP_TEV_COLOR_REG_BG(color.b & 0x7FF, color.g & 0x7FF, 0, 0xE1 + reg * 2);
+
     GDOverflowCheck(0x14);
-    J3DGDWriteBPCmd(cmd0);
-    J3DGDWriteBPCmd(cmd1);
-    J3DGDWriteBPCmd(cmd1);
-    J3DGDWriteBPCmd(cmd1);
+    J3DGDWriteBPCmd(regRA);
+    J3DGDWriteBPCmd(regBG);
+    J3DGDWriteBPCmd(regBG);
+    J3DGDWriteBPCmd(regBG);
 }
 
 /* 8030F630-8030F994 309F70 0364+00 0/0 3/3 0/0 .text J3DGDSetFog__F10_GXFogTypeffff8_GXColor */
-void J3DGDSetFog(GXFogType fogType, f32 param_1, f32 param_2, f32 nearZ, f32 farZ, GXColor color) {
-    f32 fvar1, fvar2, fvar3;
-    if (farZ == nearZ || param_2 == param_1) {
-        fvar1 = 0.0f;
-        fvar2 = 0.5f;
-        fvar3 = 0.0f;
+void J3DGDSetFog(GXFogType type, f32 startz, f32 endz, f32 nearz, f32 farz, GXColor color) {
+    f32 A;
+    f32 B;
+    f32 B_mant;
+    f32 C;
+    f32 A_f;
+    u32 b_expn;
+    u32 b_m;
+    u32 a_hex;
+    u32 c_hex;
+
+    ASSERTMSGLINE(1036, farz >= 0.0f, "GDSetFog: The farz should be positive value");
+    ASSERTMSGLINE(1037, farz >= nearz, "GDSetFog: The farz should be larger than nearz");
+
+
+    if (farz == nearz || endz == startz) {
+        A = 0.0f;
+        B = 0.5f;
+        C = 0.0f;
     } else {
-        fvar1 = (farZ * nearZ) / ((farZ - nearZ) * (param_2 - param_1));
-        fvar2 = farZ / (farZ - nearZ);
-        fvar3 = param_1 / (param_2 - param_1);
+        A = (farz * nearz) / ((farz - nearz) * (endz - startz));
+        B = farz / (farz - nearz);
+        C = startz / (endz - startz);
     }
-    u32 shift = 1;
-    for (; fvar2 > 1.0; fvar2 *= 0.5f) {
-        shift++;
+
+    B_mant = B;
+    b_expn = 1;
+
+    while (B_mant > 1.0) {
+        B_mant *= 0.5f;
+        b_expn++;
     }
-    for (; fvar2 > 0.0f && fvar2 < 0.5; fvar2 *= 2.0f) {
-        shift--;
+
+    while (B_mant > 0.0f && B_mant < 0.5) {
+        B_mant *= 2.0f;
+        b_expn--;
     }
-    f32 fvar4 = (fvar1 / (1 << shift));
-    u32 param1 = fvar2 * 8388638.0f;
-    u32 param0 = *(u32*)&fvar4;
-    u32 param3 = *(u32*)&fvar3;
-    J3DGDWriteBPCmd(param0 >> 0xc | GX_BP_REG_FOGPARAM0 << 0x18);
-    J3DGDWriteBPCmd(param1 | GX_BP_REG_FOGPARAM1 << 0x18);
-    J3DGDWriteBPCmd(shift | GX_BP_REG_FOGPARAM2 << 0x18);
-    J3DGDWriteBPCmd(param3 >> 0xc | fogType << 0x15 | GX_BP_REG_FOGPARAM3 << 0x18);
-    J3DGDWriteBPCmd(color.b | color.g << 8 | color.r << 0x10 | GX_BP_REG_FOGCOLOR << 0x18);
+
+    A_f = A / (1 << b_expn);
+    b_m = (u32) (8388638.0f * B_mant);
+
+    a_hex = *(u32*)&A_f;
+    c_hex = *(u32*)&C;
+
+    J3DGDWriteBPCmd(BP_FOG_UNK0(a_hex >> 12, 0xEE));
+    J3DGDWriteBPCmd(BP_FOG_UNK1(b_m, 0xEF));
+    J3DGDWriteBPCmd(BP_FOG_UNK2(b_expn, 0xF0));
+    J3DGDWriteBPCmd(BP_FOG_UNK3(c_hex >> 12, 0, type, 0xF1));
+    J3DGDWriteBPCmd(BP_FOG_COLOR(color.r, color.g, color.b, 0xF2));
 }
 
+#define BP_FOG_RANGE_ADJ_K0(arg0, arg1, arg2) \
+    ( \
+        (u32)(arg2) << 24 | \
+        (u32)(arg1) << 12 | \
+        (u32)(arg0) << 0 \
+    )
+
+#define BP_FOG_RANGE_ADJ(arg0, arg1, arg2) \
+    ( \
+        (u32)(arg2) << 24 | \
+        (u32)(arg0) << 0 | \
+        (u32)(arg1) << 10 \
+    )
+
 /* 8030F994-8030FAE0 30A2D4 014C+00 0/0 3/3 0/0 .text J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable
  */
-void J3DGDSetFogRangeAdj(u8 param_0, u16 param_1, GXFogAdjTable* table) {
-    if (param_0 != 0) {
-        for (int i = 0; i < 0xa; i += 2) {
-            J3DGDWriteBPCmd((i / 2 + GX_BP_REG_FOGRANGEK0) << 0x18 | table->r[i + 1] << 0xc |
-                            table->r[i]);
+void J3DGDSetFogRangeAdj(GXBool enable, u16 center, GXFogAdjTable* table) {
+    if (enable) {
+        for (int i = 0; i < 10; i += 2) {
+            u32 range_adj = BP_FOG_RANGE_ADJ_K0(table->r[i], table->r[i + 1], i / 2 + 0xE9);
+            J3DGDWriteBPCmd(range_adj);
         }
     }
-    u32 cmd = GX_BP_REG_FOGRANGE << 0x18 | (param_1 + 0x156) | param_0 << 0xa;
-    J3DGDWriteBPCmd(cmd);
+
+    u32 range_c = BP_FOG_RANGE_ADJ(center + 342, enable, GX_BP_REG_FOGRANGE);
+    J3DGDWriteBPCmd(range_c);
 }
 
 /* 8030FAE0-8030FB60 30A420 0080+00 0/0 10/10 0/0 .text            J3DFifoLoadPosMtxImm__FPA4_fUl */
-void J3DFifoLoadPosMtxImm(MtxP mtx, u32 addr) {
-    J3DFifoWriteXFCmdHdr((addr & 0x3fff) << 2, 0xc);
+void J3DFifoLoadPosMtxImm(MtxP mtx, u32 id) {
+    J3DFifoWriteXFCmdHdr(4 * id, 12);
     J3DGXCmd1f32ptr(&mtx[0][0]);
     J3DGXCmd1f32ptr(&mtx[0][1]);
     J3DGXCmd1f32ptr(&mtx[0][2]);
@@ -578,8 +674,8 @@ void J3DFifoLoadPosMtxImm(MtxP mtx, u32 addr) {
 }
 
 /* 8030FB60-8030FBCC 30A4A0 006C+00 0/0 9/9 0/0 .text            J3DFifoLoadNrmMtxImm__FPA4_fUl */
-void J3DFifoLoadNrmMtxImm(MtxP mtx, u32 addr) {
-    J3DFifoWriteXFCmdHdr(addr * 3 + 0x400, 9);
+void J3DFifoLoadNrmMtxImm(MtxP mtx, u32 id) {
+    J3DFifoWriteXFCmdHdr(id * 3 + 0x400, 9);
     J3DGXCmd1f32ptr(&mtx[0][0]);
     J3DGXCmd1f32ptr(&mtx[0][1]);
     J3DGXCmd1f32ptr(&mtx[0][2]);
@@ -593,8 +689,8 @@ void J3DFifoLoadNrmMtxImm(MtxP mtx, u32 addr) {
 
 /* 8030FBCC-8030FC38 30A50C 006C+00 0/0 3/3 0/0 .text            J3DFifoLoadNrmMtxImm3x3__FPA3_fUl
  */
-void J3DFifoLoadNrmMtxImm3x3(Mtx3P mtx, u32 addr) {
-    J3DFifoWriteXFCmdHdr(addr * 3 + 0x400, 9);
+void J3DFifoLoadNrmMtxImm3x3(Mtx3P mtx, u32 id) {
+    J3DFifoWriteXFCmdHdr(id * 3 + 0x400, 9);
     J3DGXCmd1f32ptr(&mtx[0][0]);
     J3DGXCmd1f32ptr(&mtx[0][1]);
     J3DGXCmd1f32ptr(&mtx[0][2]);
@@ -608,8 +704,8 @@ void J3DFifoLoadNrmMtxImm3x3(Mtx3P mtx, u32 addr) {
 
 /* 8030FC38-8030FCD0 30A578 0098+00 0/0 4/4 0/0 .text            J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl
  */
-void J3DFifoLoadNrmMtxToTexMtx(MtxP mtx, u32 addr) {
-    J3DFifoWriteXFCmdHdr((addr & 0x3fff) << 2, 0xc);
+void J3DFifoLoadNrmMtxToTexMtx(MtxP mtx, u32 id) {
+    J3DFifoWriteXFCmdHdr(4 * id, 12);
     J3DGXCmd1f32ptr(&mtx[0][0]);
     J3DGXCmd1f32ptr(&mtx[0][1]);
     J3DGXCmd1f32ptr(&mtx[0][2]);
@@ -625,8 +721,8 @@ void J3DFifoLoadNrmMtxToTexMtx(MtxP mtx, u32 addr) {
 }
 
 /* 8030FCD0-8030FD68 30A610 0098+00 0/0 2/2 0/0 .text J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl */
-void J3DFifoLoadNrmMtxToTexMtx3x3(Mtx3P mtx, u32 addr) {
-    J3DFifoWriteXFCmdHdr((addr & 0x3fff) << 2, 0xc);
+void J3DFifoLoadNrmMtxToTexMtx3x3(Mtx3P mtx, u32 id) {
+    J3DFifoWriteXFCmdHdr(4 * id, 0xc);
     J3DGXCmd1f32ptr(&mtx[0][0]);
     J3DGXCmd1f32ptr(&mtx[0][1]);
     J3DGXCmd1f32ptr(&mtx[0][2]);
@@ -653,12 +749,11 @@ static u8 J3DTexImage2Ids[8] = {
 
 /* 8030FD68-8030FDE8 30A6A8 0080+00 0/0 1/1 0/0 .text
  * J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize */
-void J3DFifoLoadTexCached(GXTexMapID id, u32 param_1, GXTexCacheSize param_2, u32 param_3,
-                          GXTexCacheSize param_4) {
-    J3DFifoLoadBPCmd(param_1 >> 5 | (param_2 + 3) << 0xf | (param_2 + 3) << 0x12 |
-                     J3DTexImage1Ids[id] << 0x18);
-    if (param_4 != GX_TEXCACHE_NONE && param_3 < 0x100000) {
-        J3DFifoLoadBPCmd(param_3 >> 5 | (param_4 + 3) << 0xf | (param_4 + 3) << 0x12 |
-                         J3DTexImage2Ids[id] << 0x18);
+void J3DFifoLoadTexCached(GXTexMapID id, u32 tmem_even, GXTexCacheSize size_even,
+                          u32 tmem_odd, GXTexCacheSize size_odd) {
+    J3DFifoLoadBPCmd(BP_TEX_CACHE_EVEN(tmem_even >> 5, size_even + 3, size_even + 3, 0, J3DTexImage1Ids[id]));
+
+    if (size_odd != 3 && tmem_odd < 0x100000) {
+        J3DFifoLoadBPCmd(BP_TEX_CACHE_ODD(tmem_odd >> 5, size_odd + 3, size_odd + 3, J3DTexImage2Ids[id]));
     }
 }
diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
index c4076f9c25..776b0381de 100644
--- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
@@ -1,15 +1,9 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DMatBlock
-//
-
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
-#include "dolphin/os.h"
 #include "global.h"
-#include "string.h"
+#include <string.h>
 
 inline void loadMatColors(const J3DGXColor* color) {
     J3DGDWriteXFCmdHdr(0x100C, 2);
@@ -38,7 +32,7 @@ inline void loadTevKColor(u32 reg, const J3DGXColor& color) {
 /* 8031747C-803174DC 311DBC 0060+00 0/0 1/1 0/0 .text initialize__21J3DColorBlockLightOffFv */
 void J3DColorBlockLightOff::initialize() {
     mColorChanNum = 0;
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mMatColor); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mMatColor); i++) {
         mMatColor[i] = j3dDefaultColInfo;
     }
     mMatColorOffset = 0;
@@ -48,10 +42,10 @@ void J3DColorBlockLightOff::initialize() {
 /* 803174DC-80317580 311E1C 00A4+00 0/0 1/1 0/0 .text initialize__22J3DColorBlockAmbientOnFv */
 void J3DColorBlockAmbientOn::initialize() {
     mColorChanNum = 0;
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mMatColor); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mMatColor); i++) {
         mMatColor[i] = j3dDefaultColInfo;
     }
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mAmbColor); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mAmbColor); i++) {
         mAmbColor[i] = j3dDefaultAmbInfo;
     }
     mMatColorOffset = 0;
@@ -61,13 +55,13 @@ void J3DColorBlockAmbientOn::initialize() {
 /* 80317580-80317644 311EC0 00C4+00 0/0 1/1 0/0 .text initialize__20J3DColorBlockLightOnFv */
 void J3DColorBlockLightOn::initialize() {
     mColorChanNum = 0;
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mMatColor); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mMatColor); i++) {
         mMatColor[i] = j3dDefaultColInfo;
     }
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mAmbColor); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mAmbColor); i++) {
         mAmbColor[i] = j3dDefaultAmbInfo;
     }
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mLight); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mLight); i++) {
         mLight[i] = NULL;
     }
     mMatColorOffset = 0;
@@ -77,7 +71,7 @@ void J3DColorBlockLightOn::initialize() {
 /* 80317644-80317674 311F84 0030+00 0/0 2/2 0/0 .text initialize__21J3DTexGenBlockPatchedFv */
 void J3DTexGenBlockPatched::initialize() {
     mTexGenNum = 0;
-    for (s32 i = 0; i < 8; i++)
+    for (int i = 0; i < 8; i++)
         mTexMtx[i] = NULL;
     mTexMtxOffset = 0;
 }
@@ -85,7 +79,7 @@ void J3DTexGenBlockPatched::initialize() {
 /* 80317674-803176A4 311FB4 0030+00 0/0 1/1 0/0 .text            initialize__15J3DTexGenBlock4Fv */
 void J3DTexGenBlock4::initialize() {
     mTexGenNum = 0;
-    for (s32 i = 0; i < 4; i++)
+    for (int i = 0; i < 4; i++)
         mTexMtx[i] = NULL;
     mTexMtxOffset = 0;
 }
@@ -94,7 +88,7 @@ void J3DTexGenBlock4::initialize() {
  */
 void J3DTexGenBlockBasic::initialize() {
     mTexGenNum = 0;
-    for (s32 i = 0; i < 8; i++)
+    for (int i = 0; i < 8; i++)
         mTexMtx[i] = NULL;
     mTexMtxOffset = 0;
 }
@@ -107,21 +101,22 @@ void J3DTevBlockNull::initialize() {
 /* 803176E0-803177E8 312020 0108+00 0/0 1/1 0/0 .text            initialize__18J3DTevBlockPatchedFv
  */
 void J3DTevBlockPatched::initialize() {
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mTexNo); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mTexNo); i++) {
         mTexNo[i] = 0xFFFF;
     }
-    for (s32 i = 0; i < ARRAY_SIZE(mTevStage); i++) {
+    for (int i = 0; i < ARRAY_SIZEU(mTevStage); i++) {
         mTevStage[i].setStageNo(i);
     }
-    for (s32 i = 0; i < 3; i++) {
+    for (int i = 0; i < 3; i++) {
         mTevColor[i] = j3dDefaultTevColor;
     }
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mTevKColor); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
         mTevKColor[i] = j3dDefaultTevKColor;
     }
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mTevKColorSel); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mTevKColorSel); i++) {
         mTevKColorSel[i] = GX_TEV_KCSEL_K0;
     }
+
     mTevStageNum = 1;
     mTexNoOffset = 0;
     mTevRegOffset = 0;
@@ -147,12 +142,13 @@ void J3DTevBlock2::initialize() {
     mTevKAlphaSel[0] = GX_TEV_KASEL_K0_A;
     mTevKAlphaSel[1] = GX_TEV_KASEL_K0_A;
 
-    for (s32 i = 0; i < 3; i++) {
+    for (int i = 0; i < 3; i++) {
         mTevColor[i] = j3dDefaultTevColor;
     }
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mTevKColor); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
         mTevKColor[i] = j3dDefaultTevKColor;
     }
+
     mTexNoOffset = 0;
     mTevRegOffset = 0;
 }
@@ -169,6 +165,7 @@ void J3DTevBlock4::initialize() {
     mTevStage[1].setStageNo(1);
     mTevStage[2].setStageNo(2);
     mTevStage[3].setStageNo(3);
+
     mTevKColorSel[0] = GX_TEV_KCSEL_K0;
     mTevKColorSel[1] = GX_TEV_KCSEL_K0;
     mTevKColorSel[2] = GX_TEV_KCSEL_K0;
@@ -178,37 +175,41 @@ void J3DTevBlock4::initialize() {
     mTevKAlphaSel[2] = GX_TEV_KASEL_K0_A;
     mTevKAlphaSel[3] = GX_TEV_KASEL_K0_A;
 
-    for (s32 i = 0; i < 3; i++) {
+    for (int i = 0; i < 3; i++) {
         mTevColor[i] = j3dDefaultTevColor;
     }
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mTevKColor); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
         mTevKColor[i] = j3dDefaultTevKColor;
     }
+
     mTexNoOffset = 0;
     mTevRegOffset = 0;
 }
 
 /* 80317A00-80317B28 312340 0128+00 0/0 1/1 0/0 .text            initialize__13J3DTevBlock16Fv */
 void J3DTevBlock16::initialize() {
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mTexNo); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mTexNo); i++) {
         mTexNo[i] = 0xFFFF;
     }
+
     mTevStageNum = 1;
-    for (s32 i = 0; i < 3; i++) {
+
+    for (int i = 0; i < 3; i++) {
         mTevColor[i] = j3dDefaultTevColor;
     }
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mTevKColor); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
         mTevKColor[i] = j3dDefaultTevKColor;
     }
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mTevKColorSel); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mTevKColorSel); i++) {
         mTevKColorSel[i] = GX_TEV_KCSEL_K0;
     }
-    for (s32 i = 0; i < (s32)ARRAY_SIZE(mTevKColorSel); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mTevKColorSel); i++) {
         mTevKAlphaSel[i] = GX_TEV_KASEL_K0_A;
     }
-    for (s32 i = 0; i < ARRAY_SIZE(mTevStage); i++) {
+    for (int i = 0; i < ARRAY_SIZEU(mTevStage); i++) {
         mTevStage[i].setStageNo(i);
     }
+
     mTexNoOffset = 0;
     mTevRegOffset = 0;
 }
@@ -324,10 +325,10 @@ s32 J3DPEBlockFull::countDLSize() {
 }
 
 /* 80450960-80450964 0003E0 0004+00 5/5 0/0 0/0 .sdata           SizeOfLoadMatColors */
-static u32 SizeOfLoadMatColors = 0x0000000D;
+static u32 SizeOfLoadMatColors = 13;
 
 /* 80450964-80450968 0003E4 0004+00 2/2 0/0 0/0 .sdata           SizeOfLoadAmbColors */
-static u32 SizeOfLoadAmbColors = 0x0000000D;
+static u32 SizeOfLoadAmbColors = 13;
 
 /* 80450968-80450970 0003E8 0004+04 5/5 0/0 0/0 .sdata           SizeOfLoadColorChans */
 static u32 SizeOfLoadColorChans = 21;
@@ -343,7 +344,8 @@ void J3DColorBlockLightOff::load() {
     mMatColorOffset = GDGetCurrOffset();
     loadMatColors(mMatColor);
     mColorChanOffset = GDGetCurrOffset();
-    J3DGDWriteXFCmdHdr(0x100e, 4);
+    J3DGDWriteXFCmdHdr(XF_REG_COLOR0CNTRL_ID, 4);
+
     mColorChan[0].load();
     mColorChan[2].load();
     mColorChan[1].load();
@@ -360,7 +362,8 @@ void J3DColorBlockAmbientOn::load() {
     loadMatColors(mMatColor);
     loadAmbColors(mAmbColor);
     mColorChanOffset = GDGetCurrOffset();
-    J3DGDWriteXFCmdHdr(0x100e, 4);
+    J3DGDWriteXFCmdHdr(XF_REG_COLOR0CNTRL_ID, 4);
+
     mColorChan[0].load();
     mColorChan[2].load();
     mColorChan[1].load();
@@ -374,11 +377,13 @@ void J3DColorBlockLightOn::load() {
     loadMatColors(mMatColor);
     loadAmbColors(mAmbColor);
     mColorChanOffset = GDGetCurrOffset();
-    J3DGDWriteXFCmdHdr(0x100e, 4);
+    J3DGDWriteXFCmdHdr(XF_REG_COLOR0CNTRL_ID, 4);
+
     mColorChan[0].load();
     mColorChan[2].load();
     mColorChan[1].load();
     mColorChan[3].load();
+
     for (u32 i = 0; i < 8; i++) {
         if (mLight[i] != NULL) {
             mLight[i]->load(i);
@@ -399,7 +404,7 @@ void J3DColorBlockLightOff::patchMatColor() {
     GDOverflowCheck(SizeOfLoadMatColors);
     loadMatColors(mMatColor);
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 803190AC-803194E8 3139EC 043C+00 2/0 0/0 0/0 .text patchLight__21J3DColorBlockLightOffFv */
@@ -407,13 +412,15 @@ void J3DColorBlockLightOff::patchLight() {
     GDSetCurrOffset(mColorChanOffset);
     void* start = GDGetCurrPointer();
     GDOverflowCheck(SizeOfLoadColorChans);
-    J3DGDWriteXFCmdHdr(0x100e, 4);
+    J3DGDWriteXFCmdHdr(XF_REG_COLOR0CNTRL_ID, 4);
+
     mColorChan[0].load();
     mColorChan[2].load();
     mColorChan[1].load();
     mColorChan[3].load();
+
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 803194E8-80319534 313E28 004C+00 1/0 0/0 0/0 .text            patch__20J3DColorBlockLightOnFv */
@@ -429,7 +436,7 @@ void J3DColorBlockLightOn::patchMatColor() {
     GDOverflowCheck(SizeOfLoadMatColors);
     loadMatColors(mMatColor);
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 803196E0-80319B4C 314020 046C+00 1/0 0/0 0/0 .text patchLight__20J3DColorBlockLightOnFv */
@@ -437,25 +444,29 @@ void J3DColorBlockLightOn::patchLight() {
     GDSetCurrOffset(mColorChanOffset);
     void* start = GDGetCurrPointer();
     GDOverflowCheck(SizeOfLoadColorChans);
-    J3DGDWriteXFCmdHdr(0x100e, 4);
+    J3DGDWriteXFCmdHdr(XF_REG_COLOR0CNTRL_ID, 4);
+
     mColorChan[0].load();
     mColorChan[2].load();
     mColorChan[1].load();
     mColorChan[3].load();
+
     for (u32 i = 0; i < 8; i++) {
         if (mLight[i] != NULL) {
             mLight[i]->load(i);
         }
     }
+
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 80319B4C-80319BB4 31448C 0068+00 2/0 0/0 0/0 .text            diff__21J3DColorBlockLightOffFUl */
-void J3DColorBlockLightOff::diff(u32 flag) {
-    if (flag & 0x1)
+void J3DColorBlockLightOff::diff(u32 diffFlags) {
+    if (diffFlags & J3DDiffFlag_MatColor)
         diffMatColor();
-    if (flag & 0x2)
+
+    if (diffFlags & J3DDiffFlag_ColorChan)
         diffColorChan();
 }
 
@@ -468,7 +479,7 @@ void J3DColorBlockLightOff::diffMatColor() {
 /* 80319D30-8031A13C 314670 040C+00 2/0 0/0 0/0 .text diffColorChan__21J3DColorBlockLightOffFv */
 void J3DColorBlockLightOff::diffColorChan() {
     GDOverflowCheck(SizeOfLoadColorChans);
-    J3DGDWriteXFCmdHdr(0x100e, 4);
+    J3DGDWriteXFCmdHdr(XF_REG_COLOR0CNTRL_ID, 4);
     mColorChan[0].load();
     mColorChan[2].load();
     mColorChan[1].load();
@@ -476,19 +487,19 @@ void J3DColorBlockLightOff::diffColorChan() {
 }
 
 /* 8031A13C-8031A1DC 314A7C 00A0+00 1/0 0/0 0/0 .text            diff__20J3DColorBlockLightOnFUl */
-void J3DColorBlockLightOn::diff(u32 flag) {
-    if (flag & 4)
+void J3DColorBlockLightOn::diff(u32 diffFlags) {
+    if (diffFlags & J3DDiffFlag_AmbColor)
         diffAmbColor();
 
-    if (flag & 1)
+    if (diffFlags & J3DDiffFlag_MatColor)
         diffMatColor();
     
-    if (flag & 2)
+    if (diffFlags & J3DDiffFlag_ColorChan)
         diffColorChan();
 
-    s32 lightObjNumFlag = getDiffFlag_LightObjNum(flag);
-    if (lightObjNumFlag)
-        diffLightObj(lightObjNumFlag);
+    s32 lightObjNum = getDiffFlag_LightObjNum(diffFlags);
+    if (lightObjNum != 0)
+        diffLightObj(lightObjNum);
 }
 
 /* 8031A1DC-8031A358 314B1C 017C+00 1/0 0/0 0/0 .text diffAmbColor__20J3DColorBlockLightOnFv */
@@ -506,7 +517,7 @@ void J3DColorBlockLightOn::diffMatColor() {
 /* 8031A4D4-8031A8E0 314E14 040C+00 1/0 0/0 0/0 .text diffColorChan__20J3DColorBlockLightOnFv */
 void J3DColorBlockLightOn::diffColorChan() {
     GDOverflowCheck(SizeOfLoadColorChans);
-    J3DGDWriteXFCmdHdr(0x100e, 4);
+    J3DGDWriteXFCmdHdr(XF_REG_COLOR0CNTRL_ID, 4);
     mColorChan[0].load();
     mColorChan[2].load();
     mColorChan[1].load();
@@ -514,8 +525,8 @@ void J3DColorBlockLightOn::diffColorChan() {
 }
 
 /* 8031A8E0-8031A948 315220 0068+00 1/0 0/0 0/0 .text diffLightObj__20J3DColorBlockLightOnFUl */
-void J3DColorBlockLightOn::diffLightObj(u32 param_1) {
-    for (u32 i = 0; i < param_1; i ++) {
+void J3DColorBlockLightOn::diffLightObj(u32 lightObjNum) {
+    for (u32 i = 0; i < lightObjNum; i ++) {
         if (mLight[i] != NULL) {
             mLight[i]->load(i);
         }
@@ -530,6 +541,7 @@ void J3DTexGenBlock4::load() {
             mTexMtx[i]->load(i);
         }
     }
+
     if (mTexGenNum != 0) {
         loadTexCoordGens(mTexGenNum, mTexCoord);
     }
@@ -543,6 +555,7 @@ void J3DTexGenBlockBasic::load() {
             mTexMtx[i]->load(i);
         }
     }
+
     if (mTexGenNum != 0) {
         loadTexCoordGens(mTexGenNum, mTexCoord);
     }
@@ -552,46 +565,53 @@ void J3DTexGenBlockBasic::load() {
 void J3DTexGenBlockPatched::patch() {
     GDSetCurrOffset(mTexMtxOffset);
     void* start = GDGetCurrPointer();
+
     for (u32 i = 0; i < 8; i++) {
         if (mTexMtx[i]) {
             mTexMtx[i]->load(i);
         }
     }
+
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031AB18-8031ABC0 315458 00A8+00 1/0 0/0 0/0 .text            patch__15J3DTexGenBlock4Fv */
 void J3DTexGenBlock4::patch() {
     GDSetCurrOffset(mTexMtxOffset);
     void* start = GDGetCurrPointer();
+
     for (u32 i = 0; i < 4; i++) {
         if (mTexMtx[i] && mTexCoord[i].getTexGenMtx() != GX_IDENTITY) {
             mTexMtx[i]->load(i);
         }
     }
+
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031ABC0-8031AC68 315500 00A8+00 1/0 0/0 0/0 .text            patch__19J3DTexGenBlockBasicFv */
 void J3DTexGenBlockBasic::patch() {
     GDSetCurrOffset(mTexMtxOffset);
     void* start = GDGetCurrPointer();
+
     for (u32 i = 0; i < 8; i++) {
         if (mTexMtx[i] && mTexCoord[i].getTexGenMtx() != GX_IDENTITY) {
             mTexMtx[i]->load(i);
         }
     }
+
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031AC68-8031ACD0 3155A8 0068+00 3/0 0/0 0/0 .text            diff__21J3DTexGenBlockPatchedFUl */
-void J3DTexGenBlockPatched::diff(u32 flag) {
-    if (getDiffFlag_TexGenNum(flag)) {
+void J3DTexGenBlockPatched::diff(u32 diffFlags) {
+    if (getDiffFlag_TexGenNum(diffFlags)) {
         diffTexMtx();
-        if (flag & 0x1000) {
+
+        if (diffFlags & J3DDiffFlag_TexGen) {
             diffTexGen();
         }
     }
@@ -599,7 +619,7 @@ void J3DTexGenBlockPatched::diff(u32 flag) {
 
 /* 8031ACD0-8031AD30 315610 0060+00 3/0 0/0 0/0 .text diffTexMtx__21J3DTexGenBlockPatchedFv */
 void J3DTexGenBlockPatched::diffTexMtx() {
-    for (u32 i = 0; i < ARRAY_SIZE(mTexMtx); ++i) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTexMtx); ++i) {
         if (mTexMtx[i] != NULL) {
             mTexMtx[i]->load(i);
         }
@@ -617,9 +637,11 @@ void J3DTexGenBlockPatched::diffTexGen() {
 void J3DTevBlock1::load() {
     mTexNoOffset = GDGetCurrOffset();
     GDOverflowCheck(0x69);
+
     if (mTexNo[0] != 0xffff) {
         loadTexNo(0, mTexNo[0]);
     }
+
     J3DGDSetTevOrder(
         GX_TEVSTAGE0,
         GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord),
@@ -629,10 +651,12 @@ void J3DTevBlock1::load() {
         GX_TEXMAP_NULL,
         GX_COLOR_NULL
     );
+
     loadTexCoordScale(
         GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord),
         J3DSys::sTexCoordScaleTable[mTevOrder[0].getTevOrderInfo().mTexMap & 7]
     );
+
     mTevStage[0].load(0);
     mIndTevStage[0].load(0);
 }
@@ -641,11 +665,13 @@ void J3DTevBlock1::load() {
 void J3DTevBlock2::load() {
     u32 tevStageNum = mTevStageNum;
     mTexNoOffset = GDGetCurrOffset();
+
     for (u32 i = 0; i < 2; i++) {
         if (mTexNo[i] != 0xffff) {
             loadTexNo(i, mTexNo[i]);
         }
     }
+
     J3DGDSetTevOrder(
         GX_TEVSTAGE0,
         GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord),
@@ -655,15 +681,19 @@ void J3DTevBlock2::load() {
         GXTexMapID(mTevOrder[1].getTevOrderInfo().mTexMap),
         GXChannelID(mTevOrder[1].getTevOrderInfo().mColorChan)
     );
+
     loadTexCoordScale(
         GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord),
         J3DSys::sTexCoordScaleTable[mTevOrder[0].getTevOrderInfo().mTexMap & 7]
     );
+
     loadTexCoordScale(
         GXTexCoordID(mTevOrder[1].getTevOrderInfo().mTexCoord & 7),
         J3DSys::sTexCoordScaleTable[mTevOrder[1].getTevOrderInfo().mTexMap & 7]
     );
+
     mTevRegOffset = GDGetCurrOffset();
+
     for (u32 i = 0; i < 3; i++) {
         loadTevColor(i, mTevColor[i]);
     }
@@ -674,6 +704,7 @@ void J3DTevBlock2::load() {
         mTevStage[i].load(i);
         mIndTevStage[i].load(i);
     }
+
     for (u32 i = 0; i < 16; i += 4) {
         J3DGDSetTevKonstantSel_SwapModeTable(
             GXTevStageID(i),
@@ -684,6 +715,7 @@ void J3DTevBlock2::load() {
             GXTevColorChan(mTevSwapModeTable[i / 4].getR()),
             GXTevColorChan(mTevSwapModeTable[i / 4].getG())
         );
+
         J3DGDSetTevKonstantSel_SwapModeTable(
             GXTevStageID(i + 2),
             GXTevKColorSel(mTevKColorSel[0]),
@@ -700,11 +732,13 @@ void J3DTevBlock2::load() {
 void J3DTevBlock4::load() {
     u32 tevStageNum = mTevStageNum;
     mTexNoOffset = GDGetCurrOffset();
+
     for (u32 i = 0; i < 4; i++) {
         if (mTexNo[i] != 0xffff) {
             loadTexNo(i, mTexNo[i]);
         }
     }
+
     for (u32 i = 0; i < tevStageNum; i += 2) {
         J3DGDSetTevOrder(
             GXTevStageID(i),
@@ -715,16 +749,20 @@ void J3DTevBlock4::load() {
             GXTexMapID(mTevOrder[i + 1].getTevOrderInfo().mTexMap),
             GXChannelID(mTevOrder[i + 1].getTevOrderInfo().mColorChan)
         );
+
         loadTexCoordScale(
             GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7),
             J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7]
         );
+
         loadTexCoordScale(
             GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7),
             J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7]
         );
     }
+
     mTevRegOffset = GDGetCurrOffset();
+
     for (u32 i = 0; i < 3; i++) {
         loadTevColor(i, mTevColor[i]);
     }
@@ -735,6 +773,7 @@ void J3DTevBlock4::load() {
         mTevStage[i].load(i);
         mIndTevStage[i].load(i);
     }
+
     for (u32 i = 0; i < 16; i += 4) {
         J3DGDSetTevKonstantSel_SwapModeTable(
             GXTevStageID(i),
@@ -745,6 +784,7 @@ void J3DTevBlock4::load() {
             GXTevColorChan(mTevSwapModeTable[i / 4].getR()),
             GXTevColorChan(mTevSwapModeTable[i / 4].getG())
         );
+
         J3DGDSetTevKonstantSel_SwapModeTable(
             GXTevStageID(i + 2),
             GXTevKColorSel(mTevKColorSel[2]),
@@ -761,11 +801,13 @@ void J3DTevBlock4::load() {
 void J3DTevBlock16::load() {
     u32 tevStageNum = mTevStageNum;
     mTexNoOffset = GDGetCurrOffset();
+
     for (u32 i = 0; i < 8; i++) {
         if (mTexNo[i] != 0xffff) {
             loadTexNo(i, mTexNo[i]);
         }
     }
+
     for (u32 i = 0; i < tevStageNum; i += 2) {
         J3DGDSetTevOrder(
             GXTevStageID(i),
@@ -776,16 +818,20 @@ void J3DTevBlock16::load() {
             GXTexMapID(mTevOrder[i + 1].getTevOrderInfo().mTexMap),
             GXChannelID(mTevOrder[i + 1].getTevOrderInfo().mColorChan)
         );
+
         loadTexCoordScale(
             GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7),
             J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7]
         );
+
         loadTexCoordScale(
             GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7),
             J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7]
         );
     }
+
     mTevRegOffset = GDGetCurrOffset();
+
     for (u32 i = 0; i < 3; i++) {
         loadTevColor(i, mTevColor[i]);
     }
@@ -796,6 +842,7 @@ void J3DTevBlock16::load() {
         mTevStage[i].load(i);
         mIndTevStage[i].load(i);
     }
+
     for (u32 i = 0; i < 16; i += 4) {
         J3DGDSetTevKonstantSel_SwapModeTable(
             GXTevStageID(i),
@@ -806,6 +853,7 @@ void J3DTevBlock16::load() {
             GXTevColorChan(mTevSwapModeTable[i / 4].getR()),
             GXTevColorChan(mTevSwapModeTable[i / 4].getG())
         );
+
         J3DGDSetTevKonstantSel_SwapModeTable(
             GXTevStageID(i + 2),
             GXTevKColorSel(mTevKColorSel[i + 2]),
@@ -832,7 +880,7 @@ void J3DTevBlockPatched::patchTexNo() {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031BFE0-8031C0AC 316920 00CC+00 1/0 0/0 0/0 .text            patchTevReg__18J3DTevBlockPatchedFv
@@ -841,15 +889,15 @@ void J3DTevBlockPatched::patchTevReg() {
     GDSetCurrOffset(mTevRegOffset);
     void* start = GDGetCurrPointer();
 
-    for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevKColor); i++) {
         loadTevKColor(i, mTevKColor[i]);
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031C0AC-8031C228 3169EC 017C+00 1/0 0/0 0/0 .text
@@ -875,10 +923,12 @@ void J3DTevBlockPatched::patchTexNoAndTexCoordScale() {
             GXTexMapID(mTevOrder[i + 1].getTevOrderInfo().mTexMap),
             GXChannelID(mTevOrder[i + 1].getTevOrderInfo().mColorChan)
         );
+
         loadTexCoordScale(
             GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7),
             J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7]
         );
+
         loadTexCoordScale(
             GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7),
             J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7]
@@ -886,7 +936,7 @@ void J3DTevBlockPatched::patchTexNoAndTexCoordScale() {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031C228-8031C274 316B68 004C+00 1/0 0/0 0/0 .text            patch__18J3DTevBlockPatchedFv */
@@ -905,12 +955,11 @@ void J3DTevBlock1::patchTexNo() {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031C2E4-8031C2E8 316C24 0004+00 1/0 0/0 0/0 .text            patchTevReg__12J3DTevBlock1Fv */
-void J3DTevBlock1::patchTevReg() {
-}
+void J3DTevBlock1::patchTevReg() {}
 
 /* 8031C2E8-8031C3CC 316C28 00E4+00 1/0 0/0 0/0 .text patchTexNoAndTexCoordScale__12J3DTevBlock1Fv
  */
@@ -931,13 +980,14 @@ void J3DTevBlock1::patchTexNoAndTexCoordScale() {
         GX_TEXMAP_NULL,
         GX_COLOR_NULL
     );
+
     loadTexCoordScale(
         GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord),
         J3DSys::sTexCoordScaleTable[mTevOrder[0].getTevOrderInfo().mTexMap & 7]
     );
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031C3CC-8031C3F8 316D0C 002C+00 1/0 0/0 0/0 .text            patch__12J3DTevBlock1Fv */
@@ -957,7 +1007,7 @@ void J3DTevBlock2::patchTexNo() {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031C48C-8031C558 316DCC 00CC+00 1/0 0/0 0/0 .text            patchTevReg__12J3DTevBlock2Fv */
@@ -965,15 +1015,15 @@ void J3DTevBlock2::patchTevReg() {
     GDSetCurrOffset(mTevRegOffset);
     void* start = GDGetCurrPointer();
 
-    for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevKColor); i++) {
         loadTevKColor(i, mTevKColor[i]);
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031C558-8031C6A8 316E98 0150+00 1/0 0/0 0/0 .text patchTexNoAndTexCoordScale__12J3DTevBlock2Fv
@@ -997,17 +1047,19 @@ void J3DTevBlock2::patchTexNoAndTexCoordScale() {
         GXTexMapID(mTevOrder[1].getTevOrderInfo().mTexMap),
         GXChannelID(mTevOrder[1].getTevOrderInfo().mColorChan)
     );
+
     loadTexCoordScale(
         GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord),
         J3DSys::sTexCoordScaleTable[mTevOrder[0].getTevOrderInfo().mTexMap & 7]
     );
+
     loadTexCoordScale(
         GXTexCoordID(mTevOrder[1].getTevOrderInfo().mTexCoord & 7),
         J3DSys::sTexCoordScaleTable[mTevOrder[1].getTevOrderInfo().mTexMap & 7]
     );
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031C6A8-8031C6F4 316FE8 004C+00 1/0 0/0 0/0 .text            patch__12J3DTevBlock2Fv */
@@ -1028,7 +1080,7 @@ void J3DTevBlock4::patchTexNo() {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031C788-8031C854 3170C8 00CC+00 1/0 0/0 0/0 .text            patchTevReg__12J3DTevBlock4Fv */
@@ -1036,15 +1088,15 @@ void J3DTevBlock4::patchTevReg() {
     GDSetCurrOffset(mTevRegOffset);
     void* start = GDGetCurrPointer();
 
-    for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevKColor); i++) {
         loadTevKColor(i, mTevKColor[i]);
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031C854-8031C9D0 317194 017C+00 1/0 0/0 0/0 .text patchTexNoAndTexCoordScale__12J3DTevBlock4Fv
@@ -1070,10 +1122,12 @@ void J3DTevBlock4::patchTexNoAndTexCoordScale() {
             GXTexMapID(mTevOrder[i + 1].getTevOrderInfo().mTexMap),
             GXChannelID(mTevOrder[i + 1].getTevOrderInfo().mColorChan)
         );
+
         loadTexCoordScale(
             GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7),
             J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7]
         );
+
         loadTexCoordScale(
             GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7),
             J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7]
@@ -1081,7 +1135,7 @@ void J3DTevBlock4::patchTexNoAndTexCoordScale() {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 /* 8031C9D0-8031CA1C 317310 004C+00 1/0 0/0 0/0 .text            patch__12J3DTevBlock4Fv */
 void J3DTevBlock4::patch() {
@@ -1101,7 +1155,7 @@ void J3DTevBlock16::patchTexNo() {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031CAB0-8031CB7C 3173F0 00CC+00 1/0 0/0 0/0 .text            patchTevReg__13J3DTevBlock16Fv */
@@ -1109,15 +1163,15 @@ void J3DTevBlock16::patchTevReg() {
     GDSetCurrOffset(mTevRegOffset);
     void* start = GDGetCurrPointer();
 
-    for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevKColor); i++) {
         loadTevKColor(i, mTevKColor[i]);
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031CB7C-8031CCF8 3174BC 017C+00 1/0 0/0 0/0 .text
@@ -1143,10 +1197,12 @@ void J3DTevBlock16::patchTexNoAndTexCoordScale() {
             GXTexMapID(mTevOrder[i + 1].getTevOrderInfo().mTexMap),
             GXChannelID(mTevOrder[i + 1].getTevOrderInfo().mColorChan)
         );
+
         loadTexCoordScale(
             GXTexCoordID(mTevOrder[i].getTevOrderInfo().mTexCoord & 7),
             J3DSys::sTexCoordScaleTable[mTevOrder[i].getTevOrderInfo().mTexMap & 7]
         );
+
         loadTexCoordScale(
             GXTexCoordID(mTevOrder[i + 1].getTevOrderInfo().mTexCoord & 7),
             J3DSys::sTexCoordScaleTable[mTevOrder[i + 1].getTevOrderInfo().mTexMap & 7]
@@ -1154,7 +1210,7 @@ void J3DTevBlock16::patchTexNoAndTexCoordScale() {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031CCF8-8031CD44 317638 004C+00 1/0 0/0 0/0 .text            patch__13J3DTevBlock16Fv */
@@ -1164,20 +1220,24 @@ void J3DTevBlock16::patch() {
 }
 
 /* 8031CD44-8031CE00 317684 00BC+00 6/0 1/0 0/0 .text            diff__11J3DTevBlockFUl */
-void J3DTevBlock::diff(u32 flag) {
-    if (getDiffFlag_TexNoNum(flag)) {
+void J3DTevBlock::diff(u32 diffFlags) {
+    if (getDiffFlag_TexNoNum(diffFlags)) {
         diffTexNo();
     }
-    if (flag & 0x4000000) {
+
+    if (diffFlags & J3DDiffFlag_TexCoordScale) {
         diffTexCoordScale();
     }
-    if (getDiffFlag_TevStageNum(flag)) {
+
+    if (getDiffFlag_TevStageNum(diffFlags)) {
         diffTevStage();
-        if (flag & 0x8000000) {
+
+        if (diffFlags & J3DDiffFlag_TevStageIndirect) {
             diffTevStageIndirect();
         }
     }
-    if (flag & 0x01000000) {
+
+    if (diffFlags & J3DDiffFlag_TevReg) {
         diffTevReg();
     }
 }
@@ -1185,7 +1245,7 @@ void J3DTevBlock::diff(u32 flag) {
 /* 8031CE00-8031CE64 317740 0064+00 1/0 0/0 0/0 .text            diffTexNo__18J3DTevBlockPatchedFv
  */
 void J3DTevBlockPatched::diffTexNo() {
-    for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTexNo); i++) {
         if (mTexNo[i] != 0xFFFF) {
             loadTexNo(i, mTexNo[i]);
         }
@@ -1212,10 +1272,10 @@ void J3DTevBlockPatched::diffTevStageIndirect() {
 /* 8031D028-8031D0C4 317968 009C+00 1/0 0/0 0/0 .text            diffTevReg__18J3DTevBlockPatchedFv
  */
 void J3DTevBlockPatched::diffTevReg() {
-    for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevKColor); i++) {
         loadTevKColor(i, mTevKColor[i]);
     }
 }
@@ -1243,8 +1303,7 @@ void J3DTevBlock1::diffTexNo() {
 }
 
 /* 8031D1F4-8031D1F8 317B34 0004+00 1/0 0/0 0/0 .text            diffTevReg__12J3DTevBlock1Fv */
-void J3DTevBlock1::diffTevReg() {
-}
+void J3DTevBlock1::diffTevReg() {}
 
 /* 8031D1F8-8031D2E8 317B38 00F0+00 1/0 0/0 0/0 .text            diffTevStage__12J3DTevBlock1Fv */
 void J3DTevBlock1::diffTevStage() {
@@ -1267,7 +1326,7 @@ void J3DTevBlock1::diffTexCoordScale() {
 
 /* 8031D3D0-8031D434 317D10 0064+00 1/0 0/0 0/0 .text            diffTexNo__12J3DTevBlock2Fv */
 void J3DTevBlock2::diffTexNo() {
-    for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTexNo); i++) {
         if (mTexNo[i] != 0xFFFF) {
             loadTexNo(i, mTexNo[i]);
         }
@@ -1276,10 +1335,10 @@ void J3DTevBlock2::diffTexNo() {
 
 /* 8031D434-8031D4D0 317D74 009C+00 1/0 0/0 0/0 .text            diffTevReg__12J3DTevBlock2Fv */
 void J3DTevBlock2::diffTevReg() {
-    for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevKColor); i++) {
         loadTevKColor(i, mTevKColor[i]);
     }
 }
@@ -1315,7 +1374,7 @@ void J3DTevBlock2::diffTexCoordScale() {
 
 /* 8031D758-8031D7BC 318098 0064+00 1/0 0/0 0/0 .text            diffTexNo__12J3DTevBlock4Fv */
 void J3DTevBlock4::diffTexNo() {
-    for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTexNo); i++) {
         if (mTexNo[i] != 0xFFFF) {
             loadTexNo(i, mTexNo[i]);
         }
@@ -1324,10 +1383,10 @@ void J3DTevBlock4::diffTexNo() {
 
 /* 8031D7BC-8031D858 3180FC 009C+00 1/0 0/0 0/0 .text            diffTevReg__12J3DTevBlock4Fv */
 void J3DTevBlock4::diffTevReg() {
-    for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevKColor); i++) {
         loadTevKColor(i, mTevKColor[i]);
     }
 }
@@ -1339,6 +1398,7 @@ void J3DTevBlock4::diffTevStage() {
         mTevStage[i].load(i);
     }
 }
+
 /* 8031D96C-8031DA1C 3182AC 00B0+00 1/0 0/0 0/0 .text diffTevStageIndirect__12J3DTevBlock4Fv */
 void J3DTevBlock4::diffTevStageIndirect() {
     u32 tevStageNum = mTevStageNum;
@@ -1364,7 +1424,7 @@ void J3DTevBlock4::diffTexCoordScale() {
 }
 /* 8031DB14-8031DB78 318454 0064+00 1/0 0/0 0/0 .text            diffTexNo__13J3DTevBlock16Fv */
 void J3DTevBlock16::diffTexNo() {
-    for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTexNo); i++) {
         if (mTexNo[i] != 0xFFFF) {
             loadTexNo(i, mTexNo[i]);
         }
@@ -1373,10 +1433,10 @@ void J3DTevBlock16::diffTexNo() {
 
 /* 8031DB78-8031DC14 3184B8 009C+00 1/0 0/0 0/0 .text            diffTevReg__13J3DTevBlock16Fv */
 void J3DTevBlock16::diffTevReg() {
-    for (u32 i = 0; i < ARRAY_SIZE(mTevColor) - 1; i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mTevKColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mTevKColor); i++) {
         loadTevKColor(i, mTevKColor[i]);
     }
 }
@@ -1422,8 +1482,10 @@ void J3DTevBlock16::ptrToIndex() {
         if (mTexNo[i] != 0xFFFF) {
             GDSetCurrOffset(mTexNoOffset + offs);
             patchTexNo_PtrToIdx(i, mTexNo[i]);
+
             ResTIMG* img = j3dSys.getTexture()->getResTIMG(mTexNo[i]);
-            J3D_ASSERT(0x828, img != 0, "Error : null pointer.");
+            J3D_ASSERT_NULLPTR(2088, img != NULL);
+
             offs += 0x14;
             if (img->indexTexture == 1) {
                 offs += 0x23;
@@ -1432,7 +1494,7 @@ void J3DTevBlock16::ptrToIndex() {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031DFB4-8031E098 3188F4 00E4+00 1/0 0/0 0/0 .text            ptrToIndex__18J3DTevBlockPatchedFv
@@ -1446,8 +1508,10 @@ void J3DTevBlockPatched::ptrToIndex() {
         if (mTexNo[i] != 0xFFFF) {
             GDSetCurrOffset(mTexNoOffset + offs);
             patchTexNo_PtrToIdx(i, mTexNo[i]);
+
             ResTIMG* img = j3dSys.getTexture()->getResTIMG(mTexNo[i]);
-            J3D_ASSERT(0x851, img != 0, "Error : null pointer.");
+            J3D_ASSERT_NULLPTR(2129, img != NULL);
+
             offs += 0x14;
             if (img->indexTexture == 1) {
                 offs += 0x23;
@@ -1456,7 +1520,7 @@ void J3DTevBlockPatched::ptrToIndex() {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031E098-8031E12C 3189D8 0094+00 5/5 1/1 0/0 .text indexToPtr_private__11J3DTevBlockFUl */
@@ -1475,7 +1539,7 @@ void J3DTevBlock::indexToPtr_private(u32 offs) {
     }
 
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031E12C-8031E328 318A6C 01FC+00 1/0 0/0 0/0 .text            load__15J3DIndBlockFullFv */
@@ -1484,6 +1548,7 @@ void J3DIndBlockFull::load() {
     for (u32 i = 0; i < indTexStageNum; i++) {
         mIndTexMtx[i].load(i);
     }
+
     for (u32 i = 0; i < indTexStageNum; i += 2) {
         J3DGDSetIndTexCoordScale(
             GXIndTexStageID(i),
@@ -1493,10 +1558,12 @@ void J3DIndBlockFull::load() {
             (GXIndTexScale)mIndTexCoordScale[i + 1].getScaleT()
         );
     }
+
     loadTexCoordScale((GXTexCoordID)mIndTexOrder[0].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[0].getMap() & 7]);
     loadTexCoordScale((GXTexCoordID)mIndTexOrder[1].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[1].getMap() & 7]);
     loadTexCoordScale((GXTexCoordID)mIndTexOrder[2].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[2].getMap() & 7]);
     loadTexCoordScale((GXTexCoordID)mIndTexOrder[3].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[3].getMap() & 7]);
+
     J3DGDSetIndTexOrder(
         indTexStageNum,
         (GXTexCoordID)mIndTexOrder[0].getCoord(),
@@ -1511,31 +1578,33 @@ void J3DIndBlockFull::load() {
 }
 
 /* 8031E328-8031E408 318C68 00E0+00 1/0 0/0 0/0 .text            diff__15J3DIndBlockFullFUl */
-void J3DIndBlockFull::diff(u32 flag) {
-    if ((flag & 0x08000000) == 0) {
-        return;
+void J3DIndBlockFull::diff(u32 diffFlags) {
+    if (diffFlags & J3DDiffFlag_TevStageIndirect) {
+        u32 indTexStageNum = mIndTexStageNum;
+        mIndTexMtx[0].load(0);
+
+        J3DGDSetIndTexCoordScale(
+            GX_INDTEXSTAGE0,
+            (GXIndTexScale)mIndTexCoordScale[0].getScaleS(),
+            (GXIndTexScale)mIndTexCoordScale[0].getScaleT(),
+            (GXIndTexScale)mIndTexCoordScale[1].getScaleS(),
+            (GXIndTexScale)mIndTexCoordScale[1].getScaleT()
+        );
+
+        loadTexCoordScale((GXTexCoordID)mIndTexOrder[0].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[0].getMap() & 7]);
+
+        J3DGDSetIndTexOrder(
+            indTexStageNum,
+            (GXTexCoordID)mIndTexOrder[0].getCoord(),
+            (GXTexMapID)mIndTexOrder[0].getMap(),
+            (GXTexCoordID)mIndTexOrder[1].getCoord(),
+            (GXTexMapID)mIndTexOrder[1].getMap(),
+            (GXTexCoordID)mIndTexOrder[2].getCoord(),
+            (GXTexMapID)mIndTexOrder[2].getMap(),
+            (GXTexCoordID)mIndTexOrder[3].getCoord(),
+            (GXTexMapID)mIndTexOrder[3].getMap()
+        );
     }
-    u32 indTexStageNum = mIndTexStageNum;
-    mIndTexMtx[0].load(0);
-    J3DGDSetIndTexCoordScale(
-        GX_INDTEXSTAGE0,
-        (GXIndTexScale)mIndTexCoordScale[0].getScaleS(),
-        (GXIndTexScale)mIndTexCoordScale[0].getScaleT(),
-        (GXIndTexScale)mIndTexCoordScale[1].getScaleS(),
-        (GXIndTexScale)mIndTexCoordScale[1].getScaleT()
-    );
-    loadTexCoordScale((GXTexCoordID)mIndTexOrder[0].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[0].getMap() & 7]);
-    J3DGDSetIndTexOrder(
-        indTexStageNum,
-        (GXTexCoordID)mIndTexOrder[0].getCoord(),
-        (GXTexMapID)mIndTexOrder[0].getMap(),
-        (GXTexCoordID)mIndTexOrder[1].getCoord(),
-        (GXTexMapID)mIndTexOrder[1].getMap(),
-        (GXTexCoordID)mIndTexOrder[2].getCoord(),
-        (GXTexMapID)mIndTexOrder[2].getMap(),
-        (GXTexCoordID)mIndTexOrder[3].getCoord(),
-        (GXTexMapID)mIndTexOrder[3].getMap()
-    );
 }
 
 /* 8031E408-8031E6C8 318D48 02C0+00 1/0 0/0 0/0 .text            load__13J3DPEBlockOpaFv */
@@ -1585,7 +1654,6 @@ void J3DPEBlockFogOff::diffBlend() {
     mZMode.load();
 }
 
-
 /* 8031F3C0-8031F890 319D00 04D0+00 1/0 0/0 0/0 .text            load__14J3DPEBlockFullFv */
 void J3DPEBlockFull::load() {
     mFogOffset = GDGetCurrOffset();
@@ -1604,7 +1672,7 @@ void J3DPEBlockFull::patch() {
     void* start = GDGetCurrPointer();
     mFog.load();
     void* end = GDGetCurrPointer();
-    DCStoreRange(start, (u32)end - (u32)start);
+    DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
 /* 8031F940-8031F9B8 31A280 0078+00 1/0 0/0 0/0 .text            diffFog__14J3DPEBlockFullFv */
@@ -1621,11 +1689,12 @@ void J3DPEBlockFull::diffBlend() {
 }
 
 /* 8031FCA0-8031FD08 31A5E0 0068+00 1/0 0/0 0/0 .text            diff__14J3DPEBlockFullFUl */
-void J3DPEBlockFull::diff(u32 flag) {
-    if ((flag & 0x10000000)) {
+void J3DPEBlockFull::diff(u32 diffFlags) {
+    if ((diffFlags & J3DDiffFlag_Fog)) {
         diffFog();
     }
-    if ((flag & 0x20000000)) {
+
+    if ((diffFlags & J3DDiffFlag_Blend)) {
         diffBlend();
     }
 }
@@ -1633,14 +1702,13 @@ void J3DPEBlockFull::diff(u32 flag) {
 /* 8031FD08-8031FDE4 31A648 00DC+00 1/0 0/0 0/0 .text
  * reset__21J3DColorBlockLightOffFP13J3DColorBlock              */
 void J3DColorBlockLightOff::reset(J3DColorBlock* pBlock) {
-    J3D_ASSERT(0x982, pBlock != 0, "Error : null pointer.");
-
+    J3D_ASSERT_NULLPTR(2434, pBlock != NULL);
     mColorChanNum = pBlock->getColorChanNum();
 
-    for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mMatColor); i++) {
         mMatColor[i] = *pBlock->getMatColor(i);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mColorChan); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mColorChan); i++) {
         mColorChan[i] = *pBlock->getColorChan(i);
     }
 }
@@ -1648,17 +1716,16 @@ void J3DColorBlockLightOff::reset(J3DColorBlock* pBlock) {
 /* 8031FDE4-8031FF34 31A724 0150+00 1/0 0/0 0/0 .text
  * reset__22J3DColorBlockAmbientOnFP13J3DColorBlock             */
 void J3DColorBlockAmbientOn::reset(J3DColorBlock* pBlock) {
-    J3D_ASSERT(0x993, pBlock != 0, "Error : null pointer.");
-
+    J3D_ASSERT_NULLPTR(2451, pBlock != NULL);
     mColorChanNum = pBlock->getColorChanNum();
 
-    for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mMatColor); i++) {
         mMatColor[i] = *pBlock->getMatColor(i);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mColorChan); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mColorChan); i++) {
         mColorChan[i] = *pBlock->getColorChan(i);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mAmbColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mAmbColor); i++) {
         if (pBlock->getAmbColor(i) != NULL) {
             mAmbColor[i] = *pBlock->getAmbColor(i);
         }
@@ -1668,17 +1735,16 @@ void J3DColorBlockAmbientOn::reset(J3DColorBlock* pBlock) {
 /* 8031FF34-80320084 31A874 0150+00 1/0 0/0 0/0 .text
  * reset__20J3DColorBlockLightOnFP13J3DColorBlock               */
 void J3DColorBlockLightOn::reset(J3DColorBlock* pBlock) {
-    J3D_ASSERT(0x9ac, pBlock != 0, "Error : null pointer.");
-
+    J3D_ASSERT_NULLPTR(2476, pBlock != NULL);
     mColorChanNum = pBlock->getColorChanNum();
 
-    for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mMatColor); i++) {
         mMatColor[i] = *pBlock->getMatColor(i);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mColorChan); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mColorChan); i++) {
         mColorChan[i] = *pBlock->getColorChan(i);
     }
-    for (u32 i = 0; i < ARRAY_SIZE(mAmbColor); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(mAmbColor); i++) {
         if (pBlock->getAmbColor(i) != NULL) {
             mAmbColor[i] = *pBlock->getAmbColor(i);
         }
@@ -1688,12 +1754,13 @@ void J3DColorBlockLightOn::reset(J3DColorBlock* pBlock) {
 /* 80320084-803201A0 31A9C4 011C+00 1/0 0/0 0/0 .text
  * reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock             */
 void J3DTexGenBlockPatched::reset(J3DTexGenBlock* pBlock) {
-    J3D_ASSERT(0x9c8, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2504, pBlock != NULL);
 
     mTexGenNum = pBlock->getTexGenNum();
     for (u32 i = 0; i < 8; i++) {
         mTexCoord[i] = *pBlock->getTexCoord(i);
     }
+
     for (u32 i = 0; i < 8; i++) {
         if (pBlock->getTexMtx(i) != NULL) {
             if (mTexMtx[i] != NULL) {
@@ -1709,12 +1776,13 @@ void J3DTexGenBlockPatched::reset(J3DTexGenBlock* pBlock) {
 /* 803201A0-803202DC 31AAE0 013C+00 1/0 0/0 0/0 .text reset__15J3DTexGenBlock4FP14J3DTexGenBlock
  */
 void J3DTexGenBlock4::reset(J3DTexGenBlock* pBlock) {
-    J3D_ASSERT(0x9e9, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2537, pBlock != NULL);
 
     mTexGenNum = pBlock->getTexGenNum();
     for (u32 i = 0; i < 4; i++) {
         mTexCoord[i] = *pBlock->getTexCoord(i);
     }
+
     for (u32 i = 0; i < 4; i++) {
         if (pBlock->getTexMtx(i) != NULL) {
             if (mTexMtx[i] != NULL) {
@@ -1732,12 +1800,13 @@ void J3DTexGenBlock4::reset(J3DTexGenBlock* pBlock) {
 /* 803202DC-80320418 31AC1C 013C+00 1/0 0/0 0/0 .text
  * reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock               */
 void J3DTexGenBlockBasic::reset(J3DTexGenBlock* pBlock) {
-    J3D_ASSERT(0xa0c, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2572, pBlock != NULL);
 
     mTexGenNum = pBlock->getTexGenNum();
     for (u32 i = 0; i < 8; i++) {
         mTexCoord[i] = *pBlock->getTexCoord(i);
     }
+
     for (u32 i = 0; i < 8; i++) {
         if (pBlock->getTexMtx(i) != NULL) {
             if (mTexMtx[i] != NULL) {
@@ -1755,7 +1824,7 @@ void J3DTexGenBlockBasic::reset(J3DTexGenBlock* pBlock) {
 /* 80320418-803205D4 31AD58 01BC+00 1/0 0/0 0/0 .text reset__18J3DTevBlockPatchedFP11J3DTevBlock
  */
 void J3DTevBlockPatched::reset(J3DTevBlock* pBlock) {
-    J3D_ASSERT(0xa30, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2608, pBlock != NULL);
 
     mTevStageNum = pBlock->getTevStageNum();
     for (u32 i = 0; i < 8; i++) {
@@ -1775,7 +1844,7 @@ void J3DTevBlockPatched::reset(J3DTevBlock* pBlock) {
 
 /* 803205D4-803206AC 31AF14 00D8+00 1/0 0/0 0/0 .text reset__12J3DTevBlock1FP11J3DTevBlock */
 void J3DTevBlock1::reset(J3DTevBlock* pBlock) {
-    J3D_ASSERT(0xa49, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2633, pBlock != NULL);
 
     mTexNo[0] = pBlock->getTexNo(0);
     mTevOrder[0] = *pBlock->getTevOrder(0);
@@ -1785,7 +1854,7 @@ void J3DTevBlock1::reset(J3DTevBlock* pBlock) {
 
 /* 803206AC-8032098C 31AFEC 02E0+00 1/0 0/0 0/0 .text reset__12J3DTevBlock2FP11J3DTevBlock */
 void J3DTevBlock2::reset(J3DTevBlock* pBlock) {
-    J3D_ASSERT(0xa59, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2649, pBlock != NULL);
 
     mTevStageNum = pBlock->getTevStageNum();
     mTexNo[0] = pBlock->getTexNo(0);
@@ -1800,6 +1869,7 @@ void J3DTevBlock2::reset(J3DTevBlock* pBlock) {
     mTevKColorSel[1] = pBlock->getTevKColorSel(1);
     mTevKAlphaSel[0] = pBlock->getTevKAlphaSel(0);
     mTevKAlphaSel[1] = pBlock->getTevKAlphaSel(1);
+
     for (u32 i = 0; i < 4; i++) {
         mTevColor[i] = *pBlock->getTevColor(i);
     }
@@ -1813,7 +1883,7 @@ void J3DTevBlock2::reset(J3DTevBlock* pBlock) {
 
 /* 8032098C-80320E24 31B2CC 0498+00 1/0 0/0 0/0 .text reset__12J3DTevBlock4FP11J3DTevBlock */
 void J3DTevBlock4::reset(J3DTevBlock* pBlock) {
-    J3D_ASSERT(0xa7a, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2682, pBlock != NULL);
 
     mTevStageNum = pBlock->getTevStageNum();
     mTexNo[0] = pBlock->getTexNo(0);
@@ -1840,6 +1910,7 @@ void J3DTevBlock4::reset(J3DTevBlock* pBlock) {
     mTevKAlphaSel[1] = pBlock->getTevKAlphaSel(1);
     mTevKAlphaSel[2] = pBlock->getTevKAlphaSel(2);
     mTevKAlphaSel[3] = pBlock->getTevKAlphaSel(3);
+
     for (u32 i = 0; i < 4; i++)
         mTevColor[i] = *pBlock->getTevColor(i);
     for (u32 i = 0; i < 4; i++)
@@ -1850,7 +1921,7 @@ void J3DTevBlock4::reset(J3DTevBlock* pBlock) {
 
 /* 80320E24-803210B0 31B764 028C+00 1/0 0/0 0/0 .text reset__13J3DTevBlock16FP11J3DTevBlock */
 void J3DTevBlock16::reset(J3DTevBlock* pBlock) {
-    J3D_ASSERT(0xaa8, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2728, pBlock != NULL);
 
     mTevStageNum = pBlock->getTevStageNum();
     for (u32 i = 0; i < 8; i++) {
@@ -1882,7 +1953,7 @@ void J3DTevBlock16::reset(J3DTevBlock* pBlock) {
 
 /* 803210B0-803211B4 31B9F0 0104+00 1/0 0/0 0/0 .text reset__15J3DIndBlockFullFP11J3DIndBlock */
 void J3DIndBlockFull::reset(J3DIndBlock* pBlock) {
-    J3D_ASSERT(0xaca, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2762, pBlock != NULL);
 
     mIndTexStageNum = pBlock->getIndTexStageNum();
     for (u32 i = 0; i < 4; i++) {
@@ -1898,7 +1969,7 @@ void J3DIndBlockFull::reset(J3DIndBlock* pBlock) {
 
 /* 803211B4-8032129C 31BAF4 00E8+00 1/0 0/0 0/0 .text reset__16J3DPEBlockFogOffFP10J3DPEBlock */
 void J3DPEBlockFogOff::reset(J3DPEBlock* pBlock) {
-    J3D_ASSERT(0xadf, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2783, pBlock != NULL);
 
     switch (pBlock->getType()) {
     case 'PEFL':
@@ -1913,10 +1984,10 @@ void J3DPEBlockFogOff::reset(J3DPEBlock* pBlock) {
 
 /* 8032129C-803213C0 31BBDC 0124+00 1/0 0/0 0/0 .text reset__14J3DPEBlockFullFP10J3DPEBlock */
 void J3DPEBlockFull::reset(J3DPEBlock* pBlock) {
-    J3D_ASSERT(0xaf7, pBlock != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(2807, pBlock != NULL);
 
     if (pBlock->getFog() != NULL) {
-        this->mFog.setFogInfo(pBlock->getFog()->getFogInfo());
+        mFog.setFogInfo(pBlock->getFog()->getFogInfo());
     }
 
     switch (pBlock->getType()) {
@@ -2121,21 +2192,12 @@ void J3DTexGenBlockPatched::calcPostTexMtxWithoutViewMtx(f32 const (*param_0)[4]
     }
 }
 
-void J3DTevBlock::diffTevReg() {
-    // empty function
-}
+void J3DTevBlock::diffTevReg() {}
 
-void J3DTevBlock::diffTevStageIndirect() {
-    // empty function
-}
+void J3DTevBlock::diffTevStageIndirect() {}
 
-void J3DTevBlock::diffTevStage() {
-    // empty function
-}
+void J3DTevBlock::diffTevStage() {}
 
-void J3DTevBlock::diffTexCoordScale() {
-    // empty function
-}
+void J3DTevBlock::diffTexCoordScale() {}
 
-void J3DTevBlock::diffTexNo() {
-}
+void J3DTevBlock::diffTexNo() {}
diff --git a/src/JSystem/J3DGraphBase/J3DMaterial.cpp b/src/JSystem/J3DGraphBase/J3DMaterial.cpp
index c2c7674766..3f21adae5a 100644
--- a/src/JSystem/J3DGraphBase/J3DMaterial.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMaterial.cpp
@@ -1,166 +1,184 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DMaterial
-//
-
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphBase/J3DGD.h"
 
 /* 803157A0-803159A0 3100E0 0200+00 0/0 3/3 0/0 .text            createColorBlock__11J3DMaterialFUl
  */
-J3DColorBlock* J3DMaterial::createColorBlock(u32 param_0) {
+J3DColorBlock* J3DMaterial::createColorBlock(u32 flags) {
     J3DColorBlock* rv = NULL;
-    switch (param_0) {
-        case 0:
-            rv = new J3DColorBlockLightOff();
-            break;
-        case 0x40000000:
-            rv = new J3DColorBlockLightOn();
-            break;
-        case 0x80000000:
-            rv = new J3DColorBlockAmbientOn();
-            break;
+    switch (flags) {
+    case 0:
+        rv = new J3DColorBlockLightOff();
+        break;
+    case 0x40000000:
+        rv = new J3DColorBlockLightOn();
+        break;
+    case 0x80000000:
+        rv = new J3DColorBlockAmbientOn();
+        break;
     }
 
+    J3D_ASSERT_ALLOCMEM(55, rv != NULL);
     return rv;
 }
 
 /* 803159A0-80315B04 3102E0 0164+00 0/0 2/2 0/0 .text            createTexGenBlock__11J3DMaterialFUl
  */
-J3DTexGenBlock* J3DMaterial::createTexGenBlock(u32 param_0) {
-    switch (param_0) {
-        case 0x8000000:
-            return new J3DTexGenBlock4();
-        case 0:
-        default:
-            return new J3DTexGenBlockBasic();
+J3DTexGenBlock* J3DMaterial::createTexGenBlock(u32 flags) {
+    J3DTexGenBlock* rv = NULL;
+    switch (flags) {
+    case 0x8000000:
+        rv = new J3DTexGenBlock4();
+        break;
+    case 0:
+    default:
+        rv = new J3DTexGenBlockBasic();
     }
+
+    J3D_ASSERT_ALLOCMEM(83, rv != NULL);
+    return rv;
 }
 
 /* 80315B04-80315E78 310444 0374+00 0/0 2/2 0/0 .text            createTevBlock__11J3DMaterialFi */
-J3DTevBlock* J3DMaterial::createTevBlock(int param_0) {
+J3DTevBlock* J3DMaterial::createTevBlock(int tevStageNum) {
     J3DTevBlock* rv = NULL;
-    if (param_0 <= 1) {
+    if (tevStageNum <= 1) {
         rv = new J3DTevBlock1();
-    } else if (param_0 == 2) {
+    } else if (tevStageNum == 2) {
         rv = new J3DTevBlock2();
-    } else if (param_0 <= 4) {
+    } else if (tevStageNum <= 4) {
         rv = new J3DTevBlock4();
-    } else if (param_0 <= 16) {
+    } else if (tevStageNum <= 16) {
         rv = new J3DTevBlock16();
     }
+
+    J3D_ASSERT_ALLOCMEM(116, rv != NULL);
     return rv;
 }
 
 /* 80315E78-80315F60 3107B8 00E8+00 0/0 3/3 0/0 .text            createIndBlock__11J3DMaterialFi */
-J3DIndBlock* J3DMaterial::createIndBlock(int param_0) {
-    if (param_0 != 0) {
-        return new J3DIndBlockFull();
+J3DIndBlock* J3DMaterial::createIndBlock(int flags) {
+    J3DIndBlock* rv = NULL;
+    if (flags != 0) {
+        rv = new J3DIndBlockFull();
+    } else {
+        rv = new J3DIndBlockNull();
     }
 
-    return new J3DIndBlockNull();
+    J3D_ASSERT_ALLOCMEM(139, rv != NULL);
+    return rv;
 }
 
 /* 80315F60-80316100 3108A0 01A0+00 0/0 3/3 0/0 .text            createPEBlock__11J3DMaterialFUlUl
  */
-J3DPEBlock* J3DMaterial::createPEBlock(u32 createFlag, u32 materialMode) {
+J3DPEBlock* J3DMaterial::createPEBlock(u32 flags, u32 materialMode) {
     J3DPEBlock* rv = NULL;
-
-    if (createFlag == 0) {
+    if (flags == 0) {
         if (materialMode & 1) {
             rv = new J3DPEBlockOpa();
+            J3D_ASSERT_ALLOCMEM(166, rv != NULL);
             return rv;
         } else if (materialMode & 2) {
             rv = new J3DPEBlockTexEdge();
+            J3D_ASSERT_ALLOCMEM(172, rv != NULL);
             return rv;
         } else if (materialMode & 4) {
             rv = new J3DPEBlockXlu();
+            J3D_ASSERT_ALLOCMEM(178, rv != NULL);
             return rv;
         }
     }
 
-    if (createFlag == 0x10000000) {
+    if (flags == 0x10000000) {
         rv = new J3DPEBlockFull();
-    } else if (createFlag == 0x20000000) {
+    } else if (flags == 0x20000000) {
         rv = new J3DPEBlockFogOff();
     }
 
+    J3D_ASSERT_ALLOCMEM(188, rv != NULL);
     return rv;
 }
 
 /* 80316100-80316150 310A40 0050+00 0/0 2/2 0/0 .text calcSizeColorBlock__11J3DMaterialFUl */
-u32 J3DMaterial::calcSizeColorBlock(u32 param_0) {
+u32 J3DMaterial::calcSizeColorBlock(u32 flags) {
     u32 rv = 0;
-    switch (param_0) {
-        case 0:
-            rv = sizeof(J3DColorBlockLightOff);
-            break;
-        case 0x40000000:
-            rv = sizeof(J3DColorBlockLightOn);
-            break;
-        case 0x80000000:
-            rv = sizeof(J3DColorBlockAmbientOn);
-            break;
+    switch (flags) {
+    case 0:
+        rv += sizeof(J3DColorBlockLightOff);
+        break;
+    case 0x40000000:
+        rv += sizeof(J3DColorBlockLightOn);
+        break;
+    case 0x80000000:
+        rv += sizeof(J3DColorBlockAmbientOn);
+        break;
     }
 
     return rv;
 }
 
 /* 80316150-8031617C 310A90 002C+00 0/0 1/1 0/0 .text calcSizeTexGenBlock__11J3DMaterialFUl */
-u32 J3DMaterial::calcSizeTexGenBlock(u32 param_0) {
-    switch (param_0) {
-        case 0x8000000:
-            return sizeof(J3DTexGenBlock4);
-        case 0:
-        default:
-            return sizeof(J3DTexGenBlockBasic);
+u32 J3DMaterial::calcSizeTexGenBlock(u32 flags) {
+    u32 rv = 0;
+    switch (flags) {
+    case 0x8000000:
+        rv += sizeof(J3DTexGenBlock4);
+        break;
+    case 0:
+    default:
+        rv += sizeof(J3DTexGenBlockBasic);
     }
+
+    return rv;
 }
 
 /* 8031617C-803161C4 310ABC 0048+00 0/0 1/1 0/0 .text            calcSizeTevBlock__11J3DMaterialFi
  */
-u32 J3DMaterial::calcSizeTevBlock(int param_0) {
+u32 J3DMaterial::calcSizeTevBlock(int tevStageNum) {
     u32 rv = 0;
-    if (param_0 <= 1) {
-        rv = sizeof(J3DTevBlock1);
-    } else if (param_0 == 2) {
-        rv = sizeof(J3DTevBlock2);
-    } else if (param_0 <= 4) {
-        rv = sizeof(J3DTevBlock4);
-    } else if (param_0 <= 16) {
-        rv = sizeof(J3DTevBlock16);
+    if (tevStageNum <= 1) {
+        rv += sizeof(J3DTevBlock1);
+    } else if (tevStageNum == 2) {
+        rv += sizeof(J3DTevBlock2);
+    } else if (tevStageNum <= 4) {
+        rv += sizeof(J3DTevBlock4);
+    } else if (tevStageNum <= 16) {
+        rv += sizeof(J3DTevBlock16);
     }
+
     return rv;
 }
 
 /* 803161C4-803161D8 310B04 0014+00 0/0 2/2 0/0 .text            calcSizeIndBlock__11J3DMaterialFi
  */
-u32 J3DMaterial::calcSizeIndBlock(int param_0) {
-    if (param_0 != 0) {
-        return sizeof(J3DIndBlockFull);
+u32 J3DMaterial::calcSizeIndBlock(int flags) {
+    u32 rv = 0;
+    if (flags != 0) {
+        rv += sizeof(J3DIndBlockFull);
+    } else {
+        rv += sizeof(J3DIndBlockNull);
     }
 
-    return sizeof(J3DIndBlockNull);
+    return rv;
 }
 
 /* 803161D8-80316240 310B18 0068+00 0/0 2/2 0/0 .text            calcSizePEBlock__11J3DMaterialFUlUl
  */
-u32 J3DMaterial::calcSizePEBlock(u32 param_0, u32 param_1) {
+u32 J3DMaterial::calcSizePEBlock(u32 flags, u32 materialMode) {
     u32 rv = 0;
-    if (param_0 == 0) {
-        if (param_1 & 1) {
-            rv = sizeof(J3DPEBlockOpa);
-        } else if (param_1 & 2) {
-            rv = sizeof(J3DPEBlockTexEdge);
-        } else if (param_1 & 4) {
-            rv = sizeof(J3DPEBlockXlu);
+    if (flags == 0) {
+        if (materialMode & 1) {
+            rv += sizeof(J3DPEBlockOpa);
+        } else if (materialMode & 2) {
+            rv += sizeof(J3DPEBlockTexEdge);
+        } else if (materialMode & 4) {
+            rv += sizeof(J3DPEBlockXlu);
         }
+    } else if (flags == 0x10000000) {
+        rv += sizeof(J3DPEBlockFull);
+    } else if (flags == 0x20000000) {
+        rv += sizeof(J3DPEBlockFogOff);
     }
-    else if (param_0 == 0x10000000) {
-        rv = sizeof(J3DPEBlockFull);
-    } else if (param_0 == 0x20000000) {
-        rv = sizeof(J3DPEBlockFogOff);
-    }
+
     return rv;
 }
 
@@ -191,8 +209,8 @@ u32 J3DMaterial::countDLSize() {
 
 /* 80316344-80316620 310C84 02DC+00 2/2 0/0 0/0 .text
  * makeDisplayList_private__11J3DMaterialFP17J3DDisplayListObj  */
-void J3DMaterial::makeDisplayList_private(J3DDisplayListObj* param_0) {
-    param_0->beginDL();
+void J3DMaterial::makeDisplayList_private(J3DDisplayListObj* pDLObj) {
+    pDLObj->beginDL();
     mTevBlock->load();
     mIndBlock->load();
     mPEBlock->load();
@@ -201,7 +219,7 @@ void J3DMaterial::makeDisplayList_private(J3DDisplayListObj* param_0) {
     mColorBlock->load();
     J3DGDSetNumChans(mColorBlock->getColorChanNum());
     J3DGDSetNumTexGens(mTexGenBlock->getTexGenNum());
-    param_0->endDL();
+    pDLObj->endDL();
 }
 
 /* 80316620-80316668 310F60 0048+00 1/0 0/0 0/0 .text            makeDisplayList__11J3DMaterialFv */
@@ -245,18 +263,20 @@ void J3DMaterial::patch() {
 }
 
 /* 803167D8-803169DC 311118 0204+00 2/0 0/0 0/0 .text            diff__11J3DMaterialFUl */
-void J3DMaterial::diff(u32 param_0) {
+void J3DMaterial::diff(u32 diffFlags) {
     if (j3dSys.getMatPacket()->isEnabled_Diff()) {
         j3dSys.getMatPacket()->beginDiff();
-        mTevBlock->diff(param_0);
-        mIndBlock->diff(param_0);
-        mPEBlock->diff(param_0);
-        if (param_0 & 0x2000000) {
+
+        mTevBlock->diff(diffFlags);
+        mIndBlock->diff(diffFlags);
+        mPEBlock->diff(diffFlags);
+        if (diffFlags & J3DDiffFlag_KonstColor) {
             J3DGDSetGenMode_3Param(mTexGenBlock->getTexGenNum(), mTevBlock->getTevStageNum(), mIndBlock->getIndTexStageNum());
             J3DGDSetNumTexGens(mTexGenBlock->getTexGenNum());
         }
-        mTexGenBlock->diff(param_0);
-        mColorBlock->diff(param_0);
+        mTexGenBlock->diff(diffFlags);
+        mColorBlock->diff(diffFlags);
+
         j3dSys.getMatPacket()->endDiff();
     }
 }
@@ -291,43 +311,44 @@ void J3DMaterial::setCurrentMtx() {
 void J3DMaterial::calcCurrentMtx() {
     if (!j3dSys.checkFlag(0x40000000)) {
         mCurrentMtx.setCurrentTexMtx(
-            mTexGenBlock->getTexCoord(0)->getTexGenMtx(),
-            mTexGenBlock->getTexCoord(1)->getTexGenMtx(),
-            mTexGenBlock->getTexCoord(2)->getTexGenMtx(),
-            mTexGenBlock->getTexCoord(3)->getTexGenMtx(),
-            mTexGenBlock->getTexCoord(4)->getTexGenMtx(),
-            mTexGenBlock->getTexCoord(5)->getTexGenMtx(),
-            mTexGenBlock->getTexCoord(6)->getTexGenMtx(),
-            mTexGenBlock->getTexCoord(7)->getTexGenMtx()
+            getTexCoord(0)->getTexGenMtx(),
+            getTexCoord(1)->getTexGenMtx(),
+            getTexCoord(2)->getTexGenMtx(),
+            getTexCoord(3)->getTexGenMtx(),
+            getTexCoord(4)->getTexGenMtx(),
+            getTexCoord(5)->getTexGenMtx(),
+            getTexCoord(6)->getTexGenMtx(),
+            getTexCoord(7)->getTexGenMtx()
         );
     } else {
         mCurrentMtx.setCurrentTexMtx(
-            mTexGenBlock->getTexCoord(0)->getTexMtxReg(),
-            mTexGenBlock->getTexCoord(1)->getTexMtxReg(),
-            mTexGenBlock->getTexCoord(2)->getTexMtxReg(),
-            mTexGenBlock->getTexCoord(3)->getTexMtxReg(),
-            mTexGenBlock->getTexCoord(4)->getTexMtxReg(),
-            mTexGenBlock->getTexCoord(5)->getTexMtxReg(),
-            mTexGenBlock->getTexCoord(6)->getTexMtxReg(),
-            mTexGenBlock->getTexCoord(7)->getTexMtxReg()
+            getTexCoord(0)->getTexMtxReg(),
+            getTexCoord(1)->getTexMtxReg(),
+            getTexCoord(2)->getTexMtxReg(),
+            getTexCoord(3)->getTexMtxReg(),
+            getTexCoord(4)->getTexMtxReg(),
+            getTexCoord(5)->getTexMtxReg(),
+            getTexCoord(6)->getTexMtxReg(),
+            getTexCoord(7)->getTexMtxReg()
         );
     }
 }
 
 /* 80316D68-80316E14 3116A8 00AC+00 1/1 0/0 0/0 .text            copy__11J3DMaterialFP11J3DMaterial
  */
-void J3DMaterial::copy(J3DMaterial* param_0) {
-    mColorBlock->reset(param_0->mColorBlock);
-    mTexGenBlock->reset(param_0->mTexGenBlock);
-    mTevBlock->reset(param_0->mTevBlock);
-    mIndBlock->reset(param_0->mIndBlock);
-    mPEBlock->reset(param_0->mPEBlock);
+void J3DMaterial::copy(J3DMaterial* pOther) {
+    J3D_ASSERT_NULLPTR(620, pOther != NULL);
+    mColorBlock->reset(pOther->mColorBlock);
+    mTexGenBlock->reset(pOther->mTexGenBlock);
+    mTevBlock->reset(pOther->mTevBlock);
+    mIndBlock->reset(pOther->mIndBlock);
+    mPEBlock->reset(pOther->mPEBlock);
 }
 
 /* 80316E14-80316E70 311754 005C+00 1/0 0/0 0/0 .text            reset__11J3DMaterialFv */
 void J3DMaterial::reset() {
-    if ((~mDiffFlag & 0x80000000) == 0) {
-        mDiffFlag &= ~0x80000000;
+    if ((~mDiffFlag & J3DDiffFlag_Changed) == 0) {
+        mDiffFlag &= ~J3DDiffFlag_Changed;
         mMaterialMode = mpOrigMaterial->mMaterialMode;
         mInvalid = mpOrigMaterial->mInvalid;
         mMaterialAnm = NULL;
@@ -337,47 +358,45 @@ void J3DMaterial::reset() {
 
 /* 80316E70-80316E90 3117B0 0020+00 1/0 0/0 0/0 .text            change__11J3DMaterialFv */
 void J3DMaterial::change() {
-    if ((mDiffFlag & 0xc0000000) == 0) {
-        mDiffFlag |= 0x80000000;
+    if ((mDiffFlag & (J3DDiffFlag_Changed | J3DDiffFlag_Unk40000000)) == 0) {
+        mDiffFlag |= J3DDiffFlag_Changed;
         mMaterialAnm = NULL;
     }
 }
 
 /* 80316E90-80316F24 3117D0 0094+00 0/0 2/2 0/0 .text newSharedDisplayList__11J3DMaterialFUl */
-s32 J3DMaterial::newSharedDisplayList(u32 param_0) {
+s32 J3DMaterial::newSharedDisplayList(u32 dlSize) {
     if (mSharedDLObj == NULL) {
         mSharedDLObj = new J3DDisplayListObj();
         if (mSharedDLObj == NULL) {
-            return 4;
+            return kJ3DError_Alloc;
         }
-        s32 res = mSharedDLObj->newDisplayList(param_0);
-        switch (res) {
-        case kJ3DError_Success:
-            break;
-        default:
-            return res;
+
+        s32 ret = mSharedDLObj->newDisplayList(dlSize);
+        if (ret != kJ3DError_Success) {
+            return ret;
         }
     }
-    return 0;
+
+    return kJ3DError_Success;
 }
 
 /* 80316F24-80316FB8 311864 0094+00 0/0 2/2 0/0 .text newSingleSharedDisplayList__11J3DMaterialFUl
  */
-s32 J3DMaterial::newSingleSharedDisplayList(u32 param_0) {
+s32 J3DMaterial::newSingleSharedDisplayList(u32 dlSize) {
     if (mSharedDLObj == NULL) {
         mSharedDLObj = new J3DDisplayListObj();
         if (mSharedDLObj == NULL) {
-            return 4;
+            return kJ3DError_Alloc;
         }
-        s32 res = mSharedDLObj->newSingleDisplayList(param_0);
-        switch (res) {
-        case kJ3DError_Success:
-            break;
-        default:
-            return res;
+
+        s32 ret = mSharedDLObj->newSingleDisplayList(dlSize);
+        if (ret != kJ3DError_Success) {
+            return ret;
         }
     }
-    return 0;
+
+    return kJ3DError_Success;
 }
 
 /* 80316FB8-80316FD8 3118F8 0020+00 0/0 1/1 0/0 .text            initialize__18J3DPatchedMaterialFv
@@ -387,15 +406,11 @@ void J3DPatchedMaterial::initialize() {
 }
 
 /* 80316FD8-80316FDC 311918 0004+00 1/0 0/0 0/0 .text makeDisplayList__18J3DPatchedMaterialFv */
-void J3DPatchedMaterial::makeDisplayList() {
-    /* empty function */
-}
+void J3DPatchedMaterial::makeDisplayList() {}
 
 /* 80316FDC-80316FE0 31191C 0004+00 1/0 0/0 0/0 .text
  * makeSharedDisplayList__18J3DPatchedMaterialFv                */
-void J3DPatchedMaterial::makeSharedDisplayList() {
-    /* empty function */
-}
+void J3DPatchedMaterial::makeSharedDisplayList() {}
 
 /* 80316FE0-80316FFC 311920 001C+00 1/0 0/0 0/0 .text            load__18J3DPatchedMaterialFv */
 void J3DPatchedMaterial::load() {
@@ -413,14 +428,10 @@ void J3DPatchedMaterial::loadSharedDL() {
 }
 
 /* 8031703C-80317040 31197C 0004+00 1/0 0/0 0/0 .text            reset__18J3DPatchedMaterialFv */
-void J3DPatchedMaterial::reset() {
-    /* empty function */
-}
+void J3DPatchedMaterial::reset() {}
 
 /* 80317040-80317044 311980 0004+00 1/0 0/0 0/0 .text            change__18J3DPatchedMaterialFv */
-void J3DPatchedMaterial::change() {
-    /* empty function */
-}
+void J3DPatchedMaterial::change() {}
 
 /* 80317044-80317064 311984 0020+00 0/0 1/1 0/0 .text            initialize__17J3DLockedMaterialFv
  */
@@ -429,15 +440,11 @@ void J3DLockedMaterial::initialize() {
 }
 
 /* 80317064-80317068 3119A4 0004+00 1/0 0/0 0/0 .text makeDisplayList__17J3DLockedMaterialFv */
-void J3DLockedMaterial::makeDisplayList() {
-    /* empty function */
-}
+void J3DLockedMaterial::makeDisplayList() {}
 
 /* 80317068-8031706C 3119A8 0004+00 1/0 0/0 0/0 .text makeSharedDisplayList__17J3DLockedMaterialFv
  */
-void J3DLockedMaterial::makeSharedDisplayList() {
-    /* empty function */
-}
+void J3DLockedMaterial::makeSharedDisplayList() {}
 
 /* 8031706C-80317088 3119AC 001C+00 1/0 0/0 0/0 .text            load__17J3DLockedMaterialFv */
 void J3DLockedMaterial::load() {
@@ -456,26 +463,16 @@ void J3DLockedMaterial::loadSharedDL() {
 }
 
 /* 803170C8-803170CC 311A08 0004+00 1/0 0/0 0/0 .text            patch__17J3DLockedMaterialFv */
-void J3DLockedMaterial::patch() {
-    /* empty function */
-}
+void J3DLockedMaterial::patch() {}
 
 /* 803170CC-803170D0 311A0C 0004+00 1/0 0/0 0/0 .text            diff__17J3DLockedMaterialFUl */
-void J3DLockedMaterial::diff(u32 param_0) {
-    /* empty function */
-}
+void J3DLockedMaterial::diff(u32 diffFlags) {}
 
 /* 803170D0-803170D4 311A10 0004+00 1/0 0/0 0/0 .text            calc__17J3DLockedMaterialFPA4_Cf */
-void J3DLockedMaterial::calc(const Mtx param_0) {
-    /* empty function */
-}
+void J3DLockedMaterial::calc(const Mtx param_0) {}
 
 /* 803170D4-803170D8 311A14 0004+00 1/0 0/0 0/0 .text            reset__17J3DLockedMaterialFv */
-void J3DLockedMaterial::reset() {
-    /* empty function */
-}
+void J3DLockedMaterial::reset() {}
 
 /* 803170D8-803170DC 311A18 0004+00 1/0 0/0 0/0 .text            change__17J3DLockedMaterialFv */
-void J3DLockedMaterial::change() {
-    /* empty function */
-}
+void J3DLockedMaterial::change() {}
diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/src/JSystem/J3DGraphBase/J3DPacket.cpp
index b612d8ed64..88edce5636 100644
--- a/src/JSystem/J3DGraphBase/J3DPacket.cpp
+++ b/src/JSystem/J3DGraphBase/J3DPacket.cpp
@@ -9,63 +9,64 @@
 #include "string.h"
 #include "global.h"
 
-J3DError J3DDisplayListObj::newDisplayList(u32 capacity) {
-    mCapacity = ALIGN_NEXT(capacity, 0x20);
-    mpData[0] = new (0x20) char[mCapacity];
-    mpData[1] = new (0x20) char[mCapacity];
+J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) {
+    mMaxSize = ALIGN_NEXT(maxSize, 0x20);
+    mpDisplayList[0] = new (0x20) char[mMaxSize];
+    mpDisplayList[1] = new (0x20) char[mMaxSize];
     mSize = 0;
 
-    if (mpData[0] == NULL || mpData[1] == NULL)
+    if (mpDisplayList[0] == NULL || mpDisplayList[1] == NULL)
         return kJ3DError_Alloc;
 
     return kJ3DError_Success;
 }
 
-J3DError J3DDisplayListObj::newSingleDisplayList(u32 capacity) {
-    mCapacity = ALIGN_NEXT(capacity, 0x20);
-    mpData[0] = new (0x20) char[mCapacity];
-    mpData[1] = mpData[0];
+J3DError J3DDisplayListObj::newSingleDisplayList(u32 maxSize) {
+    mMaxSize = ALIGN_NEXT(maxSize, 0x20);
+    mpDisplayList[0] = new (0x20) char[mMaxSize];
+    mpDisplayList[1] = mpDisplayList[0];
     mSize = 0;
 
-    if (mpData[0] == NULL)
+    if (mpDisplayList[0] == NULL)
         return kJ3DError_Alloc;
 
     return kJ3DError_Success;
 }
 
 /* 8031256C-803125E4 30CEAC 0078+00 0/0 1/1 0/0 .text single_To_Double__17J3DDisplayListObjFv */
-J3DError J3DDisplayListObj::single_To_Double() {
-    if (mpData[0] == mpData[1]) {
-        mpData[1] = new (0x20) char[mCapacity];
+int J3DDisplayListObj::single_To_Double() {
+    if (mpDisplayList[0] == mpDisplayList[1]) {
+        mpDisplayList[1] = new (0x20) char[mMaxSize];
 
-        if (mpData[1] == NULL)
+        if (mpDisplayList[1] == NULL)
             return kJ3DError_Alloc;
 
-        memcpy(mpData[1], mpData[0], mCapacity);
-        DCStoreRange(mpData[1], mCapacity);
+        memcpy(mpDisplayList[1], mpDisplayList[0], mMaxSize);
+        DCStoreRange(mpDisplayList[1], mMaxSize);
     }
 
     return kJ3DError_Success;
 }
 
 void J3DDisplayListObj::setSingleDisplayList(void* pDLData, u32 size) {
-    mCapacity = ALIGN_NEXT(size, 0x20);
-    mpData[0] = pDLData;
-    mpData[1] = mpData[0];
+    J3D_ASSERT_NULLPTR(148, pDLData != NULL);
+
+    mMaxSize = ALIGN_NEXT(size, 0x20);
+    mpDisplayList[0] = pDLData;
+    mpDisplayList[1] = mpDisplayList[0];
     mSize = size;
 }
 
 void J3DDisplayListObj::swapBuffer() {
-    void* pTmp = mpData[0];
-    mpData[0] = mpData[1];
-    mpData[1] = pTmp;
+    void* pTmp = mpDisplayList[0];
+    mpDisplayList[0] = mpDisplayList[1];
+    mpDisplayList[1] = pTmp;
 }
 
 void J3DDisplayListObj::callDL() const {
-    GXCallDisplayList(mpData[0], mSize);
+    GXCallDisplayList(mpDisplayList[0], mSize);
 }
 
-/* ############################################################################################## */
 /* 80434C70-80434C80 061990 0010+00 2/2 3/3 0/0 .bss             sGDLObj__17J3DDisplayListObj */
 GDLObj J3DDisplayListObj::sGDLObj;
 
@@ -77,7 +78,7 @@ s32 J3DDisplayListObj::sInterruptFlag;
 void J3DDisplayListObj::beginDL() {
     swapBuffer();
     sInterruptFlag = OSDisableInterrupts();
-    GDInitGDLObj(&sGDLObj, (u8*)mpData[0], mCapacity);
+    GDInitGDLObj(&sGDLObj, (u8*)mpDisplayList[0], mMaxSize);
     GDSetCurrent(&sGDLObj);
 }
 
@@ -105,28 +106,44 @@ u32 J3DDisplayListObj::endPatch() {
 }
 
 /* 80312750-80312758 30D090 0008+00 3/0 16/0 10/0 .text entry__9J3DPacketFP13J3DDrawBuffer */
-int J3DPacket::entry(J3DDrawBuffer*) {
+int J3DPacket::entry(J3DDrawBuffer* pBuffer) {
+    J3D_ASSERT_NULLPTR(290, pBuffer != NULL);
     return 1;
 }
 
 void J3DPacket::addChildPacket(J3DPacket* pPacket) {
+    J3D_ASSERT_NULLPTR(304, pPacket != NULL);
+
     if (mpFirstChild == NULL) {
         mpFirstChild = pPacket;
     } else {
-        pPacket->mpNextPacket = mpFirstChild;
+        pPacket->setNextPacket(mpFirstChild);
         mpFirstChild = pPacket;
     }
 }
 
-/* ############################################################################################## */
 /* 803CD900-803CD920 02AA20 0020+00 1/1 0/0 0/0 .data            sDifferedRegister */
 static u32 sDifferedRegister[8] = {
-    0x00000004, 0x00000001, 0x00000002, 0x01000000, 0x10000000, 0x20000000, 0x02000000, 0x08000000,
+    J3DDiffFlag_AmbColor,
+    J3DDiffFlag_MatColor,
+    J3DDiffFlag_ColorChan,
+    J3DDiffFlag_TevReg,
+    J3DDiffFlag_Fog,
+    J3DDiffFlag_Blend,
+    J3DDiffFlag_KonstColor,
+    J3DDiffFlag_TevStageIndirect,
 };
 
 /* 803CD920-803CD940 02AA40 0020+00 1/1 0/0 0/0 .data            sSizeOfDiffered */
 static s32 sSizeOfDiffered[8] = {
-    13, 13, 21, 120, 55, 15, 19, 45,
+    13,
+    13,
+    21,
+    120,
+    55,
+    15,
+    19,
+    45,
 };
 
 /* 80312778-803127B0 30D0B8 0038+00 2/2 0/0 0/0 .text            __ct__13J3DDrawPacketFv */
@@ -169,7 +186,7 @@ J3DError J3DDrawPacket::newSingleDisplayList(u32 size) {
 }
 
 void J3DDrawPacket::draw() {
-    mpDisplayListObj->callDL();
+    callDL();
 }
 
 /* 80312948-803129A4 30D288 005C+00 0/0 1/1 0/0 .text            __ct__12J3DMatPacketFv */
@@ -177,7 +194,7 @@ J3DMatPacket::J3DMatPacket() {
     mpInitShapePacket = NULL;
     mpShapePacket = NULL;
     mpMaterial = NULL;
-    mDiffFlag = -1;
+    mDiffFlag = 0xFFFFFFFF;
     mpTexture = NULL;
     mpMaterialAnm = NULL;
 }
@@ -189,37 +206,32 @@ void J3DMatPacket::addShapePacket(J3DShapePacket* pShape) {
     if (mpShapePacket == NULL) {
         mpShapePacket = pShape;
     } else {
-        pShape->mpNextPacket = mpShapePacket;
+        pShape->setNextPacket(mpShapePacket);
         mpShapePacket = pShape;
     }
 }
 
 void J3DMatPacket::beginDiff() {
-    mpInitShapePacket->mpDisplayListObj->beginDL();
+    mpInitShapePacket->beginDL();
 }
 
 void J3DMatPacket::endDiff() {
-    mpInitShapePacket->mpDisplayListObj->endDL();
+    mpInitShapePacket->endDL();
 }
 
 /* 80312A74-80312A9C 30D3B4 0028+00 0/0 1/1 0/0 .text isSame__12J3DMatPacketCFP12J3DMatPacket */
 bool J3DMatPacket::isSame(J3DMatPacket* pOther) const {
-    bool isSame = false;
-
-    if (mDiffFlag == pOther->mDiffFlag && !(mDiffFlag >> 0x1F)) {
-        isSame = true;
-    }
-    return isSame;
+    J3D_ASSERT_NULLPTR(521, pOther != NULL);
+    return mDiffFlag == pOther->mDiffFlag && (mDiffFlag >> 31) == 0;
 }
 
 /* 80312A9C-80312B20 30D3DC 0084+00 1/0 0/0 0/0 .text            draw__12J3DMatPacketFv */
 void J3DMatPacket::draw() {
     mpMaterial->load();
     callDL();
-    J3DShapePacket* packet = getShapePacket();
 
-    J3DShape* shape = packet->getShape();
-    shape->loadPreDrawSetting();
+    J3DShapePacket* packet = getShapePacket();
+    packet->getShape()->loadPreDrawSetting();
 
     while (packet != NULL) {
         if (packet->getDisplayListObj() != NULL) {
@@ -230,7 +242,7 @@ void J3DMatPacket::draw() {
         packet = (J3DShapePacket*)packet->getNextPacket();
     }
 
-    shape->resetVcdVatCache();
+    J3DShape::resetVcdVatCache();
 }
 
 /* 80312B20-80312B74 30D460 0054+00 0/0 1/1 0/0 .text            __ct__14J3DShapePacketFv */
@@ -247,76 +259,83 @@ J3DShapePacket::~J3DShapePacket() {}
 
 /* 80312BD4-80312DBC 30D514 01E8+00 1/1 0/0 0/0 .text calcDifferedBufferSize__14J3DShapePacketFUl
  */
-u32 J3DShapePacket::calcDifferedBufferSize(u32 flag) {
-    int iVar5 = 0;
-    for (int i = 0; i < 8; i++) {
-        if ((flag & sDifferedRegister[i]) != 0) {
-            iVar5 += sSizeOfDiffered[i];
+u32 J3DShapePacket::calcDifferedBufferSize(u32 diffFlags) {
+    u32 bufferSize = 0;
+
+    for (u32 i = 0; i < 8; i++) {
+        if ((diffFlags & sDifferedRegister[i]) != 0) {
+            bufferSize += sSizeOfDiffered[i];
         }
     }
 
-    iVar5 += getDiffFlag_LightObjNum(flag) * 0x48;
-    u32 uVar2 = getDiffFlag_TexGenNum(flag);
-    if (uVar2 != 0) {
-        u32 local_4c = mpShape->getMaterial()->getTexGenNum();
-        if (uVar2 > local_4c) {
-            local_4c = uVar2;
-        }
-        if ((flag & 0x1000)) {
-            iVar5 += calcDifferedBufferSize_TexGenSize(local_4c);
+    u32 lightObjNum = getDiffFlag_LightObjNum(diffFlags);
+    bufferSize += lightObjNum * 0x48;
+
+    u32 texGenNum = getDiffFlag_TexGenNum(diffFlags);
+    if (texGenNum != 0) {
+        u32 mat_texGenNum = mpShape->getMaterial()->getTexGenNum();
+        u32 sp30 = texGenNum > mat_texGenNum ? texGenNum : mat_texGenNum;
+
+        if (diffFlags & J3DDiffFlag_TexGen) {
+            bufferSize += calcDifferedBufferSize_TexGenSize(sp30);
         } else {
-            iVar5 += calcDifferedBufferSize_TexMtxSize(local_4c);
+            bufferSize += calcDifferedBufferSize_TexMtxSize(sp30);
         }
     }
 
-    uVar2 = getDiffFlag_TexNoNum(flag);
-    if (uVar2 != 0) {
-        u8 local_58;
+    u32 texNoNum = getDiffFlag_TexNoNum(diffFlags);
+    if (texNoNum != 0) {
+        u8 sp9;
         if (mpShape->getMaterial()->getTevStageNum() > 8) {
-            local_58 = 8;
+            sp9 = 8;
         } else {
-            local_58 = mpShape->getMaterial()->getTevStageNum();
+            sp9 = mpShape->getMaterial()->getTevStageNum();
         }
-        u32 local_50 = local_58;
-        local_50 = uVar2 > local_50 ? uVar2 : local_50;
-        if ((flag & 0x4000000)) {
-            iVar5 += calcDifferedBufferSize_TexNoAndTexCoordScaleSize(local_50);
+
+        u32 mat_texNoNum = sp9;
+        u32 sp24 = texNoNum > mat_texNoNum ? texNoNum : mat_texNoNum;
+
+        if (diffFlags & J3DDiffFlag_TexCoordScale) {
+            bufferSize += calcDifferedBufferSize_TexNoAndTexCoordScaleSize(sp24);
         } else {
-            iVar5 += calcDifferedBufferSize_TexNoSize(local_50);
+            bufferSize += calcDifferedBufferSize_TexNoSize(sp24);
         }
     }
 
-    uVar2 = getDiffFlag_TevStageNum(flag);
-    if (uVar2 != 0) {
-        u8 local_58;
+    u32 tevStageNum = getDiffFlag_TevStageNum(diffFlags);
+    if (tevStageNum != 0) {
+        u8 sp8;
         if (mpShape->getMaterial()->getTevStageNum() > 8) {
-            local_58 = 8;
+            sp8 = 8;
         } else {
-            local_58 = mpShape->getMaterial()->getTevStageNum();
+            sp8 = mpShape->getMaterial()->getTevStageNum();
         }
-        u32 local_50 = local_58;
-        local_50 = uVar2 > local_50 ? uVar2 : local_50;
-        iVar5 += calcDifferedBufferSize_TevStageSize(local_50);
-        if (flag & 0x8000000) {
-            iVar5 += calcDifferedBufferSize_TevStageDirectSize(local_50);
+
+        u32 mat_tevStageNum = sp8;
+        u32 sp18 = tevStageNum > mat_tevStageNum ? tevStageNum : mat_tevStageNum;
+
+        bufferSize += calcDifferedBufferSize_TevStageSize(sp18);
+        if (diffFlags & J3DDiffFlag_TevStageIndirect) {
+            bufferSize += calcDifferedBufferSize_TevStageDirectSize(sp18);
         }
     }
 
-    return (iVar5 + 0x1f) & ~0x1f;
+    return OSRoundUp32B(bufferSize);
 }
 
 /* 80312DBC-80312E08 30D6FC 004C+00 0/0 1/1 0/0 .text newDifferedDisplayList__14J3DShapePacketFUl
  */
-J3DError J3DShapePacket::newDifferedDisplayList(u32 flag) {
-    mDiffFlag = flag;
-    u32 bufSize = calcDifferedBufferSize(flag);
-    J3DError error = newDisplayList(bufSize);
+int J3DShapePacket::newDifferedDisplayList(u32 diffFlags) {
+    mDiffFlag = diffFlags;
 
-    if (error != kJ3DError_Success) {
-        return error;
+    u32 bufSize = calcDifferedBufferSize(diffFlags);
+    int ret = newDisplayList(bufSize);
+    if (ret != kJ3DError_Success) {
+        return ret;
     }
 
-    setDisplayListObj(getDisplayListObj());
+    J3DDisplayListObj* dlobj = getDisplayListObj();
+    setDisplayListObj(dlobj);
     return kJ3DError_Success;
 }
 
@@ -326,8 +345,7 @@ void J3DShapePacket::prepareDraw() const {
     j3dSys.setModel(mpModel);
     j3dSys.setShapePacket((J3DShapePacket*)this);
 
-    // the way that the LOD flag is set seems to be wrong...
-    J3DShapeMtx::setLODFlag(mpModel->checkFlag(0x10));
+    J3DShapeMtx::setLODFlag(mpModel->checkFlag(J3DMdlFlag_EnableLOD) != 0);
 
     if (mpModel->checkFlag(J3DMdlFlag_SkinPosCpu)) {
         mpShape->onFlag(J3DShpFlag_SkinPosCpu);
@@ -343,15 +361,14 @@ void J3DShapePacket::prepareDraw() const {
         mpShape->offFlag(J3DShpFlag_SkinNrmCpu);
     }
 
-    J3DMtxBuffer* buffer = mpMtxBuffer;
-    mpShape->setCurrentViewNoPtr(buffer->getCurrentViewNoPtr());
-    mpShape->setScaleFlagArray(buffer->getScaleFlagArray());
-    mpShape->setDrawMtx(buffer->getDrawMtxPtrPtr());
+    mpShape->setCurrentViewNoPtr(mpMtxBuffer->getCurrentViewNoPtr());
+    mpShape->setScaleFlagArray(mpMtxBuffer->getScaleFlagArray());
+    mpShape->setDrawMtx(mpMtxBuffer->getDrawMtxPtrPtr());
 
     if (!mpShape->getNBTFlag()) {
-        mpShape->setNrmMtx(buffer->getNrmMtxPtrPtr());
+        mpShape->setNrmMtx(mpMtxBuffer->getNrmMtxPtrPtr());
     } else {
-        mpShape->setNrmMtx(buffer->getBumpMtxPtrPtr()[mpShape->getBumpMtxOffset()]);
+        mpShape->setNrmMtx(mpMtxBuffer->mpBumpMtxArr[1][mpShape->getBumpMtxOffset()]);
     }
 
     mpModel->getModelData()->syncJ3DSysFlags();
@@ -363,8 +380,7 @@ void J3DShapePacket::draw() {
         prepareDraw();
 
         if (mpTexMtxObj != NULL) {
-            J3DMaterial* material = mpShape->getMaterial();
-            J3DDifferedTexMtx::sTexGenBlock = material->getTexGenBlock();
+            J3DDifferedTexMtx::sTexGenBlock = mpShape->getMaterial()->getTexGenBlock();
             J3DDifferedTexMtx::sTexMtxObj = getTexMtxObj();
         } else {
             J3DDifferedTexMtx::sTexGenBlock = NULL;
@@ -384,8 +400,7 @@ void J3DShapePacket::drawFast() {
         prepareDraw();
 
         if (mpTexMtxObj != NULL) {
-            J3DMaterial* material = mpShape->getMaterial();
-            J3DDifferedTexMtx::sTexGenBlock = material->getTexGenBlock();
+            J3DDifferedTexMtx::sTexGenBlock = mpShape->getMaterial()->getTexGenBlock();
             J3DDifferedTexMtx::sTexMtxObj = getTexMtxObj();
         } else {
             J3DDifferedTexMtx::sTexGenBlock = NULL;
@@ -399,7 +414,7 @@ void J3DShapePacket::drawFast() {
 void J3DPacket::draw() {}
 
 /* 80313048-803130A8 30D988 0060+00 1/0 0/0 0/0 .text entry__12J3DMatPacketFP13J3DDrawBuffer */
-int J3DMatPacket::entry(J3DDrawBuffer* i_buffer) {
-    sortFunc func = J3DDrawBuffer::sortFuncTable[i_buffer->mSortType];
-    return (i_buffer->*func)(this);
+int J3DMatPacket::entry(J3DDrawBuffer* pBuffer) {
+    J3DDrawBuffer::sortFunc func = J3DDrawBuffer::sortFuncTable[pBuffer->getSortMode()];
+    return (pBuffer->*func)(this);
 }
diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp
index fee08feb08..b825f095b1 100644
--- a/src/JSystem/J3DGraphBase/J3DShape.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShape.cpp
@@ -1,18 +1,13 @@
 #include "JSystem/J3DGraphBase/J3DShape.h"
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
-#include "dolphin/gd.h"
-#include "dolphin/os.h"
+#include "JSystem/J3DGraphBase/J3DFifo.h"
+#include <dolphin/gd.h>
 
 void J3DGDSetVtxAttrFmtv(_GXVtxFmt, GXVtxAttrFmtList const*, bool);
 void J3DFifoLoadPosMtxImm(Mtx, u32);
 void J3DFifoLoadNrmMtxImm(Mtx, u32);
 
-
-enum {
-    kVcdVatDLSize = 0xC0,
-};
-
 void J3DShape::initialize() {
     mMaterial = NULL;
     mIndex = -1;
@@ -62,19 +57,24 @@ void J3DShape::addTexMtxIndexInDL(GXAttr attr, u32 valueBase) {
     if (pnmtxidxOffs == -1)
         return;
 
-    for (u16 i = 0; i < getMtxGroupNum(); i++)
+    for (u16 i = 0; i < (u16)getMtxGroupNum(); i++)
         getShapeDraw(i)->addTexMtxIndexInDL(stride, attrOffs, (s32)valueBase);
 }
 
 /* 80314CBC-80314DA8 30F5FC 00EC+00 0/0 1/1 0/0 .text addTexMtxIndexInVcd__8J3DShapeF7_GXAttr */
 void J3DShape::addTexMtxIndexInVcd(GXAttr attr) {
+    u32 kSize[] = {0, 1, 1, 2};  // stripped data
+
     s32 attrIdx = -1;
-    GXVtxDescList* vtxDesc = mVtxDesc;
+    s32 attrOffs = -1;
+    s32 stride = 0;
+
+    GXVtxDescList* vtxDesc = getVtxDesc();
     s32 attrCount = 0;
 
     for (; vtxDesc->attr != GX_VA_NULL; attrCount++, vtxDesc++) {
         if (vtxDesc->attr == GX_VA_PNMTXIDX)
-            attrIdx = 0;
+            attrIdx = stride;
     }
 
     if (attrIdx == -1)
@@ -83,17 +83,21 @@ void J3DShape::addTexMtxIndexInVcd(GXAttr attr) {
     GXVtxDescList* newVtxDesc = new GXVtxDescList[attrCount + 2];
     bool inserted = false;
 
-    vtxDesc = mVtxDesc;
+    vtxDesc = getVtxDesc();
     GXVtxDescList* dst = newVtxDesc;
     for (; vtxDesc->attr != GX_VA_NULL; dst++, vtxDesc++) {
         if ((attr < vtxDesc->attr) && !inserted) {
             dst->attr = attr;
             dst->type = GX_DIRECT;
-            inserted = true;
+            attrOffs = stride;
             dst++;
+
+            inserted = true;
         }
 
-        *dst = *vtxDesc;
+        dst->attr = vtxDesc->attr;
+        dst->type = vtxDesc->type;
+        stride = stride + kSize[vtxDesc->type];
     }
 
     dst->attr = GX_VA_NULL;
@@ -104,7 +108,7 @@ void J3DShape::addTexMtxIndexInVcd(GXAttr attr) {
 
 /* 80314DA8-80314E28 30F6E8 0080+00 0/0 1/1 0/0 .text
  * calcNBTScale__8J3DShapeFRC3VecPA3_A3_fPA3_A3_f               */
-void J3DShape::calcNBTScale(Vec const& param_0, f32 (*param_1)[3][3], f32 (*param_2)[3][3]) {
+void J3DShape::calcNBTScale(const Vec& param_0, f32 (*param_1)[3][3], f32 (*param_2)[3][3]) {
     for (u16 i = 0; i < mMtxGroupNum; i++)
         mShapeMtx[i]->calcNBTScale(param_0, param_1, param_2);
 }
@@ -114,28 +118,31 @@ u16 J3DShape::countBumpMtxNum() const {
     u16 num = 0;
     for (u16 i = 0; i < mMtxGroupNum; i++)
         num += mShapeMtx[i]->getUseMtxNum();
+
     return num;
 }
 
 /* 80314E98-80314EB0 30F7D8 0018+00 1/1 0/0 0/0 .text            J3DLoadCPCmd__FUcUl */
-void J3DLoadCPCmd(u8 cmd, u32 param) {
-    GXWGFifo.u8 = GX_LOAD_CP_REG;
-    GXWGFifo.u8 = cmd;
-    GXWGFifo.u32 = param;
+void J3DLoadCPCmd(u8 addr, u32 val) {
+    GXCmd1u8(GX_LOAD_CP_REG);
+    GXCmd1u8(addr);
+    GXCmd1u32(val);
 }
 
 /* 80314EB0-80314EEC 30F7F0 003C+00 1/1 0/0 0/0 .text            J3DLoadArrayBasePtr__F7_GXAttrPv */
-static void J3DLoadArrayBasePtr(_GXAttr attr, void* data) {
+static void J3DLoadArrayBasePtr(GXAttr attr, void* data) {
     u32 idx = (attr == GX_VA_NBT) ? 1 : (attr - GX_VA_POS);
-    J3DLoadCPCmd(0xA0 + idx, ((u32)data & 0x7FFFFFFF));
+    J3DLoadCPCmd(0xA0 + idx, ((uintptr_t)data & 0x7FFFFFFF));
 }
 
 /* 80314EEC-80314F5C 30F82C 0070+00 3/3 0/0 0/0 .text            loadVtxArray__8J3DShapeCFv */
 void J3DShape::loadVtxArray() const {
     J3DLoadArrayBasePtr(GX_VA_POS, j3dSys.getVtxPos());
+
     if (!mHasNBT) {
         J3DLoadArrayBasePtr(GX_VA_NRM, j3dSys.getVtxNrm());
     }
+
     J3DLoadArrayBasePtr(GX_VA_CLR0, j3dSys.getVtxCol());
 }
 
@@ -146,6 +153,7 @@ bool J3DShape::isSameVcdVatCmd(J3DShape* other) {
     for (u32 i = 0; i < kVcdVatDLSize; i++)
         if (a[i] != b[i])
             return false;
+
     return true;
 }
 
@@ -153,9 +161,9 @@ bool J3DShape::isSameVcdVatCmd(J3DShape* other) {
 void J3DShape::makeVtxArrayCmd() {
     GXVtxAttrFmtList* vtxAttr = mVertexData->getVtxAttrFmtList();
 
-    u8 stride[0x0C];
-    void* array[0x0C];
-    for (u32 i = 0; i < 0x0C; i++) {
+    u8 stride[12];
+    void* array[12];
+    for (u32 i = 0; i < 12; i++) {
         stride[i] = 0;
         array[i] = 0;
     }
@@ -164,27 +172,28 @@ void J3DShape::makeVtxArrayCmd() {
         switch (vtxAttr->attr) {
         case GX_VA_POS: {
             if (vtxAttr->type == GX_F32)
-                stride[vtxAttr->attr - GX_VA_POS] = 0x0C;
+                stride[vtxAttr->attr - GX_VA_POS] = 12;
             else
-                stride[vtxAttr->attr - GX_VA_POS] = 0x06;
+                stride[vtxAttr->attr - GX_VA_POS] = 6;
+
             array[vtxAttr->attr - GX_VA_POS] = mVertexData->getVtxPosArray();
-            mVertexData->setVtxPosFrac(vtxAttr->frac);
+            mVertexData->setVtxPosFrac((u8)vtxAttr->frac);
             mVertexData->setVtxPosType((GXCompType)vtxAttr->type);
         } break;
         case GX_VA_NRM: {
             if (vtxAttr->type == GX_F32)
-                stride[vtxAttr->attr - GX_VA_POS] = 0x0C;
+                stride[vtxAttr->attr - GX_VA_POS] = 12;
             else
-                stride[vtxAttr->attr - GX_VA_POS] = 0x06;
+                stride[vtxAttr->attr - GX_VA_POS] = 6;
+
             array[vtxAttr->attr - GX_VA_POS] = mVertexData->getVtxNrmArray();
-            mVertexData->setVtxNrmFrac(vtxAttr->frac);
+            mVertexData->setVtxNrmFrac((u8)vtxAttr->frac);
             mVertexData->setVtxNrmType((GXCompType)vtxAttr->type);
         } break;
         case GX_VA_CLR0:
         case GX_VA_CLR1: {
-            stride[vtxAttr->attr - GX_VA_POS] = 0x04;
-            array[vtxAttr->attr - GX_VA_POS] =
-                mVertexData->getVtxColorArray(vtxAttr->attr - GX_VA_CLR0);
+            stride[vtxAttr->attr - GX_VA_POS] = 4;
+            array[vtxAttr->attr - GX_VA_POS] = mVertexData->getVtxColorArray(vtxAttr->attr - GX_VA_CLR0);
         } break;
         case GX_VA_TEX0:
         case GX_VA_TEX1:
@@ -195,11 +204,11 @@ void J3DShape::makeVtxArrayCmd() {
         case GX_VA_TEX6:
         case GX_VA_TEX7: {
             if (vtxAttr->type == GX_F32)
-                stride[vtxAttr->attr - GX_VA_POS] = 0x08;
+                stride[vtxAttr->attr - GX_VA_POS] = 8;
             else
-                stride[vtxAttr->attr - GX_VA_POS] = 0x04;
-            array[vtxAttr->attr - GX_VA_POS] =
-                mVertexData->getVtxTexCoordArray(vtxAttr->attr - GX_VA_TEX0);
+                stride[vtxAttr->attr - GX_VA_POS] = 4;
+
+            array[vtxAttr->attr - GX_VA_POS] = mVertexData->getVtxTexCoordArray(vtxAttr->attr - GX_VA_TEX0);
         } break;
         default:
             break;
@@ -218,7 +227,7 @@ void J3DShape::makeVtxArrayCmd() {
         }
     }
 
-    for (u32 i = 0; i < 0x0C; i++) {
+    for (u32 i = 0; i < 12; i++) {
         if (array[i] != 0)
             GDSetArray((GXAttr)(i + GX_VA_POS), array[i], stride[i]);
         else
@@ -226,19 +235,9 @@ void J3DShape::makeVtxArrayCmd() {
     }
 }
 
-/* ############################################################################################## */
-/* 804515C8-804515CC 000AC8 0004+00 1/1 0/0 0/0 .sbss            sInterruptFlag$903 */
-static s32 sInterruptFlag;
-
-/* 804515CC-804515D0 000ACC 0004+00 1/1 0/0 0/0 .sbss            None */
-static s8 sInitInterruptFlag;
-
 /* 80315260-80315300 30FBA0 00A0+00 1/1 2/2 0/0 .text            makeVcdVatCmd__8J3DShapeFv */
 void J3DShape::makeVcdVatCmd() {
-    if (!sInitInterruptFlag) {
-        sInterruptFlag = OSDisableInterrupts();
-        sInitInterruptFlag = true;
-    }
+    static BOOL sInterruptFlag = OSDisableInterrupts();
     OSDisableScheduler();
 
     GDLObj gdl_obj;
@@ -254,10 +253,13 @@ void J3DShape::makeVcdVatCmd() {
     OSRestoreInterrupts(sInterruptFlag);
 }
 
-/* ############################################################################################## */
 /* 804515D0-804515D4 000AD0 0004+00 5/5 25/25 9/9 .sbss            sOldVcdVatCmd__8J3DShape */
 void* J3DShape::sOldVcdVatCmd;
 
+void J3DShape::loadCurrentMtx() const {
+    mCurrentMtx.load();
+}
+
 /* 80315300-80315398 30FC40 0098+00 2/2 6/6 3/3 .text            loadPreDrawSetting__8J3DShapeCFv */
 void J3DShape::loadPreDrawSetting() const {
     if (sOldVcdVatCmd != mVcdVatCmd) {
@@ -268,9 +270,8 @@ void J3DShape::loadPreDrawSetting() const {
     mCurrentMtx.load();
 }
 
-/* ############################################################################################## */
 /* 804515D4-804515D8 000AD4 0004+00 3/3 0/0 0/0 .sbss            None */
-static u8 data_804515D4[4];
+bool J3DShape::sEnvelopeFlag;
 
 /* 80315398-8031544C 30FCD8 00B4+00 1/1 0/0 0/0 .text setArrayAndBindPipeline__8J3DShapeCFv */
 void J3DShape::setArrayAndBindPipeline() const {
@@ -279,10 +280,8 @@ void J3DShape::setArrayAndBindPipeline() const {
     j3dSys.setModelDrawMtx(mDrawMtx[*mCurrentViewNo]);
     j3dSys.setModelNrmMtx(mNrmMtx[*mCurrentViewNo]);
     J3DShapeMtx::sCurrentScaleFlag = mScaleFlagArray;
-    // The below struct_804515B0 is actually a continuation of sCurrentScaleFlag, I believe?
-    // Also, there seems to be an extra entry in the array that's only there in DEBUG builds.
     J3DShapeMtx::sNBTFlag = mHasNBT;
-    data_804515D4[0] = mHasPNMTXIdx;
+    sEnvelopeFlag = mHasPNMTXIdx;
     J3DShapeMtx::sTexMtxLoadType = getTexMtxLoadType();
 }
 
@@ -293,13 +292,12 @@ void J3DShape::drawFast() const {
         sOldVcdVatCmd = mVcdVatCmd;
     }
 
-    if (data_804515D4[0] != 0 && !mHasPNMTXIdx)
+    if (sEnvelopeFlag != 0 && !mHasPNMTXIdx)
         mCurrentMtx.load();
 
     setArrayAndBindPipeline();
     if (!checkFlag(J3DShpFlag_NoMtx)) {
-        // LOD flag shenanigans
-        if (J3DShapeMtx::getLODFlag() != 0)
+        if (J3DShapeMtx::getLODFlag())
             J3DShapeMtx::resetMtxLoadCache();
 
         for (u16 n = mMtxGroupNum, i = 0; i < n; i++) {
@@ -344,7 +342,7 @@ void J3DShape::simpleDrawCache() const {
         sOldVcdVatCmd = mVcdVatCmd;
     }
 
-    if (data_804515D4[0] != 0 && !mHasPNMTXIdx)
+    if (sEnvelopeFlag && !mHasPNMTXIdx)
         mCurrentMtx.load();
 
     loadVtxArray();
diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
index ee7ada7dee..a5f933cb95 100644
--- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
@@ -1,20 +1,15 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DShapeDraw
-//
-
 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "string.h"
-#include "dolphin/gx.h"
-#include <dolphin/os.h>
-#include "global.h"
+#include <string.h>
+#include <stdint.h>
+#include <dolphin/gx.h>
 
 /* 80314924-80314974 30F264 0050+00 1/1 0/0 0/0 .text            countVertex__12J3DShapeDrawFUl */
 u32 J3DShapeDraw::countVertex(u32 stride) {
     u32 count = 0;
-    u32 dlStart = (u32)getDisplayList();
-    for (u8* dl = (u8*)dlStart; ((u32)dl - dlStart) < getDisplayListSize();) {
+    uintptr_t dlStart = (uintptr_t)getDisplayList();
+
+    for (u8* dl = (u8*)dlStart; ((uintptr_t)dl - dlStart) < getDisplayListSize();) {
         if (*dl != GX_TRIANGLEFAN && *dl != GX_TRIANGLESTRIP)
             break;
         u16 vtxNum = *((u16*)(dl + 1));
@@ -22,6 +17,7 @@ u32 J3DShapeDraw::countVertex(u32 stride) {
         dl += stride * vtxNum;
         dl += 3;
     }
+
     return count;
 }
 
@@ -34,6 +30,7 @@ void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
     u8* oldDLStart = getDisplayList();
     u8* oldDL = oldDLStart;
     u8* newDL = newDLStart;
+
     for (; (oldDL - oldDLStart) < mDisplayListSize;) {
         // Copy command
         u8 h = *oldDL;
@@ -62,16 +59,17 @@ void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
         oldDL += 3;
     }
 
-    u32 realSize = ALIGN_NEXT((u32)newDL - (u32)newDLStart, 0x20);
+    u32 realSize = ALIGN_NEXT((uintptr_t)newDL - (uintptr_t)newDLStart, 0x20);
     for (; (newDL - newDLStart) < newSize; newDL++)
         *newDL = 0;
+
     mDisplayListSize = realSize;
     mDisplayList = newDLStart;
     DCStoreRange(newDLStart, mDisplayListSize);
 }
 
 /* 80314ABC-80314AD4 30F3FC 0018+00 0/0 1/1 0/0 .text            __ct__12J3DShapeDrawFPCUcUl */
-J3DShapeDraw::J3DShapeDraw(u8 const* displayList, u32 displayListSize) {
+J3DShapeDraw::J3DShapeDraw(const u8* displayList, u32 displayListSize) {
     mDisplayList = (void*)displayList;
     mDisplayListSize = displayListSize;
 }
diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
index e3fc9f2bc1..d2292e6f0c 100644
--- a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
@@ -1,14 +1,8 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DShapeMtx
-//
-
 #include "JSystem/J3DGraphBase/J3DShapeMtx.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
-#include "JSystem/J3DGraphBase/J3DGD.h"
+#include "JSystem/J3DGraphBase/J3DFifo.h"
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
-#include "dolphin/types.h"
 
 /* 80434C80-80434C98 0619A0 0014+04 2/2 0/0 0/0 .bss             sMtxLoadCache__11J3DShapeMtx */
 u16 J3DShapeMtx::sMtxLoadCache[10];
@@ -16,24 +10,23 @@ u16 J3DShapeMtx::sMtxLoadCache[10];
 /* 803130A8-803130E4 30D9E8 003C+00 0/0 1/1 0/0 .text            resetMtxLoadCache__11J3DShapeMtxFv
  */
 void J3DShapeMtx::resetMtxLoadCache() {
+    sMtxLoadCache[0] =
+    sMtxLoadCache[1] =
+    sMtxLoadCache[2] =
+    sMtxLoadCache[3] =
+    sMtxLoadCache[4] =
+    sMtxLoadCache[5] =
+    sMtxLoadCache[6] =
+    sMtxLoadCache[7] =
+    sMtxLoadCache[8] =
     sMtxLoadCache[9] = 0xFFFF;
-    sMtxLoadCache[8] = 0xFFFF;
-    sMtxLoadCache[7] = 0xFFFF;
-    sMtxLoadCache[6] = 0xFFFF;
-    sMtxLoadCache[5] = 0xFFFF;
-    sMtxLoadCache[4] = 0xFFFF;
-    sMtxLoadCache[3] = 0xFFFF;
-    sMtxLoadCache[2] = 0xFFFF;
-    sMtxLoadCache[1] = 0xFFFF;
-    sMtxLoadCache[0] = 0xFFFF;
 }
 
 /* 803130E4-80313128 30DA24 0044+00 1/0 0/0 0/0 .text loadMtxIndx_PNGP__11J3DShapeMtxCFiUs */
 void J3DShapeMtx::loadMtxIndx_PNGP(int slot, u16 indx) const {
-    // inlined J3DFifoLoadPosMtxIndx
+    // J3DFifoLoadPosMtxIndx(indx, slot * 3);  // matches debug, but not retail 
     J3DFifoLoadIndx(GX_LOAD_INDX_A, indx, 0xB000 | ((u16)(slot * 0x0C)));
-    // inlined J3DFifoLoadNrmMtxIndx3x3
-    J3DFifoLoadIndx(GX_LOAD_INDX_B, indx, 0x8000 | ((u16)((slot * 0x09) + 0x400)));
+    J3DFifoLoadNrmMtxIndx3x3(indx, slot * 3);
 }
 
 /* 80313128-80313188 30DA68 0060+00 1/0 0/0 0/0 .text loadMtxIndx_PCPU__11J3DShapeMtxCFiUs */
@@ -56,27 +49,27 @@ void J3DShapeMtx::loadMtxIndx_PNCPU(int slot, u16 indx) const {
 
 /* 803CD9C0-803CD9F0 02AAE0 0030+00 2/3 0/0 0/0 .data            sMtxLoadPipeline__11J3DShapeMtx */
 J3DShapeMtx_LoadFunc J3DShapeMtx::sMtxLoadPipeline[4] = {
-    &loadMtxIndx_PNGP,
-    &loadMtxIndx_PCPU,
-    &loadMtxIndx_NCPU,
-    &loadMtxIndx_PNCPU,
+    &J3DShapeMtx::loadMtxIndx_PNGP,
+    &J3DShapeMtx::loadMtxIndx_PCPU,
+    &J3DShapeMtx::loadMtxIndx_NCPU,
+    &J3DShapeMtx::loadMtxIndx_PNCPU,
 };
 
 /* 803CDA20-803CDA50 02AB40 0030+00 2/3 0/0 0/0 .data sMtxLoadPipeline__21J3DShapeMtxConcatView */
 J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadPipeline[4] = {
-    &loadMtxConcatView_PNGP,
-    &loadMtxConcatView_PCPU,
-    &loadMtxConcatView_NCPU,
-    &loadMtxConcatView_PNCPU,
+    &J3DShapeMtxConcatView::loadMtxConcatView_PNGP,
+    &J3DShapeMtxConcatView::loadMtxConcatView_PCPU,
+    &J3DShapeMtxConcatView::loadMtxConcatView_NCPU,
+    &J3DShapeMtxConcatView::loadMtxConcatView_PNCPU,
 };
 
 /* 803CDA80-803CDAB0 02ABA0 0030+00 1/2 0/0 0/0 .data sMtxLoadLODPipeline__21J3DShapeMtxConcatView
  */
 J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadLODPipeline[4] = {
-    &loadMtxConcatView_PNGP_LOD,
-    &loadMtxConcatView_PCPU,
-    &loadMtxConcatView_NCPU,
-    &loadMtxConcatView_PNCPU,
+    &J3DShapeMtxConcatView::loadMtxConcatView_PNGP_LOD,
+    &J3DShapeMtxConcatView::loadMtxConcatView_PCPU,
+    &J3DShapeMtxConcatView::loadMtxConcatView_NCPU,
+    &J3DShapeMtxConcatView::loadMtxConcatView_PNCPU,
 };
 
 /* 804515A8-804515AC 000AA8 0004+00 4/4 2/2 0/0 .sbss            sCurrentPipeline__11J3DShapeMtx */
@@ -86,13 +79,11 @@ u32 J3DShapeMtx::sCurrentPipeline;
 u8* J3DShapeMtx::sCurrentScaleFlag;
 
 // This below is technically part of J3DScaleFlag.
-
-/* 804515B0-804515B4 -00001 0004+00 5/5 3/3 0/0 .sbss            None */
 /* 804515B0 0001+00 data_804515B0 None */
+bool J3DShapeMtx::sNBTFlag;
+
 /* 804515B1 0003+00 data_804515B1 None */
-extern u8 struct_804515B0; // temporary
-u8 J3DShapeMtx::sNBTFlag;
-u8 J3DShapeMtx::sLODFlag;
+bool J3DShapeMtx::sLODFlag;
 
 /* 804515B4-804515B8 000AB4 0004+00 4/4 1/1 0/0 .sbss            sTexMtxLoadType__11J3DShapeMtx */
 u32 J3DShapeMtx::sTexMtxLoadType;
@@ -115,6 +106,7 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
         {0.0f, -0.5f, 0.5f, 0.0f},
         {0.0f, 0.0f, 1.0f, 0.0f},
     };
+
     static Mtx qMtx2 = {
         {0.5f, 0.0f, 0.0f, 0.5f},
         {0.0f, -0.5f, 0.0f, 0.5f},
@@ -126,10 +118,10 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
     Mtx44 sp_a8, sp_68;
 
     J3DTexGenBlock* tex_gen_block = sTexGenBlock; // sp_60
-    JUT_ASSERT_MSG(0xc3, tex_gen_block != NULL, "Error : null pointer");
+    J3D_ASSERT_NULLPTR(195, tex_gen_block != NULL);
 
     J3DTexMtxObj* tex_mtx_obj = sTexMtxObj; // sp_5c
-    JUT_ASSERT_MSG(0xc6, tex_mtx_obj != NULL, "Error : null pointer");
+    J3D_ASSERT_NULLPTR(198, tex_mtx_obj != NULL);
 
     J3DTexMtxInfo* tex_mtx_info_1; // sp_58
     int tex_gen_type; // sp_54
@@ -142,8 +134,9 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
             tex_gen_type = tex_gen_block->getTexCoord(i)->getTexGenType();
             if (tex_gen_type == 1 || tex_gen_type == 0) {
                 tex_mtx_2 = tex_gen_block->getTexMtx(i);
-                JUT_ASSERT_MSG(0xd7, tex_mtx_2 != NULL, "Error : null pointer");
+                J3D_ASSERT_NULLPTR(215, tex_mtx_2 != NULL);
                 tex_mtx_info_1 = &tex_mtx_2->getTexMtxInfo();
+
                 u32 sp_4c = tex_mtx_info_1->mInfo & 0x3f;
                 switch (sp_4c) {
                 case 3:
@@ -187,6 +180,7 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
                     } else if (sp_3c == 1) {
                         J3DGetTextureMtxMaya(tex_mtx_info_2->mSRT, sp_68);
                     }
+
                     MTXConcat(sp_68, qMtx, sp_68);
                     J3DMtxProjConcat(sp_68, tex_mtx_obj->getEffectMtx(i), sp_e8);
                     MTXInverse(j3dSys.getViewMtx(), sp_a8);
@@ -203,6 +197,7 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
                     } else if (sp_34 == 1) {
                         J3DGetTextureMtxMaya(tex_mtx_info_2->mSRT, sp_68);
                     }
+
                     MTXConcat(sp_68, qMtx2, sp_68);
                     J3DMtxProjConcat(sp_68, tex_mtx_obj->getEffectMtx(i), sp_e8);
                     MTXInverse(j3dSys.getViewMtx(), sp_a8);
@@ -225,8 +220,9 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
             int tex_gen_type = tex_gen_block->getTexCoord(i)->getTexGenType();
             if (tex_gen_type == 1 || tex_gen_type == 0) {
                 J3DTexMtx* tex_mtx = tex_gen_block->getTexMtx(i); // sp_2c
-                JUT_ASSERT_MSG(0x145, tex_mtx != NULL, "Error : null pointer");
+                J3D_ASSERT_NULLPTR(325, tex_mtx != NULL);
                 tex_mtx_info_1 = &tex_mtx->getTexMtxInfo();
+
                 u32 tex_gen_src = tex_mtx_info_1->mInfo & 0x3f; // sp_28
                 switch (tex_gen_src) {
                 case 3:
@@ -254,6 +250,7 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
                     } else if (sp_24 == 1) {
                         J3DGetTextureMtxMayaOld(tex_mtx_info_2->mSRT, sp_68);
                     }
+
                     J3DMtxProjConcat(sp_68, tex_mtx_obj->getEffectMtx(i), sp_e8);
                     MTXInverse(j3dSys.getViewMtx(), sp_a8);
                     MTXConcat(sp_e8, sp_a8, sp_e8);
@@ -270,6 +267,7 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
                     } else if (sp_18 == 1) {
                         J3DGetTextureMtxMaya(tex_mtx_info_2->mSRT, sp_68);
                     }
+
                     MTXConcat(sp_68, qMtx, sp_68);
                     J3DMtxProjConcat(sp_68, tex_mtx_obj->getEffectMtx(i), sp_e8);
                     MTXInverse(j3dSys.getViewMtx(), sp_a8);
@@ -287,6 +285,7 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
                     } else if (sp_10 == 1) {
                         J3DGetTextureMtxMaya(tex_mtx_info_2->mSRT, sp_68);
                     }
+
                     MTXConcat(sp_68, qMtx2, sp_68);
                     J3DMtxProjConcat(sp_68, tex_mtx_obj->getEffectMtx(i), sp_e8);
                     MTXInverse(j3dSys.getViewMtx(), sp_a8);
@@ -305,8 +304,7 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
                     break;
                 }
                 }
-                GXLoadTexMtxImm(*mtx, i * 3 + 30,
-                                (GXTexMtxType)tex_mtx_info_1->mProjection);
+                GXLoadTexMtxImm(*mtx, i * 3 + 30, (GXTexMtxType)tex_mtx_info_1->mProjection);
             }
         }
     }
@@ -340,6 +338,7 @@ void J3DShapeMtxConcatView::loadMtxConcatView_NCPU(int slot, u16 drw) const {
     J3DDifferedTexMtx::load(m);
     J3DFifoLoadPosMtxImm(m, slot * 3);
     J3DFifoLoadNrmMtxImm(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3);
+
     if (J3DShapeMtx::sTexMtxLoadType == 0x2000)
         J3DFifoLoadNrmMtxToTexMtx(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3 + GX_TEXMTX0);
 }
@@ -347,13 +346,15 @@ void J3DShapeMtxConcatView::loadMtxConcatView_NCPU(int slot, u16 drw) const {
 /* 80313A14-80313AC8 30E354 00B4+00 2/0 0/0 0/0 .text
  * loadMtxConcatView_PNCPU__21J3DShapeMtxConcatViewCFiUs        */
 void J3DShapeMtxConcatView::loadMtxConcatView_PNCPU(int slot, u16 drw) const {
-    Mtx m;
     if (J3DDifferedTexMtx::sTexGenBlock != NULL) {
+        Mtx m;
         MTXConcat(*j3dSys.getShapePacket()->getBaseMtxPtr(), j3dSys.getModelDrawMtx(drw), m);
         J3DDifferedTexMtx::loadExecute(m);
     }
+
     J3DFifoLoadPosMtxImm(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3);
     J3DFifoLoadNrmMtxImm(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3);
+
     if (J3DShapeMtx::sTexMtxLoadType == 0x2000)
         J3DFifoLoadNrmMtxToTexMtx(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3 + GX_TEXMTX0);
 }
@@ -363,7 +364,7 @@ void J3DShapeMtxConcatView::loadMtxConcatView_PNCPU(int slot, u16 drw) const {
 void J3DShapeMtxConcatView::loadMtxConcatView_PNGP_LOD(int slot, u16 drw) const {
     Mtx m;
     MTXConcat(*j3dSys.getShapePacket()->getBaseMtxPtr(), j3dSys.getModelDrawMtx(drw), m);
-    MTXConcat(m, j3dSys.mModel->getModelData()->getInvJointMtx(drw), m);
+    MTXConcat(m, j3dSys.getModel()->getModelData()->getInvJointMtx(drw), m);
     J3DDifferedTexMtx::load(m);
     J3DFifoLoadPosMtxImm(m, slot * 3);
     loadNrmMtx(slot, drw, m);
@@ -385,10 +386,11 @@ void J3DShapeMtx::calcNBTScale(Vec const& param_0, Mtx33* param_1, Mtx33* param_
 /* 80313C54-80313D28 30E594 00D4+00 1/0 0/0 0/0 .text            load__21J3DShapeMtxConcatViewCFv */
 void J3DShapeMtxConcatView::load() const {
     sMtxPtrTbl[0] = j3dSys.getModel()->getMtxBuffer()->getUserAnmMtx(0);
-    sMtxPtrTbl[1] = j3dSys.getModel()->getMtxBuffer()->getWeightAnmMtx(0);
+    sMtxPtrTbl[1] = j3dSys.getModel()->getWeightAnmMtx(0);
     J3DShapeMtxConcatView_LoadFunc func = sMtxLoadPipeline[sCurrentPipeline];
-    u32 draw_mtx_flag = j3dSys.getModel()->getModelData()->getDrawMtxFlag(mUseMtxIndex);
-    j3dSys.setModelDrawMtx((Mtx*)sMtxPtrTbl[draw_mtx_flag]);
+
+    j3dSys.setModelDrawMtx((Mtx*)sMtxPtrTbl[j3dSys.getModel()->getModelData()->getDrawMtxFlag(mUseMtxIndex)]);
+
     u16 draw_mtx_index = j3dSys.getModel()->getModelData()->getDrawMtxIndex(mUseMtxIndex);
     (this->*func)(0, draw_mtx_index);
 }
@@ -400,6 +402,7 @@ void J3DShapeMtxConcatView::loadNrmMtx(int param_0, u16 param_1, MtxP param_2) c
         if (sTexMtxLoadType == 0x2000) {
             J3DFifoLoadNrmMtxToTexMtx(param_2, 0x1e);
         }
+
         if (!sNBTFlag) {
             J3DFifoLoadNrmMtxImm(param_2, 0);
         } else {
@@ -415,6 +418,7 @@ void J3DShapeMtxConcatView::loadNrmMtx(int param_0, u16 param_1, MtxP param_2) c
         if (sTexMtxLoadType == 0x2000) {
             J3DFifoLoadNrmMtxToTexMtx3x3(mtx, 0x1e);
         }
+
         if (!sNBTFlag) {
             J3DFifoLoadNrmMtxImm3x3(mtx, 0);
         } else {
@@ -428,11 +432,11 @@ void J3DShapeMtxConcatView::loadNrmMtx(int param_0, u16 param_1, MtxP param_2) c
 /* 80313E4C-80313EEC 30E78C 00A0+00 1/0 0/0 0/0 .text            load__16J3DShapeMtxMultiCFv */
 void J3DShapeMtxMulti::load() const {
     J3DShapeMtx_LoadFunc func = sMtxLoadPipeline[sCurrentPipeline];
+
     int use_mtx_num = mUseMtxNum;
     for (int i = 0; i < use_mtx_num; i++) {
-        u16 use_mtx_index = mUseMtxIndexTable[i];
-        if (use_mtx_index != 0xffff) {
-            (this->*func)(i, use_mtx_index);
+        if (mUseMtxIndexTable[i] != 0xffff) {
+            (this->*func)(i, mUseMtxIndexTable[i]);
         }
     }
 }
@@ -442,9 +446,8 @@ void J3DShapeMtxMulti::load() const {
 void J3DShapeMtxMulti::calcNBTScale(Vec const& param_0, Mtx33* param_1, Mtx33* param_2) {
     int use_mtx_num = mUseMtxNum;
     for (int i = 0; i < use_mtx_num; i++) {
-        u16 use_mtx_index = mUseMtxIndexTable[i];
-        if (use_mtx_index != 0xffff) {
-            J3DPSMtx33Copy(param_1[use_mtx_index], param_2[use_mtx_index]);
+        if (mUseMtxIndexTable[i] != 0xffff) {
+            J3DPSMtx33Copy(param_1[mUseMtxIndexTable[i]], param_2[mUseMtxIndexTable[i]]);
             J3DScaleNrmMtx33(param_2[mUseMtxIndexTable[i]], param_0);
         }
     }
@@ -453,36 +456,34 @@ void J3DShapeMtxMulti::calcNBTScale(Vec const& param_0, Mtx33* param_1, Mtx33* p
 /* 80313FA4-8031419C 30E8E4 01F8+00 1/0 0/0 0/0 .text load__26J3DShapeMtxMultiConcatViewCFv */
 void J3DShapeMtxMultiConcatView::load() const {
     sMtxPtrTbl[0] = j3dSys.getModel()->getMtxBuffer()->getUserAnmMtx(0);
-    sMtxPtrTbl[1] = j3dSys.getModel()->getMtxBuffer()->getWeightAnmMtx(0);
+    sMtxPtrTbl[1] = j3dSys.getModel()->getWeightAnmMtx(0);
+
     if (!sLODFlag) {
         J3DShapeMtxConcatView_LoadFunc func = sMtxLoadPipeline[sCurrentPipeline];
         int use_mtx_num = mUseMtxNum;
         for (int i = 0; i < use_mtx_num; i++) {
-            u16 use_mtx_index = mUseMtxIndexTable[i];
-            if (use_mtx_index != 0xffff) {
-                u16 draw_mtx_index =
-                    j3dSys.getModel()->getModelData()->getDrawMtxIndex(use_mtx_index);
-                u8 draw_mtx_flag = j3dSys.getModel()->getModelData()->getDrawMtxFlag(use_mtx_index);
-                j3dSys.setModelDrawMtx((Mtx*)sMtxPtrTbl[draw_mtx_flag]);
+            if (mUseMtxIndexTable[i] != 0xffff) {
+                u16 draw_mtx_index = j3dSys.getModel()->getModelData()->getDrawMtxIndex(mUseMtxIndexTable[i]);
+                j3dSys.setModelDrawMtx((Mtx*)sMtxPtrTbl[j3dSys.getModel()->getModelData()->getDrawMtxFlag(mUseMtxIndexTable[i])]);
                 (this->*func)(i, draw_mtx_index);
             }
         }
     } else {
         u16* important_mtx_indices = j3dSys.getModel()->getModelData()->getWEvlpImportantMtxIndex();
         j3dSys.setModelDrawMtx((Mtx*)sMtxPtrTbl[0]);
+
         int use_mtx_num = mUseMtxNum;
         for (int i = 0; i < use_mtx_num; i++) {
             u32 current_pipeline = sCurrentPipeline;
             J3DShapeMtxConcatView_LoadFunc func = sMtxLoadLODPipeline[current_pipeline];
-            u16 use_mtx_index = mUseMtxIndexTable[i];
-            if (use_mtx_index != 0xffff) {
-                u16 important_mtx_index = important_mtx_indices[use_mtx_index];
+
+            if (mUseMtxIndexTable[i] != 0xffff) {
+                u16 important_mtx_index = important_mtx_indices[mUseMtxIndexTable[i]];
                 if (important_mtx_index != sMtxLoadCache[i]) {
-                    u8 draw_mtx_flag =
-                        j3dSys.getModel()->getModelData()->getDrawMtxFlag(use_mtx_index);
-                    if (draw_mtx_flag == 0) {
-                        func = sMtxLoadPipeline[current_pipeline];
+                    if (j3dSys.getModel()->getModelData()->getDrawMtxFlag(mUseMtxIndexTable[i]) == 0) {
+                        func = sMtxLoadPipeline[sCurrentPipeline];
                     }
+
                     (this->*func)(i, important_mtx_index);
                     sMtxLoadCache[i] = important_mtx_index;
                 }
@@ -526,22 +527,24 @@ void J3DShapeMtxMultiConcatView::loadNrmMtx(int param_0, u16 param_1, MtxP param
 void J3DShapeMtxBBoardConcatView::load() const {
     Mtx mtx;
     u16 draw_mtx_index = j3dSys.getModel()->getModelData()->getDrawMtxIndex(mUseMtxIndex);
-    u8 draw_mtx_flag = j3dSys.getModel()->getModelData()->getDrawMtxFlag(mUseMtxIndex);
-    if (draw_mtx_flag == 0) {
-        MtxP user_anm_mtx = j3dSys.getModel()->getMtxBuffer()->getUserAnmMtx(draw_mtx_index);
-        PSMTXConcat(j3dSys.getViewMtx(), user_anm_mtx, mtx);
+
+    if (j3dSys.getModel()->getModelData()->getDrawMtxFlag(mUseMtxIndex) == 0) {
+        MTXConcat(j3dSys.getViewMtx(), j3dSys.getModel()->getMtxBuffer()->getUserAnmMtx(draw_mtx_index), mtx);
     } else {
-        MtxP weight_anm_mtx = j3dSys.getModel()->getMtxBuffer()->getWeightAnmMtx(draw_mtx_index);
-        PSMTXConcat(j3dSys.getViewMtx(), weight_anm_mtx, mtx);
+        MTXConcat(j3dSys.getViewMtx(), j3dSys.getModel()->getWeightAnmMtx(draw_mtx_index), mtx);
     }
+
     J3DCalcBBoardMtx(mtx);
     J3DFifoLoadPosMtxImm(mtx, 0);
+
     mtx[0][0] = 1.0f / mtx[0][0];
     mtx[1][1] = 1.0f / mtx[1][1];
     mtx[2][2] = 1.0f / mtx[2][2];
     mtx[0][3] = 0.0f;
     mtx[1][3] = 0.0f;
     mtx[2][3] = 0.0f;
+
+    
     if (!sNBTFlag) {
         J3DFifoLoadNrmMtxImm(mtx, 0);
     } else {
@@ -556,16 +559,16 @@ void J3DShapeMtxYBBoardConcatView::load() const {
     Mtx mtx1;
     Mtx33 mtx2;
     u16 draw_mtx_index = j3dSys.getModel()->getModelData()->getDrawMtxIndex(mUseMtxIndex);
-    u8 draw_mtx_flag = j3dSys.getModel()->getModelData()->getDrawMtxFlag(mUseMtxIndex);
-    if (draw_mtx_flag == 0) {
-        MtxP user_anm_mtx = j3dSys.getModel()->getMtxBuffer()->getUserAnmMtx(draw_mtx_index);
-        PSMTXConcat(j3dSys.getViewMtx(), user_anm_mtx, mtx1);
+
+    if (j3dSys.getModel()->getModelData()->getDrawMtxFlag(mUseMtxIndex) == 0) {
+        MTXConcat(j3dSys.getViewMtx(), j3dSys.getModel()->getMtxBuffer()->getUserAnmMtx(draw_mtx_index), mtx1);
     } else {
-        MtxP weight_anm_mtx = j3dSys.getModel()->getMtxBuffer()->getWeightAnmMtx(draw_mtx_index);
-        PSMTXConcat(j3dSys.getViewMtx(), weight_anm_mtx, mtx1);
+        MTXConcat(j3dSys.getViewMtx(), j3dSys.getModel()->getWeightAnmMtx(draw_mtx_index), mtx1);
     }
+
     J3DCalcYBBoardMtx(mtx1);
     J3DFifoLoadPosMtxImm(mtx1, 0);
+
     if (sCurrentScaleFlag[mUseMtxIndex] == 1) {
         if (!sNBTFlag) {
             J3DFifoLoadNrmMtxImm(mtx1, 0);
diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/src/JSystem/J3DGraphBase/J3DSys.cpp
index ff92ce2e8b..d231ece3a4 100644
--- a/src/JSystem/J3DGraphBase/J3DSys.cpp
+++ b/src/JSystem/J3DGraphBase/J3DSys.cpp
@@ -1,40 +1,9 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DSys
-//
-
 #include "JSystem/J3DGraphBase/J3DSys.h"
-
-#include "dol2asm.h"
-#include <dolphin/gx.h>
-#include "dolphin/os.h"
-#include "dolphin/types.h"
+#include "JSystem/J3DGraphBase/J3DTevs.h"
+#include "JSystem/J3DGraphBase/J3DTexture.h"
+#include "JSystem/J3DGraphBase/J3DFifo.h"
 #include "global.h"
 
-#include "JSystem/J3DGraphBase/J3DTevs.h"
-
-#include "JSystem/J3DGraphBase/J3DTexture.h"
-#include "JSystem/J3DGraphBase/J3DGD.h"
-
-//
-// Forward References:
-//
-
-extern void J3DFifoLoadTexCached(GXTexMapID, u32, GXTexCacheSize, u32, GXTexCacheSize);
-extern void makeTexCoordTable();
-extern void makeAlphaCmpTable();
-extern void makeZModeTable();
-extern void makeTevSwapTable();
-extern "C" void GXInvalidateVtxCache();
-
-extern "C" extern const GXColor j3dDefaultColInfo;
-extern "C" extern u8 data_804563C8;
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
 /* 80434AC8-80434BE4 0617E8 011C+00 1/1 151/151 486/486 .bss             j3dSys */
 J3DSys j3dSys;
 
@@ -50,6 +19,31 @@ Vec J3DSys::mParentS;
 /* 80434C2C-80434C70 06194C 0040+04 1/1 17/17 0/0 .bss             sTexCoordScaleTable__6J3DSys */
 J3DTexCoordScaleInfo J3DSys::sTexCoordScaleTable[8];
 
+/* 803CD8A0-803CD8B0 02A9C0 0010+00 1/1 0/0 0/0 .data            NullTexData */
+static u8 NullTexData[0x10] ALIGN_DECL(32) = {0};
+
+/* 803CD8B0-803CD8E0 02A9D0 0030+00 1/1 0/0 0/0 .data            j3dIdentityMtx */
+static Mtx j3dIdentityMtx = {
+    1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 1.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+};
+
+/* 803CD8E0-803CD8F8 02AA00 0018+00 1/1 0/0 0/0 .data            IndMtx */
+static Mtx23 IndMtx = {
+    0.5f, 0.0f, 0.0f,
+    0.0f, 0.5f, 0.0f,
+};
+
+/* 80451598-804515A0 000A98 0004+04 0/0 1/1 0/0 .sbss            j3dDefaultViewNo */
+u32 j3dDefaultViewNo;
+
+/* 80450950-80450954 0003D0 0004+00 2/2 0/0 0/0 .sdata           ColorBlack */
+static GXColor ColorBlack = {0x00, 0x00, 0x00, 0x00};
+
+/* 80450954-80450958 0003D4 0004+00 2/2 0/0 0/0 .sdata           ColorWhite */
+static GXColor ColorWhite = {0xFF, 0xFF, 0xFF, 0xFF};
+
 /* 8030FDE8-8030FEC0 30A728 00D8+00 1/1 0/0 0/0 .text            __ct__6J3DSysFv */
 J3DSys::J3DSys() {
     makeTexCoordTable();
@@ -63,8 +57,10 @@ J3DSys::J3DSys() {
     mMaterialMode = 0;
     mModel = NULL;
     mShape = NULL;
-    for (u32 i = 0; i < ARRAY_SIZE(mDrawBuffer); i++)
+
+    for (int i = 0; i < 2; i++)
         mDrawBuffer[i] = NULL;
+
     mTexture = NULL;
     mMatPacket = NULL;
     mShapePacket = NULL;
@@ -74,7 +70,7 @@ J3DSys::J3DSys() {
     mVtxNrm = NULL;
     mVtxCol = NULL;
 
-    for (u32 i = 0; i < 8; i++) {
+    for (int i = 0; i < 8; i++) {
         sTexCoordScaleTable[i].field_0x00 = 1;
         sTexCoordScaleTable[i].field_0x02 = 1;
         sTexCoordScaleTable[i].field_0x04 = 0;
@@ -84,31 +80,34 @@ J3DSys::J3DSys() {
 
 /* 8030FEC0-8030FEE4 30A800 0024+00 0/0 1/1 0/0 .text            loadPosMtxIndx__6J3DSysCFiUs */
 void J3DSys::loadPosMtxIndx(int addr, u16 indx) const {
+    // J3DFifoLoadPosMtxIndx(indx, addr * 3);  // matches debug, not retail
     J3DFifoLoadIndx(GX_LOAD_INDX_A, indx, 0xB000 | ((u16)(addr * 0x0C)));
 }
 
 /* 8030FEE4-8030FF0C 30A824 0028+00 0/0 1/1 0/0 .text            loadNrmMtxIndx__6J3DSysCFiUs */
 void J3DSys::loadNrmMtxIndx(int addr, u16 indx) const {
-    J3DFifoLoadIndx(GX_LOAD_INDX_B, indx, 0x8000 | ((u16)((addr * 0x09) + 0x400)));
+    J3DFifoLoadNrmMtxIndx3x3(indx, addr * 3);
 }
 
 /* 8030FF0C-803100BC 30A84C 01B0+00 1/1 0/0 0/0 .text setTexCacheRegion__6J3DSysF15_GXTexCacheSize
  */
 void J3DSys::setTexCacheRegion(GXTexCacheSize size) {
+    J3D_ASSERT_RANGE(173, size >= 0 && size < 3);
+
     const u32 kSize[] = {
         0x00008000,
         0x00020000,
         0x00080000,
         0x00000000,
     };
+
     const u32 kRegionNum[] = {8, 4, 1, 0};
 
-    u32 regionNum = kRegionNum[size];
-    mTexCacheRegionNum = regionNum;
+    mTexCacheRegionNum = kRegionNum[size];
 
-    if (!!(mFlags & 0x80000000)) {
-        for (u32 i = 0; i < regionNum; i++) {
-            if (!!(i & 1)) {
+    if (checkFlag(0x80000000)) {
+        for (u32 i = 0; i < kRegionNum[size]; i++) {
+            if (i & 1) {
                 GXInitTexCacheRegion(&mTexCacheRegion[i], GX_FALSE, i * kSize[size] + 0x80000, size,
                                      i * kSize[size], size);
                 J3DFifoLoadTexCached((GXTexMapID)i, i * kSize[size] + 0x80000, size,
@@ -121,7 +120,7 @@ void J3DSys::setTexCacheRegion(GXTexCacheSize size) {
             }
         }
     } else {
-        for (u32 i = 0; i < regionNum; i++) {
+        for (u32 i = 0; i < kRegionNum[size]; i++) {
             GXInitTexCacheRegion(&mTexCacheRegion[i], GX_FALSE, i * kSize[size], size,
                                  i * kSize[size] + 0x80000, size);
             J3DFifoLoadTexCached((GXTexMapID)i, i * kSize[size], size, i * kSize[size] + 0x80000,
@@ -130,16 +129,6 @@ void J3DSys::setTexCacheRegion(GXTexCacheSize size) {
     }
 }
 
-/* 803CD8A0-803CD8B0 02A9C0 0010+00 1/1 0/0 0/0 .data            NullTexData */
-SECTION_DATA static u8 NullTexData[16] ALIGN_DECL(32) = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 803CD8B0-803CD8E0 02A9D0 0030+00 1/1 0/0 0/0 .data            j3dIdentityMtx */
-SECTION_DATA static Mtx j3dIdentityMtx = {
-    1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f,
-};
-
 /* 803100BC-8031073C 30A9FC 0680+00 0/0 3/3 0/0 .text            drawInit__6J3DSysFv */
 void J3DSys::drawInit() {
     GXInvalidateVtxCache();
@@ -201,16 +190,16 @@ void J3DSys::drawInit() {
     GXSetChanMatColor(GX_COLOR0A0, j3dDefaultColInfo);
     GXSetChanMatColor(GX_COLOR1A1, j3dDefaultColInfo);
 
-    GXSetNumChans(data_804563C8);
+    GXSetNumChans(j3dDefaultNumChans);
     GXSetNumTexGens(1);
     GXSetNumTevStages(1);
     GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_CLAMP, GX_AF_NONE);
     GXSetChanCtrl(GX_COLOR1A1, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_CLAMP, GX_AF_NONE);
 
     for (i = 0; i < GX_MAX_TEXMAP; i++)
-        GXSetTexCoordGen2((GXTexCoordID)i, (GXTexGenType)j3dDefaultTexCoordInfo[i].mTexGenType,
+        GXSetTexCoordGen((GXTexCoordID)i, (GXTexGenType)j3dDefaultTexCoordInfo[i].mTexGenType,
                           (GXTexGenSrc)j3dDefaultTexCoordInfo[i].mTexGenSrc,
-                          j3dDefaultTexCoordInfo[i].mTexGenMtx, GX_FALSE, GX_PTIDENTITY);
+                          j3dDefaultTexCoordInfo[i].mTexGenMtx);
 
     for (i = 0; i < GX_MAX_INDTEXSTAGE; i++)
         GXSetIndTexCoordScale((GXIndTexStageID)i, GX_ITS_1, GX_ITS_1);
@@ -268,13 +257,6 @@ void J3DSys::reinitGenMode() {
     GXSetCoPlanar(GX_FALSE);
 }
 
-/* ############################################################################################## */
-/* 80450950-80450954 0003D0 0004+00 2/2 0/0 0/0 .sdata           ColorBlack */
-SECTION_SDATA static GXColor ColorBlack = {0x00, 0x00, 0x00, 0x00};
-
-/* 80450954-80450958 0003D4 0004+00 2/2 0/0 0/0 .sdata           ColorWhite */
-SECTION_SDATA static GXColor ColorWhite = {0xFF, 0xFF, 0xFF, 0xFF};
-
 /* 803107E8-80310894 30B128 00AC+00 1/1 0/0 0/0 .text            reinitLighting__6J3DSysFv */
 void J3DSys::reinitLighting() {
     GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_NONE,
@@ -290,14 +272,14 @@ void J3DSys::reinitLighting() {
 /* 80310894-80310998 30B1D4 0104+00 1/1 0/0 0/0 .text            reinitTransform__6J3DSysFv */
 void J3DSys::reinitTransform() {
     GXSetCurrentMtx(GX_PNMTX0);
-    GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY);
-    GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_TEX1, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY);
-    GXSetTexCoordGen2(GX_TEXCOORD2, GX_TG_MTX2x4, GX_TG_TEX2, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY);
-    GXSetTexCoordGen2(GX_TEXCOORD3, GX_TG_MTX2x4, GX_TG_TEX3, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY);
-    GXSetTexCoordGen2(GX_TEXCOORD4, GX_TG_MTX2x4, GX_TG_TEX4, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY);
-    GXSetTexCoordGen2(GX_TEXCOORD5, GX_TG_MTX2x4, GX_TG_TEX5, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY);
-    GXSetTexCoordGen2(GX_TEXCOORD6, GX_TG_MTX2x4, GX_TG_TEX6, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY);
-    GXSetTexCoordGen2(GX_TEXCOORD7, GX_TG_MTX2x4, GX_TG_TEX7, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY);
+    GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
+    GXSetTexCoordGen(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_TEX1, GX_IDENTITY);
+    GXSetTexCoordGen(GX_TEXCOORD2, GX_TG_MTX2x4, GX_TG_TEX2, GX_IDENTITY);
+    GXSetTexCoordGen(GX_TEXCOORD3, GX_TG_MTX2x4, GX_TG_TEX3, GX_IDENTITY);
+    GXSetTexCoordGen(GX_TEXCOORD4, GX_TG_MTX2x4, GX_TG_TEX4, GX_IDENTITY);
+    GXSetTexCoordGen(GX_TEXCOORD5, GX_TG_MTX2x4, GX_TG_TEX5, GX_IDENTITY);
+    GXSetTexCoordGen(GX_TEXCOORD6, GX_TG_MTX2x4, GX_TG_TEX6, GX_IDENTITY);
+    GXSetTexCoordGen(GX_TEXCOORD7, GX_TG_MTX2x4, GX_TG_TEX7, GX_IDENTITY);
 }
 
 /* 80310998-80310A3C 30B2D8 00A4+00 2/2 0/0 0/0 .text            reinitTexture__6J3DSysFv */
@@ -341,7 +323,9 @@ void J3DSys::reinitTevStages() {
     GXSetTevKColor(GX_KCOLOR2, ColorWhite);
     GXSetTevKColor(GX_KCOLOR3, ColorWhite);
 
-    for (u32 i = 0; i < GX_MAX_TEVSTAGE; i++) {
+    u32 i;
+    u32 numStages = GX_MAX_TEVSTAGE;
+    for (i = 0; i < numStages; i++) {
         GXSetTevColorIn((GXTevStageID)i, GX_CC_RASC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO);
         GXSetTevColorOp((GXTevStageID)i, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE,
                         GX_TEVPREV);
@@ -360,13 +344,10 @@ void J3DSys::reinitTevStages() {
     GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_AND, GX_ALWAYS, 0);
 }
 
-/* ############################################################################################## */
-/* 803CD8E0-803CD8F8 02AA00 0018+00 1/1 0/0 0/0 .data            IndMtx */
-SECTION_DATA static Mtx23 IndMtx = {0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f};
-
 /* 80310D44-80310E3C 30B684 00F8+00 1/1 0/0 0/0 .text            reinitIndStages__6J3DSysFv */
 void J3DSys::reinitIndStages() {
-    for (u32 i = 0; i < GX_MAX_TEVSTAGE; i++) {
+    u32 i;
+    for (i = 0; i < GX_MAX_TEVSTAGE; i++) {
         GXSetTevDirect((GXTevStageID)i);
     }
 
@@ -394,7 +375,3 @@ void J3DSys::reinitPixelProc() {
     GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
     GXSetZCompLoc(GX_TRUE);
 }
-
-/* ############################################################################################## */
-/* 80451598-804515A0 000A98 0004+04 0/0 1/1 0/0 .sbss            j3dDefaultViewNo */
-u32 j3dDefaultViewNo;
diff --git a/src/JSystem/J3DGraphBase/J3DTevs.cpp b/src/JSystem/J3DGraphBase/J3DTevs.cpp
index da4bdc4b44..338198883a 100644
--- a/src/JSystem/J3DGraphBase/J3DTevs.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTevs.cpp
@@ -9,7 +9,7 @@
 #include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "global.h"
 
-static void J3DGDLoadTexMtxImm(f32 (*)[4], u32, _GXTexMtxType);
+static void J3DGDLoadTexMtxImm(f32 (*)[4], u32, GXTexMtxType);
 static void J3DGDLoadPostTexMtxImm(f32 (*)[4], u32);
 
 /* 80323590-80323644 31DED0 00B4+00 0/0 3/3 0/0 .text            load__11J3DLightObjCFUl */
@@ -23,23 +23,33 @@ void J3DLightObj::load(u32 lightIdx) const {
 
 /* 80323644-803238C4 31DF84 0280+00 0/0 3/3 0/0 .text            loadTexCoordGens__FUlP11J3DTexCoord
  */
-void loadTexCoordGens(u32 param_0, J3DTexCoord* param_1) {
-    GDOverflowCheck(param_0 * 8 + 10);
-    J3DGDWriteXFCmdHdr(0x1040, param_0);
-    for (int i = 0; i < param_0; i++) {
+void loadTexCoordGens(u32 texGenNum, J3DTexCoord* texCoords) {
+    u32 var_r28;
+    GDOverflowCheck(texGenNum * 4 * 2 + 10);
+    J3DGDWriteXFCmdHdr(GX_XF_REG_TEX0, texGenNum);
+
+    for (int i = 0; i < texGenNum; i++) {
         J3DGDSetTexCoordGen(
-            GXTexGenType(param_1[i].getTexGenType()),
-            GXTexGenSrc(param_1[i].getTexGenSrc())
+            GXTexGenType(texCoords[i].getTexGenType()),
+            GXTexGenSrc(texCoords[i].getTexGenSrc())
         );
     }
-    J3DGDWriteXFCmdHdr(0x1050, param_0);
+
+    var_r28 = 61;
+    J3DGDWriteXFCmdHdr(GX_XF_REG_DUALTEX0, texGenNum);
+
     if (j3dSys.checkFlag(0x40000000)) {
-        for (int i = 0; i < param_0; i++) {
-            J3DGDWrite_u32(param_1[i].getTexGenMtx() == 60 ? 61 : i * 3);
+        for (int i = 0; i < texGenNum; i++) {
+            if (texCoords[i].getTexGenMtx() != 60) {
+                var_r28 = i * 3;
+            } else {
+                var_r28 = 61;
+            }
+            J3DGDWrite_u32(var_r28);
         }
     } else {
-        for (int i = 0; i < param_0; i++) {
-            J3DGDWrite_u32(61);
+        for (int i = 0; i < texGenNum; i++) {
+            J3DGDWrite_u32(var_r28);
         }
     }
 }
@@ -74,7 +84,7 @@ void J3DTexMtx::calcTexMtx(const Mtx param_0) {
         0.0f, 0.0f, 1.0f, 0.0f,
     };
 
-    u8 r28 = mTexMtxInfo.mInfo & 0x3f;
+    u32 r28 = mTexMtxInfo.mInfo & 0x3f;
     u32 r30 = (mTexMtxInfo.mInfo >> 7) & 1;
     switch (r28) {
     case 8:
@@ -171,7 +181,7 @@ void J3DTexMtx::calcPostTexMtx(const Mtx param_0) {
         0.0f, 0.0f, 1.0f, 0.0f,
     };
 
-    u8 r29 = mTexMtxInfo.mInfo & 0x3f;
+    u32 r29 = mTexMtxInfo.mInfo & 0x3f;
     u32 r30 = (mTexMtxInfo.mInfo >> 7) & 1;
     switch (r29) {
     case 8:
@@ -264,8 +274,8 @@ void J3DTexMtx::calcPostTexMtx(const Mtx param_0) {
 }
 
 /* 80323F64-80323F88 31E8A4 0024+00 0/0 1/1 0/0 .text            isTexNoReg__FPv */
-bool isTexNoReg(void* param_0) {
-    u8 r31 = ((u8*)param_0)[1];
+bool isTexNoReg(void* pDL) {
+    u8 r31 = ((u8*)pDL)[1];
     if (r31 >= 0x80 && r31 <= 0xbb) {
         return true;
     }
@@ -273,19 +283,24 @@ bool isTexNoReg(void* param_0) {
 }
 
 /* 80323F88-80323F94 31E8C8 000C+00 0/0 1/1 0/0 .text            getTexNoReg__FPv */
-u16 getTexNoReg(void* param_0) {
-    return *(u32*)((u8*)param_0 + 1);
+u16 getTexNoReg(void* pDL) {
+    u32 var_r31 = *(u32*)((u8*)pDL + 1);
+    return var_r31 & 0xFFFFFF;
 }
 
 /* 80323F94-8032413C 31E8D4 01A8+00 0/0 20/20 0/0 .text            loadTexNo__FUlRCUs */
-void loadTexNo(u32 param_0, u16 const& param_1) {
-    ResTIMG* resTIMG = j3dSys.getTexture()->getResTIMG(param_1);
-    J3DSys::sTexCoordScaleTable[param_0].field_0x00 = resTIMG->width;
-    J3DSys::sTexCoordScaleTable[param_0].field_0x02 = resTIMG->height;
+void loadTexNo(u32 param_0, const u16& texNo) {
+    ResTIMG* resTIMG = j3dSys.getTexture()->getResTIMG(texNo);
+    J3D_ASSERT_NULLPTR(462, resTIMG != NULL);
+
+    J3DSys::sTexCoordScaleTable[param_0].field_0x00 = (u16)resTIMG->width;
+    J3DSys::sTexCoordScaleTable[param_0].field_0x02 = (u16)resTIMG->height;
+
     GDOverflowCheck(0x14);
     J3DGDSetTexImgPtr(GXTexMapID(param_0), (u8*)resTIMG + resTIMG->imageOffset);
     J3DGDSetTexImgAttr(GXTexMapID(param_0), resTIMG->width, resTIMG->height, GXTexFmt(resTIMG->format & 0x0f));
     J3DGDSetTexLookupMode(GXTexMapID(param_0), GXTexWrapMode(resTIMG->wrapS), GXTexWrapMode(resTIMG->wrapT), GXTexFilter(resTIMG->minFilter), GXTexFilter(resTIMG->magFilter), resTIMG->minLOD * 0.125f, resTIMG->maxLOD * 0.125f, resTIMG->LODBias * 0.01f, resTIMG->biasClamp, resTIMG->doEdgeLOD, GXAnisotropy(resTIMG->maxAnisotropy));
+
     if (resTIMG->indexTexture == true) {
         GXTlutSize tlutSize = resTIMG->numColors > 16 ? GX_TLUT_256 : GX_TLUT_16;
         GDOverflowCheck(0x14);
@@ -295,20 +310,22 @@ void loadTexNo(u32 param_0, u16 const& param_1) {
 }
 
 /* 8032413C-80324160 31EA7C 0024+00 0/0 2/2 0/0 .text            patchTexNo_PtrToIdx__FUlRCUs */
-void patchTexNo_PtrToIdx(u32 texID, u16 const& idx) {
+void patchTexNo_PtrToIdx(u32 texID, const u16& idx) {
+    ResTIMG* timg = j3dSys.getTexture()->getResTIMG(idx);
+    J3D_ASSERT_NULLPTR(523, timg != NULL);
+
     J3DGDSetTexImgPtrRaw(GXTexMapID(texID), idx);
 }
 
 /* 80324160-80324194 31EAA0 0034+00 0/0 2/2 0/0 .text            loadNBTScale__FR11J3DNBTScale */
-void loadNBTScale(J3DNBTScale& param_0) {
-    if (param_0.mbHasScale == true) {
-        j3dSys.setNBTScale(&param_0.mScale);
+void loadNBTScale(J3DNBTScale& NBTScale) {
+    if (NBTScale.mbHasScale == true) {
+        j3dSys.setNBTScale(&NBTScale.mScale);
     } else {
         j3dSys.setNBTScale(NULL);
     }
 }
 
-/* ############################################################################################## */
 /* 803A1EC8-803A1EFC 02E528 0034+00 0/0 9/9 24/24 .rodata          j3dDefaultLightInfo */
 extern const J3DLightInfo j3dDefaultLightInfo = {
     0.0f, 0.0f, 0.0f,
@@ -399,7 +416,6 @@ void makeTexCoordTable() {
     }
 }
 
-/* ############################################################################################## */
 /* 80436A60-80436E60 063780 0400+00 1/1 3/3 0/0 .bss             j3dTevSwapTableTable */
 u8 j3dTevSwapTableTable[1024];
 
@@ -421,7 +437,6 @@ void makeAlphaCmpTable() {
     }
 }
 
-/* ############################################################################################## */
 /* 80437160-804371C0 063E80 0060+00 1/1 4/4 5/5 .bss             j3dZModeTable */
 extern u8 j3dZModeTable[96];
 u8 j3dZModeTable[96];
@@ -472,7 +487,7 @@ void J3DTexMtx::loadPostTexMtx(u32 param_0) const {
 static void J3DGDLoadTexMtxImm(f32 (*param_1)[4], u32 param_2, _GXTexMtxType param_3) {
     u16 addr = param_2 << 2;
     u8 len = param_3 == GX_MTX2x4 ? 8 : 12;
-    J3DGDWriteXFCmdHdr(addr & 0xffff, len);
+    J3DGDWriteXFCmdHdr(addr, len);
     J3DGDWrite_f32(param_1[0][0]);
     J3DGDWrite_f32(param_1[0][1]);
     J3DGDWrite_f32(param_1[0][2]);
@@ -492,7 +507,9 @@ static void J3DGDLoadTexMtxImm(f32 (*param_1)[4], u32 param_2, _GXTexMtxType par
 /* 8032499C-80324F08 31F2DC 056C+00 1/1 0/0 0/0 .text            J3DGDLoadPostTexMtxImm__FPA4_fUl */
 static void J3DGDLoadPostTexMtxImm(f32 (*param_1)[4], u32 param_2) {
     u16 addr = (param_2 - 0x40) * 4 + 0x500;
-    J3DGDWriteXFCmdHdr(addr, 12);
+    int stride = 12;
+
+    J3DGDWriteXFCmdHdr(addr, stride);
     J3DGDWrite_f32(param_1[0][0]);
     J3DGDWrite_f32(param_1[0][1]);
     J3DGDWrite_f32(param_1[0][2]);
@@ -507,7 +524,6 @@ static void J3DGDLoadPostTexMtxImm(f32 (*param_1)[4], u32 param_2) {
     J3DGDWrite_f32(param_1[2][3]);
 }
 
-/* ############################################################################################## */
 /* 804563C0-804563C4 0049C0 0004+00 0/0 4/4 0/0 .sdata2          j3dDefaultColInfo */
 extern const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF};
 
@@ -515,7 +531,7 @@ extern const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF};
 extern const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32};
 
 /* 804563C8-804563CC 0049C8 0004+00 0/0 1/1 0/0 .sdata2          None */
-extern const u8 data_804563C8 = 0x01;
+extern const u8 j3dDefaultNumChans = 1;
 
 /* 804563CC-804563D0 0049CC 0004+00 0/0 3/3 0/0 .sdata2          j3dDefaultTevOrderInfoNull */
 extern const J3DTevOrderInfo j3dDefaultTevOrderInfoNull = {0xFF, 0xFF, 0xFF, 0x00};
diff --git a/src/JSystem/J3DGraphBase/J3DTexture.cpp b/src/JSystem/J3DGraphBase/J3DTexture.cpp
index e4ff174899..ce4256b31d 100644
--- a/src/JSystem/J3DGraphBase/J3DTexture.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTexture.cpp
@@ -1,30 +1,22 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DTexture
-//
-
 #include "JSystem/J3DGraphBase/J3DTexture.h"
-
-#include "dolphin/gx.h"
-#include "global.h"
+#include "JSystem/J3DAssert.h"
 
 /* 8031204C-803121A4 30C98C 0158+00 0/0 1/1 0/0 .text loadGX__10J3DTextureCFUs11_GXTexMapID */
 void J3DTexture::loadGX(u16 idx, GXTexMapID texMapID) const {
-    J3D_ASSERT(0, idx < mNum, "Error : range over.");
+    J3D_ASSERT_RANGE(29, idx < mNum);
 
     ResTIMG* timg = getResTIMG(idx);
     GXTexObj texObj;
+    GXTlutObj tlutObj;
 
     if (!timg->indexTexture) {
         GXInitTexObj(&texObj, ((u8*)timg) + timg->imageOffset, timg->width, timg->height,
                      (GXTexFmt)timg->format, (GXTexWrapMode)timg->wrapS, (GXTexWrapMode)timg->wrapT,
-                     (GXBool)timg->mipmapEnabled);
+                     timg->mipmapEnabled);
     } else {
-        GXTlutObj tlutObj;
-
         GXInitTexObjCI(&texObj, ((u8*)timg) + timg->imageOffset, timg->width, timg->height,
                        (GXCITexFmt)timg->format, (GXTexWrapMode)timg->wrapS,
-                       (GXTexWrapMode)timg->wrapT, (GXBool)timg->mipmapEnabled, (u32)texMapID);
+                       (GXTexWrapMode)timg->wrapT, timg->mipmapEnabled, (u32)texMapID);
         GXInitTlutObj(&tlutObj, ((u8*)timg) + timg->paletteOffset, (GXTlutFmt)timg->colorFormat,
                       timg->numColors);
         GXLoadTlut(&tlutObj, texMapID);
@@ -34,31 +26,31 @@ void J3DTexture::loadGX(u16 idx, GXTexMapID texMapID) const {
     const f32 kLODBiasScale = 1.0f / 100.0f;
     GXInitTexObjLOD(&texObj, (GXTexFilter)timg->minFilter, (GXTexFilter)timg->magFilter,
                     timg->minLOD * kLODClampScale, timg->maxLOD * kLODClampScale,
-                    timg->LODBias * kLODBiasScale, (GXBool)timg->biasClamp, (GXBool)timg->doEdgeLOD,
+                    timg->LODBias * kLODBiasScale, timg->biasClamp, timg->doEdgeLOD,
                     (GXAnisotropy)timg->maxAnisotropy);
     GXLoadTexObj(&texObj, texMapID);
 }
 
 /* 803121A4-8031221C 30CAE4 0078+00 1/1 0/0 0/0 .text            entryNum__10J3DTextureFUs */
 void J3DTexture::entryNum(u16 num) {
-    J3D_ASSERT(79, num != 0, "Error : non-zero argument is specified 0.");
+    J3D_ASSERT_NONZEROARG(79, num != 0);
 
     mNum = num;
-    mpRes = new ResTIMG[num]();
-    J3D_ASSERT(83, mpRes != 0, "Error : allocate memory.");
+    mpRes = new ResTIMG[num];
+    J3D_ASSERT_ALLOCMEM(83, mpRes != NULL);
 
-    for (s32 i = 0; i < mNum; i++) {
+    for (int i = 0; i < mNum; i++) {
         mpRes[i].paletteOffset = 0;
         mpRes[i].imageOffset = 0;
     }
 }
 
 /* 8031221C-80312488 30CB5C 026C+00 0/0 1/1 0/0 .text addResTIMG__10J3DTextureFUsPC7ResTIMG */
-void J3DTexture::addResTIMG(u16 newNum, ResTIMG const* newRes) {
+void J3DTexture::addResTIMG(u16 newNum, const ResTIMG* newRes) {
     if (newNum == 0)
         return;
 
-    J3D_ASSERT(105, newRes != 0, "Error : null pointer.");
+    J3D_ASSERT_NULLPTR(105, newRes != 0);
 
     u16 oldNum = mNum;
     ResTIMG* oldRes = mpRes;
diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/src/JSystem/J3DGraphBase/J3DTransform.cpp
index 127cfde23f..ee0d58f27f 100644
--- a/src/JSystem/J3DGraphBase/J3DTransform.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTransform.cpp
@@ -1,12 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DTransform
-//
-
 #include "JSystem/J3DGraphBase/J3DTransform.h"
-#include "JSystem/JMath/JMATrigonometric.h"
 #include "JSystem/J3DGraphBase/J3DStruct.h"
-#include "dolphin/base/PPCArch.h"
+#include "JSystem/JMath/JMATrigonometric.h"
+#include "JSystem/JMath/JMath.h"
 
 /* 80311630-80311638 -00001 0008+00 0/0 0/0 0/0 .text            __MTGQR7__FUl */
 void __MTGQR7(register u32 v) {
@@ -19,12 +14,14 @@ void __MTGQR7(register u32 v) {
 
 /* 80311638-80311670 30BF78 0038+00 0/0 2/2 0/0 .text            J3DGQRSetup7__FUlUlUlUl */
 void J3DGQRSetup7(u32 r0, u32 r1, u32 r2, u32 r3) {
-    u32 v = (((r0 << 8) + r1) << 16) | ((r2 << 8) + r3);
+    u32 v = ((r0 << 8) + r1) << 16;
+	v |= (r2 << 8) + r3;
     __MTGQR7(v);
 }
 
 /* 80311670-80311760 30BFB0 00F0+00 0/0 2/2 0/0 .text            J3DCalcBBoardMtx__FPA4_f */
 // this uses a non-standard sqrtf, not sure why or how its supposed to be setup
+#if !PLATFORM_SHIELD
 inline f32 J3D_sqrtf(register f32 x) {
 	register f32 recip;
 
@@ -36,6 +33,9 @@ inline f32 J3D_sqrtf(register f32 x) {
 	}
 	return x;
 }
+#else
+#define J3D_sqrtf sqrtf
+#endif
 
 void J3DCalcBBoardMtx(register Mtx mtx) {
     f32 x = (mtx[0][0] * mtx[0][0]) + (mtx[1][0] * mtx[1][0]) + (mtx[2][0] * mtx[2][0]);
@@ -86,10 +86,10 @@ void J3DCalcYBBoardMtx(Mtx mtx) {
     f32 z = (mtx[0][2] * mtx[0][2]) + (mtx[1][2] * mtx[1][2]) + (mtx[2][2] * mtx[2][2]);
 
 	if (x > 0.0f) {
-		x = J3D_sqrtf(x);
+		x = JMath::fastSqrt(x);
 	}
 	if (z > 0.0f) {
-		z = J3D_sqrtf(z);
+		z = JMath::fastSqrt(z);
 	}
 
 	Vec vec = { 0.0f, -mtx[2][1], mtx[1][1] };
@@ -165,6 +165,9 @@ lbl_8005F118:
 /* 80311964-80311A24 30C2A4 00C0+00 0/0 2/2 2/2 .text
  * J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f         */
 void J3DGetTranslateRotateMtx(const J3DTransformInfo& tx, Mtx dst) {
+	f32 cxsz;
+	f32 sxcz;
+	
     f32 sx = JMASSin(tx.mRotation.x), cx = JMASCos(tx.mRotation.x);
     f32 sy = JMASSin(tx.mRotation.y), cy = JMASCos(tx.mRotation.y);
     f32 sz = JMASSin(tx.mRotation.z), cz = JMASCos(tx.mRotation.z);
@@ -175,15 +178,15 @@ void J3DGetTranslateRotateMtx(const J3DTransformInfo& tx, Mtx dst) {
     dst[2][1] = cy * sx;
     dst[2][2] = cy * cx;
 
-    f32 cxsz = cx * sz;
-    f32 sxcz = sx * cz;
+    cxsz = cx * sz;
+    sxcz = sx * cz;
     dst[0][1] = sxcz * sy - cxsz;
     dst[1][2] = cxsz * sy - sxcz;
 
-    f32 sxsz = sx * sz;
-    f32 cxcz = cx * cz;
-    dst[0][2] = cxcz * sy + sxsz;
-    dst[1][1] = sxsz * sy + cxcz;
+    cxsz = sx * sz;
+    sxcz = cx * cz;
+    dst[0][2] = sxcz * sy + cxsz;
+    dst[1][1] = cxsz * sy + sxcz;
 
     dst[0][3] = tx.mTranslate.x;
     dst[1][3] = tx.mTranslate.y;
@@ -192,6 +195,9 @@ void J3DGetTranslateRotateMtx(const J3DTransformInfo& tx, Mtx dst) {
 
 /* 80311A24-80311ACC 30C364 00A8+00 0/0 1/1 0/0 .text J3DGetTranslateRotateMtx__FsssfffPA4_f */
 void J3DGetTranslateRotateMtx(s16 rx, s16 ry, s16 rz, f32 tx, f32 ty, f32 tz, Mtx dst) {
+	f32 cxsz;
+	f32 sxcz;
+
     f32 sx = JMASSin(rx), cx = JMASCos(rx);
     f32 sy = JMASSin(ry), cy = JMASCos(ry);
     f32 sz = JMASSin(rz), cz = JMASCos(rz);
@@ -202,15 +208,15 @@ void J3DGetTranslateRotateMtx(s16 rx, s16 ry, s16 rz, f32 tx, f32 ty, f32 tz, Mt
     dst[2][1] = cy * sx;
     dst[2][2] = cy * cx;
 
-    f32 cxsz = cx * sz;
-    f32 sxcz = sx * cz;
+    cxsz = cx * sz;
+    sxcz = sx * cz;
     dst[0][1] = sxcz * sy - cxsz;
     dst[1][2] = cxsz * sy - sxcz;
 
-    f32 sxsz = sx * sz;
-    f32 cxcz = cx * cz;
-    dst[0][2] = cxcz * sy + sxsz;
-    dst[1][1] = sxsz * sy + cxcz;
+    cxsz = sx * sz;
+    sxcz = cx * cz;
+    dst[0][2] = sxcz * sy + cxsz;
+    dst[1][1] = cxsz * sy + sxcz;
 
     dst[0][3] = tx;
     dst[1][3] = ty;
@@ -235,15 +241,10 @@ void J3DGetTextureMtx(const J3DTextureSRTInfo& srt, const Vec& center, Mtx dst)
     dst[1][1] = cy;
     dst[1][2] = (-sy * center.x - cy * center.y) + center.y + srt.mTranslationY;
 
-    dst[2][3] = 0.0f;
-    dst[2][1] = 0.0f;
-    dst[2][0] = 0.0f;
-    dst[1][3] = 0.0f;
-    dst[0][3] = 0.0f;
-    dst[2][2] = 1.0f;
+    dst[0][3] = dst[1][3] = dst[2][0] = dst[2][1] = dst[2][3] = 0.0f;
+	dst[2][2] = 1.0f;
 }
 
-
 /* 80311B80-80311C34 30C4C0 00B4+00 0/0 3/3 0/0 .text
  * J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f       */
 void J3DGetTextureMtxOld(const J3DTextureSRTInfo& srt, const Vec& center, Mtx dst) {
@@ -262,12 +263,8 @@ void J3DGetTextureMtxOld(const J3DTextureSRTInfo& srt, const Vec& center, Mtx ds
     dst[1][1] = cy;
     dst[1][3] = (-sy * center.x - cy * center.y) + center.y + srt.mTranslationY;
 
-    dst[2][3] = 0.0f;
-    dst[2][1] = 0.0f;
-    dst[2][0] = 0.0f;
-    dst[1][2] = 0.0f;
-    dst[0][2] = 0.0f;
-    dst[2][2] = 1.0f;
+    dst[0][2] = dst[1][2] = dst[2][0] = dst[2][1] = dst[2][3] = 0.0f;
+	dst[2][2] = 1.0f;
 }
 
 /* 80311C34-80311CE4 30C574 00B0+00 0/0 3/3 0/0 .text
@@ -285,15 +282,10 @@ void J3DGetTextureMtxMaya(const J3DTextureSRTInfo& srt, Mtx dst) {
     dst[1][1] = srt.mScaleY * cr;
     dst[1][2] = -tx * sr - cr * (ty + srt.mScaleY) + 0.5f;
 
-    dst[2][3] = 0.0f;
-    dst[2][1] = 0.0f;
-    dst[2][0] = 0.0f;
-    dst[1][3] = 0.0f;
-    dst[0][3] = 0.0f;
-    dst[2][2] = 1.0f;
+	dst[0][3] = dst[1][3] = dst[2][0] = dst[2][1] = dst[2][3] = 0.0f;
+	dst[2][2] = 1.0f;
 }
 
-
 /* 80311CE4-80311D94 30C624 00B0+00 0/0 3/3 0/0 .text
  * J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f         */
 void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo& srt, Mtx dst) {
@@ -309,15 +301,10 @@ void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo& srt, Mtx dst) {
     dst[1][1] = srt.mScaleY * cr;
     dst[1][3] = -tx * sr - cr * (ty + srt.mScaleY) + 0.5f;
 
-    dst[2][3] = 0.0f;
-    dst[2][1] = 0.0f;
-    dst[2][0] = 0.0f;
-    dst[1][2] = 0.0f;
-    dst[0][2] = 0.0f;
-    dst[2][2] = 1.0f;
+	dst[0][2] = dst[1][2] = dst[2][0] = dst[2][1] = dst[2][3] = 0.0f;
+	dst[2][2] = 1.0f;
 }
 
-
 /* 80311D94-80311DF8 30C6D4 0064+00 0/0 2/2 0/0 .text            J3DScaleNrmMtx__FPA4_fRC3Vec */
 asm void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
 #ifdef __MWERKS__ // clang-format off
diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/src/JSystem/J3DGraphBase/J3DVertex.cpp
index dfdfc48e73..481ab42fca 100644
--- a/src/JSystem/J3DGraphBase/J3DVertex.cpp
+++ b/src/JSystem/J3DGraphBase/J3DVertex.cpp
@@ -1,14 +1,8 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DVertex
-//
-
 #include "JSystem/J3DGraphBase/J3DVertex.h"
 #include "JSystem/J3DGraphAnimator/J3DJointTree.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "string.h"
-#include <dolphin/os.h>
+#include <string.h>
 #include "global.h"
 
 /* 80310EF8-80310F78 30B838 0080+00 0/0 1/1 0/0 .text            __ct__13J3DVertexDataFv */
@@ -24,10 +18,10 @@ J3DVertexData::J3DVertexData() {
     mVtxNrmArray = NULL;
     mVtxNBTArray = NULL;
 
-    for (int i = 0; i < ARRAY_SIZE(mVtxColorArray); i++)
+    for (int i = 0; i < 2; i++)
         mVtxColorArray[i] = NULL;
 
-    for (int i = 0; i < ARRAY_SIZE(mVtxTexCoordArray); i++)
+    for (int i = 0; i < 8; i++)
         mVtxTexCoordArray[i] = NULL;
 
     mVtxPosFrac = 0;
@@ -39,6 +33,8 @@ J3DVertexData::J3DVertexData() {
 /* 80310F78-80310FD8 30B8B8 0060+00 0/0 1/1 0/0 .text
  * setVertexData__15J3DVertexBufferFP13J3DVertexData            */
 void J3DVertexBuffer::setVertexData(J3DVertexData* pVtxData) {
+    J3D_ASSERT_NULLPTR(175, pVtxData != NULL);
+
     mVtxData = pVtxData;
     mVtxPosArray[0] = pVtxData->getVtxPosArray();
     mVtxNrmArray[0] = pVtxData->getVtxNrmArray();
@@ -59,20 +55,11 @@ void J3DVertexBuffer::setVertexData(J3DVertexData* pVtxData) {
 void J3DVertexBuffer::init() {
     mVtxData = NULL;
 
-    mVtxPosArray[1] = NULL;
-    mVtxPosArray[0] = NULL;
-
-    mVtxNrmArray[1] = NULL;
-    mVtxNrmArray[0] = NULL;
-
-    mVtxColArray[1] = NULL;
-    mVtxColArray[0] = NULL;
-
-    mTransformedVtxPosArray[1] = NULL;
-    mTransformedVtxPosArray[0] = NULL;
-
-    mTransformedVtxNrmArray[1] = NULL;
-    mTransformedVtxNrmArray[0] = NULL;
+    mVtxPosArray[0] = mVtxPosArray[1] = NULL;
+    mVtxNrmArray[0] = mVtxNrmArray[1] = NULL;
+    mVtxColArray[0] = mVtxColArray[1] = NULL;
+    mTransformedVtxPosArray[0] = mTransformedVtxPosArray[1] = NULL;
+    mTransformedVtxNrmArray[0] = mTransformedVtxNrmArray[1] = NULL;
 
     mCurrentVtxPos = NULL;
     mCurrentVtxNrm = NULL;
@@ -96,25 +83,26 @@ void J3DVertexBuffer::setArray() const {
 s32 J3DVertexBuffer::copyLocalVtxPosArray(u32 flag) {
     if (flag & 1) {
         for (int i = 0; i < 2; i++) {
-            mVtxPosArray[i] = new (0x20) Vec[mVtxData->getVtxNum()];
-
+            mVtxPosArray[i] = new (0x20) char[mVtxData->getVtxNum() * 3 * 4];
             if (mVtxPosArray[i] == NULL) {
                 return kJ3DError_Alloc;
             }
-            memcpy(mVtxPosArray[i], mVtxData->getVtxPosArray(), mVtxData->getVtxNum() * 12);
-            DCStoreRange(mVtxPosArray[i], mVtxData->getVtxNum() * 12);
+
+            memcpy(mVtxPosArray[i], mVtxData->getVtxPosArray(), mVtxData->getVtxNum() * 3 * 4);
+            DCStoreRange(mVtxPosArray[i], mVtxData->getVtxNum() * 3 * 4);
         }
     } else {
         mVtxPosArray[0] = mVtxData->getVtxPosArray();
 
         if (mVtxPosArray[1] == NULL) {
-            mVtxPosArray[1] = new (0x20) Vec[mVtxData->getVtxNum()];
+            mVtxPosArray[1] = new (0x20) char[mVtxData->getVtxNum() * 3 * 4];
             if (mVtxPosArray[1] == NULL) {
                 return kJ3DError_Alloc;
             }
         }
-        memcpy(mVtxPosArray[1], mVtxData->getVtxPosArray(), mVtxData->getVtxNum() * 12);
-        DCStoreRange(mVtxPosArray[1], mVtxData->getVtxNum() * 12);
+
+        memcpy(mVtxPosArray[1], mVtxData->getVtxPosArray(), mVtxData->getVtxNum() * 3 * 4);
+        DCStoreRange(mVtxPosArray[1], mVtxData->getVtxNum() * 3 * 4);
     }
 
     return kJ3DError_Success;
@@ -125,25 +113,26 @@ s32 J3DVertexBuffer::copyLocalVtxPosArray(u32 flag) {
 s32 J3DVertexBuffer::copyLocalVtxNrmArray(u32 flag) {
     if (flag & 1) {
         for (int i = 0; i < 2; i++) {
-            mVtxNrmArray[i] = new (0x20) VertexNormal[mVtxData->getNrmNum()];
-
+            mVtxNrmArray[i] = new (0x20) char[mVtxData->getNrmNum() * 3 * 4];
             if (mVtxNrmArray[i] == NULL) {
                 return kJ3DError_Alloc;
             }
-            memcpy(mVtxNrmArray[i], mVtxData->getVtxNrmArray(), mVtxData->getNrmNum() * 12);
-            DCStoreRange(mVtxNrmArray[i], mVtxData->getNrmNum() * 12);
+
+            memcpy(mVtxNrmArray[i], mVtxData->getVtxNrmArray(), mVtxData->getNrmNum() * 3 * 4);
+            DCStoreRange(mVtxNrmArray[i], mVtxData->getNrmNum() * 3 * 4);
         }
     } else {
         mVtxNrmArray[0] = mVtxData->getVtxNrmArray();
 
         if (mVtxNrmArray[1] == NULL) {
-            mVtxNrmArray[1] = new (0x20) VertexNormal[mVtxData->getNrmNum()];
+            mVtxNrmArray[1] = new (0x20) char[mVtxData->getNrmNum() * 3 * 4];
             if (mVtxNrmArray[1] == NULL) {
                 return kJ3DError_Alloc;
             }
         }
-        memcpy(mVtxNrmArray[1], mVtxData->getVtxNrmArray(), mVtxData->getNrmNum() * 12);
-        DCStoreRange(mVtxNrmArray[1], mVtxData->getNrmNum() * 12);
+
+        memcpy(mVtxNrmArray[1], mVtxData->getVtxNrmArray(), mVtxData->getNrmNum() * 3 * 4);
+        DCStoreRange(mVtxNrmArray[1], mVtxData->getNrmNum() * 3 * 4);
     }
 
     return kJ3DError_Success;
@@ -185,6 +174,7 @@ s32 J3DVertexBuffer::copyLocalVtxArray(u32 flag) {
                         delete mVtxPosArray[i];
                     mVtxPosArray[i] = oldPosArray[i];
                 }
+
                 if (oldNrmArray[i] != mVtxNrmArray[i]) {
                     if (mVtxNrmArray[i] != mVtxData->getVtxNrmArray())
                         delete mVtxNrmArray[i];
@@ -208,7 +198,7 @@ s32 J3DVertexBuffer::allocTransformedVtxPosArray() {
 
     for (int i = 0; i < 2; i++) {
         if (i == 0 || mTransformedVtxPosArray[i] == NULL) {
-            mTransformedVtxPosArray[i] = new (0x20) Vec[mVtxData->getVtxNum()];
+            mTransformedVtxPosArray[i] = new (0x20) char[mVtxData->getVtxNum() * 3 * 4];
             if (mTransformedVtxPosArray[i] == NULL)
                 return kJ3DError_Alloc;
         }
@@ -225,7 +215,7 @@ s32 J3DVertexBuffer::allocTransformedVtxNrmArray() {
 
     for (int i = 0; i < 2; i++) {
         if (i == 0 || mTransformedVtxNrmArray[i] == NULL) {
-            mTransformedVtxNrmArray[i] = new (0x20) VertexNormal[mVtxData->getNrmNum()];
+            mTransformedVtxNrmArray[i] = new (0x20) char[mVtxData->getNrmNum() * 3 * 4];
             if (mTransformedVtxNrmArray[i] == NULL)
                 return kJ3DError_Alloc;
         }
diff --git a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
index 0a287669de..da82b66d1b 100644
--- a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
@@ -10,8 +10,8 @@
 
 /* 80337178-803371D0 331AB8 0058+00 0/0 1/1 0/0 .text __ct__15J3DJointFactoryFRC13J3DJointBlock */
 J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) {
-    mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&block, (u32)block.mpJointInitData);
-    mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpIndexTable);
+    mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&block, (uintptr_t)block.mpJointInitData);
+    mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (uintptr_t)block.mpIndexTable);
 }
 
 /* 803371D0-80337338 331B10 0168+00 0/0 1/1 0/0 .text            create__15J3DJointFactoryFi */
diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
index 126d898137..14069bc0a4 100644
--- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
@@ -16,7 +16,7 @@ J3DMaterialFactory::J3DMaterialFactory(J3DMaterialBlock const& i_block) {
     mMaterialNum = i_block.mMaterialNum;
     mpMaterialInitData = JSUConvertOffsetToPtr<J3DMaterialInitData>(&i_block, i_block.mpMaterialInitData);
     mpMaterialID = JSUConvertOffsetToPtr<u16>(&i_block, i_block.mpMaterialID);
-    if (i_block.mpIndInitData != NULL && (u32)i_block.mpIndInitData - (u32)i_block.mpNameTable > 4) {
+    if (i_block.mpIndInitData != NULL && (uintptr_t)i_block.mpIndInitData - (uintptr_t)i_block.mpNameTable > 4) {
         mpIndInitData = JSUConvertOffsetToPtr<J3DIndInitData>(&i_block, i_block.mpIndInitData);
     } else {
         mpIndInitData = NULL;
@@ -384,7 +384,7 @@ J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* i_material, i
     if (i_material->mSharedDLObj == NULL) {
         i_material->mSharedDLObj = new J3DDisplayListObj();
         i_material->mSharedDLObj->setSingleDisplayList((void*)(
-            mpDisplayListInit[i_idx].mOffset + (u32)&mpDisplayListInit[i_idx]),
+            mpDisplayListInit[i_idx].mOffset + (uintptr_t)&mpDisplayListInit[i_idx]),
             mpDisplayListInit[i_idx].field_0x4
         );
     }
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
index d35577179b..a019922c4d 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
@@ -32,14 +32,14 @@ J3DModelData* J3DModelLoaderDataBase::load(void const* i_data, u32 i_flags) {
     if (i_data == NULL) {
         return NULL;
     }
-    if (*(u32*)i_data == 'J3D1' && *(u32*)((u32)i_data + 4) == 'bmd1') {
+    if (*(u32*)i_data == 'J3D1' && *(u32*)((uintptr_t)i_data + 4) == 'bmd1') {
         return NULL;
     }
-    if (*(u32*)i_data == 'J3D2' && *(u32*)((u32)i_data + 4) == 'bmd2') {
+    if (*(u32*)i_data == 'J3D2' && *(u32*)((uintptr_t)i_data + 4) == 'bmd2') {
         J3DModelLoader_v21 loader;
         return loader.load(i_data, i_flags);
     }
-    if (*(u32*)i_data == 'J3D2' && *(u32*)((u32)i_data + 4) == 'bmd3') {
+    if (*(u32*)i_data == 'J3D2' && *(u32*)((uintptr_t)i_data + 4) == 'bmd3') {
         J3DModelLoader_v26 loader;
         return loader.load(i_data, i_flags);
     }
@@ -89,7 +89,7 @@ J3DModelData* J3DModelLoader::load(void const* i_data, u32 i_flags) {
                 OSReport("Unknown data block\n");
                 break;
         }
-        block = (J3DModelBlock*)((u32)block + block->mBlockSize);
+        block = (J3DModelBlock*)((uintptr_t)block + block->mBlockSize);
     }
     J3DModelHierarchy const* hierarchy = mpModelData->getHierarchy();
     mpModelData->makeHierarchy(NULL, &hierarchy);
@@ -126,7 +126,7 @@ J3DMaterialTable* J3DModelLoader::loadMaterialTable(void const* i_data) {
                 OSReport("Unknown data block\n");
                 break;
         }
-        block = (J3DModelBlock*)((u32)block + block->mBlockSize);
+        block = (J3DModelBlock*)((uintptr_t)block + block->mBlockSize);
     }
     if (mpMaterialTable->mTexture == NULL) {
         mpMaterialTable->mTexture = new J3DTexture(0, NULL);
@@ -187,7 +187,7 @@ J3DModelData* J3DModelLoader::loadBinaryDisplayList(void const* i_data, u32 i_fl
                 OSReport("Unknown data block\n");
                 break;
         }
-        block = (J3DModelBlock*)((u32)block + block->mBlockSize);
+        block = (J3DModelBlock*)((uintptr_t)block + block->mBlockSize);
     }
     J3DModelHierarchy const* hierarchy = mpModelData->getHierarchy();
     mpModelData->makeHierarchy(NULL, &hierarchy);
@@ -206,10 +206,10 @@ void J3DModelLoader::setupBBoardInfo() {
         if (mesh != NULL) {
             u16 shape_index = mesh->getShape()->getIndex();
             u16* index_table = JSUConvertOffsetToPtr<u16>(mpShapeBlock,
-                                                          (u32)mpShapeBlock->mpIndexTable);
+                                                          (uintptr_t)mpShapeBlock->mpIndexTable);
             J3DShapeInitData* shape_init_data =
                 JSUConvertOffsetToPtr<J3DShapeInitData>(mpShapeBlock,
-                                                        (u32)mpShapeBlock->mpShapeInitData);
+                                                        (uintptr_t)mpShapeBlock->mpShapeInitData);
             J3DJoint* joint;
             switch (shape_init_data[index_table[shape_index]].mShapeMtxType) {
                 case 0:
@@ -304,9 +304,9 @@ void J3DModelLoader::readVertex(J3DVertexBlock const* i_block) {
     if (vertex_data.mVtxNrmArray == NULL) {
         vertex_data.mNrmNum = 0;
     } else if (nrm_end != NULL) {
-        vertex_data.mNrmNum = ((u32)nrm_end - (u32)vertex_data.mVtxNrmArray) / nrm_size + 1;
+        vertex_data.mNrmNum = ((uintptr_t)nrm_end - (uintptr_t)vertex_data.mVtxNrmArray) / nrm_size + 1;
     } else {
-        vertex_data.mNrmNum = (i_block->mBlockSize - (u32)i_block->mpVtxNrmArray) / nrm_size + 1;
+        vertex_data.mNrmNum = (i_block->mBlockSize - (uintptr_t)i_block->mpVtxNrmArray) / nrm_size + 1;
     }
 
     void* color0_end = NULL;
@@ -319,15 +319,15 @@ void J3DModelLoader::readVertex(J3DVertexBlock const* i_block) {
     if (vertex_data.mVtxColorArray[0] == NULL) {
         vertex_data.mColNum = 0;
     } else if (color0_end != NULL) {
-        vertex_data.mColNum = ((u32)color0_end - (u32)vertex_data.mVtxColorArray[0]) / 4 + 1;
+        vertex_data.mColNum = ((uintptr_t)color0_end - (uintptr_t)vertex_data.mVtxColorArray[0]) / 4 + 1;
     } else {
-        vertex_data.mColNum = (i_block->mBlockSize - (u32)i_block->mpVtxColorArray[0]) / 4 + 1;
+        vertex_data.mColNum = (i_block->mBlockSize - (uintptr_t)i_block->mpVtxColorArray[0]) / 4 + 1;
     }
 
     if (vertex_data.mVtxTexCoordArray[0] == NULL) {
         vertex_data.mTexCoordNum = 0;
     } else {
-        vertex_data.mTexCoordNum = (i_block->mBlockSize - (u32)i_block->mpVtxTexCoordArray[0]) / 8 + 1;
+        vertex_data.mTexCoordNum = (i_block->mBlockSize - (uintptr_t)i_block->mpVtxTexCoordArray[0]) / 8 + 1;
     }
 }
 
@@ -403,7 +403,7 @@ void J3DModelLoader_v26::readMaterial(J3DMaterialBlock const* i_block, u32 i_fla
         for (u16 i = 0; i < mpMaterialTable->mUniqueMatNum; i++) {
             factory.create(&mpMaterialTable->field_0x10[i],
                            J3DMaterialFactory::MATERIAL_TYPE_NORMAL, i, i_flags);
-            mpMaterialTable->field_0x10[i].mDiffFlag = (u32)&mpMaterialTable->field_0x10[i] >> 4;
+            mpMaterialTable->field_0x10[i].mDiffFlag = (uintptr_t)&mpMaterialTable->field_0x10[i] >> 4;
         }
     }
     for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
@@ -413,14 +413,14 @@ void J3DModelLoader_v26::readMaterial(J3DMaterialBlock const* i_block, u32 i_fla
     if (i_flags & 0x200000) {
         for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
             mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-                (u32)&mpMaterialTable->field_0x10[factory.getMaterialID(i)] >> 4;
+                (uintptr_t)&mpMaterialTable->field_0x10[factory.getMaterialID(i)] >> 4;
             mpMaterialTable->mMaterialNodePointer[i]->mpOrigMaterial =
                 &mpMaterialTable->field_0x10[factory.getMaterialID(i)];
         }
     } else {
         for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
             mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-                ((u32)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
+                ((uintptr_t)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
         }
     }
 }
@@ -446,7 +446,7 @@ void J3DModelLoader_v21::readMaterial_v21(J3DMaterialBlock_v21 const* i_block, u
     if (i_flags & 0x200000) {
         for (u16 i = 0; i < mpMaterialTable->mUniqueMatNum; i++) {
             factory.create(&mpMaterialTable->field_0x10[i], i, i_flags);
-            mpMaterialTable->field_0x10[i].mDiffFlag = (u32)&mpMaterialTable->field_0x10[i] >> 4;
+            mpMaterialTable->field_0x10[i].mDiffFlag = (uintptr_t)&mpMaterialTable->field_0x10[i] >> 4;
         }
     }
     for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
@@ -455,7 +455,7 @@ void J3DModelLoader_v21::readMaterial_v21(J3DMaterialBlock_v21 const* i_block, u
     if (i_flags & 0x200000) {
         for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
             mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-                (u32)&mpMaterialTable->field_0x10[factory.getMaterialID(i)] >> 4;
+                (uintptr_t)&mpMaterialTable->field_0x10[factory.getMaterialID(i)] >> 4;
             mpMaterialTable->mMaterialNodePointer[i]->mpOrigMaterial =
                 &mpMaterialTable->field_0x10[factory.getMaterialID(i)];
         }
@@ -524,7 +524,7 @@ void J3DModelLoader_v26::readMaterialTable(J3DMaterialBlock const* i_block, u32
     }
     for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
         mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-            (u32)mpMaterialTable->mMaterialNodePointer + factory.getMaterialID(i);
+            (uintptr_t)mpMaterialTable->mMaterialNodePointer + factory.getMaterialID(i);
     }
 }
 
@@ -546,7 +546,7 @@ void J3DModelLoader_v21::readMaterialTable_v21(J3DMaterialBlock_v21 const* i_blo
     }
     for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) {
         mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-            ((u32)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
+            ((uintptr_t)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
     }
 }
 
@@ -582,7 +582,7 @@ void J3DModelLoader::readPatchedMaterial(J3DMaterialBlock const* i_block, u32 i_
         mpMaterialTable->mMaterialNodePointer[i] =
             factory.create(NULL, J3DMaterialFactory::MATERIAL_TYPE_PATCHED, i, i_flags);
         mpMaterialTable->mMaterialNodePointer[i]->mDiffFlag =
-            ((u32)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
+            ((uintptr_t)mpMaterialTable->mMaterialNodePointer >> 4) + factory.getMaterialID(i);
     }
 }
 
diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
index 08dbd44df4..eaa4a6a790 100644
--- a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
@@ -13,13 +13,13 @@
 
 /* 80337350-80337400 331C90 00B0+00 0/0 2/2 0/0 .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock */
 J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) {
-    mShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, (u32)block.mpShapeInitData);
-    mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpIndexTable);
-    mVtxDescList = JSUConvertOffsetToPtr<GXVtxDescList>(&block, (u32)block.mpVtxDescList),
-    mMtxTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpMtxTable);
-    mDisplayListData = JSUConvertOffsetToPtr<u8>(&block, (u32)block.mpDisplayListData),
-    mMtxInitData = JSUConvertOffsetToPtr<J3DShapeMtxInitData>(&block, (u32)block.mpMtxInitData),
-    mDrawInitData = JSUConvertOffsetToPtr<J3DShapeDrawInitData>(&block, (u32)block.mpDrawInitData),
+    mShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, (uintptr_t)block.mpShapeInitData);
+    mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (uintptr_t)block.mpIndexTable);
+    mVtxDescList = JSUConvertOffsetToPtr<GXVtxDescList>(&block, (uintptr_t)block.mpVtxDescList),
+    mMtxTable = JSUConvertOffsetToPtr<u16>(&block, (uintptr_t)block.mpMtxTable);
+    mDisplayListData = JSUConvertOffsetToPtr<u8>(&block, (uintptr_t)block.mpDisplayListData),
+    mMtxInitData = JSUConvertOffsetToPtr<J3DShapeMtxInitData>(&block, (uintptr_t)block.mpMtxInitData),
+    mDrawInitData = JSUConvertOffsetToPtr<J3DShapeDrawInitData>(&block, (uintptr_t)block.mpDrawInitData),
     mVcdVatCmdBuffer = NULL;
 }
 
diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/src/JSystem/JAudio2/JASAiCtrl.cpp
index 04499c3067..28ae8fa273 100644
--- a/src/JSystem/JAudio2/JASAiCtrl.cpp
+++ b/src/JSystem/JAudio2/JASAiCtrl.cpp
@@ -19,6 +19,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/ai.h"
 #include <dolphin/os.h>
+#include <stdint.h>
 
 /* 80431C58-80431C68 05E978 000C+04 2/2 0/0 0/0 .bss             sDmaDacBuffer__9JASDriver */
 s16* JASDriver::sDmaDacBuffer[3];
@@ -87,7 +88,7 @@ void JASDriver::initAI(void (*param_0)(void)) {
     sDspStatus = 0;
     JASChannel::initBankDisposeMsgQueue();
     AIInit(NULL);
-    AIInitDMA((u32)sDmaDacBuffer[2], size);
+    AIInitDMA((uintptr_t)sDmaDacBuffer[2], size);
     BOOL isOutputRate;
     if (sOutputRate == 0) {
         isOutputRate = FALSE;
@@ -139,7 +140,7 @@ void JASDriver::updateDac() {
     s16* r30 = lastRspMadep;
     lastRspMadep = NULL;
     if (r30) {
-        AIInitDMA((u32)r30, getDacSize() * 2);
+        AIInitDMA((uintptr_t)r30, getDacSize() * 2);
     }
     s32 frameSamples = getFrameSamples();
     readDspBuffer(sDmaDacBuffer[dacp], frameSamples);
diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp
index 56cbd26bef..940b19e10a 100644
--- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp
+++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp
@@ -10,6 +10,7 @@
 #include "JSystem/JKernel/JKRDvdAramRipper.h"
 #include "cstring.h"
 #include "dolphin/os.h"
+#include <stdint.h>
 
 /* 80451290-80451298 000790 0004+04 1/1 0/0 0/0 .sbss            sAramHeap__16JASWaveArcLoader */
 JASHeap* JASWaveArcLoader::sAramHeap;
@@ -113,7 +114,7 @@ bool JASWaveArc::sendLoadCmd() {
     loadToAramCallbackParams commandInfo;
     commandInfo.mWavArc = this;
     commandInfo.mEntryNum = mEntryNum;
-    commandInfo.mBase = (u32)mHeap.mBase;
+    commandInfo.mBase = (uintptr_t)mHeap.mBase;
     commandInfo._c = ++_58;
 
     _5a++;
diff --git a/src/JSystem/JHostIO/JORServer.cpp b/src/JSystem/JHostIO/JORServer.cpp
index 1143a75e8a..275777d9a0 100644
--- a/src/JSystem/JHostIO/JORServer.cpp
+++ b/src/JSystem/JHostIO/JORServer.cpp
@@ -539,7 +539,7 @@ void JORMContext::genControl(u32 type, u32 kind, const char* label, u32 style, u
     mOutputStream << type << kind << label << style << id;
 
     if (kind & JORPropertyEvent::EKind_HasListener) {
-        mOutputStream << (u32)pListener;
+        mOutputStream << (uintptr_t)pListener;
     }
 
     if ((kind & JORPropertyEvent::EKind_ValueID) && type != 'EDBX') {
@@ -741,7 +741,7 @@ void JORMContext::openFile(JORFile* pFile, u32 flags, const char* path, const ch
         flags |= JORFile::EFlags_HAS_SUFFIX;
     }
 
-    mOutputStream << (u32)JORFile::ECommand_OPEN << (u32)pFile << flags << path;
+    mOutputStream << (u32)JORFile::ECommand_OPEN << (uintptr_t)pFile << flags << path;
     mOutputStream << (u16)maskSize;
     mOutputStream.write(extMask, maskSize);
 
@@ -759,13 +759,13 @@ void JORMContext::openFile(JORFile* pFile, u32 flags, const char* path, const ch
 }
 
 void JORMContext::closeFile(JORFile* pFile) {
-    mOutputStream << (u32)JORFile::ECommand_CLOSE << (u32)pFile << pFile->getHandle();
+    mOutputStream << (u32)JORFile::ECommand_CLOSE << (uintptr_t)pFile << pFile->getHandle();
 }
 
 void JORMContext::readBegin(JORFile* pFile, s32 size) {
     mOutputStream << (u32)JORFile::ECommand_READ
                   << (u32)JORFile::EStatus_READ_BEGIN
-                  << (u32)pFile
+                  << (uintptr_t)pFile
                   << pFile->getHandle()
                   << (u32)size;
 }
@@ -773,14 +773,14 @@ void JORMContext::readBegin(JORFile* pFile, s32 size) {
 void JORMContext::readData(JORFile* pFile) {
     mOutputStream << (u32)JORFile::ECommand_READ
                   << (u32)JORFile::EStatus_READ_DATA
-                  << (u32)pFile
+                  << (uintptr_t)pFile
                   << pFile->getHandle();
 }
 
 void JORMContext::writeBegin(JORFile* pFile, u16 flags, u32 size) {
     mOutputStream << (u32)JORFile::ECommand_WRITE
                   << (u32)JORFile::EStatus_WRITE_BEGIN
-                  << (u32)pFile
+                  << (uintptr_t)pFile
                   << pFile->getHandle()
                   << (u32)size
                   << (u32)flags;
@@ -789,7 +789,7 @@ void JORMContext::writeBegin(JORFile* pFile, u16 flags, u32 size) {
 void JORMContext::writeData(JORFile* pFile, const void* pBuffer, s32 size, u32 position) {
     mOutputStream << (u32)JORFile::ECommand_WRITE
                   << (u32)JORFile::EStatus_WRITE_DATA
-                  << (u32)pFile
+                  << (uintptr_t)pFile
                   << pFile->getHandle()
                   << (u32)position;
 
@@ -800,21 +800,21 @@ void JORMContext::writeData(JORFile* pFile, const void* pBuffer, s32 size, u32 p
 void JORMContext::writeDone(JORFile* pFile, u32 size) {
     mOutputStream << (u32)JORFile::ECommand_WRITE
                   << (u32)JORFile::EStatus_WRITE_END
-                  << (u32)pFile
+                  << (uintptr_t)pFile
                   << pFile->getHandle()
                   << (u32)size;
 }
 
 void JORMContext::openMessageBox(void* param_0, u32 style, const char* message, const char* title) {
-    mOutputStream << (u32)param_0 << (u32)style << message << title;
+    mOutputStream << (uintptr_t)param_0 << (u32)style << message << title;
 }
 
 void JORMContext::sendHostInfoRequest(u32 requestType, JORHostInfo* pHostInfo) {
-    mOutputStream << requestType << (u32)pHostInfo;
+    mOutputStream << requestType << (uintptr_t)pHostInfo;
 }
 
 void JORMContext::sendShellExecuteRequest(void* param_0, const char* param_1, const char* param_2,
                                           const char* param_3, const char* param_4, int param_5)
 {
-    mOutputStream << (u32)param_0 << param_1 << param_2 << param_3 << param_4 << (u32)param_5;
+    mOutputStream << (uintptr_t)param_0 << param_1 << param_2 << param_3 << param_4 << (u32)param_5;
 }
diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp
index 038a39d527..0621dccac9 100644
--- a/src/JSystem/JKernel/JKRAram.cpp
+++ b/src/JSystem/JKernel/JKRAram.cpp
@@ -47,7 +47,7 @@ OSMessageQueue JKRAram::sMessageQueue = {0};
 /* 802D2040-802D214C 2CC980 010C+00 1/1 0/0 0/0 .text            __ct__7JKRAramFUlUll */
 JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority)
     : JKRThread(0xC00, 0x10, priority) {
-    u32 aramBase = ARInit(mStackArray, ARRAY_SIZE(mStackArray));
+    u32 aramBase = ARInit(mStackArray, ARRAY_SIZEU(mStackArray));
     ARQInit();
 
     u32 aramSize = ARGetSize();
@@ -103,11 +103,11 @@ void* JKRAram::run(void) {
 /* 802D2248-802D22DC 2CCB88 0094+00 2/2 0/0 0/0 .text
  * checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl              */
 void JKRAram::checkOkAddress(u8* addr, u32 size, JKRAramBlock* block, u32 param_4) {
-    if (!IS_ALIGNED((u32)addr, 0x20) && !IS_ALIGNED(size, 0x20)) {
+    if (!IS_ALIGNED((uintptr_t)addr, 0x20) && !IS_ALIGNED(size, 0x20)) {
         JUTException::panic(__FILE__, 219, ":::address not 32Byte aligned.");
     }
 
-    if (block && !IS_ALIGNED((u32)block->getAddress() + param_4, 0x20)) {
+    if (block && !IS_ALIGNED((uintptr_t)block->getAddress() + param_4, 0x20)) {
         JUTException::panic(__FILE__, 227, ":::address not 32Byte aligned.");
     }
 }
@@ -163,7 +163,7 @@ JKRAramBlock* JKRAram::mainRamToAram(u8* buf, u32 bufSize, u32 alignedSize,
             block = NULL;
         } else {
             JKRDecompress(buf, (u8*)allocatedMem, fileSize, 0);
-            JKRAramPcs(0, (u32)allocatedMem, bufSize, alignedSize, block);
+            JKRAramPcs(0, (uintptr_t)allocatedMem, bufSize, alignedSize, block);
             JKRFreeToHeap(heap, allocatedMem);
             block = block == NULL ? (JKRAramBlock*)-1 : block;
             if (pSize != NULL) {
@@ -184,7 +184,7 @@ JKRAramBlock* JKRAram::mainRamToAram(u8* buf, u32 bufSize, u32 alignedSize,
             bufSize = allocatedBlock->getAddress();
         }
 
-        JKRAramPcs(0, (u32)buf, bufSize, alignedSize, block);
+        JKRAramPcs(0, (uintptr_t)buf, bufSize, alignedSize, block);
         block = block == NULL ? (JKRAramBlock*)-1 : block;
         if (pSize != NULL)
             *pSize = alignedSize;
@@ -205,8 +205,8 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS
     u32 expandSize;
     if (expandSwitch == EXPAND_SWITCH_UNKNOWN1) {
         u8 buffer[64];
-        u8* bufPtr = (u8*)ALIGN_NEXT((u32)buffer, 32);
-        JKRAramPcs(1, address, (u32)bufPtr, sizeof(buffer) / 2,
+        u8* bufPtr = (u8*)ALIGN_NEXT((uintptr_t)buffer, 32);
+        JKRAramPcs(1, address, (uintptr_t)bufPtr, sizeof(buffer) / 2,
                    NULL);  // probably change sizeof(buffer) / 2 to 32
         compression = JKRCheckCompressed_noASR(bufPtr);
         expandSize = JKRDecompExpandSize(bufPtr);
@@ -230,7 +230,7 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS
         if (szpSpace == NULL) {
             return NULL;
         } else {
-            JKRAramPcs(1, address, (u32)szpSpace, p3, NULL);
+            JKRAramPcs(1, address, (uintptr_t)szpSpace, p3, NULL);
             if (p5 != 0 && p5 < expandSize)
                 expandSize = p5;
 
@@ -261,7 +261,7 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS
             return NULL;
         } else {
             changeGroupIdIfNeed(buf, id);
-            JKRAramPcs(1, address, (u32)buf, p3, NULL);
+            JKRAramPcs(1, address, (uintptr_t)buf, p3, NULL);
             if (pSize != NULL) {
                 *pSize = p3;
             }
@@ -494,8 +494,8 @@ static u8* firstSrcData() {
         length = size;
     }
 
-    u32 src = (u32)(srcAddress + srcOffset);
-    u32 dst = (u32)buffer;
+    u32 src = (uintptr_t)(srcAddress + srcOffset);
+    u32 dst = (uintptr_t)buffer;
     u32 alignedLength = ALIGN_NEXT(length, 0x20);
     JKRAramPcs(1, src, dst, alignedLength, NULL);
 
@@ -511,18 +511,18 @@ static u8* firstSrcData() {
 /* 802D2CE4-802D2DAC 2CD624 00C8+00 1/1 0/0 0/0 .text            nextSrcData__FPUc */
 static u8* nextSrcData(u8* current) {
     u8* dest;
-    u32 left = (u32)(szpEnd - current);
+    u32 left = (uintptr_t)(szpEnd - current);
     if (IS_NOT_ALIGNED(left, 0x20))
         dest = szpBuf + 0x20 - (left & (0x20 - 1));
     else
         dest = szpBuf;
 
     memcpy(dest, current, left);
-    u32 transSize = (u32)(szpEnd - (dest + left));
+    u32 transSize = (uintptr_t)(szpEnd - (dest + left));
     if (transSize > transLeft)
         transSize = transLeft;
 
-    JKRAramPcs(1, (u32)(srcAddress + srcOffset), ((u32)dest + left), ALIGN_NEXT(transSize, 0x20),
+    JKRAramPcs(1, (uintptr_t)(srcAddress + srcOffset), ((uintptr_t)dest + left), ALIGN_NEXT(transSize, 0x20),
                NULL);
     srcOffset += transSize;
     transLeft -= transSize;
diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp
index 9a42aa7e3a..d5ad390f48 100644
--- a/src/JSystem/JKernel/JKRAramStream.cpp
+++ b/src/JSystem/JKernel/JKRAramStream.cpp
@@ -2,6 +2,7 @@
 #include "JSystem/JKernel/JKRAramPiece.h"
 #include "JSystem/JSupport/JSUFileStream.h"
 #include "JSystem/JUtility/JUTException.h"
+#include <stdint.h>
 
 /* ############################################################################################## */
 /* 80451408-8045140C 000908 0004+00 1/1 0/0 0/0 .sbss            sAramStreamObject__13JKRAramStream
@@ -40,7 +41,7 @@ JKRAramStream::~JKRAramStream() {}
 
 /* 802D3C68-802D3CD8 2CE5A8 0070+00 1/0 0/0 0/0 .text            run__13JKRAramStreamFv */
 void* JKRAramStream::run() {
-    OSInitMessageQueue(&sMessageQueue, sMessageBuffer, ARRAY_SIZE(sMessageBuffer));
+    OSInitMessageQueue(&sMessageQueue, sMessageBuffer, ARRAY_SIZEU(sMessageBuffer));
 
     for (;;) {
         OSMessage message;
@@ -115,7 +116,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
                 break;
             }
 
-            JKRAramPcs(0, (u32)buffer, destination, length, NULL);
+            JKRAramPcs(0, (uintptr_t)buffer, destination, length, NULL);
             dstSize -= length;
             writtenLength += length;
             destination += length;
@@ -205,7 +206,7 @@ void JKRAramStream::setTransBuffer(u8* buffer, u32 bufferSize, JKRHeap* heap) {
     transHeap = NULL;
 
     if (buffer) {
-        transBuffer = (u8*)ALIGN_NEXT((u32)buffer, 0x20);
+        transBuffer = (u8*)ALIGN_NEXT((uintptr_t)buffer, 0x20);
     }
 
     if (bufferSize) {
@@ -227,4 +228,4 @@ JKRAramStreamCommand::JKRAramStreamCommand() {
 // should be an inline function
 extern "C" s32 getAvailable__20JSURandomInputStreamCFv(JSURandomInputStream* self) {
     return self->getLength() - self->getPosition();
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/JSystem/JKernel/JKRArchivePri.cpp
index 5bff13bc11..977b39f3a6 100644
--- a/src/JSystem/JKernel/JKRArchivePri.cpp
+++ b/src/JSystem/JKernel/JKRArchivePri.cpp
@@ -190,7 +190,7 @@ void JKRArchive::CArcName::store(const char* name) {
     while (*name) {
         s32 ch = tolower(*name);
         mHash = ch + mHash * 3;
-        if (length < (s32)ARRAY_SIZE(mData)) {
+        if (length < ARRAY_SIZE(mData)) {
             mData[length++] = ch;
         }
         name++;
@@ -208,7 +208,7 @@ const char* JKRArchive::CArcName::store(const char* name, char endChar) {
     while (*name && *name != endChar) {
         s32 lch = tolower((int)*name);
         mHash = lch + mHash * 3;
-        if (length < (s32)ARRAY_SIZE(mData)) {
+        if (length < ARRAY_SIZE(mData)) {
             mData[length++] = lch;
         }
         name++;
@@ -240,4 +240,4 @@ u32 JKRArchive::getExpandSize(SDIFileEntry* fileEntry) const {
         return 0;
 
     return mExpandedSize[index];
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp
index b2cb4b403c..9a8dd46d15 100644
--- a/src/JSystem/JKernel/JKRCompArchive.cpp
+++ b/src/JSystem/JKernel/JKRCompArchive.cpp
@@ -10,6 +10,7 @@
 #include "JSystem/JUtility/JUTException.h"
 #include "math.h"
 #include "string.h"
+#include <stdint.h>
 
 /* 802D87D4-802D887C 2D3114 00A8+00 0/0 1/1 0/0 .text
  * __ct__14JKRCompArchiveFlQ210JKRArchive15EMountDirection      */
@@ -104,10 +105,10 @@ bool JKRCompArchive::open(s32 entryNum) {
             }
             else
             {
-                JKRDvdToMainRam(entryNum, (u8 *)mArcInfoBlock, EXPAND_SWITCH_UNKNOWN1, (u32)arcHeader->file_data_offset + mSizeOfMemPart,
+                JKRDvdToMainRam(entryNum, (u8 *)mArcInfoBlock, EXPAND_SWITCH_UNKNOWN1, (uintptr_t)arcHeader->file_data_offset + mSizeOfMemPart,
                                 NULL, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, 0x20, NULL, NULL);
-                DCInvalidateRange(mArcInfoBlock, (u32)arcHeader->file_data_offset + mSizeOfMemPart);
-                field_0x64 = (u32)mArcInfoBlock + arcHeader->file_data_offset;
+                DCInvalidateRange(mArcInfoBlock, (uintptr_t)arcHeader->file_data_offset + mSizeOfMemPart);
+                field_0x64 = (uintptr_t)mArcInfoBlock + arcHeader->file_data_offset;
 
                 if (mSizeOfAramPart != 0) {
                     mAramPart = (JKRAramBlock*)JKRAllocFromAram(mSizeOfAramPart, JKRAramHeap::HEAD);
@@ -119,9 +120,9 @@ bool JKRCompArchive::open(s32 entryNum) {
                     JKRDvdToAram(entryNum, mAramPart->getAddress(), EXPAND_SWITCH_UNKNOWN1, arcHeader->header_length + arcHeader->file_data_offset + mSizeOfMemPart, 0, NULL);
                 }
 
-                mNodes = (SDIDirEntry*)((u32)mArcInfoBlock + mArcInfoBlock->node_offset);
-                mFiles = (SDIFileEntry *)((u32)mArcInfoBlock + mArcInfoBlock->file_entry_offset);
-                mStringTable = (char*)((u32)mArcInfoBlock + mArcInfoBlock->string_table_offset);
+                mNodes = (SDIDirEntry*)((uintptr_t)mArcInfoBlock + mArcInfoBlock->node_offset);
+                mFiles = (SDIFileEntry *)((uintptr_t)mArcInfoBlock + mArcInfoBlock->file_entry_offset);
+                mStringTable = (char*)((uintptr_t)mArcInfoBlock + mArcInfoBlock->string_table_offset);
                 field_0x6c = arcHeader->header_length + arcHeader->file_data_offset;
             }
             break;
@@ -155,7 +156,7 @@ bool JKRCompArchive::open(s32 entryNum) {
                     else {
                         // arcHeader + 1 should lead to 0x20, which is the data after the header
                         JKRHeap::copyMemory((u8 *)mArcInfoBlock, arcHeader + 1, (arcHeader->file_data_offset + mSizeOfMemPart));
-                        field_0x64 = (u32)mArcInfoBlock + arcHeader->file_data_offset;
+                        field_0x64 = (uintptr_t)mArcInfoBlock + arcHeader->file_data_offset;
                         if (mSizeOfAramPart != 0) {
                             mAramPart = (JKRAramBlock*)JKRAllocFromAram(mSizeOfAramPart, JKRAramHeap::HEAD);
                             if(mAramPart == NULL) {
@@ -169,9 +170,9 @@ bool JKRCompArchive::open(s32 entryNum) {
                     }
                 }
             }
-            mNodes = (SDIDirEntry *)((u32)mArcInfoBlock + mArcInfoBlock->node_offset);
-            mFiles = (SDIFileEntry *)((u32)mArcInfoBlock + mArcInfoBlock->file_entry_offset);
-            mStringTable = (char *)((u32)mArcInfoBlock + mArcInfoBlock->string_table_offset);
+            mNodes = (SDIDirEntry *)((uintptr_t)mArcInfoBlock + mArcInfoBlock->node_offset);
+            mFiles = (SDIFileEntry *)((uintptr_t)mArcInfoBlock + mArcInfoBlock->file_entry_offset);
+            mStringTable = (char *)((uintptr_t)mArcInfoBlock + mArcInfoBlock->string_table_offset);
             field_0x6c = arcHeader->header_length + arcHeader->file_data_offset;
             break;
         }
@@ -374,7 +375,7 @@ u32 JKRCompArchive::getExpandedResSize(const void *resource) const
     }
 
     u8 buf[64];
-    u8 *bufPtr = (u8 *)ALIGN_NEXT((u32)buf, 32);
+    u8 *bufPtr = (u8 *)ALIGN_NEXT((uintptr_t)buf, 32);
     if ((flags & 0x20) != 0) {
         u32 addr = mAramPart->mAddress;
         addr = fileEntry->data_offset + addr;
@@ -391,4 +392,4 @@ u32 JKRCompArchive::getExpandedResSize(const void *resource) const
     u32 expandSize = JKRDecompExpandSize(bufPtr);
     const_cast<JKRCompArchive *>(this)->setExpandSize(fileEntry, expandSize);
     return expandSize;
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp
index 91098c4cf2..b53b3a44d0 100644
--- a/src/JSystem/JKernel/JKRDvdArchive.cpp
+++ b/src/JSystem/JKernel/JKRDvdArchive.cpp
@@ -7,6 +7,7 @@
 #include "math.h"
 #include "string.h"
 #include "global.h"
+#include <stdint.h>
 
 /* 802D7BF0-802D7C98 2D2530 00A8+00 0/0 1/1 0/0 .text
  * __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection       */
@@ -233,7 +234,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
             // The dst pointer to JKRDvdToMainRam should be aligned to 32 bytes. This will align
             // arcHeader to 32 bytes on the stack.
             char arcHeaderBuffer[64];
-            u8* arcHeader = (u8*)ALIGN_NEXT((u32)arcHeaderBuffer, 0x20);
+            u8* arcHeader = (u8*)ALIGN_NEXT((uintptr_t)arcHeaderBuffer, 0x20);
             JKRDvdToMainRam(entryNum, arcHeader, EXPAND_SWITCH_UNKNOWN2, sizeof(SArcHeader),
                             NULL, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL, NULL);
             DCInvalidateRange(arcHeader, sizeof(SArcHeader));
@@ -300,7 +301,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
             // The dst pointer to JKRDvdToMainRam should be aligned to 32 bytes. This will align
             // arcHeader to 32 bytes on the stack.
             char arcHeaderBuffer[64];
-            u8* arcHeader = (u8*)ALIGN_NEXT((u32)arcHeaderBuffer, 0x20);
+            u8* arcHeader = (u8*)ALIGN_NEXT((uintptr_t)arcHeaderBuffer, 0x20);
             JKRDvdToMainRam(entryNum, arcHeader, EXPAND_SWITCH_UNKNOWN2, sizeof(SArcHeader),
                             NULL, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL, NULL);
             DCInvalidateRange(arcHeader, sizeof(SArcHeader));
@@ -364,7 +365,7 @@ u32 JKRDvdArchive::getExpandedResSize(const void* resource) const {
     // The dst pointer to JKRDvdToMainRam should be aligned to 32 bytes. This will align arcHeader
     // to 32 bytes on the stack.
     char buffer[64];
-    u8* arcHeader = (u8*)ALIGN_NEXT((u32)buffer, 0x20);
+    u8* arcHeader = (u8*)ALIGN_NEXT((uintptr_t)buffer, 0x20);
     JKRDvdToMainRam(mEntryNum, arcHeader, EXPAND_SWITCH_UNKNOWN2, sizeof(SArcHeader), NULL,
                     JKRDvdRipper::ALLOC_DIRECTION_FORWARD,
                     mDataOffset + fileEntry->data_offset, NULL, NULL);
@@ -375,4 +376,4 @@ u32 JKRDvdArchive::getExpandedResSize(const void* resource) const {
     ((JKRDvdArchive*)this)->setExpandSize(fileEntry, resourceSize);
 
     return resourceSize;
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp
index 4ce620b1dd..6645915215 100644
--- a/src/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdRipper.cpp
@@ -10,6 +10,7 @@
 #include <dolphin/os.h>
 #include <dolphin/os.h>
 #include "dolphin/vi.h"
+#include <stdint.h>
 
 static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*);
 static int decompSZS_subroutine(u8*, u8*);
@@ -66,7 +67,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
     if (expandSwitch == EXPAND_SWITCH_UNKNOWN1)
     {
         u8 buffer[0x40];
-        u8 *bufPtr = (u8 *)ALIGN_NEXT((u32)buffer, 32);
+        u8 *bufPtr = (u8 *)ALIGN_NEXT((uintptr_t)buffer, 32);
         while (true)
         {
             int readBytes = DVDReadPrio(dvdFile->getFileInfo(), bufPtr, 0x20, 0, 2);
@@ -134,7 +135,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
         if (offset != 0)
         {
             u8 buffer[0x40];
-            u8 *bufPtr = (u8 *)ALIGN_NEXT((u32)buffer, 32);
+            u8 *bufPtr = (u8 *)ALIGN_NEXT((uintptr_t)buffer, 32);
             while (true)
             {
                 int readBytes = DVDReadPrio(dvdFile->getFileInfo(), bufPtr, 32, (s32)offset, 2);
@@ -534,7 +535,7 @@ static u8* nextSrcData(u8* src) {
         buf = szpBuf;
 
     memcpy(buf, src, limit);
-    u32 transSize = (u32)(szpEnd - (buf + limit));
+    u32 transSize = (uintptr_t)(szpEnd - (buf + limit));
     if (transSize > transLeft)
         transSize = transLeft;
     while (true)
diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp
index cb9dc2b18c..ab40964ac6 100644
--- a/src/JSystem/JKernel/JKRExpHeap.cpp
+++ b/src/JSystem/JKernel/JKRExpHeap.cpp
@@ -75,7 +75,7 @@ JKRExpHeap* JKRExpHeap::create(void* ptr, u32 size, JKRHeap* parent, bool errorF
         return NULL;
 
     void* dataPtr = (u8*)ptr + expHeapSize;
-    u32 alignedSize = ALIGN_PREV((u32)ptr + size - (u32)dataPtr, 0x10);
+    u32 alignedSize = ALIGN_PREV((uintptr_t)ptr + size - (uintptr_t)dataPtr, 0x10);
     if (ptr) {
         newHeap = new (ptr) JKRExpHeap(dataPtr, alignedSize, parent2, errorFlag);
     }
@@ -182,7 +182,7 @@ void* JKRExpHeap::allocFromHead(u32 size, int align) {
 
     for (CMemBlock* block = mHeadFreeList; block; block = block->mNext) {
         u32 offset =
-            ALIGN_PREV(align - 1 + (u32)block->getContent(), align) - (u32)block->getContent();
+            ALIGN_PREV(align - 1 + (uintptr_t)block->getContent(), align) - (uintptr_t)block->getContent();
         if (block->size < size + offset) {
             continue;
         }
@@ -239,7 +239,7 @@ void* JKRExpHeap::allocFromHead(u32 size, int align) {
                 CMemBlock* prev = foundBlock->mPrev;
                 CMemBlock* next = foundBlock->mNext;
                 removeFreeBlock(foundBlock);
-                newUsedBlock = (CMemBlock*)((u32)foundBlock + foundOffset);
+                newUsedBlock = (CMemBlock*)((uintptr_t)foundBlock + foundOffset);
                 newUsedBlock->size = foundBlock->size - foundOffset;
                 newFreeBlock =
                     newUsedBlock->allocFore(size, mCurrentGroupId, (u8)foundOffset, 0, 0);
@@ -252,7 +252,7 @@ void* JKRExpHeap::allocFromHead(u32 size, int align) {
                 CMemBlock* prev = foundBlock->mPrev;
                 CMemBlock* next = foundBlock->mNext;
                 // Works but very fake match
-                size = (u32)foundBlock->allocFore(size, mCurrentGroupId, 0, 0, 0);
+                size = (uintptr_t)foundBlock->allocFore(size, mCurrentGroupId, 0, 0, 0);
                 removeFreeBlock(foundBlock);
                 if (size) {
                     setFreeBlock((CMemBlock*)size, prev, next);
@@ -318,8 +318,8 @@ void* JKRExpHeap::allocFromTail(u32 size, int align) {
     u32 start;
 
     for (CMemBlock* block = mTailFreeList; block; block = block->mPrev) {
-        start = ALIGN_PREV((u32)block->getContent() + block->size - size, align);
-        usedSize = (u32)block->getContent() + block->size - start;
+        start = ALIGN_PREV((uintptr_t)block->getContent() + block->size - size, align);
+        usedSize = (uintptr_t)block->getContent() + block->size - start;
         if (block->size >= usedSize) {
             foundBlock = block;
             offset = block->size - usedSize;
@@ -454,7 +454,7 @@ s32 JKRExpHeap::do_resize(void* ptr, u32 size) {
     if (size > block->size) {
         CMemBlock* foundBlock = NULL;
         for (CMemBlock* freeBlock = mHeadFreeList; freeBlock; freeBlock = freeBlock->mNext) {
-            if (freeBlock == (CMemBlock*)((u32)(block + 1) + block->size)) {
+            if (freeBlock == (CMemBlock*)((uintptr_t)(block + 1) + block->size)) {
                 foundBlock = freeBlock;
                 break;
             }
@@ -718,9 +718,9 @@ void JKRExpHeap::recycleFreeBlock(JKRExpHeap::CMemBlock* block) {
 /* 802D00B4-802D0190 2CA9F4 00DC+00 1/1 0/0 0/0 .text
  * joinTwoBlocks__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock        */
 void JKRExpHeap::joinTwoBlocks(CMemBlock* block) {
-    u32 endAddr = (u32)(block + 1) + block->size;
+    u32 endAddr = (uintptr_t)(block + 1) + block->size;
     CMemBlock* next = block->mNext;
-    u32 nextAddr = (u32)next - (next->mFlags & 0x7f);
+    u32 nextAddr = (uintptr_t)next - (next->mFlags & 0x7f);
     if (endAddr > nextAddr) {
         JUTWarningConsole_f(":::Heap may be broken. (block = %x)", block);
         JKRGetCurrentHeap()->dump();
@@ -776,7 +776,7 @@ bool JKRExpHeap::check() {
                                     block->mNext->mPrev);
             }
 
-            if ((u32)block + block->size + sizeof(CMemBlock) > (u32)block->mNext) {
+            if ((uintptr_t)block + block->size + sizeof(CMemBlock) > (uintptr_t)block->mNext) {
                 ok = false;
                 JUTWarningConsole_f(":::addr %08x: bad block size (%08x)\n", block, block->size);
             }
@@ -932,7 +932,7 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocFore(u32 size, u8 groupId1, u
     mGroupId = groupId1;
     mFlags = alignment1;
     if (getSize() >= size + sizeof(CMemBlock)) {
-        block = (CMemBlock*)(size + (u32)this);
+        block = (CMemBlock*)(size + (uintptr_t)this);
         block[1].mGroupId = groupId2;
         block[1].mFlags = alignment2;
         block[1].size = this->size - (size + sizeof(CMemBlock));
@@ -948,7 +948,7 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocBack(u32 size, u8 groupId1, u
                                                         u8 groupId2, u8 alignment2) {
     CMemBlock* newblock = NULL;
     if (getSize() >= size + sizeof(CMemBlock)) {
-        newblock = (CMemBlock*)((u32)this + getSize() - size);
+        newblock = (CMemBlock*)((uintptr_t)this + getSize() - size);
         newblock->mGroupId = groupId2;
         newblock->mFlags = alignment2 | 0x80;
         newblock->size = size;
@@ -997,10 +997,10 @@ void JKRExpHeap::state_register(JKRHeap::TState* p, u32 param_1) const {
         if (param_1 <= 0xff) {
             u8 groupId = block->getGroupId();
             if (groupId == param_1) {
-                checkCode += (u32)block * 3;
+                checkCode += (uintptr_t)block * 3;
             }
         } else {
-            checkCode += (u32)block * 3;
+            checkCode += (uintptr_t)block * 3;
         }
     }
     p->mCheckCode = checkCode;
diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp
index ab6dcdba48..fbcecb1cbf 100644
--- a/src/JSystem/JKernel/JKRFileLoader.cpp
+++ b/src/JSystem/JKernel/JKRFileLoader.cpp
@@ -110,7 +110,7 @@ JKRFileLoader* JKRFileLoader::findVolume(const char** volumeName) {
     }
 
     char volumeNameBuffer[0x101];
-    *volumeName = fetchVolumeName(volumeNameBuffer, ARRAY_SIZE(volumeNameBuffer), *volumeName);
+    *volumeName = fetchVolumeName(volumeNameBuffer, ARRAY_SIZEU(volumeNameBuffer), *volumeName);
 
     JSUList<JKRFileLoader>& volumeList = getVolumeList();
     JSUListIterator<JKRFileLoader> iterator;
@@ -159,4 +159,4 @@ const char* JKRFileLoader::fetchVolumeName(char* buffer, s32 bufferSize, const c
     }
 
     return path;
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp
index 7da2689cee..bbcca9c2c3 100644
--- a/src/JSystem/JKernel/JKRHeap.cpp
+++ b/src/JSystem/JKernel/JKRHeap.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
+#include <stdint.h>
 
 bool data_804508B0 = 1;
 
@@ -109,8 +110,8 @@ bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) {
         return false;
 
     arenaStart = OSInitAlloc(arenaLo, arenaHi, maxHeaps);
-    ram_start = (void*)ALIGN_NEXT((u32)arenaStart, 0x20);
-    ram_end = (void*)ALIGN_PREV((u32)arenaHi, 0x20);
+    ram_start = (void*)ALIGN_NEXT((uintptr_t)arenaStart, 0x20);
+    ram_end = (void*)ALIGN_PREV((uintptr_t)arenaHi, 0x20);
 
     OSBootInfo* codeStart = (OSBootInfo*)OSPhysicalToCached(0);
     mCodeStart = codeStart;
@@ -124,7 +125,7 @@ bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) {
     OSSetArenaHi(ram_end);
 
     *memory = (char*)ram_start;
-    *size = (u32)ram_end - (u32)ram_start;
+    *size = (uintptr_t)ram_end - (uintptr_t)ram_start;
     return true;
 }
 
@@ -273,7 +274,7 @@ s32 JKRHeap::changeGroupID(u8 groupID) {
 /* 802CE7DC-802CE83C 2C911C 0060+00 0/0 2/2 0/0 .text            getMaxAllocatableSize__7JKRHeapFi
  */
 u32 JKRHeap::getMaxAllocatableSize(int alignment) {
-    u32 maxFreeBlock = (u32)getMaxFreeBlock();
+    u32 maxFreeBlock = (uintptr_t)getMaxFreeBlock();
     u32 ptrOffset = (alignment - 1) & alignment - (maxFreeBlock & 0xf);
     return ~(alignment - 1) & (getFreeSize() - ptrOffset);
 }
@@ -363,13 +364,13 @@ void JKRHeap::dispose_subroutine(u32 begin, u32 end) {
 
 /* 802CEA78-802CEAA0 2C93B8 0028+00 0/0 1/1 0/0 .text            dispose__7JKRHeapFPvUl */
 bool JKRHeap::dispose(void* ptr, u32 size) {
-    dispose_subroutine((u32)ptr, (u32)ptr + size);
+    dispose_subroutine((uintptr_t)ptr, (uintptr_t)ptr + size);
     return false;
 }
 
 /* 802CEAA0-802CEAC0 2C93E0 0020+00 0/0 1/1 0/0 .text            dispose__7JKRHeapFPvPv */
 void JKRHeap::dispose(void* begin, void* end) {
-    dispose_subroutine((u32)begin, (u32)end);
+    dispose_subroutine((uintptr_t)begin, (uintptr_t)end);
 }
 
 /* 802CEAC0-802CEB18 2C9400 0058+00 0/0 3/3 0/0 .text            dispose__7JKRHeapFv */
diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp
index bc8ae24645..9fadefc771 100644
--- a/src/JSystem/JKernel/JKRMemArchive.cpp
+++ b/src/JSystem/JKernel/JKRMemArchive.cpp
@@ -5,6 +5,7 @@
 #include "JSystem/JUtility/JUTException.h"
 #include "string.h"
 #include "global.h"
+#include <stdint.h>
 
 /* 802D69B8-802D6A6C 2D12F8 00B4+00 0/0 2/2 0/0 .text
  * __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection       */
@@ -94,7 +95,7 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio
         mStringTable = (char *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset);
 
         mArchiveData =
-            (u8 *)((u32)mArcHeader + mArcHeader->header_length + mArcHeader->file_data_offset);
+            (u8 *)((uintptr_t)mArcHeader + mArcHeader->header_length + mArcHeader->file_data_offset);
         mIsOpen = true;
     }
 
@@ -116,7 +117,7 @@ bool JKRMemArchive::open(void* buffer, u32 bufferSize, JKRMemBreakFlag flag) {
     mNodes = (SDIDirEntry *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset);
     mFiles = (SDIFileEntry *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset);
     mStringTable = (char *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset);
-    mArchiveData = (u8 *)(((u32)mArcHeader + mArcHeader->header_length) + mArcHeader->file_data_offset);
+    mArchiveData = (u8 *)(((uintptr_t)mArcHeader + mArcHeader->header_length) + mArcHeader->file_data_offset);
     mIsOpen = (flag == JKRMEMBREAK_FLAG_UNKNOWN1) ? true : false; // mIsOpen might be u8
     mHeap = JKRHeap::findFromRoot(buffer);
     mCompression = COMPRESSION_NONE;
@@ -239,4 +240,4 @@ u32 JKRMemArchive::getExpandedResSize(const void* resource) const {
     } else {
         return JKRDecompExpandSize((u8*)resource);
     }
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp
index bd9eedd63a..66dfd29d26 100644
--- a/src/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/src/JSystem/JKernel/JKRSolidHeap.cpp
@@ -2,6 +2,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "global.h"
+#include <stdint.h>
 
 /* 802D0A24-802D0AD0 2CB364 00AC+00 0/0 4/4 1/1 .text            create__12JKRSolidHeapFUlP7JKRHeapb
  */
@@ -58,7 +59,7 @@ s32 JKRSolidHeap::adjustSize(void) {
     JKRHeap* parent = getParent();
     if (parent) {
         lock();
-        u32 thisSize = (u32)mStart - (u32)this;
+        u32 thisSize = (uintptr_t)mStart - (uintptr_t)this;
         u32 newSize = ALIGN_NEXT(mSolidHead - mStart, 0x20);
         if (parent->resize(this, thisSize + newSize) != -1) {
             mFreeSize = 0;
@@ -115,8 +116,8 @@ void* JKRSolidHeap::do_alloc(u32 size, int alignment) {
 void* JKRSolidHeap::allocFromHead(u32 size, int alignment) {
     size = ALIGN_NEXT(size, 0x4);
     void* ptr = NULL;
-    u32 alignedStart = (alignment - 1 + (u32)mSolidHead) & ~(alignment - 1);
-    u32 offset = alignedStart - (u32)mSolidHead;
+    u32 alignedStart = (alignment - 1 + (uintptr_t)mSolidHead) & ~(alignment - 1);
+    u32 offset = alignedStart - (uintptr_t)mSolidHead;
     u32 totalSize = size + offset;
     if (totalSize <= mFreeSize) {
         ptr = (void*)alignedStart;
@@ -137,8 +138,8 @@ void* JKRSolidHeap::allocFromHead(u32 size, int alignment) {
 void* JKRSolidHeap::allocFromTail(u32 size, int alignment) {
     size = ALIGN_NEXT(size, 4);
     void* ptr = NULL;
-    u32 alignedStart = ALIGN_PREV((u32)mSolidTail - size, alignment);
-    u32 totalSize = (u32)mSolidTail - (u32)alignedStart;
+    u32 alignedStart = ALIGN_PREV((uintptr_t)mSolidTail - size, alignment);
+    u32 totalSize = (uintptr_t)mSolidTail - (uintptr_t)alignedStart;
     if (totalSize <= mFreeSize) {
         ptr = (void*)alignedStart;
         mSolidTail -= totalSize;
@@ -178,7 +179,7 @@ void JKRSolidHeap::do_freeTail(void) {
         dispose(mSolidTail, mEnd);
     }
 
-    this->mFreeSize = ((u32)mEnd - (u32)mSolidTail + mFreeSize);
+    this->mFreeSize = ((uintptr_t)mEnd - (uintptr_t)mSolidTail + mFreeSize);
     this->mSolidTail = mEnd;
 
     JKRSolidHeap::Unknown* unknown = field_0x78;
@@ -216,7 +217,7 @@ bool JKRSolidHeap::check(void) {
 
     bool result = true;
     u32 calculatedSize =
-        ((u32)mSolidHead - (u32)mStart) + mFreeSize + ((u32)mEnd - (u32)mSolidTail);
+        ((uintptr_t)mSolidHead - (uintptr_t)mStart) + mFreeSize + ((uintptr_t)mEnd - (uintptr_t)mSolidTail);
     u32 availableSize = mSize;
     if (calculatedSize != availableSize) {
         result = false;
@@ -233,11 +234,11 @@ bool JKRSolidHeap::dump(void) {
     bool result = check();
 
     lock();
-    u32 headSize = ((u32)mSolidHead - (u32)mStart);
-    u32 tailSize = ((u32)mEnd - (u32)mSolidTail);
+    u32 headSize = ((uintptr_t)mSolidHead - (uintptr_t)mStart);
+    u32 tailSize = ((uintptr_t)mEnd - (uintptr_t)mSolidTail);
     s32 htSize = headSize + tailSize;
     JUTReportConsole_f("head %08x: %08x\n", mStart, headSize);
-    JUTReportConsole_f("tail %08x: %08x\n", mSolidTail, ((u32)mEnd - (u32)mSolidTail));
+    JUTReportConsole_f("tail %08x: %08x\n", mSolidTail, ((uintptr_t)mEnd - (uintptr_t)mSolidTail));
 
     u32 totalSize = mSize;
     float percentage = (float)htSize / (float)totalSize * 100.0f;
@@ -255,8 +256,8 @@ void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
     getState_(p);
     setState_u32ID_(p, id);
     setState_uUsedSize_(p, getUsedSize((JKRSolidHeap*)this));
-    u32 r29 = (u32)mSolidHead;
-    r29 += (u32)mSolidTail * 3;
+    u32 r29 = (uintptr_t)mSolidHead;
+    r29 += (uintptr_t)mSolidTail * 3;
     setState_u32CheckCode_(p, r29);
 }
 
diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp
index 03fc20b1da..fc2bbff804 100644
--- a/src/JSystem/JKernel/JKRThread.cpp
+++ b/src/JSystem/JKernel/JKRThread.cpp
@@ -4,6 +4,7 @@
 #include "stdio.h"
 #include "dol2asm.h"
 #include "global.h"
+#include <stdint.h>
 
 /* 8043428C-80434298 060FAC 000C+00 5/6 0/0 0/0 .bss             sThreadList__9JKRThread */
 JSUList<JKRThread> JKRThread::sThreadList(0);
@@ -53,7 +54,7 @@ JKRThread::JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param
 JKRThread::JKRThread(OSThread* thread, int message_count) : mThreadListLink(this) {
     mHeap = NULL;
     mThreadRecord = thread;
-    mStackSize = (u32)thread->stackEnd - (u32)thread->stackBase;
+    mStackSize = (uintptr_t)thread->stackEnd - (uintptr_t)thread->stackBase;
     mStackMemory = thread->stackBase;
 
     setCommon_mesgQueue(JKRHeap::getSystemHeap(), message_count);
diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp
index bbbc80d01a..4d1d228017 100644
--- a/src/JSystem/JStudio/JStudio/stb.cpp
+++ b/src/JSystem/JStudio/JStudio/stb.cpp
@@ -268,7 +268,7 @@ void TObject::process_paragraph_reserved_(u32 arg1, const void* pContent, u32 uS
         data::TParse_TParagraph_dataID dataID(pContent);
         const void* temp = dataID.getContent();
         on_data(dataID.get_ID(), dataID.get_IDSize(), temp,
-                uSize - ((u32)temp - (u32)dataID.getRaw()));
+                uSize - ((uintptr_t)temp - (uintptr_t)dataID.getRaw()));
         break;
     case 0x82:
         ASSERT(pContent != 0);
diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/src/JSystem/JUtility/JUTDirectFile.cpp
index 8b9c31e747..8a670475c5 100644
--- a/src/JSystem/JUtility/JUTDirectFile.cpp
+++ b/src/JSystem/JUtility/JUTDirectFile.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/JUtility/JUTDirectFile.h"
 #include <dolphin/os.h>
 #include "global.h"
+#include <stdint.h>
 
 //
 // Forward References:
@@ -47,7 +48,7 @@ JUTDirectFile::JUTDirectFile() {
 	mLength      = 0;
 	mPos         = 0;
 	mToRead      = 0;
-	mSectorStart = (u8*)ALIGN_NEXT((u32)mBuffer, DVD_MIN_TRANSFER_SIZE);
+	mSectorStart = (u8*)ALIGN_NEXT((uintptr_t)mBuffer, DVD_MIN_TRANSFER_SIZE);
 	mIsOpen      = false;
 }
 
diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp
index a020ee2936..2f708f3043 100644
--- a/src/JSystem/JUtility/JUTDirectPrint.cpp
+++ b/src/JSystem/JUtility/JUTDirectPrint.cpp
@@ -190,7 +190,7 @@ void JUTDirectPrint::printSub(u16 position_x, u16 position_y, char const* format
         return;
     }
 
-    int buffer_length = vsnprintf(buffer, ARRAY_SIZE(buffer), format, args);
+    int buffer_length = vsnprintf(buffer, ARRAY_SIZEU(buffer), format, args);
     u16 x = position_x;
     if (buffer_length > 0) {
         if (clear) {
diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp
index 7ea4a54e22..754b8277c4 100644
--- a/src/JSystem/JUtility/JUTException.cpp
+++ b/src/JSystem/JUtility/JUTException.cpp
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <dolphin.h>
+#include <stdint.h>
 
 /* 803CC620-803CC640 029740 0020+00 3/3 0/0 0/0 .data            sMessageQueue__12JUTException */
 OSMessageQueue JUTException::sMessageQueue = {0};
@@ -191,7 +192,7 @@ void JUTException::panic_f_va(char const* file, int line, char const* format, va
 
     OSContext* current_context = OSGetCurrentContext();
     memcpy(&context, current_context, sizeof(OSContext));
-    sErrorManager->mStackPointer = (u32)OSGetStackPointer();
+    sErrorManager->mStackPointer = (uintptr_t)OSGetStackPointer();
 
     exCallbackObject.callback = sPreUserCallback;
     exCallbackObject.error = 0xFF;
@@ -468,10 +469,10 @@ bool JUTException::showMapInfo_subroutine(u32 address, bool begin_with_newline)
         if (result == true) {
             result =
                 queryMapAddress((char*)name_part, section_offset, section_id, &out_addr, &out_size,
-                                out_line, ARRAY_SIZE(out_line), true, begin_with_newline);
+                                out_line, ARRAY_SIZEU(out_line), true, begin_with_newline);
         } else {
             result = queryMapAddress(NULL, address, -1, &out_addr, &out_size, out_line,
-                                     ARRAY_SIZE(out_line), true, begin_with_newline);
+                                     ARRAY_SIZEU(out_line), true, begin_with_newline);
         }
 
         if (result == true) {
@@ -826,7 +827,7 @@ void JUTException::createFB() {
     u32 pixel_count = width * height;
     u32 size = pixel_count * 2;
 
-    void* begin = (void*)ALIGN_PREV((u32)end - size, 32);
+    void* begin = (void*)ALIGN_PREV((uintptr_t)end - size, 32);
     void* object = (void*)ALIGN_PREV((s32)begin - sizeof(JUTExternalFB), 32);
     new (object) JUTExternalFB(renderMode, GX_GM_1_7, begin, size);
 
@@ -934,7 +935,7 @@ bool JUTException::queryMapAddress_single(char* mapPath, u32 address, s32 sectio
 			char* src;
 			char* dst;
 
-			if (file.fgets(buffer, ARRAY_SIZE(buffer)) < 0)
+			if (file.fgets(buffer, ARRAY_SIZEU(buffer)) < 0)
 				break;
 			if (buffer[0] != '.')
 				continue;
@@ -968,7 +969,7 @@ bool JUTException::queryMapAddress_single(char* mapPath, u32 address, s32 sectio
 		int length;
 
 		while (true) {
-			if ((length = file.fgets(buffer, ARRAY_SIZE(buffer))) <= 4)
+			if ((length = file.fgets(buffer, ARRAY_SIZEU(buffer))) <= 4)
 				break;
 			if ((length < 28))
 				continue;
diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/src/JSystem/JUtility/JUTProcBar.cpp
index a276be2321..fc72d7a276 100644
--- a/src/JSystem/JUtility/JUTProcBar.cpp
+++ b/src/JSystem/JUtility/JUTProcBar.cpp
@@ -2,6 +2,7 @@
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTVideo.h"
+#include <stdint.h>
 
 /* 802E5888-802E599C 2E01C8 0114+00 1/1 0/0 0/0 .text            __ct__10JUTProcBarFv */
 JUTProcBar::JUTProcBar() {
@@ -263,7 +264,7 @@ void JUTProcBar::drawProcessBar() {
 
 /* 802E6D3C-802E6DA4 2E167C 0068+00 2/2 0/0 0/0 .text            addrToXPos__FPvi */
 static int addrToXPos(void* param_0, int param_1) {
-    return param_1 * (((u32)param_0 - 0x80000000) / (float)JKRHeap::mMemorySize);
+    return param_1 * (((uintptr_t)param_0 - 0x80000000) / (float)JKRHeap::mMemorySize);
 }
 
 /* 802E6DA4-802E6E0C 2E16E4 0068+00 2/2 0/0 0/0 .text            byteToXLen__Fii */
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h
new file mode 100644
index 0000000000..157c4180b7
--- /dev/null
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h
@@ -0,0 +1,22 @@
+#ifndef MSL_STDINT_H_
+#define MSL_STDINT_H_
+
+#include <cstdint.h>
+
+#ifdef __cplusplus
+    using std::uint8_t;
+	using std::uint16_t;
+	using std::uint32_t;
+
+    using std::int8_t;
+	using std::int16_t;
+	using std::int32_t;
+
+    using std::uint64_t;
+    using std::int64_t;
+
+    using std::uintptr_t;
+    using std::intptr_t;
+#endif
+
+#endif
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c
index e5f6449bf2..e57ec2d44b 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c
+++ b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c
@@ -1,4 +1,5 @@
 #include "__va_arg.h"
+#include <stdint.h>
 
 #undef __va_arg
 
@@ -38,7 +39,7 @@ void* __va_arg(_va_list_struct* list, int type) {
     } else {
         *reg = 8;
         addr = list->input_arg_area;
-        addr = (char*)(((u32)(addr) + ((size)-1)) & ~((size)-1));
+        addr = (char*)(((uintptr_t)(addr) + ((size)-1)) & ~((size)-1));
         list->input_arg_area = addr + size;
     }
 
@@ -47,4 +48,4 @@ void* __va_arg(_va_list_struct* list, int type) {
     }
 
     return addr;
-}
\ No newline at end of file
+}
diff --git a/src/SSystem/SComponent/c_cc_s.cpp b/src/SSystem/SComponent/c_cc_s.cpp
index 7fa9b0cbbd..ead97f8b8f 100644
--- a/src/SSystem/SComponent/c_cc_s.cpp
+++ b/src/SSystem/SComponent/c_cc_s.cpp
@@ -16,22 +16,22 @@ cCcS::cCcS() {}
 
 /* 80264A94-80264B60 25F3D4 00CC+00 1/1 1/1 0/0 .text            Ct__4cCcSFv */
 void cCcS::Ct() {
-    for (cCcD_Obj** obj = mpObjAt; obj < mpObjAt + ARRAY_SIZE(mpObjAt); ++obj) {
+    for (cCcD_Obj** obj = mpObjAt; obj < mpObjAt + ARRAY_SIZEU(mpObjAt); ++obj) {
         *obj = NULL;
     }
     mObjAtCount = 0;
 
-    for (cCcD_Obj** obj = mpObjTg; obj < mpObjTg + ARRAY_SIZE(mpObjTg); ++obj) {
+    for (cCcD_Obj** obj = mpObjTg; obj < mpObjTg + ARRAY_SIZEU(mpObjTg); ++obj) {
         *obj = NULL;
     }
     mObjTgCount = 0;
 
-    for (cCcD_Obj** obj = mpObjCo; obj < mpObjCo + ARRAY_SIZE(mpObjCo); ++obj) {
+    for (cCcD_Obj** obj = mpObjCo; obj < mpObjCo + ARRAY_SIZEU(mpObjCo); ++obj) {
         *obj = NULL;
     }
     mObjCoCount = 0;
 
-    for (cCcD_Obj** obj = mpObj; obj < mpObj + ARRAY_SIZE(mpObj); ++obj) {
+    for (cCcD_Obj** obj = mpObj; obj < mpObj + ARRAY_SIZEU(mpObj); ++obj) {
         *obj = NULL;
     }
     mObjCount = 0;
@@ -56,9 +56,9 @@ WeightType cCcS::GetWt(u8 param_0) const {
 /* 80264BA8-80264C5C 25F4E8 00B4+00 0/0 7/7 454/454 .text            Set__4cCcSFP8cCcD_Obj */
 void cCcS::Set(cCcD_Obj* obj) {
     if (obj->ChkAtSet()) {
-        if (mObjAtCount >= ARRAY_SIZE(mpObjAt)) {
+        if (mObjAtCount >= ARRAY_SIZEU(mpObjAt)) {
             OS_REPORT("\x1b[43;30m");
-            OS_REPORT("cCcS::Set AT Overflow.Now Max is %d.\n", ARRAY_SIZE(mpObjAt));
+            OS_REPORT("cCcS::Set AT Overflow.Now Max is %d.\n", ARRAY_SIZEU(mpObjAt));
             OS_REPORT("\x1b[m");
         } else {
             mpObjAt[mObjAtCount] = obj;
@@ -67,9 +67,9 @@ void cCcS::Set(cCcD_Obj* obj) {
     }
 
     if (obj->ChkTgSet()) {
-        if (mObjTgCount >= ARRAY_SIZE(mpObjTg)) {
+        if (mObjTgCount >= ARRAY_SIZEU(mpObjTg)) {
             OS_REPORT("\x1b[43;30m");
-            OS_REPORT("cCcS::Set TG Overflow.Now Max is %d.\n", ARRAY_SIZE(mpObjTg));
+            OS_REPORT("cCcS::Set TG Overflow.Now Max is %d.\n", ARRAY_SIZEU(mpObjTg));
             OS_REPORT("\x1b[m");
         } else {
             mpObjTg[mObjTgCount] = obj;
@@ -78,9 +78,9 @@ void cCcS::Set(cCcD_Obj* obj) {
     }
 
     if (obj->ChkCoSet()) {
-        if (mObjCoCount >= ARRAY_SIZE(mpObjCo)) {
+        if (mObjCoCount >= ARRAY_SIZEU(mpObjCo)) {
             OS_REPORT("\x1b[43;30m");
-            OS_REPORT("cCcS::Set CO Overflow.Now Max is %d.\n", ARRAY_SIZE(mpObjCo));
+            OS_REPORT("cCcS::Set CO Overflow.Now Max is %d.\n", ARRAY_SIZEU(mpObjCo));
             OS_REPORT("\x1b[m");
         } else {
             mpObjCo[mObjCoCount] = obj;
@@ -88,9 +88,9 @@ void cCcS::Set(cCcD_Obj* obj) {
         }
     }
 
-    if (mObjCount >= ARRAY_SIZE(mpObj)) {
+    if (mObjCount >= ARRAY_SIZEU(mpObj)) {
         OS_REPORT("\x1b[43;30m");
-        OS_REPORT("cCcS::Set SET Overflow.Now Max is %d.\n", ARRAY_SIZE(mpObj));
+        OS_REPORT("cCcS::Set SET Overflow.Now Max is %d.\n", ARRAY_SIZEU(mpObj));
         OS_REPORT("\x1b[m");
     } else {
         mpObj[mObjCount] = obj;
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c
index 51546fbbb0..7d8aecac06 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c
@@ -4,6 +4,7 @@
  */
 
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h"
+#include <stdint.h>
 
 #pragma dont_inline on
 /* 8036F580-8036F638 369EC0 00B8+00 0/0 1/1 0/0 .text            TRK_fill_mem */
@@ -14,7 +15,7 @@ void TRK_fill_mem(void* dst, int val, u32 n) {
     ((u8*)dst) = ((u8*)dst) - 1;
 
     if (n >= 32) {
-        i = (~(u32)dst) & 3;
+        i = (~(uintptr_t)dst) & 3;
 
         if (i) {
             n -= i;
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c
index 8f9849ff59..4221e7e191 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c
@@ -1,5 +1,6 @@
 #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h"
 #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h"
+#include <stdint.h>
 
 typedef struct memRange {
     u8* start;
@@ -136,7 +137,7 @@ DSError TRKValidMemory32(const void* addr, size_t length, ValidMemoryOptions rea
                 */
 
                 if (start < (const u8*)gTRKMemMap[i].start)
-                    err = TRKValidMemory32(start, (u32)((const u8*)gTRKMemMap[i].start - start),
+                    err = TRKValidMemory32(start, (uintptr_t)((const u8*)gTRKMemMap[i].start - start),
                                            readWriteable);
 
                 /*
@@ -150,7 +151,7 @@ DSError TRKValidMemory32(const void* addr, size_t length, ValidMemoryOptions rea
                 if ((err == DS_NoError) && (end > (const u8*)gTRKMemMap[i].end))
                     err =
                         TRKValidMemory32((const u8*)gTRKMemMap[i].end,
-                                         (u32)(end - (const u8*)gTRKMemMap[i].end), readWriteable);
+                                         (uintptr_t)(end - (const u8*)gTRKMemMap[i].end), readWriteable);
             }
 
             break;
@@ -183,7 +184,7 @@ DSError TRKTargetAccessMemory(void* data, u32 start, size_t* length,
             TRK_ppc_memcpy(data, addr, *length, uVar5, param4);
         } else {
             TRK_ppc_memcpy(addr, data, *length, param4, uVar5);
-            TRK_flush_cache((u32)addr, *length);
+            TRK_flush_cache((uintptr_t)addr, *length);
             if ((void*)start != addr) {
                 TRK_flush_cache(start, *length);
             }
@@ -1169,4 +1170,4 @@ asm void WriteFPSCR(register f64*) {
 	addi	r1,	r1, 0x40
 	blr
     // clang-format on
-}
\ No newline at end of file
+}
diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp
index 37ed2979d4..b1402c1fa9 100644
--- a/src/Z2AudioLib/Z2SceneMgr.cpp
+++ b/src/Z2AudioLib/Z2SceneMgr.cpp
@@ -216,12 +216,12 @@ void Z2SceneMgr::setSceneName(char* spotName, s32 room, s32 layer) {
     }
 
     if (spotName != NULL) {
-        for (spot = 0; spot < (int)ARRAY_SIZE(sSpotName); spot++) {
+        for (spot = 0; spot < ARRAY_SIZE(sSpotName); spot++) {
             if (!strcmp(spotName, sSpotName[spot])) {
                 break;
             }
         }
-        if (spot == (int)ARRAY_SIZE(sSpotName)) {
+        if (spot == ARRAY_SIZE(sSpotName)) {
             spot = SPOT_NONE;
         }
     }
diff --git a/src/Z2AudioLib/Z2SeMgr.cpp b/src/Z2AudioLib/Z2SeMgr.cpp
index b5886c6a3f..cbb20a3614 100644
--- a/src/Z2AudioLib/Z2SeMgr.cpp
+++ b/src/Z2AudioLib/Z2SeMgr.cpp
@@ -694,7 +694,7 @@ bool Z2SeMgr::seStartLevel(JAISoundID i_soundID, Vec const* i_pos, u32 param_2,
             Z2GetAudience()->calcOffMicSound(i_volume);
         }
 
-        (*handle)->setUserData((u32)i_pos);
+        (*handle)->setUserData((uintptr_t)i_pos);
 
         if (ret) {
             (*handle)->setLifeTime(1, false);
diff --git a/src/Z2AudioLib/Z2SoundObjMgr.cpp b/src/Z2AudioLib/Z2SoundObjMgr.cpp
index 47d0d36c15..761b8dba4d 100644
--- a/src/Z2AudioLib/Z2SoundObjMgr.cpp
+++ b/src/Z2AudioLib/Z2SoundObjMgr.cpp
@@ -340,7 +340,7 @@ void Z2SoundObjMgr::setGhostEnemyState(u8 p1) {
  * getEnemyID__13Z2SoundObjMgrFPCcP26JSULink<15Z2CreatureEnemy> */
 u8 Z2SoundObjMgr::getEnemyID(char const* param_0, JSULink<Z2CreatureEnemy>* param_1) {
     if (param_0 != NULL) {
-        for (u8 uVar2 = 0; uVar2 < ARRAY_SIZE(mEnemyInfo); uVar2++) {
+        for (u8 uVar2 = 0; uVar2 < ARRAY_SIZEU(mEnemyInfo); uVar2++) {
             if (strcmp(param_0, mEnemyInfo[(u32)uVar2].mName) == 0) {
                 append(param_1);
                 return uVar2;
diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp
index f114fc444a..17dd970f33 100644
--- a/src/c/c_dylink.cpp
+++ b/src/c/c_dylink.cpp
@@ -784,11 +784,11 @@ static int cCc_Init() {
     JKRHeap* prev = heap->becomeCurrentHeap();
 
     memset(&DMC, 0, sizeof(DMC));
-    for (int i = 0; i < ARRAY_SIZE(DynamicNameTable); i++) {
+    for (int i = 0; i < ARRAY_SIZEU(DynamicNameTable); i++) {
         const DynamicNameTableEntry* d = &DynamicNameTable[i];
 
         if (d->name != NULL) {
-            for (int j = 0; j < ARRAY_SIZE(DMC); j++) {
+            for (int j = 0; j < ARRAY_SIZEU(DMC); j++) {
                 if (DMC[j] != NULL) {
                     if (!strcmp(d->name, DMC[j]->getModuleName())) {
                         DMC[d->mKey] = DMC[j];
@@ -834,7 +834,7 @@ int cDyl_LinkASync(s16 i_ProfName) {
         return cPhs_INIT_e;
     }
 
-    if (i_ProfName >= ARRAY_SIZE(DMC)) {
+    if (i_ProfName >= ARRAY_SIZEU(DMC)) {
         OSReport_Error("cDyl_Link i_ProfName=%d\n", i_ProfName);
         return cPhs_ERROR_e;
     }
@@ -950,4 +950,4 @@ int cDylPhs::Unlink(request_of_phase_process_class* i_phase, s16 i_ProfName) {
     }
 
     return ret;
-}
\ No newline at end of file
+}
diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp
index 8bf4c097cf..3ef1533015 100644
--- a/src/d/actor/d_a_L7low_dr.cpp
+++ b/src/d/actor/d_a_L7low_dr.cpp
@@ -143,7 +143,7 @@ int daL7lowDr_c::CreateHeap() {
     }
 
     J3DModel* model = mpModelMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     return 1;
 }
 
diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp
index 34d92145e0..ad4a66f55a 100644
--- a/src/d/actor/d_a_alink.cpp
+++ b/src/d/actor/d_a_alink.cpp
@@ -3925,7 +3925,7 @@ J3DModel* daAlink_c::initModel(J3DModelData* i_modelData, u32 mdlFlags, u32 diff
     if (texNo >= 0) {
         ResTIMG* timg = tex->getResTIMG(texNo);
 
-        if (mpWarpTexData == (void*)((u32)timg + timg->imageOffset)) {
+        if (mpWarpTexData == (void*)((uintptr_t)timg + timg->imageOffset)) {
             warpMaterial = true;
         }
     }
@@ -4002,7 +4002,7 @@ static int daAlink_Draw(daAlink_c* i_this);
 /* 800A4068-800A4820 09E9A8 07B8+00 1/1 0/0 0/0 .text            createHeap__9daAlink_cFv */
 int daAlink_c::createHeap() {
     ResTIMG* sp14 = (ResTIMG*)dComIfG_getObjectRes("Always", 0x5D);
-    mpWarpTexData = (void*)((u32)sp14 + sp14->imageOffset);
+    mpWarpTexData = (void*)((uintptr_t)sp14 + sp14->imageOffset);
 
     if (*dStage_roomControl_c::getDemoArcName() != 0) {
         if (!initDemoModel(&mpDemoHLTmpModel, "demo00_Link_cut00_HL_tmp.bmd", 0x1000000)) {
@@ -14680,7 +14680,7 @@ void daAlink_c::setLight() {
         spC4.z = light_m->field_0x18;
 
         f32 var_f26;
-        if ((u32)light_m == (u32)&daAlinkHIO_wlLight_c0::m) {
+        if ((uintptr_t)light_m == (uintptr_t)&daAlinkHIO_wlLight_c0::m) {
             cXyz spD0 = eyePos - field_0x34e0;
             s16 sp104 = spD0.atan2sY_XZ();
             s16 sp106 = spD0.atan2sX_Z();
diff --git a/src/d/actor/d_a_alink_bottle.inc b/src/d/actor/d_a_alink_bottle.inc
index 63741311bf..9f0acf5de5 100644
--- a/src/d/actor/d_a_alink_bottle.inc
+++ b/src/d/actor/d_a_alink_bottle.inc
@@ -94,7 +94,7 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
         field_0x2f95 = 9;
     } else {
         item_model_data->getJointNodePointer(1)->setCallBack(daAlink_bottleModelCallBack);
-        mHeldItemModel->setUserArea((u32)this);
+        mHeldItemModel->setUserArea((uintptr_t)this);
         field_0x2f94 = 3;
         mItemMode = 0;
     }
diff --git a/src/d/actor/d_a_alink_cut.inc b/src/d/actor/d_a_alink_cut.inc
index 3fd0e22dc4..27d11f8165 100644
--- a/src/d/actor/d_a_alink_cut.inc
+++ b/src/d/actor/d_a_alink_cut.inc
@@ -777,14 +777,14 @@ void daAlink_c::initCutAtnActorSearch() {
         mProcVar4.field_0x3010 = 0;
     }
 
-    field_0x32cc = (u32)mTargetedActor;
+    field_0x32cc = (uintptr_t)mTargetedActor;
 }
 
 /* 800D2C54-800D2C78 0CD594 0024+00 3/3 0/0 0/0 .text checkCutAtnActorChange__9daAlink_cFv */
 void daAlink_c::checkCutAtnActorChange() {
-    if (field_0x32cc != (u32)mTargetedActor) {
+    if (field_0x32cc != (uintptr_t)mTargetedActor) {
         mProcVar4.field_0x3010 = 0;
-        field_0x32cc = (u32)mTargetedActor;
+        field_0x32cc = (uintptr_t)mTargetedActor;
     }
 }
 
diff --git a/src/d/actor/d_a_alink_effect.inc b/src/d/actor/d_a_alink_effect.inc
index fbf5a070ec..9ebff986ac 100644
--- a/src/d/actor/d_a_alink_effect.inc
+++ b/src/d/actor/d_a_alink_effect.inc
@@ -1796,13 +1796,13 @@ void daAlink_c::setFirePointDamageEffect() {
                 } else {
                     if (var_r26 && temp_r28 != NULL) {
                         temp_r28->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                        temp_r28->setUserWork((u32)&var_r30->field_0x24);
+                        temp_r28->setUserWork((uintptr_t)&var_r30->field_0x24);
                     }
 
                     JPABaseEmitter* temp_r28_2 = setEmitter(&var_r30->field_0x8, 0x743, &sp24, NULL);
                     if (var_r26 && temp_r28_2 != NULL) {
                         temp_r28_2->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                        temp_r28_2->setUserWork((u32)&var_r30->field_0x24);
+                        temp_r28_2->setUserWork((uintptr_t)&var_r30->field_0x24);
                     }
 
                     var_r30->field_0xc = sp24;
@@ -2019,7 +2019,7 @@ void daAlink_blur_c::draw() {
     GXSetNumIndStages(0);
     nColor0.a = field_0x20;
 
-    GXInitTexObj(&texObj, (void*)((u32)m_blurTex + m_blurTex->imageOffset), 0x10, 4, GX_TF_I4,
+    GXInitTexObj(&texObj, (void*)((uintptr_t)m_blurTex + m_blurTex->imageOffset), 0x10, 4, GX_TF_I4,
                  GX_CLAMP, GX_CLAMP, GX_FALSE);
     GXInitTexObjLOD(&texObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE,
                     GX_ANISO_1);
diff --git a/src/d/actor/d_a_alink_hook.inc b/src/d/actor/d_a_alink_hook.inc
index 99ea0d2a49..eb1b0a704c 100644
--- a/src/d/actor/d_a_alink_hook.inc
+++ b/src/d/actor/d_a_alink_hook.inc
@@ -430,7 +430,7 @@ void daAlink_c::setHookshotModel() {
     mDoExt_setCurrentHeap(heap);
 
     resetHookshotMode();
-    mpHookChain->setUserArea((u32)this);
+    mpHookChain->setUserArea((uintptr_t)this);
     field_0x2f94 = 1;
     if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT) {
         field_0x2f95 = 6;
diff --git a/src/d/actor/d_a_alink_ironball.inc b/src/d/actor/d_a_alink_ironball.inc
index 8570933e96..ef2ef93ef9 100644
--- a/src/d/actor/d_a_alink_ironball.inc
+++ b/src/d/actor/d_a_alink_ironball.inc
@@ -127,7 +127,7 @@ void daAlink_c::setIronBallModel() {
 
     mDoExt_setCurrentHeap(prev_heap);
 
-    mpHookChain->setUserArea((u32)this);
+    mpHookChain->setUserArea((uintptr_t)this);
 
     field_0xFB8.SetAtType(AT_TYPE_IRON_BALL);
     field_0xFB8.SetAtHitMark(3);
diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc
index 6e21eb20de..4c52d7f62a 100644
--- a/src/d/actor/d_a_alink_wolf.inc
+++ b/src/d/actor/d_a_alink_wolf.inc
@@ -150,7 +150,7 @@ void daAlink_c::changeWolf() {
     mDoExt_setCurrentHeap(current_heap);
 
     dComIfGs_setTransformStatus(1);
-    mpLinkModel->setUserArea((u32)this);
+    mpLinkModel->setUserArea((uintptr_t)this);
     changeModelDataDirectWolf(0);
     mEyeHL1.entry(field_0x064C, "wl_eye_Hilight");
     mEyeHL2.entry(mpWlMidnaModel->getModelData(), "midona_eye_Hlight");
@@ -326,8 +326,8 @@ void daAlink_c::changeLink(int param_0) {
     mDoExt_setCurrentHeap(current_heap);
 
     dComIfGs_setTransformStatus(0);
-    mpLinkModel->setUserArea((u32)this);
-    mpLinkHatModel->setUserArea((u32)this);
+    mpLinkModel->setUserArea((uintptr_t)this);
+    mpLinkHatModel->setUserArea((uintptr_t)this);
     changeModelDataDirect(param_0);
     field_0x06e4 = NULL;
 
@@ -407,7 +407,7 @@ void daAlink_c::changeLink(int param_0) {
     face_modeldata->getMaterialNodePointer(3)->setMaterialAnm(field_0x2180[1]);
     mEyeHL1.entry(face_modeldata, "highlight02");
 
-    mpKanteraModel->setUserArea((u32)this);
+    mpKanteraModel->setUserArea((uintptr_t)this);
     mpKanteraModel->getModelData()->getJointNodePointer(1)->setCallBack(
         daAlink_kandelaarModelCallBack);
     mZ2Link.setLinkState(var_r27);
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index edf64707d3..56146691f2 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -536,7 +536,7 @@ int daArrow_c::procWait() {
         JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(field_0x964);
         if (emitter != NULL) {
             emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-            emitter->setUserWork((u32)&mSmokePos);
+            emitter->setUserWork((uintptr_t)&mSmokePos);
 
             if (field_0x942 != 0) {
                 emitter->stopDrawParticle();
diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp
index 881ecdb596..8e5b9aaebb 100644
--- a/src/d/actor/d_a_b_bq.cpp
+++ b/src/d/actor/d_a_b_bq.cpp
@@ -2431,7 +2431,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModel* model = a_this->mpMorf->getModel();
-    model->setUserArea((u32)a_this);
+    model->setUserArea((uintptr_t)a_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp
index 7a8d72a2f1..024c91e8b4 100644
--- a/src/d/actor/d_a_b_dr.cpp
+++ b/src/d/actor/d_a_b_dr.cpp
@@ -4084,7 +4084,7 @@ int daB_DR_c::CreateHeap() {
     }
 
     this->model = mpModelMorf->getModel();
-    this->model->setUserArea((u32)this);
+    this->model->setUserArea((uintptr_t)this);
 
     for (u16 i = 0; i < this->model->getModelData()->getJointNum(); i++) {
         if (i != 0) {
diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp
index 8f62f8f369..200efb4254 100644
--- a/src/d/actor/d_a_b_ds.cpp
+++ b/src/d/actor/d_a_b_ds.cpp
@@ -4280,7 +4280,7 @@ void daB_DS_c::executeBullet() {
             if (emitter != NULL) {
                 emitter->setGlobalTranslation(JGeometry::TVec3<f32>(current.pos));
                 emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                emitter->setUserWork((u32)&field_0x724);
+                emitter->setUserWork((uintptr_t)&field_0x724);
             }
         }
     }
@@ -5401,7 +5401,7 @@ int daB_DS_c::CreateHeap() {
     }
 
     model = mpMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         if (i != 0) {
             model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp
index d87d533863..7395ecf084 100644
--- a/src/d/actor/d_a_b_gg.cpp
+++ b/src/d/actor/d_a_b_gg.cpp
@@ -4510,7 +4510,7 @@ int daB_GG_c::Create() {
         fopAcM_setCullSizeFar(this, 3.0f);
     
         J3DModel* model = mpModelMorf->getModel();
-        model->setUserArea((u32)this);
+        model->setUserArea((uintptr_t)this);
 
         for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
             if (i != 0) {
@@ -4521,7 +4521,7 @@ int daB_GG_c::Create() {
         field_0x5ac = 150.0f;
 
         if (mType == TYPE_L7_MBOSS) {
-            mpHelmetModel->setUserArea((u32)this);
+            mpHelmetModel->setUserArea((uintptr_t)this);
             mpHelmetModel->getModelData()->getJointNodePointer(1)->setCallBack(HeadJointCallBack);
             mpHelmetModel->getModelData()->getJointNodePointer(2)->setCallBack(HeadJointCallBack);
         }
diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp
index 38bd222955..fd5cb29ce5 100644
--- a/src/d/actor/d_a_b_gm.cpp
+++ b/src/d/actor/d_a_b_gm.cpp
@@ -2010,7 +2010,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModel* model = a_this->mpModelMorf->getModel();
-    model->setUserArea((u32)a_this);
+    model->setUserArea((uintptr_t)a_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp
index 90f17ee5c3..179a1285ab 100644
--- a/src/d/actor/d_a_b_gnd.cpp
+++ b/src/d/actor/d_a_b_gnd.cpp
@@ -4637,7 +4637,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     }
 
     J3DModel* model = i_this->mpModelMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
@@ -4734,7 +4734,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     }
     
     model = i_this->mpHorseMorf->getModel();
-    model->setUserArea((u32)a_this);
+    model->setUserArea((uintptr_t)a_this);
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(h_nodeCallBack);
     }
diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp
index 39a1bcb8d9..bc2eeb8abc 100644
--- a/src/d/actor/d_a_b_mgn.cpp
+++ b/src/d/actor/d_a_b_mgn.cpp
@@ -3357,7 +3357,7 @@ int daB_MGN_c::CreateHeap() {
     }
 
     J3DModel* model = mpMgnModelMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
         if (i == 1 || i == 25) {
diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp
index 0f5d04fcd7..626d58aaa4 100644
--- a/src/d/actor/d_a_b_ob.cpp
+++ b/src/d/actor/d_a_b_ob.cpp
@@ -3289,7 +3289,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
             return 0;
         }
 
-        a_this->mBodyParts[i].mpMorf->getModel()->setUserArea((u32)i_this);
+        a_this->mBodyParts[i].mpMorf->getModel()->setUserArea((uintptr_t)i_this);
 
         for (u16 j = 0; j < a_this->mBodyParts[i].mpMorf->getModel()->getModelData()->getJointNum();
              j++)
@@ -3320,7 +3320,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
                 return 0;
             }
 
-            a_this->mBodyParts[i].mpFinMorf->getModel()->setUserArea((u32)i_this);
+            a_this->mBodyParts[i].mpFinMorf->getModel()->setUserArea((uintptr_t)i_this);
 
             for (u16 j = 0;
                  j < a_this->mBodyParts[i].mpFinMorf->getModel()->getModelData()->getJointNum();
@@ -3351,7 +3351,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
                 return 0;
             }
 
-            a_this->mBodyParts[i].mpFinUnkMorf->getModel()->setUserArea((u32)i_this);
+            a_this->mBodyParts[i].mpFinUnkMorf->getModel()->setUserArea((uintptr_t)i_this);
 
             for (u16 j = 0;
                  j < a_this->mBodyParts[i].mpFinUnkMorf->getModel()->getModelData()->getJointNum();
@@ -3376,7 +3376,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
                 return 0;
             }
 
-            a_this->mBodyParts[i].mpFinBMorf->getModel()->setUserArea((u32)i_this);
+            a_this->mBodyParts[i].mpFinBMorf->getModel()->setUserArea((uintptr_t)i_this);
 
             for (u16 j = 0;
                  j < a_this->mBodyParts[i].mpFinBMorf->getModel()->getModelData()->getJointNum();
@@ -3401,7 +3401,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
                 return 0;
             }
 
-            a_this->mBodyParts[i].mpFinCMorf->getModel()->setUserArea((u32)i_this);
+            a_this->mBodyParts[i].mpFinCMorf->getModel()->setUserArea((uintptr_t)i_this);
 
             for (u16 j = 0;
                  j < a_this->mBodyParts[i].mpFinCMorf->getModel()->getModelData()->getJointNum();
@@ -3424,7 +3424,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
         return 0;
     }
 
-    a_this->mpSuiModel->setUserArea((u32)i_this);
+    a_this->mpSuiModel->setUserArea((uintptr_t)i_this);
 
     for (u16 j = 0; j < modelData->getJointNum(); j++) {
         modelData->getJointNodePointer(j)->setCallBack(sui_nodeCallBack);
diff --git a/src/d/actor/d_a_b_oh.cpp b/src/d/actor/d_a_b_oh.cpp
index 1eba7c7671..3084af013d 100644
--- a/src/d/actor/d_a_b_oh.cpp
+++ b/src/d/actor/d_a_b_oh.cpp
@@ -815,7 +815,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
         return 0;
     }
 
-    this_->mpMorf->getModel()->setUserArea((u32)this_);
+    this_->mpMorf->getModel()->setUserArea((uintptr_t)this_);
 
     for (u16 i = 0; i < this_->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         this_->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(
diff --git a/src/d/actor/d_a_b_oh2.cpp b/src/d/actor/d_a_b_oh2.cpp
index d6c46fb507..4651917694 100644
--- a/src/d/actor/d_a_b_oh2.cpp
+++ b/src/d/actor/d_a_b_oh2.cpp
@@ -238,7 +238,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
         return 0;
     }
 
-    _this->mpMorf->getModel()->setUserArea((u32)i_this);
+    _this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < _this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         _this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(
diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp
index 5789d8f78d..9911933d42 100644
--- a/src/d/actor/d_a_b_tn.cpp
+++ b/src/d/actor/d_a_b_tn.cpp
@@ -5047,7 +5047,7 @@ int daB_TN_c::CreateHeap() {
     }
 
     J3DModel* model = mpModelMorf2->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     model->getModelData()->getJointNodePointer(5)->setCallBack(JointCallBack);
     model->getModelData()->getJointNodePointer(1)->setCallBack(JointCallBack);
 
diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp
index 86477226ab..7ce4b8671f 100644
--- a/src/d/actor/d_a_b_zant.cpp
+++ b/src/d/actor/d_a_b_zant.cpp
@@ -5490,7 +5490,7 @@ int daB_ZANT_c::CreateHeap() {
     }
 
     J3DModel* model = mpModelMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     model->getModelData()->getJointNodePointer(1)->setCallBack(JointCallBack);
     model->getModelData()->getJointNodePointer(2)->setCallBack(JointCallBack);
 
diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp
index 88932e62d7..fb3f0317df 100644
--- a/src/d/actor/d_a_b_zant_magic.cpp
+++ b/src/d/actor/d_a_b_zant_magic.cpp
@@ -83,7 +83,7 @@ void daB_ZANTM_c::setMagicEffect() {
         if (emitter != NULL) {
             emitter->setGlobalScale(size);
             emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-            emitter->setUserWork((u32)&field_0x5dc);
+            emitter->setUserWork((uintptr_t)&field_0x5dc);
         }
     }
 }
diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp
index 239f5be124..cdb7f5f538 100644
--- a/src/d/actor/d_a_boomerang.cpp
+++ b/src/d/actor/d_a_boomerang.cpp
@@ -1520,7 +1520,7 @@ int daBoomerang_c::create() {
     m_windBtk->searchUpdateMaterialID(mp_shippuModel->getModelData());
     mp_shippuModel->getModelData()->entryTexMtxAnimator(m_windBtk);
     mp_shippuModel->getModelData()->getJointNodePointer(4)->setCallBack(daBoomeang_windModelCallBack);
-    mp_shippuModel->setUserArea((u32)this);
+    mp_shippuModel->setUserArea((uintptr_t)this);
 
     m_waitEffBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x47);
     JUT_ASSERT(3011, m_waitEffBtk);
diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp
index 76c9d20893..57f22c709b 100644
--- a/src/d/actor/d_a_coach_fire.cpp
+++ b/src/d/actor/d_a_coach_fire.cpp
@@ -87,7 +87,7 @@ int daCoachFire_c::draw() {
         speed.y = 0.0f;
         speed *= 0.9f;
         emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-        emitter->setUserWork((u32)(&speed));
+        emitter->setUserWork((uintptr_t)(&speed));
     }
     return 1;
 }
diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp
index d6cf731111..9ee870b284 100644
--- a/src/d/actor/d_a_cow.cpp
+++ b/src/d/actor/d_a_cow.cpp
@@ -3074,7 +3074,7 @@ int daCow_c::CreateHeap() {
         return cPhs_INIT_e;
     }
 
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
 
     for (u16 iJoint = 0; iJoint < modelData->getJointNum(); iJoint++) {
         if (iJoint == 1 || iJoint == 8 || iJoint == 0) {
diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp
index 1873bf3390..4a9761c1b4 100644
--- a/src/d/actor/d_a_cstatue.cpp
+++ b/src/d/actor/d_a_cstatue.cpp
@@ -165,7 +165,7 @@ int daCstatue_c::createHeap() {
     mpMorf = new mDoExt_McaMorfSO(
         static_cast<J3DModelData*>(dComIfG_getObjectRes(mResName, (u16)resource_index)), NULL, NULL,
         animation, 0, 0.0f, animation->getFrameMax(), -1, &mSound,
-        mType == daCstatueType_Normal2 ? J3DMdlFlag_None : J3DMdlFlag_Unk80000, data->morfIndex);
+        mType == daCstatueType_Normal2 ? J3DMdlFlag_None : J3DMdlFlag_DifferedDLBuffer, data->morfIndex);
 
     if (mpMorf == NULL || mpMorf->mpModel == NULL) {
         return cPhs_INIT_e;
diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp
index d22d55a2d6..520c59df4d 100644
--- a/src/d/actor/d_a_do.cpp
+++ b/src/d/actor/d_a_do.cpp
@@ -2418,7 +2418,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 
     J3DModel* model = _this->mpMorf->getModel();
     _this->model = model;
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
 
     for (u16 jnt_no = 0; jnt_no < model->getModelData()->getJointNum(); jnt_no++) {
         if (jnt_no == 9 || jnt_no == 10 || jnt_no == 22 || jnt_no == 23) {
diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp
index 6d97ebbf5f..38e8d1f018 100644
--- a/src/d/actor/d_a_door_dbdoor00.cpp
+++ b/src/d/actor/d_a_door_dbdoor00.cpp
@@ -101,7 +101,7 @@ int daDbDoor00_c::CreateHeap() {
     J3DJoint* nodePointerR = modelData->getJointNodePointer(field_0x5c1);
     nodePointerL->setCallBack(nodeCallBack);
     nodePointerR->setCallBack(nodeCallBack);
-    mpModel2->setUserArea((u32)this);
+    mpModel2->setUserArea((uintptr_t)this);
 
     mpBgW = new dBgW();
     cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb());
@@ -188,7 +188,7 @@ int daDbDoor00_c::getDemoAction() {
         "WAIT",      "SET_START", "SET_ANGLE", "END",        "OPEN",
         "STOP_OPEN", "SET_GOAL",  "SET_GOAL2", "ADJUSTMENT",
     };
-    return dComIfGp_evmng_getMyActIdx(field_0x598, action_table, ARRAY_SIZE(action_table), 0, 0);
+    return dComIfGp_evmng_getMyActIdx(field_0x598, action_table, ARRAY_SIZEU(action_table), 0, 0);
 }
 
 /* 8045DAB0-8045DE44 0007B0 0394+00 5/4 0/0 0/0 .text            demoProc__12daDbDoor00_cFv */
diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp
index b71d59d830..1b847782e2 100644
--- a/src/d/actor/d_a_door_push.cpp
+++ b/src/d/actor/d_a_door_push.cpp
@@ -260,7 +260,7 @@ int daDoorPush_c::demoProc() {
     field_0x644 = dComIfGp_evmng_getMyStaffId("pdoor", NULL, 0);
 
     s32 actIdx =
-        dComIfGp_evmng_getMyActIdx(field_0x644, action_table, ARRAY_SIZE(action_table), 0, 0);
+        dComIfGp_evmng_getMyActIdx(field_0x644, action_table, ARRAY_SIZEU(action_table), 0, 0);
     if (dComIfGp_evmng_getIsAddvance(field_0x644) != 0) {
         switch (actIdx) {
         case WAIT_e:
diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp
index 5ea1178154..7279059b7e 100644
--- a/src/d/actor/d_a_e_arrow.cpp
+++ b/src/d/actor/d_a_e_arrow.cpp
@@ -89,7 +89,7 @@ static void fire_eff_set(e_arrow_class* i_this) {
             if (emitter_p != NULL) {
                 if (i_this->field_0x5d8.abs() > 1.0f) {
                     emitter_p->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                    emitter_p->setUserWork((u32)&i_this->field_0x5d8);
+                    emitter_p->setUserWork((uintptr_t)&i_this->field_0x5d8);
                 } else {
                     emitter_p->setParticleCallBackPtr(NULL);
                 }
diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp
index f0ff909de1..07a0e42ed8 100644
--- a/src/d/actor/d_a_e_ba.cpp
+++ b/src/d/actor/d_a_e_ba.cpp
@@ -962,7 +962,7 @@ static int daE_BA_Execute(e_ba_class* i_this) {
                     if (emitter != NULL) {
                         emitter->setGlobalSRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(18));
                         emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                        emitter->setUserWork((u32)&i_this->field_0x6b0);
+                        emitter->setUserWork((uintptr_t)&i_this->field_0x6b0);
                     }
                 }
                 i_this->mCreatureSound.startCreatureSoundLevel(Z2SE_EN_BA_FIRE, 0, -1);
@@ -977,7 +977,7 @@ static int daE_BA_Execute(e_ba_class* i_this) {
                 if (emitter != NULL) {
                     emitter->setGlobalSRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(18));
                     emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                    emitter->setUserWork((u32)&i_this->field_0x6b0);
+                    emitter->setUserWork((uintptr_t)&i_this->field_0x6b0);
                 }
             }
         }
diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp
index da26ad3f8e..55ee39429e 100644
--- a/src/d/actor/d_a_e_bg.cpp
+++ b/src/d/actor/d_a_e_bg.cpp
@@ -1198,7 +1198,7 @@ void daE_BG_c::mtx_set() {
     J3DModel* model = mpMorfSO->getModel();
 
     model->setBaseTRMtx(mDoMtx_stack_c::get());
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
@@ -1346,7 +1346,7 @@ int daE_BG_c::CreateHeap() {
 
     J3DModel* model = mpMorfSO->getModel();
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp
index f65cb01d73..89675cc1ff 100644
--- a/src/d/actor/d_a_e_bs.cpp
+++ b/src/d/actor/d_a_e_bs.cpp
@@ -826,7 +826,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModel* model = a_this->modelMorf->getModel();
-    model->setUserArea((u32)a_this);
+    model->setUserArea((uintptr_t)a_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         if (i == 10) {
diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp
index 7637ed7860..472886ed8d 100644
--- a/src/d/actor/d_a_e_bu.cpp
+++ b/src/d/actor/d_a_e_bu.cpp
@@ -985,7 +985,7 @@ static int daE_BU_Execute(e_bu_class* i_this) {
                 if (emitter != NULL) {
                     emitter->setGlobalSRTMatrix(i_this->modelMorf->getModel()->getAnmMtx(0));
                     emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                    emitter->setUserWork((u32)&i_this->field_0x6c0);
+                    emitter->setUserWork((uintptr_t)&i_this->field_0x6c0);
                 }
             }
         } else {
@@ -997,7 +997,7 @@ static int daE_BU_Execute(e_bu_class* i_this) {
                 if (emitter != NULL) {
                     emitter->setGlobalSRTMatrix(i_this->modelMorf->getModel()->getAnmMtx(0));
                     emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                    emitter->setUserWork((u32)&i_this->field_0x6c0);
+                    emitter->setUserWork((uintptr_t)&i_this->field_0x6c0);
                 }
             }
         }
@@ -1039,7 +1039,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModel* model = a_this->modelMorf->getModel();
-    model->setUserArea((u32)a_this);
+    model->setUserArea((uintptr_t)a_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp
index c4c2e80928..06b0432e63 100644
--- a/src/d/actor/d_a_e_cr.cpp
+++ b/src/d/actor/d_a_e_cr.cpp
@@ -486,7 +486,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModel* model = a_this->modelMorf->getModel();
-    model->setUserArea((u32)a_this);
+    model->setUserArea((uintptr_t)a_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         if (i == 2) {
diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp
index 1bbfb31b32..cd7e8202e5 100644
--- a/src/d/actor/d_a_e_dd.cpp
+++ b/src/d/actor/d_a_e_dd.cpp
@@ -1610,7 +1610,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     }
 
     J3DModel* model = i_this->mpModelMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         if (i != 0) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp
index c48c03de0c..afab9a1164 100644
--- a/src/d/actor/d_a_e_df.cpp
+++ b/src/d/actor/d_a_e_df.cpp
@@ -725,7 +725,7 @@ int daE_DF_c::Create() {
 
         initCcCylinder();
         J3DModel* model = mpMorfSO->getModel();
-        model->setUserArea((u32)this);
+        model->setUserArea((uintptr_t)this);
 
         for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
             if (i != 0) {
diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp
index 7ba0078a74..0e57f148e4 100644
--- a/src/d/actor/d_a_e_dn.cpp
+++ b/src/d/actor/d_a_e_dn.cpp
@@ -3289,7 +3289,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     }
 
     J3DModel* model = i_this->mpModelMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         if (i != 0) {
diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp
index e3fb41c5e1..bea43e3a19 100644
--- a/src/d/actor/d_a_e_dt.cpp
+++ b/src/d/actor/d_a_e_dt.cpp
@@ -2502,7 +2502,7 @@ int daE_DT_c::CreateHeap() {
         return 0;
     }
     J3DModel* model = mpMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
     }
@@ -2518,7 +2518,7 @@ int daE_DT_c::CreateHeap() {
     if (mpSpitModel == NULL) {
         return 0;
     }
-    mpSpitModel->setUserArea((u32)this);
+    mpSpitModel->setUserArea((uintptr_t)this);
     for (u16 i = 1; i < mpSpitModel->getModelData()->getJointNum(); i++) {
         mpSpitModel->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBackTuba);
     }
diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp
index ad0d2602aa..af6beb1161 100644
--- a/src/d/actor/d_a_e_fk.cpp
+++ b/src/d/actor/d_a_e_fk.cpp
@@ -848,7 +848,7 @@ int daE_FK_c::Create() {
         mSize = 0.0f;
 
         J3DModel* model_p = mpModelMorf->getModel();
-        model_p->setUserArea((u32)this);
+        model_p->setUserArea((uintptr_t)this);
 
         for (u16 i = 0; i < model_p->getModelData()->getJointNum(); i++) {
             if (i != 0) {
diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp
index 2b73057845..9e1baad7d9 100644
--- a/src/d/actor/d_a_e_fm.cpp
+++ b/src/d/actor/d_a_e_fm.cpp
@@ -3531,7 +3531,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModel* fm_model = a_this->mpFmModelMorf->getModel();
-    fm_model->setUserArea((u32)a_this);
+    fm_model->setUserArea((uintptr_t)a_this);
 
     for (u16 i = 0; i < fm_model->getModelData()->getJointNum(); i++) {
         if (i == 1 || i == 2) {
diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp
index f62c307661..904dcc76be 100644
--- a/src/d/actor/d_a_e_fz.cpp
+++ b/src/d/actor/d_a_e_fz.cpp
@@ -892,7 +892,7 @@ s32 daE_FZ_c::execute() {
             mDoMtx_stack_c::transM(0.0f, 40.0f, 0.0f);
             emitter->setGlobalSRTMatrix(mDoMtx_stack_c::get());
             emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-            emitter->setUserWork((u32)(&mUserWork));
+            emitter->setUserWork((uintptr_t)(&mUserWork));
         }
     }
 
diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp
index dbb4b5db70..534debbf9b 100644
--- a/src/d/actor/d_a_e_gi.cpp
+++ b/src/d/actor/d_a_e_gi.cpp
@@ -1033,7 +1033,7 @@ int daE_GI_c::CreateHeap() {
     }
 
     J3DModel* model = mpModelMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
         if (i == 3) {
diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp
index c84425ae74..26a35b24d1 100644
--- a/src/d/actor/d_a_e_gob.cpp
+++ b/src/d/actor/d_a_e_gob.cpp
@@ -2281,7 +2281,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModel* model = a_this->mpModelMorf->getModel();
-    model->setUserArea((u32)a_this);
+    model->setUserArea((uintptr_t)a_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp
index e9d36af008..d30c839bad 100644
--- a/src/d/actor/d_a_e_hp.cpp
+++ b/src/d/actor/d_a_e_hp.cpp
@@ -1166,7 +1166,7 @@ int daE_HP_c::CreateHeap() {
     }
 
     model = mpMorfSO->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         if (i != 0) {
@@ -1182,7 +1182,7 @@ int daE_HP_c::CreateHeap() {
         return 0;
     }
 
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
     for (u16 i = 0; i < mpModel->getModelData()->getJointNum(); i++) {
         if (i != 0) {
             mpModel->getModelData()->getJointNodePointer(i)->setCallBack(LampJointCallBack);
diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp
index c2e39de5c3..4022e6291a 100644
--- a/src/d/actor/d_a_e_hzelda.cpp
+++ b/src/d/actor/d_a_e_hzelda.cpp
@@ -1345,7 +1345,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModel* model = a_this->mpModelMorf->getModel();
-    model->setUserArea((u32)a_this);
+    model->setUserArea((uintptr_t)a_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp
index c13d3867ee..c2f242a2a8 100644
--- a/src/d/actor/d_a_e_kk.cpp
+++ b/src/d/actor/d_a_e_kk.cpp
@@ -1371,7 +1371,7 @@ int daE_KK_c::CreateHeap() {
             return 0;
         }
         model = mpMorfSO->getModel();
-        model->setUserArea((u32)this);
+        model->setUserArea((uintptr_t)this);
         for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
             if (i != 0) {
                 model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp
index 4126e6a0e1..aa812a0d9b 100644
--- a/src/d/actor/d_a_e_mf.cpp
+++ b/src/d/actor/d_a_e_mf.cpp
@@ -3160,7 +3160,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     }
 
     J3DModel* model = i_this->mpModelMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         if (i != 0) {
diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp
index 3c8c274d28..0c37887d8b 100644
--- a/src/d/actor/d_a_e_oc.cpp
+++ b/src/d/actor/d_a_e_oc.cpp
@@ -2487,7 +2487,7 @@ int daE_OC_c::CreateHeap() {
         return 0;
     }
     J3DModel* my_model = mpMorf->getModel();
-    my_model->setUserArea((u32)this);
+    my_model->setUserArea((uintptr_t)this);
     for (u16 idx = 1; idx < my_model->getModelData()->getJointNum(); ++idx) {
         if (idx == 0x11 || idx == 0xc) {
             my_model->getModelData()->getJointNodePointer(idx)->setCallBack(&daE_OC_c::JointCallBack);
diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp
index 56799f606d..64f6a574b3 100644
--- a/src/d/actor/d_a_e_oct_bg.cpp
+++ b/src/d/actor/d_a_e_oct_bg.cpp
@@ -816,7 +816,7 @@ int daE_OctBg_c::CreateHeap() {
         return 0;
     }
     J3DModel* model = field_0x5b4->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     for (u16 i = 1; i <  model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
     }
diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp
index e9e316783c..0971701517 100644
--- a/src/d/actor/d_a_e_ph.cpp
+++ b/src/d/actor/d_a_e_ph.cpp
@@ -1265,7 +1265,7 @@ int daE_PH_c::create() {
         mAtInfo.mpSound = &mSound;
 
         J3DModel* model = mpMorf->getModel();
-        model->setUserArea((u32)this);
+        model->setUserArea((uintptr_t)this);
 
         for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
             if (i != 0) {
diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp
index d1f5cca00f..f333264531 100644
--- a/src/d/actor/d_a_e_pm.cpp
+++ b/src/d/actor/d_a_e_pm.cpp
@@ -2815,7 +2815,7 @@ cPhs__Step daE_PM_c::Create() {
         mCreatureSound.setEnemyName("E_PM");
 
         J3DModel* model = mpMorf->getModel();
-        model->setUserArea((u32)this);
+        model->setUserArea((uintptr_t)this);
         model->getModelData()->getJointNodePointer(JNT_HEAD)->setCallBack(JointCallBack);
 
         if (dComIfG_play_c::getLayerNo(0) == 2 || dComIfG_play_c::getLayerNo(0) == 5) {
diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp
index b8cbf82a06..2d81b8e5a4 100644
--- a/src/d/actor/d_a_e_po.cpp
+++ b/src/d/actor/d_a_e_po.cpp
@@ -1096,7 +1096,7 @@ static void e_po_dead(e_po_class* i_this) {
                 JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->mParticleKey5[i]);
                 if (emitter != NULL) {
                     emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                    emitter->setUserWork((u32)&i_this->field_0x814);
+                    emitter->setUserWork((uintptr_t)&i_this->field_0x814);
                 }
             }
             bool var_r0 = FALSE;
@@ -2864,7 +2864,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
         return 0;
     }
 
-    a_this->mpMorf->getModel()->setUserArea((u32)i_this);
+    a_this->mpMorf->getModel()->setUserArea((uintptr_t)i_this);
     for (u16 i = 0; i < a_this->mpMorf->getModel()->getModelData()->getJointNum(); i++) {
         if (i == 2 || (i >= 17 && i <= 22)) {
             a_this->mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(
diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp
index 3a63435e8e..6762aff337 100644
--- a/src/d/actor/d_a_e_rd.cpp
+++ b/src/d/actor/d_a_e_rd.cpp
@@ -5577,7 +5577,7 @@ static void fire_eff_set(e_rd_class* i_this) {
             JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->field_0x1274[i]);
             if (emitter != NULL) {
                 emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                emitter->setUserWork((u32)&i_this->field_0x1288);
+                emitter->setUserWork((uintptr_t)&i_this->field_0x1288);
             }
         }
     }
@@ -7024,7 +7024,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
         }
 
         model = i_this->mpModelMorf->getModel();
-        model->setUserArea((u32)i_this);
+        model->setUserArea((uintptr_t)i_this);
 
         for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
             model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_B);
@@ -7085,7 +7085,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
         }
 
         model = i_this->mpModelMorf->getModel();
-        model->setUserArea((u32)i_this);
+        model->setUserArea((uintptr_t)i_this);
         mDoMtx_stack_c::scaleS(0.0f, 0.0f, 0.0f);
         model->setBaseTRMtx(mDoMtx_stack_c::get());
 
@@ -7117,7 +7117,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
             }
 
             model = i_this->mpMorfBowAnm->getModel();
-            model->setUserArea((u32)i_this);
+            model->setUserArea((uintptr_t)i_this);
             model->setBaseTRMtx(mDoMtx_stack_c::get());
 
             for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp
index 004f44d438..ea236208bb 100644
--- a/src/d/actor/d_a_e_rdb.cpp
+++ b/src/d/actor/d_a_e_rdb.cpp
@@ -1794,7 +1794,7 @@ static int useHeapInit(fopAc_ac_c* actor) {
     }
 
     J3DModel* model = i_this->mpModelMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
     for (u16 i_idx = 0; i_idx < model->getModelData()->getJointNum(); i_idx++) {
         model->getModelData()->getJointNodePointer(i_idx)->setCallBack(nodeCallBack);
     }
diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp
index ff252093d5..e7191c7491 100644
--- a/src/d/actor/d_a_e_rdy.cpp
+++ b/src/d/actor/d_a_e_rdy.cpp
@@ -3759,7 +3759,7 @@ static void fire_eff_set(e_rdy_class* i_this) {
             JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->mFireParticleKey[i]);
             if (emitter != NULL) {
                 emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                emitter->setUserWork((u32)&i_this->field_0x1358);
+                emitter->setUserWork((uintptr_t)&i_this->field_0x1358);
             }
         }
     }
@@ -4809,7 +4809,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModel* model = _this->mpMorf->getModel();
-    model->setUserArea((u32)_this);
+    model->setUserArea((uintptr_t)_this);
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
     }
@@ -4833,7 +4833,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
         }
 
         J3DModel* bow_model = _this->mpBowMorf->getModel();
-        bow_model->setUserArea((u32)_this);
+        bow_model->setUserArea((uintptr_t)_this);
         for (u16 i = 0; i < bow_model->getModelData()->getJointNum(); i++) {
             if (i == 2 || i == 3) {
                 bow_model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_bow);
diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp
index 53f60476bd..1e10b20278 100644
--- a/src/d/actor/d_a_e_sb.cpp
+++ b/src/d/actor/d_a_e_sb.cpp
@@ -1196,7 +1196,7 @@ cPhs__Step daE_SB_c::Create() {
         mCyl.OffAtSetBit();
         mSound.setEnemyName("E_SB");
         J3DModel* model = mpMorf->getModel();
-        model->setUserArea((u32) this);
+        model->setUserArea((uintptr_t) this);
         for (u16 idx = 0; idx < model->getModelData()->getJointNum(); ++idx) {
             if (idx != 0) {
                 model->getModelData()->getJointNodePointer(idx)->setCallBack(JointCallBack);
diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp
index f9d8261034..84a861ef24 100644
--- a/src/d/actor/d_a_e_sg.cpp
+++ b/src/d/actor/d_a_e_sg.cpp
@@ -1176,7 +1176,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
         return 0;
     }
 
-    a_this->mpModel->setUserArea((u32)i_this);
+    a_this->mpModel->setUserArea((uintptr_t)i_this);
     if (a_this->mJoint.init(a_this, &jc_data, a_this->mpModel, 1) == 0) {
         return 0;
     }
diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp
index 855ee4603b..8bc656c2ac 100644
--- a/src/d/actor/d_a_e_sm2.cpp
+++ b/src/d/actor/d_a_e_sm2.cpp
@@ -1430,7 +1430,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
         return 0;
     }
 
-    a_this->modelMorf->getModel()->setUserArea((u32)a_this);
+    a_this->modelMorf->getModel()->setUserArea((uintptr_t)a_this);
 
     for (u16 i = 0; i < a_this->modelMorf->getModel()->getModelData()->getJointNum(); i++) {
         if (i >= 1) {
diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp
index 90a1e8ab2a..5020a72625 100644
--- a/src/d/actor/d_a_e_th.cpp
+++ b/src/d/actor/d_a_e_th.cpp
@@ -1209,7 +1209,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     }
 
     J3DModel* model_p = i_this->mpModelMorf->getModel();
-    model_p->setUserArea((u32)i_this);
+    model_p->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < model_p->getModelData()->getJointNum(); i++) {
         model_p->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp
index 2d9d82975e..bb057e02f5 100644
--- a/src/d/actor/d_a_e_tk_ball.cpp
+++ b/src/d/actor/d_a_e_tk_ball.cpp
@@ -285,7 +285,7 @@ static void action(e_tk_ball_class* i_this) {
                 particle_emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
                 i_this->mParticleDirection = particle_position - i_this->mPreviousPosition;
                 i_this->mParticleDirection *= 0.8f;
-                particle_emitter->setUserWork((u32)&i_this->mParticleDirection);
+                particle_emitter->setUserWork((uintptr_t)&i_this->mParticleDirection);
                 i_this->mPreviousPosition = particle_position;
                 break;
             }
diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp
index 9c1559ec07..5b1570dd5a 100644
--- a/src/d/actor/d_a_e_vt.cpp
+++ b/src/d/actor/d_a_e_vt.cpp
@@ -3747,7 +3747,7 @@ int daE_VA_c::CreateHeap() {
     }
 
     J3DModel* model = mpMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
         if (i == 11 || i == 12 || i == 13 || i == 14 || i == 27 || i == 33 || i == 34) {
@@ -3786,7 +3786,7 @@ int daE_VA_c::CreateHeap() {
     }
 
     model = mpEndEfMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
         if (i == 11 || i == 12 || i == 13 || i == 14 || i == 27 || i == 33 || i == 34) {
diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp
index 9754a6d23f..a31ec5f08d 100644
--- a/src/d/actor/d_a_e_wb.cpp
+++ b/src/d/actor/d_a_e_wb.cpp
@@ -2407,7 +2407,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     }
 
     J3DModel* model = i_this->mpModelMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp
index 339806021a..d30a2311e3 100644
--- a/src/d/actor/d_a_e_ym.cpp
+++ b/src/d/actor/d_a_e_ym.cpp
@@ -293,7 +293,7 @@ void daE_YM_c::setFireEffect() {
             if (emitter != NULL) {
                 if (speed.abs() > 1.0f) {
                     emitter->setParticleCallBackPtr((JPAParticleCallBack*)&JPTracePCB4);
-                    emitter->setUserWork((u32)field_0x6d0);
+                    emitter->setUserWork((uintptr_t)field_0x6d0);
                 } else {
                     emitter->setParticleCallBackPtr(NULL);
                 }
diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp
index 310c451013..b4d471ca28 100644
--- a/src/d/actor/d_a_e_ymb.cpp
+++ b/src/d/actor/d_a_e_ymb.cpp
@@ -3201,7 +3201,7 @@ int daE_YMB_c::CreateHeap() {
     }
 
     J3DModel* model = mpModelMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
     }
diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp
index 483e9998eb..1dbfadab5a 100644
--- a/src/d/actor/d_a_horse.cpp
+++ b/src/d/actor/d_a_horse.cpp
@@ -747,7 +747,7 @@ int daHorse_c::create() {
 
         procWaitInit();
 
-        m_model->setUserArea((u32)this);
+        m_model->setUserArea((uintptr_t)this);
         for (u16 i = 0; i < 38; i++) {
             m_modelData->getJointNodePointer(i)->setCallBack(daHorse_modelCallBack);
         }
diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp
index 97bfadd5b4..0cadf7f7a2 100644
--- a/src/d/actor/d_a_hozelda.cpp
+++ b/src/d/actor/d_a_hozelda.cpp
@@ -225,7 +225,7 @@ int daHoZelda_c::create() {
         J3DModelData* modelData = mpZeldaModel->getModelData();
 
         modelData->getJointNodePointer(0)->setMtxCalc(field_0x5a8);
-        mpZeldaModel->setUserArea((u32)this);
+        mpZeldaModel->setUserArea((uintptr_t)this);
 
         modelData->getJointNodePointer(0)->setCallBack(daHoZelda_modelCallBack);
         modelData->getJointNodePointer(1)->setCallBack(daHoZelda_modelCallBack);
diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp
index 25d58b2feb..f76f1d3c3d 100644
--- a/src/d/actor/d_a_kago.cpp
+++ b/src/d/actor/d_a_kago.cpp
@@ -3804,7 +3804,7 @@ int daKago_c::CreateHeap() {
     }
 
     J3DModel* model = mpMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
         if (i == 3 || i == 5 || i == 6) {
diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp
index 61b02e0dd4..2f5d7ed517 100644
--- a/src/d/actor/d_a_mg_fshop.cpp
+++ b/src/d/actor/d_a_mg_fshop.cpp
@@ -239,7 +239,7 @@ static void koro2_draw(fshop_class* param_1) {
     }
     g_env_light.setLightTevColorType_MAJI(ArcIX_A_crwaku_model[0], &param_1->tevStr);
     mDoExt_modelUpdateDL(ArcIX_A_crwaku_model[0]);
-    for (s32 iVar1 = 0; iVar1 < (s32)ARRAY_SIZE(param_1->mKoro2); iVar1++) {
+    for (s32 iVar1 = 0; iVar1 < ARRAY_SIZE(param_1->mKoro2); iVar1++) {
         if (param_1->mKoro2[iVar1].mpModel != NULL) {
             g_env_light.setLightTevColorType_MAJI(param_1->mKoro2[iVar1].mpModel, &param_1->tevStr);
             mDoExt_modelUpdateDL(param_1->mKoro2[iVar1].mpModel);
diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp
index d518b42035..81b0d54b17 100644
--- a/src/d/actor/d_a_mg_rod.cpp
+++ b/src/d/actor/d_a_mg_rod.cpp
@@ -230,7 +230,7 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) {
                 g_env_light.setLightTevColorType_MAJI(i_this->esa_model[i_this->esa_kind - 1], &actor->tevStr);
 
                 if (i_this->esa_kind == 2) {
-                    i_this->esa_model[i_this->esa_kind - 1]->setUserArea((u32)i_this);
+                    i_this->esa_model[i_this->esa_kind - 1]->setUserArea((uintptr_t)i_this);
                     for (u16 i = 0; i < i_this->esa_model[i_this->esa_kind - 1]->getModelData()->getJointNum(); i++) {
                         if (i >= 1) {
                             i_this->esa_model[i_this->esa_kind - 1]->getModelData()->getJointNodePointer(i)->setCallBack(Worm_nodeCallBack);
@@ -6086,7 +6086,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
             }
 
             if (i == 0) {
-                a_this->lure_model[i]->setUserArea((u32)a_this);
+                a_this->lure_model[i]->setUserArea((uintptr_t)a_this);
                 for (u16 j = 0; j < a_this->lure_model[i]->getModelData()->getJointNum(); j++) {
                     if (j == 1) {
                         a_this->lure_model[i]->getModelData()->getJointNodePointer(j)->setCallBack(frog_nodeCallBack);
@@ -6094,7 +6094,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
                 }
             } else {
                 if (i == 3) {
-                    a_this->lure_model[i]->setUserArea((u32)a_this);
+                    a_this->lure_model[i]->setUserArea((uintptr_t)a_this);
                     for (u16 j = 0; j < a_this->lure_model[i]->getModelData()->getJointNum(); j++) {
                         if (j == 1 || j == 2) {
                             a_this->lure_model[i]->getModelData()->getJointNodePointer(j)->setCallBack(ws_nodeCallBack);
@@ -6131,7 +6131,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
         }
     
         J3DModel* model = a_this->rod_modelMorf->getModel();
-        model->setUserArea((u32)a_this);
+        model->setUserArea((uintptr_t)a_this);
         for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
             if (i == 1 || i == 3) {
                 model->getModelData()->getJointNodePointer(i)->setCallBack(Reel_CallBack);
diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp
index 39d2352db4..f16b563d81 100644
--- a/src/d/actor/d_a_midna.cpp
+++ b/src/d/actor/d_a_midna.cpp
@@ -533,7 +533,7 @@ cPhs__Step daMidna_c::create() {
         
         mSound.init(&current.pos, &eyePos, 3, 1);
         mpShadowModel = mpMorf->getModel();
-        mpShadowModel->setUserArea((u32)this);
+        mpShadowModel->setUserArea((uintptr_t)this);
         J3DModelData* model_data = mpShadowModel->getModelData();
 
         model_data->getJointNodePointer(JNT_WORLD_ROOT)->setCallBack(&daMidna_modelCallBack);
diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp
index f729a49b04..13ab531cd0 100644
--- a/src/d/actor/d_a_nbomb.cpp
+++ b/src/d/actor/d_a_nbomb.cpp
@@ -535,7 +535,7 @@ void daNbomb_c::setEffect() {
         JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mEffectEmitterIDs[0]);
         if (emitter != NULL) {
             emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-            emitter->setUserWork((u32)&field_0xbe4);
+            emitter->setUserWork((uintptr_t)&field_0xbe4);
         }
 
         mEffectEmitterIDs[1] =
diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp
index 543e65d342..847a56f4d2 100644
--- a/src/d/actor/d_a_ni.cpp
+++ b/src/d/actor/d_a_ni.cpp
@@ -2086,7 +2086,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
 
     J3DModel* model = a_this->mpMorf->getModel();
     a_this->model = model;
-    model->setUserArea((u32)a_this);
+    model->setUserArea((uintptr_t)a_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp
index 1e245e4714..904af1cf58 100644
--- a/src/d/actor/d_a_npc.cpp
+++ b/src/d/actor/d_a_npc.cpp
@@ -715,7 +715,7 @@ static f32 dummy_literal() {
  */
 void daNpcT_JntAnm_c::initialize() {
     mActrMngr.initialize();
-    memset(&mAttnPos, 0, (u32)&field_0x158 - (u32)&mAttnPos);
+    memset(&mAttnPos, 0, (uintptr_t)&field_0x158 - (uintptr_t)&mAttnPos);
 }
 
 /* 80146CD8-80147858 141618 0B80+00 1/0 0/0 52/52 .text
@@ -1610,7 +1610,7 @@ void daNpcT_c::setMtx() {
     mDoMtx_stack_c::scaleM(scale);
 
     model->setBaseTRMtx(mDoMtx_stack_c::get());
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMorf[0]->onMorfNone();
     if (cM3d_IsZero(field_0xdfc) != FALSE) {
@@ -1986,7 +1986,7 @@ void daNpcT_c::evtChange() {
 void daNpcT_c::clrParam() {
     field_0xd7e = mCurAngle;
     mCutType = 0;
-    memset(&mEvtNo, 0, (u32)&field_0xe38 - (u32)&mEvtNo);
+    memset(&mEvtNo, 0, (uintptr_t)&field_0xe38 - (uintptr_t)&mEvtNo);
     mJntAnm.clrDirectFlag();
 }
 
diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp
index d63cffe1e3..68039625f0 100644
--- a/src/d/actor/d_a_npc2.cpp
+++ b/src/d/actor/d_a_npc2.cpp
@@ -638,7 +638,7 @@ void daBaseNpc_c::setMtx(int param_0) {
     model->setBaseTRMtx(mDoMtx_stack_c::get());
 
     if (param_0) {
-        model->setUserArea((u32)this);
+        model->setUserArea((uintptr_t)this);
     } else {
         model->setUserArea(0);
     }
diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp
index 9f1a79e95f..1236ad347c 100644
--- a/src/d/actor/d_a_npc4.cpp
+++ b/src/d/actor/d_a_npc4.cpp
@@ -740,7 +740,7 @@ void daNpcF_c::setMtx() {
     mDoMtx_stack_c::ZXYrotM(mCurAngle);
     mDoMtx_stack_c::scaleM(scale);
     model->setBaseTRMtx(mDoMtx_stack_c::get());
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     if (mAnmFlags & 0x100) {
         mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
@@ -757,7 +757,7 @@ void daNpcF_c::setMtx2() {
     mDoMtx_stack_c::ZXYrotM(mCurAngle);
     mDoMtx_stack_c::scaleM(scale);
     model->setBaseTRMtx(mDoMtx_stack_c::get());
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     if (cM3d_IsZero_inverted(mExpressionMorf)) {
         mpMorf->onMorfNone();
diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp
index 1b12ffa425..d7142753be 100644
--- a/src/d/actor/d_a_npc_ash.cpp
+++ b/src/d/actor/d_a_npc_ash.cpp
@@ -556,7 +556,7 @@ BOOL daNpcAsh_c::CreateHeap() {
     for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) {
         modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
@@ -1201,7 +1201,7 @@ bool daNpcAsh_c::demo(void* param_0) {
             if (staff_id != -1) {
                 mStaffID = staff_id;
                 s32 eventIdx = eventManager.getMyActIdx(staff_id, l_evtNames,
-                                                        ARRAY_SIZE(l_evtNames), 0, 0);
+                                                        ARRAY_SIZEU(l_evtNames), 0, 0);
                 if (eventIdx >= 1 && eventIdx < 6) {
                     mOrderEvtNo = eventIdx;
                 }
diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp
index d9ae1918fd..53cbf89812 100644
--- a/src/d/actor/d_a_npc_ashB.cpp
+++ b/src/d/actor/d_a_npc_ashB.cpp
@@ -419,7 +419,7 @@ BOOL daNpcAshB_c::CreateHeap() {
     for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) {
         modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp
index e75220055b..9bbdfc7100 100644
--- a/src/d/actor/d_a_npc_besu.cpp
+++ b/src/d/actor/d_a_npc_besu.cpp
@@ -715,7 +715,7 @@ int daNpc_Besu_c::CreateHeap() {
     for (u16 i = 0; i < modelData->getJointNum(); i++) {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
         return 0;
diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp
index e14f429e00..d1a878e2aa 100644
--- a/src/d/actor/d_a_npc_bou.cpp
+++ b/src/d/actor/d_a_npc_bou.cpp
@@ -257,7 +257,7 @@ int daNpc_Bou_c::CreateHeap() {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
         return 0;
diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp
index 4473f05aeb..76972da115 100644
--- a/src/d/actor/d_a_npc_cd.cpp
+++ b/src/d/actor/d_a_npc_cd.cpp
@@ -260,7 +260,7 @@ int daNpcCd_c::NpcCreate(int param_1) {
         a_mdlData_p->getJointNodePointer(i)->setCallBack(jntNodeCallBack);
     }
 
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
 
     OS_REPORT("   [ |   X   l     Type=%d  ", param_1);
 
diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp
index f600bc42c7..848c2d60cd 100644
--- a/src/d/actor/d_a_npc_cd2.cpp
+++ b/src/d/actor/d_a_npc_cd2.cpp
@@ -293,7 +293,7 @@ int daNpcCd2_c::NpcCreate(int param_1) {
     for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) {
         a_mdlData_p->getJointNodePointer(i)->setCallBack(jntNodeCallBack);
     }
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     return 1;
 }
 
diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp
index db251966fa..c9713ea352 100644
--- a/src/d/actor/d_a_npc_coach.cpp
+++ b/src/d/actor/d_a_npc_coach.cpp
@@ -566,7 +566,7 @@ int daNpcCoach_c::createHeap() {
     for (u16 i = 0; i < modelData->getJointNum(); i++) {
         modelData->getJointNodePointer(i)->setCallBack(jointHorseCallBack);
     }
-    mChHorse.mpModelMorf->getModel()->setUserArea((u32)this);
+    mChHorse.mpModelMorf->getModel()->setUserArea((uintptr_t)this);
 
     mChHorse.mpBtpAnm = new mDoExt_btpAnm();
     J3DAnmTexPattern* i_btk = (J3DAnmTexPattern*)dComIfG_getObjectRes(l_arcName, BTP_HU_EYE);
@@ -607,7 +607,7 @@ int daNpcCoach_c::createHeap() {
             modelData->getJointNodePointer(i)->setCallBack(jointFrontWheelCallBack);
         }
     }
-    mChHarness.mHarnessModel->setUserArea((u32)this);
+    mChHarness.mHarnessModel->setUserArea((uintptr_t)this);
 
     mChHarness.field_0x6a0 = new dBgW();
     if (mChHarness.field_0x6a0 == NULL) {
@@ -637,7 +637,7 @@ int daNpcCoach_c::createHeap() {
             modelData->getJointNodePointer(i)->setCallBack(jointCoachCallBack);
         }
     }
-    mChCoach.mCoachModel->setUserArea((u32)this);
+    mChCoach.mCoachModel->setUserArea((uintptr_t)this);
 
     mChCoach.field_0x564 = new dBgW();
     if (mChCoach.field_0x564 == NULL) {
@@ -917,10 +917,10 @@ void daNpcCoach_c::setCoachBlazing(u8 param_1) {
     mChCoach.field_0x5d4 = mChCoach.field_0x5c8 * 0.8f;
     mChCoach.field_0x5f8[0]->setGlobalAlpha(param_1);
     mChCoach.field_0x5f8[0]->setRate(fVar1);
-    mChCoach.field_0x5f8[0]->setUserWork((u32)&mChCoach.field_0x5d4);
+    mChCoach.field_0x5f8[0]->setUserWork((uintptr_t)&mChCoach.field_0x5d4);
     mChCoach.field_0x5f8[1]->setGlobalAlpha(uVar2);
     mChCoach.field_0x5f8[1]->setRate(fVar2);
-    mChCoach.field_0x5f8[1]->setUserWork((u32)&mChCoach.field_0x5d4);
+    mChCoach.field_0x5f8[1]->setUserWork((uintptr_t)&mChCoach.field_0x5d4);
 }
 
 /* 8099F4BC-8099F988 001E5C 04CC+00 1/1 0/0 0/0 .text            reinsExecute__12daNpcCoach_cFv */
diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp
index ecbdcc31c0..e5b7dadf5b 100644
--- a/src/d/actor/d_a_npc_doorboy.cpp
+++ b/src/d/actor/d_a_npc_doorboy.cpp
@@ -250,7 +250,7 @@ int daNpcDoorBoy_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    mpMorf->getModel()->setUserArea((u32)this);
+    mpMorf->getModel()->setUserArea((uintptr_t)this);
     
     setMotion(MOT_WAIT_A, -1.0f, 0);
 
diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp
index acef43869f..f60eaaca42 100644
--- a/src/d/actor/d_a_npc_grc.cpp
+++ b/src/d/actor/d_a_npc_grc.cpp
@@ -387,7 +387,7 @@ int daNpc_grC_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     field_0xbd8 = 0;
 
diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp
index ee0de236c5..97b2d4b204 100644
--- a/src/d/actor/d_a_npc_grmc.cpp
+++ b/src/d/actor/d_a_npc_grmc.cpp
@@ -294,7 +294,7 @@ int daNpc_grMC_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm[0] = NULL;
 
diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp
index 45dd9026d2..f51a9edab1 100644
--- a/src/d/actor/d_a_npc_grr.cpp
+++ b/src/d/actor/d_a_npc_grr.cpp
@@ -361,7 +361,7 @@ int daNpc_grR_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp
index 2ae6c31074..c539a69996 100644
--- a/src/d/actor/d_a_npc_hanjo.cpp
+++ b/src/d/actor/d_a_npc_hanjo.cpp
@@ -263,7 +263,7 @@ int daNpc_Hanjo_c::CreateHeap() {
     for (u16 i = 0; i < modelData->getJointNum(); i++) {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
         return 0;
diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp
index 5246ded5d8..810ab5c0dc 100644
--- a/src/d/actor/d_a_npc_impal.cpp
+++ b/src/d/actor/d_a_npc_impal.cpp
@@ -187,7 +187,7 @@ BOOL daNpcImpal_c::CreateHeap() {
     for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) {
         modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp
index 26027f7bae..409d3e352b 100644
--- a/src/d/actor/d_a_npc_jagar.cpp
+++ b/src/d/actor/d_a_npc_jagar.cpp
@@ -394,7 +394,7 @@ int daNpc_Jagar_c::CreateHeap() {
     for (u16 i = 0; i < modelData->getJointNum(); i++) {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp
index ab4efa5e40..0985268dca 100644
--- a/src/d/actor/d_a_npc_kasi_hana.cpp
+++ b/src/d/actor/d_a_npc_kasi_hana.cpp
@@ -724,7 +724,7 @@ int daNpcKasiHana_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     setMotion(MOT_W_WAIT_A, -1.0f, 0);
 
diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp
index 1df16348ef..a8d9765edc 100644
--- a/src/d/actor/d_a_npc_kasi_kyu.cpp
+++ b/src/d/actor/d_a_npc_kasi_kyu.cpp
@@ -276,7 +276,7 @@ int daNpcKasiKyu_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     setMotion(MOT_W_WAIT_A, -1.0f, 0);
 
diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp
index fbade0d8c5..23878b97bc 100644
--- a/src/d/actor/d_a_npc_kasi_mich.cpp
+++ b/src/d/actor/d_a_npc_kasi_mich.cpp
@@ -276,7 +276,7 @@ int daNpcKasiMich_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     setMotion(MOT_W_WAIT_A, -1.0f, 0);
 
diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp
index 97dd13a3f3..f60111ded2 100644
--- a/src/d/actor/d_a_npc_kn.cpp
+++ b/src/d/actor/d_a_npc_kn.cpp
@@ -525,7 +525,7 @@ int daNpc_Kn_c::CreateHeap() {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model_p->setUserArea((u32)this);
+    model_p->setUserArea((uintptr_t)this);
 
     if (!mInvisModel.create(mpModelMorf[0]->getModel(), 1)) {
         return 0;
@@ -557,7 +557,7 @@ int daNpc_Kn_c::CreateHeap() {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model_p->setUserArea((u32)this);
+    model_p->setUserArea((uintptr_t)this);
 
     if (mType == 4) {
         J3DModelData* modelData = NULL;
@@ -1075,7 +1075,7 @@ void daNpc_Kn_c::setAttnPos() {
     mDoMtx_stack_c::ZXYrotM(mCurAngle);
     mDoMtx_stack_c::scaleM(scale);
     model->setBaseTRMtx(mDoMtx_stack_c::get());
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     mpModelMorf[1]->modelCalc();
 
     mDoMtx_stack_c::copy(mpModelMorf[0]->getModel()->getAnmMtx(getHeadJointNo()));
diff --git a/src/d/actor/d_a_npc_kn_base.inc b/src/d/actor/d_a_npc_kn_base.inc
index ab7b16f9f0..94ca72f060 100644
--- a/src/d/actor/d_a_npc_kn_base.inc
+++ b/src/d/actor/d_a_npc_kn_base.inc
@@ -458,7 +458,7 @@ void daNpc_Kn_c::setMtx() {
     mDoMtx_stack_c::ZXYrotM(mCurAngle);
     mDoMtx_stack_c::scaleM(scale);
     model_p->setBaseTRMtx(mDoMtx_stack_c::get());
-    model_p->setUserArea((u32)this);
+    model_p->setUserArea((uintptr_t)this);
 
     if (mAnmFlags & ANM_PLAY_BCK) {
         mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp
index 9ddd756cf2..60192768ca 100644
--- a/src/d/actor/d_a_npc_kolin.cpp
+++ b/src/d/actor/d_a_npc_kolin.cpp
@@ -500,7 +500,7 @@ int daNpc_Kolin_c::CreateHeap() {
     for (u16 i = 0; i < modelData->getJointNum(); i++) {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp
index e3ffe02041..01c443c6ba 100644
--- a/src/d/actor/d_a_npc_kolinb.cpp
+++ b/src/d/actor/d_a_npc_kolinb.cpp
@@ -353,7 +353,7 @@ int daNpc_Kolinb_c::CreateHeap() {
     for (u16 i = 0; i < modelData->getJointNum(); i++) {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpBgW = new dBgW();
     if (mpBgW == NULL) {
diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp
index b7c9c8a5b8..72323b1a0d 100644
--- a/src/d/actor/d_a_npc_ks.cpp
+++ b/src/d/actor/d_a_npc_ks.cpp
@@ -6892,7 +6892,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     }
 
     J3DModel* model = i_this->mpModelMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
     }
diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp
index 34745057ff..ea21e60441 100644
--- a/src/d/actor/d_a_npc_lf.cpp
+++ b/src/d/actor/d_a_npc_lf.cpp
@@ -265,13 +265,13 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     lf_s* fish = a_this->mFish;
 
     for (int i = 0; i < a_this->mIter; i++, fish++) {        
-        fish->mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_Unk80000,0x11000084);
+        fish->mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer,0x11000084);
 
         if (!fish->mpModel) {
             return 0;
         }
 
-        fish->mpModel->setUserArea((u32)fish);
+        fish->mpModel->setUserArea((uintptr_t)fish);
     }
 
     return 1;
diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp
index 9607744069..f230b586fa 100644
--- a/src/d/actor/d_a_npc_maro.cpp
+++ b/src/d/actor/d_a_npc_maro.cpp
@@ -318,7 +318,7 @@ int daNpc_Maro_c::CreateHeap() {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
         return 0;
diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp
index e2f23feb41..4cf8f7c746 100644
--- a/src/d/actor/d_a_npc_midp.cpp
+++ b/src/d/actor/d_a_npc_midp.cpp
@@ -190,7 +190,7 @@ int daNpc_midP_c::CreateHeap() {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     for (int i = 0; i < 2; i++) {
         mpMatAnm[i] = new daNpcT_MatAnm_c();
 
diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp
index 836f070f88..f39e9c3f6d 100644
--- a/src/d/actor/d_a_npc_moi.cpp
+++ b/src/d/actor/d_a_npc_moi.cpp
@@ -359,7 +359,7 @@ int daNpc_Moi_c::CreateHeap() {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp
index 745b1b40a2..061a7ef72d 100644
--- a/src/d/actor/d_a_npc_moir.cpp
+++ b/src/d/actor/d_a_npc_moir.cpp
@@ -392,7 +392,7 @@ int daNpcMoiR_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    mdl_p->setUserArea((u32)this);
+    mdl_p->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp
index 8c73d22ca5..e79e7ae1e1 100644
--- a/src/d/actor/d_a_npc_ne.cpp
+++ b/src/d/actor/d_a_npc_ne.cpp
@@ -3107,7 +3107,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 
     J3DModel* model = _this->mpMorf->getModel();
     i_this->model = model;
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         if (i == 1 || i == 2 || i == 3 || i == 4 || i == 20 || i == 21) {
diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp
index 8b234e1672..54127ab0de 100644
--- a/src/d/actor/d_a_npc_prayer.cpp
+++ b/src/d/actor/d_a_npc_prayer.cpp
@@ -184,7 +184,7 @@ int daNpcPray_c::CreateHeap() {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model_p->setUserArea((u32)this);
+    model_p->setUserArea((uintptr_t)this);
     setMotion(MOTION_WAIT_e, -1.0f, 0);
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp
index 99e8ace64e..65176b762b 100644
--- a/src/d/actor/d_a_npc_saru.cpp
+++ b/src/d/actor/d_a_npc_saru.cpp
@@ -376,7 +376,7 @@ int daNpc_Saru_c::CreateHeap() {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (int i = 0; i < 2; i++) {
         if (l_bmdData[bmdTypeList[i]][0] >= 0) {
diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp
index 7b51e8b029..50dec3a4cf 100644
--- a/src/d/actor/d_a_npc_seib.cpp
+++ b/src/d/actor/d_a_npc_seib.cpp
@@ -173,7 +173,7 @@ int daNpc_seiB_c::CreateHeap() {
         return 0;
     }
 
-    mpMorf[0]->getModel()->setUserArea((u32)this);
+    mpMorf[0]->getModel()->setUserArea((uintptr_t)this);
     if (setFaceMotionAnm(0, false) && setMotionAnm(0, 0.0f, FALSE)) {
         return 1;
     }
diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp
index b9911cb1ee..6b06d21517 100644
--- a/src/d/actor/d_a_npc_seic.cpp
+++ b/src/d/actor/d_a_npc_seic.cpp
@@ -191,7 +191,7 @@ int daNpc_seiC_c::CreateHeap() {
         return 0;
     }
 
-    mpMorf[0]->getModel()->setUserArea((u32)this);
+    mpMorf[0]->getModel()->setUserArea((uintptr_t)this);
     if (setFaceMotionAnm(0, false) && setMotionAnm(0, 0.0f, FALSE)) {
         return 1;
     }
diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp
index a2f884e5a6..2911b3dfb5 100644
--- a/src/d/actor/d_a_npc_seid.cpp
+++ b/src/d/actor/d_a_npc_seid.cpp
@@ -192,7 +192,7 @@ int daNpc_seiD_c::CreateHeap() {
         return 0;
     }
 
-    mpMorf[0]->getModel()->setUserArea((u32)this);
+    mpMorf[0]->getModel()->setUserArea((uintptr_t)this);
     if (setFaceMotionAnm(0, false) && setMotionAnm(0, 0.0f, FALSE)) {
         return 1;
     }
diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp
index bfae1ec22b..a9320de8d1 100644
--- a/src/d/actor/d_a_npc_shad.cpp
+++ b/src/d/actor/d_a_npc_shad.cpp
@@ -491,7 +491,7 @@ int daNpcShad_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp
index a332579fcc..2d946c6ca7 100644
--- a/src/d/actor/d_a_npc_shoe.cpp
+++ b/src/d/actor/d_a_npc_shoe.cpp
@@ -206,7 +206,7 @@ BOOL daNpcShoe_c::CreateHeap() {
     for (u16 jointNo = 0; jointNo < mdlData_p->getJointNum(); jointNo++) {
         mdlData_p->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], 9));
 
diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp
index 4e1f3fe6ac..6342a47ae4 100644
--- a/src/d/actor/d_a_npc_taro.cpp
+++ b/src/d/actor/d_a_npc_taro.cpp
@@ -441,7 +441,7 @@ int daNpc_Taro_c::CreateHeap() {
     for (u16 i = 0; i < modelData->getJointNum(); i++) {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
         return 0;
diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp
index bce6f592ff..3c76c6398c 100644
--- a/src/d/actor/d_a_npc_the.cpp
+++ b/src/d/actor/d_a_npc_the.cpp
@@ -445,7 +445,7 @@ int daNpcThe_c::CreateHeap() {
     for (u16 i = 0; i < model_data->getJointTree().getJointNum(); i++) {
         model_data->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
@@ -1472,7 +1472,7 @@ BOOL daNpcThe_c::doEvent() {
             if (staff_id != -1) {
                 mStaffID = staff_id;
                 int act_idx = event_manager.getMyActIdx(staff_id, mEvtCutNameList,
-                                                        ARRAY_SIZE(mEvtCutNameList), 0, 0);
+                                                        ARRAY_SIZEU(mEvtCutNameList), 0, 0);
                 if (act_idx > 0 && act_idx < 4) {
                     if ((this->*mEvtCutList[act_idx])(staff_id)) {
                         event_manager.cutEnd(staff_id);
diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp
index 6c554be936..8aa2274315 100644
--- a/src/d/actor/d_a_npc_tk.cpp
+++ b/src/d/actor/d_a_npc_tk.cpp
@@ -3245,7 +3245,7 @@ int daNPC_TK_c::CreateHeap() {
     }
 
     J3DModel* model = mpMorf->getModel();
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         if (i != 0) {
diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp
index 9b49ec81a2..574eb67ea9 100644
--- a/src/d/actor/d_a_npc_tkj2.cpp
+++ b/src/d/actor/d_a_npc_tkj2.cpp
@@ -1074,7 +1074,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     }
 
     J3DModel* model = i_this->mpModelMorf->getModel();
-    model->setUserArea((u32)i_this);
+    model->setUserArea((uintptr_t)i_this);
 
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp
index 3b7f022eb5..cd8cdcd7c7 100644
--- a/src/d/actor/d_a_npc_tr.cpp
+++ b/src/d/actor/d_a_npc_tr.cpp
@@ -228,7 +228,7 @@ static int useHeapInit(fopAc_ac_c* actor) {
         return 0;
     }
 
-    npc_tr->field_0x5b8->setUserArea((u32)actor);
+    npc_tr->field_0x5b8->setUserArea((uintptr_t)actor);
 
     for (u16 i = 0; i < npc_tr->field_0x5b8->getModelData()->getJointNum(); i++) {
         npc_tr->field_0x5b8->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp
index b5b563b854..edfbbd70b6 100644
--- a/src/d/actor/d_a_npc_uri.cpp
+++ b/src/d/actor/d_a_npc_uri.cpp
@@ -285,7 +285,7 @@ int daNpc_Uri_c::CreateHeap() {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp
index 188f6277a5..81b94eed54 100644
--- a/src/d/actor/d_a_npc_worm.cpp
+++ b/src/d/actor/d_a_npc_worm.cpp
@@ -37,7 +37,7 @@ static int daNPC_WORM_Draw(npc_worm_class* i_this) {
         return 1;
     }
     g_env_light.setLightTevColorType_MAJI(i_this->mModel1, &i_this->tevStr);
-    i_this->mModel1->setUserArea((u32)i_this);
+    i_this->mModel1->setUserArea((uintptr_t)i_this);
     for (u16 i = 0; i < i_this->mModel1->getModelData()->getJointNum(); i++) {
         if (i >= 1) {
             i_this->mModel1->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp
index 36565d754f..80fdc29ec0 100644
--- a/src/d/actor/d_a_npc_wrestler.cpp
+++ b/src/d/actor/d_a_npc_wrestler.cpp
@@ -581,7 +581,7 @@ int daNpcWrestler_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp
index 85036e7f4e..b4efe97fcc 100644
--- a/src/d/actor/d_a_npc_yamid.cpp
+++ b/src/d/actor/d_a_npc_yamid.cpp
@@ -242,7 +242,7 @@ int daNpc_yamiD_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp
index 5076c02ef0..18e7dffaf2 100644
--- a/src/d/actor/d_a_npc_yelia.cpp
+++ b/src/d/actor/d_a_npc_yelia.cpp
@@ -449,7 +449,7 @@ int daNpc_Yelia_c::CreateHeap() {
     for (u16 i = 0; i < model_data->getJointNum(); i++) {
         model_data->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
@@ -564,7 +564,7 @@ BOOL daNpc_Yelia_c::isDelete() {
 
 /* 80B4DF10-80B4E068 000CF0 0158+00 1/1 0/0 0/0 .text            reset__13daNpc_Yelia_cFv */
 void daNpc_Yelia_c::reset() {
-    u32 size = (u32)&field_0xfec - (u32)&mpNextAction;
+    u32 size = (uintptr_t)&field_0xfec - (uintptr_t)&mpNextAction;
     if (mpMatAnm[0] != NULL) {
         mpMatAnm[0]->initialize();
     }
diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp
index 97e1da8278..c7529e6a5b 100644
--- a/src/d/actor/d_a_npc_ykm.cpp
+++ b/src/d/actor/d_a_npc_ykm.cpp
@@ -563,7 +563,7 @@ int daNpc_ykM_c::CreateHeap() {
     for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
@@ -1316,7 +1316,7 @@ void daNpc_ykM_c::setAttnPos() {
     mDoMtx_stack_c::ZXYrotM(mCurAngle);
     mDoMtx_stack_c::scaleM(scale);
     model->setBaseTRMtx(mDoMtx_stack_c::get());
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMorf[0]->onMorfNone();
     if (cM3d_IsZero(field_0xdfc) != false) {
diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp
index 8f176f70e7..5129778ff5 100644
--- a/src/d/actor/d_a_npc_ykw.cpp
+++ b/src/d/actor/d_a_npc_ykw.cpp
@@ -437,7 +437,7 @@ int daNpc_ykW_c::CreateHeap() {
     for (u16 i = 0; i < modelData->getJointNum(); i++) {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
@@ -641,7 +641,7 @@ void daNpc_ykW_c::reset() {
     cXyz unkXyz1;
     csXyz unkSxyz1;
 
-    u32 memsetSize = (u32)field_0x1074 - (u32)&field_0xfd8;
+    u32 memsetSize = (uintptr_t)field_0x1074 - (uintptr_t)&field_0xfd8;
 
     if (mpMatAnm[0] != NULL) {
         mpMatAnm[0]->initialize();
diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp
index ce4f4cbe11..de02eb1165 100644
--- a/src/d/actor/d_a_npc_zant.cpp
+++ b/src/d/actor/d_a_npc_zant.cpp
@@ -156,7 +156,7 @@ int daNpc_Zant_c::CreateHeap() {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     if (setFaceMotionAnm(0, false) && setMotionAnm(0, 0.0f, 0))
     {
diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp
index eabcad85a8..05d2cc02a0 100644
--- a/src/d/actor/d_a_npc_zelR.cpp
+++ b/src/d/actor/d_a_npc_zelR.cpp
@@ -204,7 +204,7 @@ int daNpc_ZelR_c::CreateHeap() {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     for (int i = 0; i < 2; i++) {
         mpMatAnm[i] = new daNpcT_MatAnm_c();
 
diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp
index 955416cf9c..788fecfeef 100644
--- a/src/d/actor/d_a_npc_zelda.cpp
+++ b/src/d/actor/d_a_npc_zelda.cpp
@@ -282,7 +282,7 @@ int daNpc_Zelda_c::CreateHeap() {
         modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     for (s32 i = 0; i < 2; i++) {
         mpMatAnm[i] = new daNpcT_MatAnm_c();
@@ -367,7 +367,7 @@ int daNpc_Zelda_c::isDelete() {
 /* 80B75B30-80B75C9C 000AF0 016C+00 1/1 0/0 0/0 .text            reset__13daNpc_Zelda_cFv */
 void daNpc_Zelda_c::reset() {
     csXyz acStack_20;
-    u32 clearSize = (u32)&field_0xf9c - (u32)&mAction1;
+    u32 clearSize = (uintptr_t)&field_0xf9c - (uintptr_t)&mAction1;
 
     for (s32 i = 0; i < 2; i++) {
         if (mpMatAnm[i] != NULL) {
diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp
index ea42729c2d..7ec117a6ef 100644
--- a/src/d/actor/d_a_npc_zra.cpp
+++ b/src/d/actor/d_a_npc_zra.cpp
@@ -656,7 +656,7 @@ int daNpc_zrA_c::CreateHeap() {
             model_data->getJointNodePointer(i)->setCallBack(NULL);
         }
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
@@ -1188,7 +1188,7 @@ void daNpc_zrA_c::setMtx() {
     mDoMtx_stack_c::ZXYrotM(mCurAngle);
     mDoMtx_stack_c::scaleM(scale);
     model->setBaseTRMtx(mDoMtx_stack_c::get());
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     if (mAnmFlags & ANM_PLAY_BCK) {
         mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
@@ -2135,7 +2135,7 @@ BOOL daNpc_zrA_c::doEvent() {
             if (staff_id != -1) {
                 mStaffID = staff_id;
                 int act_idx = event_manager->getMyActIdx(staff_id, mEvtCutNameList,
-                                                        ARRAY_SIZE(mEvtCutNameList), 0, 0);
+                                                        ARRAY_SIZEU(mEvtCutNameList), 0, 0);
                 JUT_ASSERT(0xf0e, act_idx >= 0 && act_idx < 11);
                 JUT_ASSERT(0xf0f, mEvtCutList[act_idx] != 0);
                 if ((this->*mEvtCutList[act_idx])(staff_id)) {
diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp
index 8840834f74..c30dfed55a 100644
--- a/src/d/actor/d_a_npc_zrc.cpp
+++ b/src/d/actor/d_a_npc_zrc.cpp
@@ -310,7 +310,7 @@ int daNpc_zrC_c::CreateHeap() {
     for (u16 i = 0; i < model_data->getJointNum(); i++) {
         model_data->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp
index 3851d3dcbc..a9d4ab8505 100644
--- a/src/d/actor/d_a_npc_zrz.cpp
+++ b/src/d/actor/d_a_npc_zrz.cpp
@@ -291,7 +291,7 @@ int daNpc_zrZ_c::CreateHeap() {
     for (u16 i = 0; i < model_data->getJointNum(); i++) {
         model_data->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     mpMatAnm = new daNpcF_MatAnm_c();
     if (mpMatAnm == NULL) {
@@ -710,7 +710,7 @@ void daNpc_zrZ_c::setMtx() {
     mDoMtx_stack_c::ZXYrotM(mCurAngle);
     mDoMtx_stack_c::scaleM(scale);
     model->setBaseTRMtx(mDoMtx_stack_c::get());
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
 
     if (mAnmFlags & ANM_PLAY_BCK) {
         mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
@@ -1117,7 +1117,7 @@ BOOL daNpc_zrZ_c::doEvent() {
             if (staff_id != -1) {
                 mStaffID = staff_id;
                 int act_idx = event_manager.getMyActIdx(staff_id, mEvtCutNameList,
-                                                        ARRAY_SIZE(mEvtCutNameList), 0, 0);
+                                                        ARRAY_SIZEU(mEvtCutNameList), 0, 0);
                 if ((this->*mEvtCutList[act_idx])(staff_id)) {
                     event_manager.cutEnd(staff_id);
                 }
diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp
index ed736b26ec..d22023cd7c 100644
--- a/src/d/actor/d_a_obj_amiShutter.cpp
+++ b/src/d/actor/d_a_obj_amiShutter.cpp
@@ -64,7 +64,7 @@ int daAmiShutter_c::CreateHeap() {
     JUT_ASSERT(167, modelData != 0); 
     
     mpModel = mDoExt_J3DModel__create(modelData, 
-        J3DMdlFlag_Unk80000, 0x11000084);
+        J3DMdlFlag_DifferedDLBuffer, 0x11000084);
     if (mpModel == NULL) {
         return 0;
     }
diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp
index 2d37ec71a5..cd2b31907d 100644
--- a/src/d/actor/d_a_obj_ari.cpp
+++ b/src/d/actor/d_a_obj_ari.cpp
@@ -729,7 +729,7 @@ cPhs__Step daObjARI_c::create() {
         }
 
         J3DModel* model = mpMorf->getModel();
-        model->setUserArea((u32)this);
+        model->setUserArea((uintptr_t)this);
         for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
             if (i != 0) {
                 model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp
index f9149ea267..f03358e1f1 100644
--- a/src/d/actor/d_a_obj_bemos.cpp
+++ b/src/d/actor/d_a_obj_bemos.cpp
@@ -602,7 +602,7 @@ int daObjBm_c::Create() {
         }
     }
 
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
     JUTNameTab* material_name = mpModel->getModelData()->getMaterialTable().getMaterialName();
 
     u32 uVar12 = 0;
diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp
index 60d39ee035..a199ffb119 100644
--- a/src/d/actor/d_a_obj_burnbox.cpp
+++ b/src/d/actor/d_a_obj_burnbox.cpp
@@ -104,7 +104,7 @@ int daObjBurnBox_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName[type], l_bmd[type]);
     JUT_ASSERT(0x106, modelData != 0);
 
-    mpBoxModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_Unk80000, 0x11000084);
+    mpBoxModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000084);
     if (mpBoxModel == NULL) {
         return 0;
     }
diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp
index 1686a501f1..85cbd69a7e 100644
--- a/src/d/actor/d_a_obj_carry.cpp
+++ b/src/d/actor/d_a_obj_carry.cpp
@@ -1332,7 +1332,7 @@ int daObjCarry_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getArcName(), getBmdName());
     JUT_ASSERT(2813, modelData != 0);
 
-    u32 mdl_flags = prm_chk_type_ironball() ? J3DMdlFlag_None : J3DMdlFlag_Unk80000;
+    u32 mdl_flags = prm_chk_type_ironball() ? J3DMdlFlag_None : J3DMdlFlag_DifferedDLBuffer;
     mpModel = mDoExt_J3DModel__create(modelData, mdl_flags, 0x11000084);
     if (mpModel == 0) {
         return 0;
diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp
index 3122169c99..b0845c5c5a 100644
--- a/src/d/actor/d_a_obj_dmelevator.cpp
+++ b/src/d/actor/d_a_obj_dmelevator.cpp
@@ -176,11 +176,11 @@ int daObjDmElevator_c::Create() {
         
         mpElevatorModel->mModelData->getJointTree().getJointNodePointer(2)->setCallBack(
             nodeCallBack);
-        mpElevatorModel->setUserArea((u32)this);
+        mpElevatorModel->setUserArea((uintptr_t)this);
         
         mpSwitchModel->mModelData->getJointTree().getJointNodePointer(1)->setCallBack(
             nodeCallBackForSw);
-        mpSwitchModel->setUserArea((u32)this);
+        mpSwitchModel->setUserArea((uintptr_t)this);
         
         mpBgW->SetRideCallback(rideCallBack);
         mpBgW->Move();
diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp
index e0b87e5ff8..639f1f8957 100644
--- a/src/d/actor/d_a_obj_fchain.cpp
+++ b/src/d/actor/d_a_obj_fchain.cpp
@@ -42,7 +42,7 @@ int daObjFchain_c::create() {
             return cPhs_ERROR_e;
         }
         tevStr.room_no = dComIfGp_roomControl_getStayNo();
-        mShape.setUserArea((u32)this);
+        mShape.setUserArea((uintptr_t)this);
         current.pos.y += 3.0f;
         s16 local_58 = shape_angle.y;
         cXyz* local_44 = &current.pos;
diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp
index d763de8db7..8edc09b0fa 100644
--- a/src/d/actor/d_a_obj_flag.cpp
+++ b/src/d/actor/d_a_obj_flag.cpp
@@ -216,7 +216,7 @@ inline int daObjFlag_c::createHeap() {
             J3DJoint* nodePtr = (J3DJoint*)(mpModel1->getModelData()->getJointNodePointer(i));
             if (nodePtr != NULL) {
                 nodePtr->setCallBack(nodeCallBack);
-                mpModel1->setUserArea((u32)this);
+                mpModel1->setUserArea((uintptr_t)this);
             }
         }
     }
diff --git a/src/d/actor/d_a_obj_glowSphere.cpp b/src/d/actor/d_a_obj_glowSphere.cpp
index 92ad51cc0a..ad66df989b 100644
--- a/src/d/actor/d_a_obj_glowSphere.cpp
+++ b/src/d/actor/d_a_obj_glowSphere.cpp
@@ -226,7 +226,7 @@ void daGlwSph_c::effectSet() {
         JPABaseEmitter* emitterp = dComIfGp_particle_getEmitter(mEmitterIDs[i]);
         if (emitterp != NULL) {
             emitterp->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-            emitterp->setUserWork((u32)&field_0x974);
+            emitterp->setUserWork((uintptr_t)&field_0x974);
         }
     }
 
diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp
index d07a3e113f..51d3e01054 100644
--- a/src/d/actor/d_a_obj_gra2.cpp
+++ b/src/d/actor/d_a_obj_gra2.cpp
@@ -318,7 +318,7 @@ int daObj_GrA_c::CreateHeap() {
     for (u16 i = 0; i < aMdlData_p->getJointNum(); i++) {
         aMdlData_p->getJointNodePointer(i)->setCallBack(jointCtrlCallBack);
     }
-    aMdl_p->setUserArea((u32)this);
+    aMdl_p->setUserArea((uintptr_t)this);
 
     field_0x83c = l_entryJntNoList;
     setFaceAnm(22, false, 0.0f);
@@ -1054,7 +1054,7 @@ void daObj_GrA_c::setMtx(int param_1) {
     model->setBaseTRMtx(mDoMtx_stack_c::get());
 
     if (param_1 != 0) {
-        model->setUserArea((u32)this);
+        model->setUserArea((uintptr_t)this);
     } else {
         model->setUserArea(0);
     }
diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp
index a027e224cf..4f9e4b1911 100644
--- a/src/d/actor/d_a_obj_katatsumuri.cpp
+++ b/src/d/actor/d_a_obj_katatsumuri.cpp
@@ -840,7 +840,7 @@ int daObjKAT_c::create() {
                   fopAcM_GetSpeed_p(this), NULL, NULL);
 
         J3DModel* model = mpMorfSO->getModel();
-        model->setUserArea((u32)this);
+        model->setUserArea((uintptr_t)this);
 
         for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
             if (i != 0) {
diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp
index d3d7ec90ab..7704e76b9f 100644
--- a/src/d/actor/d_a_obj_keyhole.cpp
+++ b/src/d/actor/d_a_obj_keyhole.cpp
@@ -697,7 +697,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
             return 0;
         }
 
-        a_this->lock_model->setUserArea((u32)a_this);
+        a_this->lock_model->setUserArea((uintptr_t)a_this);
 
         for (u16 i = 0; i < a_this->lock_model->getModelData()->getJointNum(); i++) {
             if (i == 1) {
diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp
index 6c2dffbb38..ab6ef03ee0 100644
--- a/src/d/actor/d_a_obj_kgate.cpp
+++ b/src/d/actor/d_a_obj_kgate.cpp
@@ -944,7 +944,7 @@ void daObjKGate_c::demoProc() {
 int daObjKGate_c::getDemoAction() {
     static char* action_table[] = {"WAIT", "ADJUSTMENT", "UNLOCK", "OPEN"};
 
-    return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZE(action_table), 0, 0);
+    return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZEU(action_table), 0, 0);
 }
 
 /* 8058A550-8058A5B8 002550 0068+00 1/0 0/0 0/0 .text            Execute__12daObjKGate_cFPPA3_A4_f
diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp
index b0a712fe4e..edbb13e3d7 100644
--- a/src/d/actor/d_a_obj_ki.cpp
+++ b/src/d/actor/d_a_obj_ki.cpp
@@ -134,7 +134,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
     
     J3DModel* model = _this->mpMorf->getModel();
-    model->setUserArea((u32)_this);
+    model->setUserArea((uintptr_t)_this);
     for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
         model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
     }
diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp
index 80d2203912..15492b200c 100644
--- a/src/d/actor/d_a_obj_kkanban.cpp
+++ b/src/d/actor/d_a_obj_kkanban.cpp
@@ -68,7 +68,7 @@ int daObjKKanban_c::Create() {
         }
     }
     mpModel->getModelData()->getJointNodePointer(mJointIdx)->setCallBack(nodeCallBack);
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
     fopAcM_setCullSizeBox(this, -950.0f, -2150.0f, -2000.0f, 100.0f, 50.0f, 800.0f);
     mStts.Init(0xff, 0xff, this);
     mTri.Set(l_tri_src);
diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp
index 57dbcc8b14..e395292638 100644
--- a/src/d/actor/d_a_obj_laundry.cpp
+++ b/src/d/actor/d_a_obj_laundry.cpp
@@ -221,7 +221,7 @@ int daObjLdy_c::createHeap() {
         J3DJoint* joint = mpModel->getModelData()->getJointNodePointer(i);
         if (joint != NULL) {
             joint->setCallBack(nodeCallBack);
-            mpModel->setUserArea((u32)this);
+            mpModel->setUserArea((uintptr_t)this);
         }
     }
 
diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp
index 615a05bc84..033b2f0e12 100644
--- a/src/d/actor/d_a_obj_lv6bemos.cpp
+++ b/src/d/actor/d_a_obj_lv6bemos.cpp
@@ -156,7 +156,7 @@ int daObjL6Bm_c::Create() {
         eyeJnt->setCallBack(nodeCallBack);
     }
 
-    mBeamosModel->setUserArea((u32)this);
+    mBeamosModel->setUserArea((uintptr_t)this);
 
     if (neckJnt == NULL) {
         OS_REPORT_ERROR("表ビーモス：首ジョイントが見つかりませんでした！\n"); // Table Beamos : Neck joint not found!
diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp
index 9ead00b745..096a51da41 100644
--- a/src/d/actor/d_a_obj_lv6bemos2.cpp
+++ b/src/d/actor/d_a_obj_lv6bemos2.cpp
@@ -210,7 +210,7 @@ int daObjLv6Bm_c::Create() {
         }
     }
 
-    mBeamosModel->setUserArea((u32)this);
+    mBeamosModel->setUserArea((uintptr_t)this);
     name = mBeamosModel->getModelData()->getMaterialTable().getMaterialName();
     for (u16 i = 0; i < mBeamosModel->getModelData()->getMaterialNum(); i++) {
         if (strcmp(name->getName(i), l_eye_matName) == 0) {
diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp
index bca94cff91..7ced7e3748 100644
--- a/src/d/actor/d_a_obj_poFire.cpp
+++ b/src/d/actor/d_a_obj_poFire.cpp
@@ -161,7 +161,7 @@ void daPoFire_c::setFire() {
         JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mParticleKeys[i]);
         if (emitter != NULL) {
             emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-            emitter->setUserWork((u32)&unk5A0);
+            emitter->setUserWork((uintptr_t)&unk5A0);
         }
     }
     unk5AC = temp_r2;
diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp
index 47393e1b05..dcfb3935f4 100644
--- a/src/d/actor/d_a_obj_rgate.cpp
+++ b/src/d/actor/d_a_obj_rgate.cpp
@@ -259,7 +259,7 @@ int daObjRgate_c::Create() {
                 JUT_ASSERT(448, jnt != 0);
 
                 jnt->setCallBack(nodeCallBack);
-                mpGateModel->setUserArea((u32)this);
+                mpGateModel->setUserArea((uintptr_t)this);
             }
         }
     }
@@ -832,7 +832,7 @@ void daObjRgate_c::demoProc() {
 int daObjRgate_c::getDemoAction() {
     static char* action_table[] = {"WAIT", "ADJUSTMENT", "UNLOCK", "OPEN"};
 
-    return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZE(action_table), 0, 0);
+    return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZEU(action_table), 0, 0);
 }
 
 /* 80CBBDB0-80CBBE18 002190 0068+00 1/0 0/0 0/0 .text            Execute__12daObjRgate_cFPPA3_A4_f
diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp
index 38fc9395aa..50a25c8eef 100644
--- a/src/d/actor/d_a_obj_sekizoa.cpp
+++ b/src/d/actor/d_a_obj_sekizoa.cpp
@@ -750,7 +750,7 @@ void daObj_Sekizoa_c::setAttnPos() {
         mDoMtx_stack_c::scaleM(scale);
 
         mp_model->setBaseTRMtx(mDoMtx_stack_c::get());
-        mp_model->setUserArea((u32)this);
+        mp_model->setUserArea((uintptr_t)this);
         mpMorf[1]->modelCalc();
     }
     if (mpMcaMorf != NULL) {
diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp
index 18466039da..239085a971 100644
--- a/src/d/actor/d_a_obj_swhang.cpp
+++ b/src/d/actor/d_a_obj_swhang.cpp
@@ -162,7 +162,7 @@ int daObjSwHang_c::Create() {
             mpModel->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
         }
     }
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
     return 1;
 }
 
diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp
index 1d3da61d15..49f2aa4dfd 100644
--- a/src/d/actor/d_a_obj_swpropeller.cpp
+++ b/src/d/actor/d_a_obj_swpropeller.cpp
@@ -115,7 +115,7 @@ int daObjSwPr_c::Create() {
 
     J3DJoint* jnt = mpModel->getModelData()->getJointNodePointer(mKaitenJntID);
     jnt->setCallBack(nodeCallBack);
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
 
     eyePos.y += 100.0f;
 
diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp
index edc0f7bbdf..23cf3cf4e3 100644
--- a/src/d/actor/d_a_obj_swpush.cpp
+++ b/src/d/actor/d_a_obj_swpush.cpp
@@ -87,7 +87,7 @@ bool daObjSwpush::Act_c::create_heap() {
 
             if (bVar1) {
                 model_data->getJointNodePointer(i)->setCallBack(jnodeCB);
-                mpModel->setUserArea((u32)this);
+                mpModel->setUserArea((uintptr_t)this);
                 break;
             }
         }
diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp
index 58a31d65d0..4a06b84a62 100644
--- a/src/d/actor/d_a_obj_tks.cpp
+++ b/src/d/actor/d_a_obj_tks.cpp
@@ -175,7 +175,7 @@ int daObjTks_c::CreateHeap() {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    mdl_p->setUserArea((u32)this);
+    mdl_p->setUserArea((uintptr_t)this);
 
 
     mpMatAnm = new daNpcF_MatAnm_c();
@@ -295,7 +295,7 @@ void daObjTks_c::setMtx() {
     mDoMtx_stack_c::scaleM(scale);
 
     mdl_p->setBaseTRMtx(mDoMtx_stack_c::get());
-    mdl_p->setUserArea((u32)this);
+    mdl_p->setUserArea((uintptr_t)this);
 
     if (mAnmFlags & ANM_PLAY_BCK) {
         mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp
index 625c2cf361..d66b9f2693 100644
--- a/src/d/actor/d_a_obj_tobyhouse.cpp
+++ b/src/d/actor/d_a_obj_tobyhouse.cpp
@@ -189,7 +189,7 @@ int daObjTobyHouse_c::Create() {
         J3DJoint* jnt = mModel->getModelData()->getJointNodePointer(mBirlPJnt);
         JUT_ASSERT(398, jnt != 0);
         jnt->setCallBack(nodeCallBack);
-        mModel->setUserArea((u32)this);
+        mModel->setUserArea((uintptr_t)this);
 
         jnt = mModel->getModelData()->getJointNodePointer(mBirlCannonJnt);
         JUT_ASSERT(406, jnt != 0);
diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp
index 999e6baff4..eeb6801809 100644
--- a/src/d/actor/d_a_obj_treesh.cpp
+++ b/src/d/actor/d_a_obj_treesh.cpp
@@ -82,7 +82,7 @@ int daTreeSh_c::Create() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     modelData->getJointNodePointer(1)->setCallBack(nodeCallBack);
     modelData->getJointNodePointer(2)->setCallBack(nodeCallBack);
-    mpModel->setUserArea((u32)this);
+    mpModel->setUserArea((uintptr_t)this);
     return 1;
 }
 
diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp
index 3003592cf7..d8ca932aaf 100644
--- a/src/d/actor/d_a_obj_waterPillar.cpp
+++ b/src/d/actor/d_a_obj_waterPillar.cpp
@@ -81,7 +81,7 @@ int daWtPillar_c::createHeapCallBack(fopAc_ac_c* i_this) {
 int daWtPillar_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("efWater", 8));
     JUT_ASSERT(369, modelData != 0);
-    mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_Unk80000, 0x11000284);
+    mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000284);
 
     if(!mpModel)
         return 0;
diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp
index 27a09a1160..cd63b52bde 100644
--- a/src/d/actor/d_a_obj_wchain.cpp
+++ b/src/d/actor/d_a_obj_wchain.cpp
@@ -24,7 +24,7 @@ int daObjWchain_c::createHeap() {
         return 0;
     }
     mpChainModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3);
-    mShape.setUserArea((u32)this);
+    mShape.setUserArea((uintptr_t)this);
     return 1;
 }
 
diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp
index 07dd6a64e1..7a220f7b9d 100644
--- a/src/d/actor/d_a_obj_wdStick.cpp
+++ b/src/d/actor/d_a_obj_wdStick.cpp
@@ -137,7 +137,7 @@ void daWdStick_c::setFire() {
             JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(field_0xae4[i]);
             if (emitter != NULL) {
                 emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                emitter->setUserWork((u32)&field_0xa94);
+                emitter->setUserWork((uintptr_t)&field_0xa94);
             }
         }
     }
@@ -150,7 +150,7 @@ void daWdStick_c::setFire() {
             JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(field_0xaec[i]);
             if (emitter != NULL) {
                 emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
-                emitter->setUserWork((u32)&field_0xaa0);
+                emitter->setUserWork((uintptr_t)&field_0xaa0);
             }
         }
     }
diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp
index 46ff42616d..ba0e313e11 100644
--- a/src/d/actor/d_a_obj_yobikusa.cpp
+++ b/src/d/actor/d_a_obj_yobikusa.cpp
@@ -327,7 +327,7 @@ int daObjYobikusa_c::createHeap() {
             J3DJoint* joint = mpModelTypeA->getModelData()->getJointNodePointer(i);
             if (joint != NULL) {
                 joint->setCallBack(nodeCallBack);
-                mpModelTypeA->setUserArea((u32)this);
+                mpModelTypeA->setUserArea((uintptr_t)this);
             }
         }
 
diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp
index 1b51fcf515..c9ba5e2f43 100644
--- a/src/d/actor/d_a_peru.cpp
+++ b/src/d/actor/d_a_peru.cpp
@@ -244,7 +244,7 @@ int daPeru_c::CreateHeap() {
         mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
     }
 
-    model->setUserArea((u32)this);
+    model->setUserArea((uintptr_t)this);
     mpMatAnm[0] = new daNpcT_MatAnm_c();
     if (mpMatAnm[0] == NULL) {
         return 0;
diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp
index bd3a5ff4d6..d7c4e74b31 100644
--- a/src/d/actor/d_a_tag_river_back.cpp
+++ b/src/d/actor/d_a_tag_river_back.cpp
@@ -127,7 +127,7 @@ static char* action_table[] = {"WAIT", "SCENE_CHG"};
 
 /* 80D5F710-80D5F88C 000490 017C+00 2/2 0/0 0/0 .text            demoProc__16daTagRiverBack_cFv */
 int daTagRiverBack_c::demoProc() {
-    int act_id = dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZE(action_table), 0, 0);
+    int act_id = dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZEU(action_table), 0, 0);
 
     if (dComIfGp_evmng_getIsAddvance(mStaffID)) {
         switch (act_id) {
diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp
index 3ba350aa73..b57e38f4ad 100644
--- a/src/d/actor/d_a_tag_statue_evt.cpp
+++ b/src/d/actor/d_a_tag_statue_evt.cpp
@@ -291,7 +291,7 @@ static s16 l_statue_ang[6] = {
 
 /* 805A784C-805A7A68 00096C 021C+00 2/2 0/0 0/0 .text            demoProc__13daTagStatue_cFv */
 int daTagStatue_c::demoProc() {
-    int act_id = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0);
+    int act_id = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZEU(action_table), 0, 0);
 
     if(dComIfGp_evmng_getIsAddvance(mStaffId)) {
         switch(act_id) {
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index dfb26ec1dc..84d751df21 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -864,7 +864,7 @@ void daTbox_c::demoProcAppear() {
 /* 80493518-80493838 0028D8 0320+00 7/7 0/0 0/0 .text            demoProc__8daTbox_cFv */
 int daTbox_c::demoProc() {
     static char* action_table[] = {"WAIT", "OPEN", "APPEAR", "OPEN_SHORT", "DROP"};
-    int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0);
+    int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZEU(action_table), 0, 0);
     int tbox_no;
 
     if (dComIfGp_evmng_getIsAddvance(mStaffId)) {
diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp
index f60aa227cc..c5019654e4 100644
--- a/src/d/actor/d_a_tbox2.cpp
+++ b/src/d/actor/d_a_tbox2.cpp
@@ -168,7 +168,7 @@ int daTbox2_c::create1st() {
 int daTbox2_c::demoProc() {
     static char* action_table[] = {"WAIT", "OPEN", "APPEAR", "OPEN_SHORT"};
     int act_idx =
-        dComIfGp_evmng_getMyActIdx(mStaffIdx, action_table, ARRAY_SIZE(action_table), 0, 0);
+        dComIfGp_evmng_getMyActIdx(mStaffIdx, action_table, ARRAY_SIZEU(action_table), 0, 0);
 
     if (dComIfGp_evmng_getIsAddvance(mStaffIdx)) {
         switch (act_idx) {
diff --git a/src/d/d_bg_s.cpp b/src/d/d_bg_s.cpp
index d8376a2c5b..99bff775de 100644
--- a/src/d/d_bg_s.cpp
+++ b/src/d/d_bg_s.cpp
@@ -194,18 +194,18 @@ void* cBgS::ConvDzb(void* p_dzb) {
     }
 
     if (pbgd->m_v_tbl != 0) {
-        pbgd->m_v_tbl += (u32)p_dzb;
+        pbgd->m_v_tbl += (uintptr_t)p_dzb;
     }
 
-    pbgd->m_t_tbl += (u32)p_dzb;
-    pbgd->m_b_tbl += (u32)p_dzb;
-    pbgd->m_tree_tbl += (u32)p_dzb;
-    pbgd->m_g_tbl += (u32)p_dzb;
-    pbgd->m_ti_tbl += (u32)p_dzb;
+    pbgd->m_t_tbl += (uintptr_t)p_dzb;
+    pbgd->m_b_tbl += (uintptr_t)p_dzb;
+    pbgd->m_tree_tbl += (uintptr_t)p_dzb;
+    pbgd->m_g_tbl += (uintptr_t)p_dzb;
+    pbgd->m_ti_tbl += (uintptr_t)p_dzb;
 
     for (int i = 0; i < pbgd->m_g_num; i++) {
         ((cBgD_Grp_t_*)pbgd->m_g_tbl)[i].strOffset =
-            (u32)p_dzb + ((cBgD_Grp_t_*)pbgd->m_g_tbl)[i].strOffset;
+            (uintptr_t)p_dzb + ((cBgD_Grp_t_*)pbgd->m_g_tbl)[i].strOffset;
     }
 
     return p_dzb;
diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp
index 43c89d2dcd..1aaf2031b9 100644
--- a/src/d/d_bg_w_kcol.cpp
+++ b/src/d/d_bg_w_kcol.cpp
@@ -24,10 +24,10 @@ dBgWKCol::~dBgWKCol() {}
 
 /* 8007E7D0-8007E804 079110 0034+00 0/0 1/1 0/0 .text            initKCollision__8dBgWKColFPv */
 void* dBgWKCol::initKCollision(void* i_kclData) {
-    ((KC_Header*)i_kclData)->m_pos_data = (Vec*)((u32)((KC_Header*)i_kclData) + (u32)((KC_Header*)i_kclData)->m_pos_data);
-    ((KC_Header*)i_kclData)->m_nrm_data = (Vec*)((u32)((KC_Header*)i_kclData) + (u32)((KC_Header*)i_kclData)->m_nrm_data);
-    ((KC_Header*)i_kclData)->m_prism_data = (KC_PrismData*)((u32)((KC_Header*)i_kclData) + (u32)((KC_Header*)i_kclData)->m_prism_data);
-    ((KC_Header*)i_kclData)->m_block_data = (KC_PrismData*)((u32)((KC_Header*)i_kclData) + (u32)((KC_Header*)i_kclData)->m_block_data);
+    ((KC_Header*)i_kclData)->m_pos_data = (Vec*)((uintptr_t)((KC_Header*)i_kclData) + (uintptr_t)((KC_Header*)i_kclData)->m_pos_data);
+    ((KC_Header*)i_kclData)->m_nrm_data = (Vec*)((uintptr_t)((KC_Header*)i_kclData) + (uintptr_t)((KC_Header*)i_kclData)->m_nrm_data);
+    ((KC_Header*)i_kclData)->m_prism_data = (KC_PrismData*)((uintptr_t)((KC_Header*)i_kclData) + (uintptr_t)((KC_Header*)i_kclData)->m_prism_data);
+    ((KC_Header*)i_kclData)->m_block_data = (KC_PrismData*)((uintptr_t)((KC_Header*)i_kclData) + (uintptr_t)((KC_Header*)i_kclData)->m_block_data);
 
     return i_kclData;
 }
@@ -40,7 +40,7 @@ void dBgWKCol::create(void* pprism, void* plc) {
     ClrDBgWBase();
     m_pkc_head = (KC_Header*)pprism;
 
-    u32 poly_num = ((u32)m_pkc_head->m_block_data - (u32)m_pkc_head->m_prism_data) / 0xC;
+    u32 poly_num = ((uintptr_t)m_pkc_head->m_block_data - (uintptr_t)m_pkc_head->m_prism_data) / 0xC;
     poly_num++;
     JUT_ASSERT(0x50, poly_num <= 0x4000);
 
@@ -595,7 +595,7 @@ bool dBgWKCol::GroundCross(cBgS_GndChk* i_chk) {
     cXyz sp4C;
     int sp2C = 0;
     do {
-        u32 block = (u32)m_pkc_head->m_block_data;
+        uintptr_t block = (uintptr_t)m_pkc_head->m_block_data;
         u32 shift = m_pkc_head->m_block_width_shift;
         int sp20 = 4 * (((u32)sp34 >> shift) << m_pkc_head->m_area_xy_blocks_shift |
                        ((u32)sp30 >> shift) << m_pkc_head->m_area_x_blocks_shift |
@@ -821,8 +821,8 @@ void dBgWKCol::ShdwDraw(cBgS_ShdwDraw* param_0) {
                                     }
 
                                     unk_sp24 = drawBits_sp140 + (prism_sp34[0] >> 5);
-                                    if ((*(u32*)((u32)unk_sp24 + 0) & bitMask_sp28) == 0) {
-                                        *(u32*)((u32)unk_sp24 + 0) |= bitMask_sp28;
+                                    if ((*(u32*)((uintptr_t)unk_sp24 + 0) & bitMask_sp28) == 0) {
+                                        *(u32*)((uintptr_t)unk_sp24 + 0) |= bitMask_sp28;
 
                                         getPolyCode(prism_sp34[0], &polyCode_sp108);
 
@@ -1589,7 +1589,7 @@ bool dBgWKCol::RoofChk(dBgS_RoofChk* param_0) {
     bool sp0A = false;
     u32 sp30 = ~m_pkc_head->m_area_y_width_mask;
     do {
-        u32 sp2C = (u32)m_pkc_head->m_block_data;
+        uintptr_t sp2C = (uintptr_t)m_pkc_head->m_block_data;
         u32 sp28 = m_pkc_head->m_block_width_shift;
         s32 sp24 = 4 * (((u32)sp38 >> sp28) << m_pkc_head->m_area_xy_blocks_shift |
                        ((u32)sp34 >> sp28) << m_pkc_head->m_area_x_blocks_shift |
diff --git a/src/d/d_cc_mass_s.cpp b/src/d/d_cc_mass_s.cpp
index 1338c4b1fb..20243ababc 100644
--- a/src/d/d_cc_mass_s.cpp
+++ b/src/d/d_cc_mass_s.cpp
@@ -230,11 +230,11 @@ void dCcMassS_Mng::Clear() {
     mMassObjCount = 0;
     mMassAreaCount = 0;
 
-    for (int i = 0; i < (s32)ARRAY_SIZE(mMassObjs); ++i) {
+    for (int i = 0; i < ARRAY_SIZE(mMassObjs); ++i) {
         mMassObjs[i].Clear();
     }
 
-    for (int i = 0; i < (s32)ARRAY_SIZE(mMassAreas); ++i) {
+    for (int i = 0; i < ARRAY_SIZE(mMassAreas); ++i) {
         mMassAreas[i].Clear();
     }
 
@@ -246,8 +246,8 @@ void dCcMassS_Mng::Clear() {
 
 /* 80085D98-80085E6C 0806D8 00D4+00 0/0 4/4 7/7 .text            Set__12dCcMassS_MngFP8cCcD_ObjUc */
 void dCcMassS_Mng::Set(cCcD_Obj* p_obj, u8 priority) {
-    if (mMassObjCount >= (s32)ARRAY_SIZE(mMassObjs)) {
-        for (int i = 0; i < (s32)ARRAY_SIZE(mMassObjs); ++i) {
+    if (mMassObjCount >= ARRAY_SIZE(mMassObjs)) {
+        for (int i = 0; i < ARRAY_SIZE(mMassObjs); ++i) {
             int prevPrio = mMassObjs[i].GetPriority();
             if (prevPrio > priority || (prevPrio == priority && cM_rndF(1.0f) < 0.5f)) {
                 mMassObjs[i].Set(p_obj, priority, NULL);
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index 96038df9c4..26ca573212 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -1698,7 +1698,7 @@ u8 dComIfGs_checkGetInsectNum() {
     u8 insectCount = 0;
     u8* insectList = l_itemno;
 
-    for (int i = 0; i < ARRAY_SIZE(l_itemno); i++) {
+    for (int i = 0; i < ARRAY_SIZEU(l_itemno); i++) {
         u8 insectId = *insectList;
         insectList++;
         if (dComIfGs_isItemFirstBit(insectId) &&
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 516e04bdf1..6580716bb7 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -1099,7 +1099,7 @@ static J3DDrawBuffer* J3DDrawBuffer__create(u32 size) {
     J3DDrawBuffer* buffer = new J3DDrawBuffer();
 
     if (buffer) {
-        J3DError error = buffer->allocBuffer(size);
+        int error = buffer->allocBuffer(size);
         if (error == kJ3DError_Success) {
             return buffer;
         }
diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp
index 87909bb337..c5eb481698 100644
--- a/src/d/d_event_data.cpp
+++ b/src/d/d_event_data.cpp
@@ -52,7 +52,7 @@ static TelopDataStruct TelopData[] = {
     {'F127', 1140, -1, 1},    {'R127', 1140, -1, 0},   {'F126', 1141, -1, 1}};
 
 /* 80450640-80450648 0000C0 0004+04 2/2 0/0 0/0 .sdata           numTelopData */
-static s32 numTelopData = ARRAY_SIZE(TelopData);
+static s32 numTelopData = ARRAY_SIZEU(TelopData);
 
 /* 8004372C-800437C4 03E06C 0098+00 2/2 0/0 0/0 .text            getTelopNo__FPCc */
 static u16 getTelopNo(char const* pName) {
diff --git a/src/d/d_event_debug.cpp b/src/d/d_event_debug.cpp
index 7bf58be7f6..c8b5d2d2be 100644
--- a/src/d/d_event_debug.cpp
+++ b/src/d/d_event_debug.cpp
@@ -204,7 +204,7 @@ bool dEvM_HIO_c::setDebugCameraData(void* buffer) {
 
 void dEvM_root_bit_HIO_c::genMessage(JORMContext* ctx) {
     u8 i = 0;
-    for(; i < ARRAY_SIZE(mBit) && i < mFlagTables->mNumRootBits; i++) {
+    for(; i < ARRAY_SIZEU(mBit) && i < mFlagTables->mNumRootBits; i++) {
         mBit[i].mFlagTables = mFlagTables;
         mBit[i].mRootBitIdx = i;
 
@@ -215,7 +215,7 @@ void dEvM_root_bit_HIO_c::genMessage(JORMContext* ctx) {
 
 void dEvM_root_reg_HIO_c::genMessage(JORMContext* ctx) {
     u8 i = 0;
-    for(; i < ARRAY_SIZE(mReg) && i < mFlagTables->mNumRootRegs; i++) {
+    for(; i < ARRAY_SIZEU(mReg) && i < mFlagTables->mNumRootRegs; i++) {
         mReg[i].mFlagTables = mFlagTables;
         mReg[i].mRootRegIdx = i;
 
diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp
index eb7ff40782..8873e3ea4a 100644
--- a/src/d/d_event_manager.cpp
+++ b/src/d/d_event_manager.cpp
@@ -539,7 +539,7 @@ s16 dEvent_manager_c::getEventIdx(char const* eventName, u8 mapToolID, s32 roomN
     dEvDtBase_c* event;
     int j;
     int i;
-    for (i = ARRAY_SIZE(mEventList) - 1; i >= 1; i--) {
+    for (i = ARRAY_SIZEU(mEventList) - 1; i >= 1; i--) {
         if (i < 4 || 9 < i || roomNo == mEventList[i].roomNo()) {
             event = &mEventList[i];
             if (event->getHeaderP() != NULL) {
@@ -599,7 +599,7 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8
     dEvDtBase_c* event;
     int j;
     int type;
-    for (type = ARRAY_SIZE(mEventList) - 1; type >= 1; type--) {
+    for (type = ARRAY_SIZEU(mEventList) - 1; type >= 1; type--) {
         dEvDtBase_c* eventP = &mEventList[type];
         dEvDtBase_c event;
         if (type < 4 || 9 < type || actorRoomNo == mEventList[type].roomNo()) {
@@ -1083,7 +1083,7 @@ static int dEv_talkman_get_action(int param_0) {
             "TALK1",
         };
         int actIdx = dComIfGp_getEventManager().getMyActIdx(staffId, action_table,
-                                                              ARRAY_SIZE(action_table), 0, 0);
+                                                              ARRAY_SIZEU(action_table), 0, 0);
         if (actIdx == param_0) {
             dComIfGp_getEventManager().cutEnd(staffId);
         }
diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp
index 838f7dd25e..c1b1b87385 100644
--- a/src/d/d_kankyo_wether.cpp
+++ b/src/d/d_kankyo_wether.cpp
@@ -180,7 +180,7 @@ static void dKyw_drawSun(int i_type) {
 
 /* 8005710C-80057130 051A4C 0024+00 1/1 0/0 0/0 .text            dKyw_Sun_Draw__Fv */
 static void dKyw_Sun_Draw() {
-    dKyw_drawSun(J3DSys_XLU_BUFFER_e);
+    dKyw_drawSun(J3DSysDrawBuf_Xlu);
 }
 
 /* 80057130-80057174 051A70 0044+00 1/1 0/0 0/0 .text            dKyw_drawSunlenz__Fi */
@@ -194,7 +194,7 @@ static void dKyw_drawSunlenz(int i_type) {
 
 /* 80057174-80057198 051AB4 0024+00 1/1 0/0 0/0 .text            dKyw_Sunlenz_Draw__Fv */
 static void dKyw_Sunlenz_Draw() {
-    dKyw_drawSunlenz(J3DSys_XLU_BUFFER_e);
+    dKyw_drawSunlenz(J3DSysDrawBuf_Xlu);
 }
 
 /* 80057198-800571C8 051AD8 0030+00 1/1 0/0 0/0 .text            dKyw_drawRain__Fi */
@@ -204,7 +204,7 @@ static void dKyw_drawRain(int i_type) {
 
 /* 800571C8-800571EC 051B08 0024+00 1/1 0/0 0/0 .text            dKyw_Rain_Draw__Fv */
 static void dKyw_Rain_Draw() {
-    dKyw_drawRain(J3DSys_XLU_BUFFER_e);
+    dKyw_drawRain(J3DSysDrawBuf_Xlu);
 }
 
 /* 800571EC-8005721C 051B2C 0030+00 1/1 0/0 0/0 .text            dKyw_drawSnow__Fi */
@@ -214,7 +214,7 @@ static void dKyw_drawSnow(int i_type) {
 
 /* 8005721C-80057240 051B5C 0024+00 1/1 0/0 0/0 .text            dKyw_Snow_Draw__Fv */
 static void dKyw_Snow_Draw() {
-    dKyw_drawSnow(J3DSys_XLU_BUFFER_e);
+    dKyw_drawSnow(J3DSysDrawBuf_Xlu);
 }
 
 /* 80057240-80057270 051B80 0030+00 1/1 0/0 0/0 .text            dKyw_drawStar__Fi */
@@ -224,7 +224,7 @@ static void dKyw_drawStar(int i_type) {
 
 /* 80057270-80057294 051BB0 0024+00 1/1 0/0 0/0 .text            dKyw_Star_Draw__Fv */
 static void dKyw_Star_Draw() {
-    dKyw_drawStar(J3DSys_XLU_BUFFER_e);
+    dKyw_drawStar(J3DSysDrawBuf_Xlu);
 }
 
 /* 80057294-800572C4 051BD4 0030+00 1/1 0/0 0/0 .text            dKyw_drawHousi__Fi */
@@ -234,7 +234,7 @@ static void dKyw_drawHousi(int i_type) {
 
 /* 800572C4-800572E8 051C04 0024+00 1/1 0/0 0/0 .text            dKyw_Housi_Draw__Fv */
 static void dKyw_Housi_Draw() {
-    dKyw_drawHousi(J3DSys_XLU_BUFFER_e);
+    dKyw_drawHousi(J3DSysDrawBuf_Xlu);
 }
 
 /* 800572E8-80057318 051C28 0030+00 1/1 0/0 0/0 .text            dKyw_drawCloud__Fi */
@@ -244,7 +244,7 @@ static void dKyw_drawCloud(int i_type) {
 
 /* 80057318-8005733C 051C58 0024+00 1/1 0/0 0/0 .text            dKyw_Cloud_Draw__Fv */
 static void dKyw_Cloud_Draw() {
-    dKyw_drawCloud(J3DSys_XLU_BUFFER_e);
+    dKyw_drawCloud(J3DSysDrawBuf_Xlu);
 }
 
 /* 8005733C-8005736C 051C7C 0030+00 1/1 0/0 0/0 .text            dKyw_drawVrkumo__Fi */
@@ -254,7 +254,7 @@ static void dKyw_drawVrkumo(int i_type) {
 
 /* 8005736C-80057390 051CAC 0024+00 1/1 0/0 0/0 .text            dKyw_Vrkumo_Draw__Fv */
 static void dKyw_Vrkumo_Draw() {
-    dKyw_drawVrkumo(J3DSys_XLU_BUFFER_e);
+    dKyw_drawVrkumo(J3DSysDrawBuf_Xlu);
 }
 
 /* 80057390-800573C0 051CD0 0030+00 1/1 0/0 0/0 .text            dKyw_shstar_packet__Fi */
@@ -264,7 +264,7 @@ static void dKyw_shstar_packet(int i_type) {
 
 /* 800573C0-800573E4 051D00 0024+00 1/1 0/0 0/0 .text            dKyw_shstar_Draw__Fv */
 static void dKyw_shstar_Draw() {
-    dKyw_shstar_packet(J3DSys_XLU_BUFFER_e);
+    dKyw_shstar_packet(J3DSysDrawBuf_Xlu);
 }
 
 /* 800573E4-80057414 051D24 0030+00 1/1 0/0 0/0 .text            dKyw_odour_packet__Fi */
@@ -274,7 +274,7 @@ static void dKyw_odour_packet(int i_type) {
 
 /* 80057414-80057438 051D54 0024+00 1/1 0/0 0/0 .text            dKyw_Odour_Draw__Fv */
 static void dKyw_Odour_Draw() {
-    dKyw_odour_packet(J3DSys_XLU_BUFFER_e);
+    dKyw_odour_packet(J3DSysDrawBuf_Xlu);
 }
 
 /* 80057438-80057468 051D78 0030+00 1/1 0/0 0/0 .text            dKyw_mud_packet__Fi */
@@ -284,7 +284,7 @@ static void dKyw_mud_packet(int i_type) {
 
 /* 80057468-8005748C 051DA8 0024+00 1/1 0/0 0/0 .text            dKyw_mud_Draw__Fv */
 static void dKyw_mud_Draw() {
-    dKyw_mud_packet(J3DSys_XLU_BUFFER_e);
+    dKyw_mud_packet(J3DSysDrawBuf_Xlu);
 }
 
 /* 8005748C-800574BC 051DCC 0030+00 1/1 0/0 0/0 .text            dKyw_evil_packet__Fi */
@@ -294,7 +294,7 @@ static void dKyw_evil_packet(int i_type) {
 
 /* 800574BC-800574E0 051DFC 0024+00 1/1 0/0 0/0 .text            dKyw_evil_Draw__Fv */
 static void dKyw_evil_Draw() {
-    dKyw_evil_packet(J3DSys_XLU_BUFFER_e);
+    dKyw_evil_packet(J3DSysDrawBuf_Xlu);
 }
 
 /* 800574E0-800579EC 051E20 050C+00 0/0 1/1 0/0 .text            dKyw_wether_init__Fv */
@@ -1515,7 +1515,7 @@ static void pntwind_get_info(cXyz* param_0, cXyz* i_dir, f32* i_power, u8 param_
     *i_power = 0.0f;
 
     WIND_INFLUENCE* influence;
-    s32 influence_count = ARRAY_SIZE(g_env_light.pntwind);
+    s32 influence_count = ARRAY_SIZEU(g_env_light.pntwind);
     for (int i = 0; i < influence_count; i++) {
         influence = g_env_light.pntwind[i];
         if (influence != NULL && influence->field_0x29 == param_3) {
diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp
index ee783051ae..cda14658c8 100644
--- a/src/d/d_map_path_dmap.cpp
+++ b/src/d/d_map_path_dmap.cpp
@@ -442,7 +442,7 @@ void dMpath_c::createWork() {
  * setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc     */
 int dMpath_c::setPointer(dDrawPath_c::room_class* i_room, s8* param_1, s8* param_2) {
     int var_r6 = 0;
-    if ((u32)i_room->mpFloor >= 0x80000000) {
+    if ((uintptr_t)i_room->mpFloor >= 0x80000000) {
         dDrawPath_c::floor_class* floor_p = i_room->mpFloor;
         for (int i = 0; i < i_room->mFloorNum; i++) {
             if (floor_p->mFloorNo < *param_1) {
@@ -461,39 +461,39 @@ int dMpath_c::setPointer(dDrawPath_c::room_class* i_room, s8* param_1, s8* param
 
         if (group_e->mPolyNum != 0) {
             dDrawPath_c::poly_class* poly_e = &group_e->mpPoly[group_e->mPolyNum - 1];
-            return (u32)(poly_e->mpData + poly_e->mDataNum) - (u32)i_room;
+            return (uintptr_t)(poly_e->mpData + poly_e->mDataNum) - (uintptr_t)i_room;
         }
 
         dDrawPath_c::line_class* line_e = &group_e->mpLine[group_e->mLineNum - 1];
-        return (u32)(line_e->mpData + line_e->mDataNum) - (u32)i_room;
+        return (uintptr_t)(line_e->mpData + line_e->mDataNum) - (uintptr_t)i_room;
     }
     
-    i_room->mpFloor = (dDrawPath_c::floor_class*)((u32)i_room + (u32)i_room->mpFloor);
-    i_room->mpFloatData = (f32*)((u32)i_room + (u32)i_room->mpFloatData);
+    i_room->mpFloor = (dDrawPath_c::floor_class*)((uintptr_t)i_room + (uintptr_t)i_room->mpFloor);
+    i_room->mpFloatData = (f32*)((uintptr_t)i_room + (uintptr_t)i_room->mpFloatData);
 
     dDrawPath_c::floor_class* floor_p = i_room->mpFloor;
     int room = (int)i_room;
     for (int i = 0; i < i_room->mFloorNum; i++) {
-        floor_p->mpGroup = (dDrawPath_c::group_class*)(room + (u32)floor_p->mpGroup);
+        floor_p->mpGroup = (dDrawPath_c::group_class*)(room + (uintptr_t)floor_p->mpGroup);
 
         dDrawPath_c::group_class* group_p = floor_p->mpGroup;
         for (int j = 0; j < floor_p->mGroupNum; j++) {
-            var_r6 = (u32)group_p->mpPoly;
-            group_p->mpLine = (dDrawPath_c::line_class*)(room + (u32)group_p->mpLine);
+            var_r6 = (uintptr_t)group_p->mpPoly;
+            group_p->mpLine = (dDrawPath_c::line_class*)(room + (uintptr_t)group_p->mpLine);
 
             dDrawPath_c::line_class* line_p = group_p->mpLine;
             for (int k = 0; k < group_p->mLineNum; k++) {
-                var_r6 = (u32)(line_p->mpData + line_p->mDataNum);
-                line_p->mpData = (u16*)(room + (u32)line_p->mpData);
+                var_r6 = (uintptr_t)(line_p->mpData + line_p->mDataNum);
+                line_p->mpData = (u16*)(room + (uintptr_t)line_p->mpData);
                 line_p++;
             }
 
-            group_p->mpPoly = (dDrawPath_c::poly_class*)(room + (u32)group_p->mpPoly);
+            group_p->mpPoly = (dDrawPath_c::poly_class*)(room + (uintptr_t)group_p->mpPoly);
             
             dDrawPath_c::poly_class* poly_p = group_p->mpPoly;
             for (int l = 0; l < group_p->mPolyNum; l++) {
-                var_r6 = (u32)(poly_p->mpData + poly_p->mDataNum);
-                poly_p->mpData = (u16*)(room + (u32)poly_p->mpData);
+                var_r6 = (uintptr_t)(poly_p->mpData + poly_p->mDataNum);
+                poly_p->mpData = (u16*)(room + (uintptr_t)poly_p->mpData);
                 poly_p++;
             }
 
diff --git a/src/d/d_menu_map_common.cpp b/src/d/d_menu_map_common.cpp
index ee6ee512e5..ac6bea08eb 100644
--- a/src/d/d_menu_map_common.cpp
+++ b/src/d/d_menu_map_common.cpp
@@ -622,7 +622,7 @@ void dMenuMapCommon_c::moveLightDropAnime() {
 /* 801C4738-801C4778 1BF078 0040+00 1/1 0/0 0/0 .text            getIconSizeX__16dMenuMapCommon_cFUc
  */
 f32 dMenuMapCommon_c::getIconSizeX(u8 i_iconNo) {
-    for (int i = 0; i < ARRAY_SIZE(map_icon_size); i++) {
+    for (int i = 0; i < ARRAY_SIZEU(map_icon_size); i++) {
         if (map_icon_size[i].icon_no == i_iconNo) {
             return map_icon_size[i].size_x;
         }
@@ -634,7 +634,7 @@ f32 dMenuMapCommon_c::getIconSizeX(u8 i_iconNo) {
 /* 801C4778-801C47C4 1BF0B8 004C+00 1/1 0/0 0/0 .text            getIconSizeY__16dMenuMapCommon_cFUc
  */
 f32 dMenuMapCommon_c::getIconSizeY(u8 i_iconNo) {
-    for (int i = 0; i < ARRAY_SIZE(map_icon_size); i++) {
+    for (int i = 0; i < ARRAY_SIZEU(map_icon_size); i++) {
         if (map_icon_size[i].icon_no == i_iconNo) {
             return map_icon_size[i].size_y;
         }
diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp
index 49ffc63258..0ed7f510bd 100644
--- a/src/d/d_meter2_info.cpp
+++ b/src/d/d_meter2_info.cpp
@@ -1473,11 +1473,11 @@ bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32
     JUT_ASSERT(3065, s < i_resTimg->width && t < i_resTimg->height);
 
     u32 sp1C = (t & ~3) * ((timg_width + 7) & ~7) + ((s & ~7) * 4 + (s & 7)) + (t & 3) * 8;
-    u8* pixel = (u8*)((u32)i_resTimg + (i_resTimg->imageOffset + sp1C));
+    u8* pixel = (u8*)((uintptr_t)i_resTimg + (i_resTimg->imageOffset + sp1C));
 
     JUT_ASSERT(3074, *pixel < i_resTimg->numColors);
 
-    u16* palette_p = (u16*)((u32)i_resTimg + i_resTimg->paletteOffset);
+    u16* palette_p = (u16*)((uintptr_t)i_resTimg + i_resTimg->paletteOffset);
     u16 var_r24 = (u16)palette_p[*pixel];
     if (var_r24 & 0x8000) {
         return 1;
diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp
index 1ed2868429..4864576949 100644
--- a/src/d/d_meter_HIO.cpp
+++ b/src/d/d_meter_HIO.cpp
@@ -1311,7 +1311,7 @@ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() {
     mLV5DungeonItem = fpcNm_ITEM_NONE;
     mIconDebug = false;
 
-    for (int i = 0; i < ARRAY_SIZE(mIconDisplay); i++) {
+    for (int i = 0; i < ARRAY_SIZEU(mIconDisplay); i++) {
         mIconDisplay[i] = true;
     }
 
@@ -1500,7 +1500,7 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() {
     mMapBlink[ZOOM_VIEW].field_0x20.set(0, 0, 0, 0);
     mMapBlink[ZOOM_VIEW].field_0x24.set(0, 0, 0, 255);
 
-    for (int i = 0; i < ARRAY_SIZE(mDebugRegionBits); i++) {
+    for (int i = 0; i < ARRAY_SIZEU(mDebugRegionBits); i++) {
         mDebugRegionBits[i] = 0;
     }
 }
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 67ecefda29..949a3fc978 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -307,7 +307,7 @@ J3DModelData* dRes_info_c::loaderBasicBmd(u32 i_tag, void* i_data) {
     }
 
     if (i_tag == 'BMDR' || i_tag == 'BMWR') {
-        if (modelData->newSharedDisplayList(0x40000) != 0) {
+        if (modelData->newSharedDisplayList(J3DMdlFlag_UseSingleDL) != kJ3DError_Success) {
             return NULL;
         } else {
             modelData->simpleCalcMaterial(0, (MtxP)j3dDefaultMtx);
@@ -399,7 +399,7 @@ int dRes_info_c::loadResource() {
                     }
 
                     setAlpha(modelData);
-                    if (modelData->newSharedDisplayList(0x40000) != 0) {
+                    if (modelData->newSharedDisplayList(J3DMdlFlag_UseSingleDL) != kJ3DError_Success) {
                         return -1;
                     }
 
@@ -427,7 +427,7 @@ int dRes_info_c::loadResource() {
                         return -1;
                     }
 #endif
-                    if (modelData->newSharedDisplayList(0x40000) != 0) {
+                    if (modelData->newSharedDisplayList(J3DMdlFlag_UseSingleDL) != kJ3DError_Success) {
                         return -1;
                     }
 
@@ -440,7 +440,7 @@ int dRes_info_c::loadResource() {
                     }
 
                     modelData = (J3DModelData*)result;
-                    if (modelData->newSharedDisplayList(0x40000) != 0) {
+                    if (modelData->newSharedDisplayList(J3DMdlFlag_UseSingleDL) != kJ3DError_Success) {
                         return -1;
                     }
 
@@ -724,11 +724,11 @@ void dRes_info_c::dump(dRes_info_c* i_resInfo, int i_infoNum) {
 
 /* 8003BFB0-8003C078 0368F0 00C8+00 0/0 1/1 0/0 .text            __dt__14dRes_control_cFv */
 dRes_control_c::~dRes_control_c() {
-    for (int i = 0; i < (int)ARRAY_SIZE(mObjectInfo); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mObjectInfo); i++) {
         mObjectInfo[i].~dRes_info_c();
     }
 
-    for (int i = 0; i < (int)ARRAY_SIZE(mStageInfo); i++) {
+    for (int i = 0; i < ARRAY_SIZE(mStageInfo); i++) {
         mStageInfo[i].~dRes_info_c();
     }
 }
@@ -932,11 +932,11 @@ int dRes_control_c::setObjectRes(char const* i_arcName, void* i_archiveRes, u32
     JUT_ASSERT(0x7A3, i_archiveRes != 0);
 
 #ifdef DEBUG
-    dRes_info_c* nowInfo = getResInfo(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
+    dRes_info_c* nowInfo = getResInfo(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
     JUT_ASSERT(0x7A6, nowInfo == 0);
 #endif
 
-    if (!setRes(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo), "", mDoDvd_MOUNT_DIRECTION_HEAD, NULL)) {
+    if (!setRes(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo), "", mDoDvd_MOUNT_DIRECTION_HEAD, NULL)) {
         return 0;
     }
 
@@ -945,7 +945,7 @@ int dRes_control_c::setObjectRes(char const* i_arcName, void* i_archiveRes, u32
         return 0;
     }
 
-    dRes_info_c* info = getResInfo(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
+    dRes_info_c* info = getResInfo(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
     JUT_ASSERT(0x7B7, info != 0);
 
     int rt = info->setRes(memArchive, i_heap);
@@ -962,24 +962,24 @@ int dRes_control_c::setStageRes(char const* i_arcName, JKRHeap* i_heap) {
     char path[20];
 
     snprintf(path, sizeof(path), "/res/Stage/%s/", dComIfGp_getStartStageName());
-    return setRes(i_arcName, mStageInfo, ARRAY_SIZE(mStageInfo), path, mDoDvd_MOUNT_DIRECTION_TAIL, i_heap);
+    return setRes(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo), path, mDoDvd_MOUNT_DIRECTION_TAIL, i_heap);
 }
 
 /* 8003C638-8003C6B8 036F78 0080+00 0/0 2/2 0/0 .text            dump__14dRes_control_cFv */
 void dRes_control_c::dump() {
     JUTReportConsole_f("\ndRes_control_c::dump mObjectInfo\n");
-    dRes_info_c::dump(mObjectInfo, ARRAY_SIZE(mObjectInfo));
-    dRes_info_c::dump_long(mObjectInfo, ARRAY_SIZE(mObjectInfo));
+    dRes_info_c::dump(mObjectInfo, ARRAY_SIZEU(mObjectInfo));
+    dRes_info_c::dump_long(mObjectInfo, ARRAY_SIZEU(mObjectInfo));
 
     JUTReportConsole_f("\ndRes_control_c::dump mStageInfo\n");
-    dRes_info_c::dump(mStageInfo, ARRAY_SIZE(mStageInfo));
-    dRes_info_c::dump_long(mStageInfo, ARRAY_SIZE(mStageInfo));
+    dRes_info_c::dump(mStageInfo, ARRAY_SIZEU(mStageInfo));
+    dRes_info_c::dump_long(mStageInfo, ARRAY_SIZEU(mStageInfo));
 }
 
 /* 8003C6B8-8003C734 036FF8 007C+00 0/0 0/0 32/32 .text
  * getObjectResName2Index__14dRes_control_cFPCcPCc              */
 int dRes_control_c::getObjectResName2Index(char const* i_arcName, char const* i_resName) {
-    dRes_info_c* info = getResInfoLoaded(i_arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
+    dRes_info_c* info = getResInfoLoaded(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
 
     if (info == NULL) {
         return -1;
diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp
index 066d98b1e5..22b5ef3e49 100644
--- a/src/d/d_s_menu.cpp
+++ b/src/d/d_s_menu.cpp
@@ -1577,11 +1577,11 @@ int phase_2(dScnMenu_c* i_this) {
     JUT_ASSERT(3237, i_this->info != 0);
 
     menu_info_class* menu_info = i_this->info;
-    menu_info->stage_data = (menu_stage_class*)((u32)menu_info->stage_data + (u32)menu_info);
+    menu_info->stage_data = (menu_stage_class*)((uintptr_t)menu_info->stage_data + (uintptr_t)menu_info);
 
     for (int i = 0; i < menu_info->num; i++) {
         menu_info->stage_data[i].data =
-            (menu_data_class*)((u32)menu_info->stage_data[i].data + (u32)menu_info);
+            (menu_data_class*)((uintptr_t)menu_info->stage_data[i].data + (uintptr_t)menu_info);
     }
 
     if (l_groupPoint == NULL) {
@@ -1606,11 +1606,11 @@ int phase_2(dScnMenu_c* i_this) {
         category_offset += menu_info->stage_data[i].field_0x41 * sizeof(menu_data_class);
     }
 
-    i_this->category_info = (menu_category_class*)((u32)i_this->command->getMemAddress() + category_offset);
+    i_this->category_info = (menu_category_class*)((uintptr_t)i_this->command->getMemAddress() + category_offset);
     JUT_ASSERT(3282, i_this->category_info != 0);
 
     category_info = i_this->category_info;
-    category_info->data = (menu_category_data_class*)((u32)category_info->data + (u32)menu_info);
+    category_info->data = (menu_category_data_class*)((uintptr_t)category_info->data + (uintptr_t)menu_info);
     i_this->current_category = menu_info->stage_data[l_cursolID].field_0x43;
 
     delete i_this->command;
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 39ab1353a1..74c25ebacf 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -78,7 +78,7 @@ static void dStage_KeepDoorInfoProc(dStage_dt_c* i_stage, stage_tgsc_class* i_dr
         DoorInfo.mNum = 0;
         return;
     }
-    if (i_drtg->num >= (int)ARRAY_SIZE(DoorInfo.mDrTgData) || i_drtg->num < 0) {
+    if (i_drtg->num >= ARRAY_SIZE(DoorInfo.mDrTgData) || i_drtg->num < 0) {
         DoorInfo.mNum = 0;
         return;
     }
@@ -1182,7 +1182,7 @@ static int createRoomScene(int param_0) {
     }
     *ptr = param_0;
 
-    if (!fopScnM_CreateReq(PROC_ROOM_SCENE, 0x7FFF, 0, (u32)ptr)) {
+    if (!fopScnM_CreateReq(PROC_ROOM_SCENE, 0x7FFF, 0, (uintptr_t)ptr)) {
         JKRHeap::free(ptr, NULL);
         return 0;
     }
@@ -1205,14 +1205,14 @@ int dStage_roomControl_c::loadRoom(int roomCount, u8* rooms, bool param_2) {
         return 0;
     }
 
-    for (int roomNo = 0; roomNo < ARRAY_SIZE(mStatus); roomNo++) {
+    for (int roomNo = 0; roomNo < ARRAY_SIZEU(mStatus); roomNo++) {
         if (checkStatusFlag(roomNo, 0x02 | 0x04)) {
             return 0;
         }
     }
     
     BOOL r26 = TRUE;
-    for (int roomNo = 0; roomNo < (int)ARRAY_SIZE(mStatus); roomNo++) {
+    for (int roomNo = 0; roomNo < ARRAY_SIZE(mStatus); roomNo++) {
         if (dStage_roomControl_c::checkStatusFlag(roomNo, 0x01)) {
             if (!stayRoomCheck(roomCount, rooms, roomNo)) {
                 onStatusFlag(roomNo, 0xc);
@@ -1500,7 +1500,7 @@ static void dummy0() {
 dStage_objectNameInf* dStage_searchName(char const* objName) {
     dStage_objectNameInf* obj = l_objectName;
 
-    for (u32 i = 0; i < ARRAY_SIZE(l_objectName); i++) {
+    for (u32 i = 0; i < ARRAY_SIZEU(l_objectName); i++) {
         if (!strcmp(obj->mName, objName)) {
             return obj;
         }
@@ -1517,7 +1517,7 @@ static const char* dStage_getName(s16 procName, s8 subtype) {
     dStage_objectNameInf* obj = l_objectName;
     char* tmp = NULL;
 
-    for (int i = 0; i < ARRAY_SIZE(l_objectName); i++) {
+    for (int i = 0; i < ARRAY_SIZEU(l_objectName); i++) {
         if (obj->mProcName == procName) {
             if (obj->mSubtype == subtype) {
                 return obj->mName;
@@ -2088,8 +2088,8 @@ static int dStage_pathInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
     i_stage->setPathInfo(path_c);
 
     for (int i = 0; i < path_c->m_num; i++) {
-        if ((u32)path->m_points < 0x80000000) {
-            path->m_points = (dPnt*)((u32)path->m_points + i_stage->getPntInf()->m_pnt_offset);
+        if ((uintptr_t)path->m_points < 0x80000000) {
+            path->m_points = (dPnt*)((uintptr_t)path->m_points + i_stage->getPntInf()->m_pnt_offset);
         }
         path++;
     }
@@ -2112,10 +2112,10 @@ static int dStage_rpatInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, vo
 
     i_stage->setPath2Info(pStagePath);
     for (s32 i = 0; i < pStagePath->m_num; pPath++, i++, (void)0) {
-        if ((u32)pPath->m_points >= 0x80000000) {
+        if ((uintptr_t)pPath->m_points >= 0x80000000) {
             continue;
         }
-        pPath->m_points = (dPnt*)((u32)pPath->m_points + i_stage->getPnt2Inf()->m_pnt_offset);
+        pPath->m_points = (dPnt*)((uintptr_t)pPath->m_points + i_stage->getPnt2Inf()->m_pnt_offset);
     }
     return 1;
 }
@@ -2266,7 +2266,7 @@ static void dStage_dt_c_offsetToPtr(void* i_data) {
     for (int i = 0; i < file->m_chunkCount; i++) {
         JUT_ASSERT(3381, p_tno->m_offset != 0);
         if (p_tno->m_offset != 0 && p_tno->m_offset < 0x80000000) {
-            p_tno->m_offset += (u32)i_data;
+            p_tno->m_offset += (uintptr_t)i_data;
         }
         p_tno++;
     }
@@ -2351,10 +2351,10 @@ static void readMult(dStage_dt_c* i_stage, dStage_Multi_c* multi, bool useOldRes
             if (dzs != NULL) {
                 dStage_dt_c_offsetToPtr(dzs);
                 i_stage->setRoomNo(info->mRoomNo);
-                dStage_dt_c_decode(dzs, i_stage, l_roomFuncTable, ARRAY_SIZE(l_roomFuncTable));
-                dStage_setLayerTagName(l_layerFuncTable, ARRAY_SIZE(l_layerFuncTable),
+                dStage_dt_c_decode(dzs, i_stage, l_roomFuncTable, ARRAY_SIZEU(l_roomFuncTable));
+                dStage_setLayerTagName(l_layerFuncTable, ARRAY_SIZEU(l_layerFuncTable),
                                        dComIfG_play_c::getLayerNo(0));
-                dStage_dt_c_decode(dzs, i_stage, l_layerFuncTable, ARRAY_SIZE(l_layerFuncTable));
+                dStage_dt_c_decode(dzs, i_stage, l_layerFuncTable, ARRAY_SIZEU(l_layerFuncTable));
             }
 
             info++;
@@ -2453,7 +2453,7 @@ static void layerMemoryInfoLoader(void* i_data, dStage_dt_c* i_stage, int param_
         {"MEC0", dStage_mecoInfoInit},
     };
 
-    dStage_dt_c_decode(i_data, i_stage, l_layerFuncTable, ARRAY_SIZE(l_layerFuncTable));
+    dStage_dt_c_decode(i_data, i_stage, l_layerFuncTable, ARRAY_SIZEU(l_layerFuncTable));
 }
 
 /* 80026940-800269B4 021280 0074+00 1/1 0/0 0/0 .text
@@ -2463,7 +2463,7 @@ static void dStage_dt_c_stageInitLoader(void* i_data, dStage_dt_c* i_stage) {
 
     dStage_dt_c_offsetToPtr(i_data);
     i_stage->init();
-    dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZE(l_funcTable));
+    dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZEU(l_funcTable));
     layerMemoryInfoLoader(i_data, i_stage, -1);
 }
 
@@ -2484,20 +2484,20 @@ static void layerTableLoader(void* i_data, dStage_dt_c* i_stage, int roomNo) {
         newRoomNo = dComIfGp_getStartStageRoomNo();
     }
 
-    dStage_setLayerTagName(l_layerFuncTableA, ARRAY_SIZE(l_layerFuncTableA),
+    dStage_setLayerTagName(l_layerFuncTableA, ARRAY_SIZEU(l_layerFuncTableA),
                            dComIfG_play_c::getLayerNo(0));
-    dStage_dt_c_decode(i_data, i_stage, l_layerFuncTableA, ARRAY_SIZE(l_layerFuncTableA));
+    dStage_dt_c_decode(i_data, i_stage, l_layerFuncTableA, ARRAY_SIZEU(l_layerFuncTableA));
 
     dStage_Elst_c* elst = dComIfGp_getStage()->getElst();
     if (elst != NULL && newRoomNo >= 0 && elst->m_entryNum > newRoomNo) {
         dStage_Elst_dt_c* d = elst->m_entries;
         int layer = dComIfG_play_c::getLayerNo(0);
-        dStage_setLayerTagName(l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable),
+        dStage_setLayerTagName(l_envLayerFuncTable, ARRAY_SIZEU(l_envLayerFuncTable),
                                d[newRoomNo].m_layerTable[layer]);
-        dStage_dt_c_decode(i_data, i_stage, l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable));
+        dStage_dt_c_decode(i_data, i_stage, l_envLayerFuncTable, ARRAY_SIZEU(l_envLayerFuncTable));
     } else {
-        dStage_setLayerTagName(l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable), 0);
-        dStage_dt_c_decode(i_data, i_stage, l_envLayerFuncTable, ARRAY_SIZE(l_envLayerFuncTable));
+        dStage_setLayerTagName(l_envLayerFuncTable, ARRAY_SIZEU(l_envLayerFuncTable), 0);
+        dStage_dt_c_decode(i_data, i_stage, l_envLayerFuncTable, ARRAY_SIZEU(l_envLayerFuncTable));
     }
 }
 
@@ -2513,7 +2513,7 @@ static void layerActorLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
     };
 
     dStage_setLayerTagName(l_layerFuncTable, 4, dComIfG_play_c::getLayerNo(0));
-    dStage_dt_c_decode(i_data, i_stage, l_layerFuncTable, ARRAY_SIZE(l_layerFuncTable));
+    dStage_dt_c_decode(i_data, i_stage, l_layerFuncTable, ARRAY_SIZEU(l_layerFuncTable));
 }
 
 /* 80026B58-80026BBC 021498 0064+00 1/1 0/0 0/0 .text dStage_dt_c_stageLoader__FPvP11dStage_dt_c
@@ -2535,7 +2535,7 @@ static void dStage_dt_c_stageLoader(void* i_data, dStage_dt_c* i_stage) {
         {"REVT", dStage_stEventInfoInit},   {"SOND", dStage_soundInfoInitCL},
     };
 
-    dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZE(l_funcTable));
+    dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZEU(l_funcTable));
     layerTableLoader(i_data, i_stage, -1);
     layerActorLoader(i_data, i_stage, -1);
 }
@@ -2555,7 +2555,7 @@ void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
 
     dStage_dt_c_offsetToPtr(i_data);
     i_stage->init();
-    dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZE(l_funcTable));
+    dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZEU(l_funcTable));
     layerTableLoader(i_data, i_stage, param_2);
 }
 
@@ -2569,7 +2569,7 @@ void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
         {"TGDR", dStage_tgscInfoInit},         {"REVT", dStage_mapEventInfoInit},
     };
 
-    dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZE(l_funcTable));
+    dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZEU(l_funcTable));
     layerActorLoader(i_data, i_stage, param_2);
 }
 
@@ -2585,7 +2585,7 @@ void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage) {
     JUT_ASSERT(4428, i_data != 0);
 
     dStage_dt_c_offsetToPtr(i_data);
-    dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZE(l_funcTable));
+    dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZEU(l_funcTable));
 }
 
 /* ############################################################################################## */
diff --git a/src/f_op/f_op_draw_tag.cpp b/src/f_op/f_op_draw_tag.cpp
index d6d423aae3..319c0e7361 100644
--- a/src/f_op/f_op_draw_tag.cpp
+++ b/src/f_op/f_op_draw_tag.cpp
@@ -31,5 +31,5 @@ bool fopDwTg_Init(create_tag_class* i_createTag, void* i_process) {
 void fopDwTg_CreateQueue() {
     static node_list_class lists[1000];
 
-    cTr_Create(&g_fopDwTg_Queue, lists, ARRAY_SIZE(lists));
+    cTr_Create(&g_fopDwTg_Queue, lists, ARRAY_SIZEU(lists));
 }
diff --git a/src/f_pc/f_pc_line.cpp b/src/f_pc/f_pc_line.cpp
index c4a336ccb9..91e9b8a705 100644
--- a/src/f_pc/f_pc_line.cpp
+++ b/src/f_pc/f_pc_line.cpp
@@ -12,7 +12,7 @@ static node_list_class l_fpcLn_Line[16];
 
 /* 80021F64-80021FB8 0054+00 s=0 e=1 z=0  None .text      fpcLn_Create__Fv */
 void fpcLn_Create() {
-    s32 i = ARRAY_SIZE(l_fpcLn_Line);
+    s32 i = ARRAY_SIZEU(l_fpcLn_Line);
     node_list_class* line_node = l_fpcLn_Line;
     while (i-- > 0)
         cLs_Create(line_node++);
@@ -21,5 +21,5 @@ void fpcLn_Create() {
 /* 804505D8-804505E0 0008+00 s=0 e=2 z=0  None .sdata     g_fpcLn_Queue */
 node_lists_tree_class g_fpcLn_Queue = {
     l_fpcLn_Line,
-    ARRAY_SIZE(l_fpcLn_Line),
+    ARRAY_SIZEU(l_fpcLn_Line),
 };
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index b0bd4a9ec1..5288636ec2 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -3064,18 +3064,18 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u3
             // Update the modelFlag if the model data passed in has a shared dlist object
             if (i_modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL) {
                 if (i_modelData->isLocked()) {
-                    i_modelFlag = J3DMdlFlag_Unk20000;
-                } else if (i_modelFlag == J3DMdlFlag_Unk20000) {
-                    i_modelFlag |= J3DMdlFlag_Unk40000;
+                    i_modelFlag = J3DMdlFlag_UseSharedDL;
+                } else if (i_modelFlag == J3DMdlFlag_UseSharedDL) {
+                    i_modelFlag |= J3DMdlFlag_UseSingleDL;
                 } else {
-                    i_modelFlag = J3DMdlFlag_Unk80000;
+                    i_modelFlag = J3DMdlFlag_DifferedDLBuffer;
                 }
             }
 
             // Set up the model
-            if (!model->entryModelData(i_modelData, i_modelFlag, 1)) {
-                if (i_modelFlag == J3DMdlFlag_Unk80000 &&
-                    model->newDifferedDisplayList(i_differedDlistFlag))
+            if (model->entryModelData(i_modelData, i_modelFlag, 1) == kJ3DError_Success) {
+                if (i_modelFlag == J3DMdlFlag_DifferedDLBuffer &&
+                    model->newDifferedDisplayList(i_differedDlistFlag) != kJ3DError_Success)
                 {
                     return NULL;
                 }
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index 44e40aba06..989c5c28b3 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -415,7 +415,7 @@ static void my_PrintHeap(char const* heapName, u32 heapSize) {
 /* 8000BCF8-8000BD44 006638 004C+00 1/1 0/0 0/0 .text            my_SysPrintHeap__FPCcPvUl */
 void my_SysPrintHeap(char const* message, void* start, u32 size) {
     OSReport_System("\x1b[32m%-24s = %08x-%08x size=%d KB\n\x1b[m", message, start,
-                    (u32)start + size, size / 1024);
+                    (uintptr_t)start + size, size / 1024);
 }
 
 #if VERSION != VERSION_GCN_PAL
@@ -552,15 +552,15 @@ int mDoMch_Create() {
     JFWSystem::setMaxStdHeap(1);
 
     #ifndef DEBUG
-    u32 arenaHi = (u32)OSGetArenaHi();
-    u32 arenaLo =(u32)OSGetArenaLo();
+    uintptr_t arenaHi = (uintptr_t)OSGetArenaHi();
+    uintptr_t arenaLo = (uintptr_t)OSGetArenaLo();
 
     if (arenaHi > 0x81800000 && arenaHi - 0x1800000 > arenaLo) {
         OSSetArenaHi((void*)(arenaHi - 0x1800000));
     }
     #endif
 
-    u32 arenaSize = ((u32)OSGetArenaHi() - (u32)OSGetArenaLo()) - 0xF0;
+    u32 arenaSize = ((uintptr_t)OSGetArenaHi() - (uintptr_t)OSGetArenaLo()) - 0xF0;
     my_PrintHeap("アリーナ", arenaSize);
 
     if (mDoMain::memMargin != -1) {
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index 00ed254f0c..64adf2f620 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -126,8 +126,8 @@ void mDoPrintf_vprintf_Interrupt(char const* fmt, va_list args) {
     s32 interruptStatus = OSDisableInterrupts();
     if (!data_80450BB5) {
         data_80450BB5 = true;
-        OSSwitchFiberEx((u32)fmt, (u32)args, 0, 0, (u32)vprintf,
-                        (u32)&mDoPrintf_FiberStack + sizeof(mDoPrintf_FiberStack));
+        OSSwitchFiberEx((uintptr_t)fmt, (uintptr_t)args, 0, 0, (uintptr_t)vprintf,
+                        (uintptr_t)&mDoPrintf_FiberStack + sizeof(mDoPrintf_FiberStack));
         data_80450BB5 = false;
     }
     OSRestoreInterrupts(interruptStatus);
@@ -257,7 +257,7 @@ void OSPanic(const char* file, int line, const char* fmt, ...) {
     OSAttention(" in \"%s\" on line %d.\n", file, line);
 
     OSAttention("\nAddress:      Back Chain    LR Save\n");
-    for (i = 0, p = (u32*)OSGetStackPointer(); p && (u32)p != 0xFFFFFFFF && i++ < 16; p = (u32*)*p) {
+    for (i = 0, p = (u32*)OSGetStackPointer(); p && (uintptr_t)p != 0xFFFFFFFF && i++ < 16; p = (u32*)*p) {
         OSAttention("0x%08x:   0x%08x    0x%08x\n", p, p[0], p[1]);
     }