J3D work (#2064)

1 files changed, 89 insertions, 20 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h
index 35bfd28691..6453019814 100644
--- a/include/JSystem/J3DGraphBase/J3DTevs.h
+++ b/include/JSystem/J3DGraphBase/J3DTevs.h
@@ -12,16 +12,101 @@ struct J3DTevStageInfo {
     /* 0x5 */ u8 mTevAlphaOp;
     /* 0x6 */ u8 mTevAlphaAB;
     /* 0x7 */ u8 mTevSwapModeInfo;
-    /* 0x8 */ u8 field_0x8[0xc];
+    /* 0x8 */ u8 field_0x8;
+    /* 0x8 */ u8 field_0x9;
+    /* 0x8 */ u8 field_0xa;
+    /* 0x8 */ u8 field_0xb;
+    /* 0x8 */ u8 field_0xc;
+    /* 0x8 */ u8 field_0xd;
+    /* 0x8 */ u8 field_0xe;
+    /* 0x8 */ u8 field_0xf;
+    /* 0x8 */ u8 field_0x10;
+    /* 0x8 */ u8 field_0x11;
+    /* 0x8 */ u8 field_0x12;
+    /* 0x8 */ u8 field_0x13;
 };
 
 extern J3DTevStageInfo const j3dDefaultTevStageInfo;
 
+struct J3DTevSwapModeTableInfo {
+    /* 0x0 */ u8 field_0x0;
+    /* 0x1 */ u8 field_0x1;
+    /* 0x2 */ u8 field_0x2;
+    /* 0x3 */ u8 field_0x3;
+}; // Size: 0x4
+
+extern const J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable;
+
+struct J3DTevSwapModeInfo {
+    /* 0x0 */ u8 mRasSel;
+    /* 0x1 */ u8 mTexSel;
+    /* 0x2 */ u8 field_0x2;
+    /* 0x3 */ u8 field_0x3;
+}; // Size: 0x4
+
+extern J3DTevSwapModeInfo const j3dDefaultTevSwapMode;
+
 struct J3DTevStage {
     /* 8000E230 */ J3DTevStage();
-    /* 8000E298 */ void setTevStageInfo(J3DTevStageInfo const&);
-    /* 8003AACC */ J3DTevStage(J3DTevStageInfo const&);
+    void setTevColorOp(u8 param_1, u8 param_2, u8 param_3, u8 param_4, u8 param_5) {
+        mTevColorOp = mTevColorOp & ~(0x01 << 2) | param_1 << 2;
+        if (param_1 <= 1) {
+            mTevColorOp = mTevColorOp & ~(0x03 << 4) | param_3 << 4;
+            mTevColorOp = mTevColorOp & ~0x03 | param_2;
+        } else {
+            mTevColorOp = mTevColorOp & ~(0x03 << 4) | (param_1 >> 1 & 3) << 4;
+            mTevColorOp = mTevColorOp & ~0x03 | 3;
+        }
+        mTevColorOp = mTevColorOp & ~(0x01 << 3) | param_4 << 3;
+        mTevColorOp = mTevColorOp & ~(0x03 << 6) | param_5 << 6;
+    }
+
+    void setTevColorAB(u8 a, u8 b) { mTevColorAB = a << 4 | b; }
+    void setTevColorCD(u8 c, u8 d) { mTevColorCD = c << 4 | d; }
+    void setAlphaA(u8 a) { mTevAlphaAB = mTevAlphaAB & ~(0x07 << 5) | a << 5; }
+    void setAlphaB(u8 b) { mTevAlphaAB = mTevAlphaAB & ~(0x07 << 2) | b << 2; }
+    void setAlphaC(u8 c) {
+        mTevAlphaAB = mTevAlphaAB & ~0x03 | c >> 1;
+        mTevSwapModeInfo = mTevSwapModeInfo & ~(0x01 << 7) | c << 7;
+    }
+    void setAlphaD(u8 d) { mTevSwapModeInfo = mTevSwapModeInfo & ~(0x07 << 4) | d << 4; }
+    void setAlphaABCD(u8 a, u8 b, u8 c, u8 d) {
+        setAlphaA(a);
+        setAlphaB(b);
+        setAlphaC(c);
+        setAlphaD(d);
+    }
+
+    void setTevAlphaOp(u8 param_1, u8 param_2, u8 param_3, u8 param_4, u8 param_5) {
+        mTevAlphaOp = mTevAlphaOp & ~(0x01 << 2) | param_1 << 2;
+        if (param_1 <= 1) {
+            mTevAlphaOp = mTevAlphaOp & ~0x03 | param_2;
+            mTevAlphaOp = mTevAlphaOp & ~(0x03 << 4) | param_3 << 4;
+        } else {
+            mTevAlphaOp = mTevAlphaOp & ~(0x03 << 4) | (param_1 >> 1 & 3) << 4;
+            mTevAlphaOp = mTevAlphaOp & ~0x03 | 3;
+        }
+        mTevAlphaOp = mTevAlphaOp & ~(0x01 << 3) | param_4 << 3;
+        mTevAlphaOp = mTevAlphaOp & ~(0x03 << 6) | param_5 << 6;
+    }
+
+    void setTevStageInfo(const J3DTevStageInfo& info) {
+        setTevColorOp(info.mTevAlphaOp, info.mTevAlphaAB, info.mTevSwapModeInfo, info.field_0x8, info.field_0x9);
+        setTevColorAB(info.mTevColorOp, info.mTevColorAB);
+        setTevColorCD(info.mTevColorCD, info.field_0x4);
+        setAlphaABCD(info.field_0xa, info.field_0xb, info.field_0xc, info.field_0xd);
+        setTevAlphaOp(info.field_0xe, info.field_0xf, info.field_0x10, info.field_0x11, info.field_0x12);
+    }
 
+    /* 8003AACC */ J3DTevStage(J3DTevStageInfo const& param_0) {
+        setTevStageInfo(param_0);
+        setTevSwapModeInfo(j3dDefaultTevSwapMode);
+    }
+
+    void setTevSwapModeInfo(J3DTevSwapModeInfo const& param_0) {
+        setTexSel(param_0.mTexSel);
+        setRasSel(param_0.mRasSel);
+    }
     void setRasSel(u8 ras_sel) { mTevSwapModeInfo = (mTevSwapModeInfo & ~3) | ras_sel; }
     void setTexSel(u8 tex_sel) { mTevSwapModeInfo = (mTevSwapModeInfo & ~0xc) | (tex_sel << 2); }
 
@@ -88,7 +173,7 @@ struct J3DTevOrderInfo {
     /* 0x3 */ u8 field_0x3; // Maybe padding
 };
 
-extern J3DTevOrderInfo j3dDefaultTevOrderInfoNull;
+extern const J3DTevOrderInfo j3dDefaultTevOrderInfoNull;
 
 struct J3DTevOrder : public J3DTevOrderInfo {
     /* 8000E140 */ J3DTevOrder() : J3DTevOrderInfo(j3dDefaultTevOrderInfoNull) {}
@@ -97,15 +182,6 @@ struct J3DTevOrder : public J3DTevOrderInfo {
     u8 getTexMap() { return mTexMap; }
 };
 
-struct J3DTevSwapModeTableInfo {
-    /* 0x0 */ u8 field_0x0;
-    /* 0x1 */ u8 field_0x1;
-    /* 0x2 */ u8 field_0x2;
-    /* 0x3 */ u8 field_0x3;
-}; // Size: 0x4
-
-extern J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable;
-
 struct J3DTevSwapModeTable {
     /* 8000E134 */ J3DTevSwapModeTable();
     J3DTevSwapModeTable(J3DTevSwapModeTableInfo const& info) {
@@ -118,13 +194,6 @@ struct J3DTevSwapModeTable {
     /* 0x0 */ u8 field_0x0;
 };  // Size: 0x1
 
-struct J3DTevSwapModeInfo {
-    /* 0x0 */ u8 mRasSel;
-    /* 0x1 */ u8 mTexSel;
-    /* 0x2 */ u8 field_0x2;
-    /* 0x3 */ u8 field_0x3;
-}; // Size: 0x4
-
 struct J3DNBTScale;
 struct J3DTexCoord;
 void loadNBTScale(J3DNBTScale& param_0);