4 files changed, 7 insertions, 5 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 92ca58ef6b..8103a83087 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -75,7 +75,7 @@ public:
     J3DTexCoord* getTexCoord(u32 idx) { return mTexGenBlock->getTexCoord(idx); }
     J3DZMode* getZMode() { return mPEBlock->getZMode(); }
     J3DBlend* getBlend() { return mPEBlock->getBlend(); }
-    J3DColorChan* getColorChan(u32 idx) { return getColorBlock()->getColorChan(idx); }
+    J3DColorChan* getColorChan(u32 idx) { return mColorBlock->getColorChan(idx); }
     J3DGXColor* getMatColor(u32 i) { return mColorBlock->getMatColor(i); }
 
     void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 151f4235ab..ed26d73694 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -180,7 +180,7 @@ public:
 
     void setDrawMtx(Mtx** pDrawMtx) { mDrawMtx = pDrawMtx; }
     void setNrmMtx(Mtx33** pNrmMtx) { mNrmMtx = pNrmMtx; }
-    void setTexMtxLoadType(u32 type) { mFlags = (mFlags & 0xFFFF0FFF) | type; }
+    void setTexMtxLoadType(u32 type) { mFlags = type | (mFlags & ~0xF000); }
     bool getNBTFlag() const { return mHasNBT; }
     u32 getBumpMtxOffset() const { return mBumpMtxOffset; }
     void setBumpMtxOffset(u32 offset) { mBumpMtxOffset = offset; }
diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h
index a13b54e4a4..3d70245220 100644
--- a/include/JSystem/J3DGraphBase/J3DTevs.h
+++ b/include/JSystem/J3DGraphBase/J3DTevs.h
@@ -201,10 +201,12 @@ struct J3DTevOrder : public J3DTevOrderInfo {
     J3DTevOrder() {
         J3DTevOrderInfo::operator=(j3dDefaultTevOrderInfoNull);
     }
-    J3DTevOrder(const J3DTevOrderInfo& info) : J3DTevOrderInfo(info) {}
+    J3DTevOrder(const J3DTevOrderInfo& info) {
+        J3DTevOrderInfo::operator=(info);
+    }
     J3DTevOrderInfo& getTevOrderInfo() { return *this; }
 
-    u8 getTexMap() { return mTexMap; }
+    u8 getTexMap() const { return mTexMap; }
 };
 
 extern u8 j3dTevSwapTableTable[1024];
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 8c95729d66..da8276e767 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -90,7 +90,7 @@ struct J3DTexCoord : public J3DTexCoordInfo {
         mTexMtxReg = mTexGenMtx;
     }
     void setTexCoordInfo(const J3DTexCoordInfo& info) {
-        __memcpy(this, &info, sizeof(J3DTexCoordInfo));
+        J3DTexCoordInfo::operator=(info);
     }
 
     u8 getTexGenType() const { return mTexGenType; }