From ca4ecc5a41f34f07ccd0580a2a923e39a8ae20cb Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Tue, 25 Jun 2024 20:15:24 -0400
Subject: [PATCH] Minor J3D/GX doc

---
 include/JSystem/J3DGraphBase/J3DTevs.h   | 10 +++----
 src/JSystem/J3DGraphBase/J3DGD.cpp       |  4 +--
 src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 36 ++++++++++++------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h
index f82f4ddc5..10f13e343 100644
--- a/include/JSystem/J3DGraphBase/J3DTevs.h
+++ b/include/JSystem/J3DGraphBase/J3DTevs.h
@@ -105,15 +105,15 @@ struct J3DTevStage {
     }
 
     void load(u32) const {
-        J3DGDWriteBPCmd(*(u32*)&field_0x0);
-        J3DGDWriteBPCmd(*(u32*)&field_0x4);
+        J3DGDWriteBPCmd(*(u32*)&mTevColorReg);
+        J3DGDWriteBPCmd(*(u32*)&mTevAlphaReg);
     }
 
-    /* 0x0 */ u8 field_0x0;
+    /* 0x0 */ u8 mTevColorReg;
     /* 0x1 */ u8 mTevColorOp;
-    /* 0x1 */ u8 mTevColorAB;
+    /* 0x2 */ u8 mTevColorAB;
     /* 0x3 */ u8 mTevColorCD;
-    /* 0x4 */ u8 field_0x4;
+    /* 0x4 */ u8 mTevAlphaReg;
     /* 0x5 */ u8 mTevAlphaOp;
     /* 0x6 */ u8 mTevAlphaAB;
     /* 0x7 */ u8 mTevSwapModeInfo;
diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/src/JSystem/J3DGraphBase/J3DGD.cpp
index 5fc3ae450..95d501a86 100644
--- a/src/JSystem/J3DGraphBase/J3DGD.cpp
+++ b/src/JSystem/J3DGraphBase/J3DGD.cpp
@@ -407,8 +407,8 @@ void J3DGDSetIndTexOrder(u32 num, GXTexCoordID tc0, GXTexMapID tm0, GXTexCoordID
 void J3DGDSetTevOrder(GXTevStageID stage, GXTexCoordID coord1, GXTexMapID map1, GXChannelID color1, GXTexCoordID coord2, GXTexMapID map2, GXChannelID color2) {
     static u8 c2r[] = {0, 1, 0, 1, 0, 1, 7, 5, 6, 0, 0, 0, 0, 0, 0, 7};
 
-    GXTexCoordID r31 = coord1 >= 8 ? GX_TEXCOORD0 : coord1;
-    GXTexCoordID r30 = coord2 >= 8 ? GX_TEXCOORD0 : coord2;
+    GXTexCoordID r31 = coord1 >= GX_MAXCOORD ? GX_TEXCOORD0 : coord1;
+    GXTexCoordID r30 = coord2 >= GX_MAXCOORD ? GX_TEXCOORD0 : coord2;
     GDOverflowCheck(5);
     J3DGDWriteBPCmd(
         ((map1 & 7) << 0) |
diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
index a900126bd..53b8a5c8c 100644
--- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
@@ -128,8 +128,8 @@ void J3DTevBlockPatched::initialize() {
     for (u32 i = 0; i < ARRAY_SIZE(mTexNo); i++)
         mTexNo[i] = 0xFFFF;
     for (u32 i = 0; i < ARRAY_SIZE(mTevStage); i++) {
-        mTevStage[i].field_0x0 = 0xC0 + i * 2;
-        mTevStage[i].field_0x4 = 0xC1 + i * 2;
+        mTevStage[i].mTevColorReg = 0xC0 + i * 2;
+        mTevStage[i].mTevAlphaReg = 0xC1 + i * 2;
     }
     for (u32 i = 0; i < 3; i++)
         mTevColor[i] = j3dDefaultTevColor;
@@ -145,8 +145,8 @@ void J3DTevBlockPatched::initialize() {
 /* 802DFABC-802DFAE4       .text initialize__12J3DTevBlock1Fv */
 void J3DTevBlock1::initialize() {
     mTexNo[0] = 0xFFFF;
-    mTevStage[0].field_0x0 = 0xC0;
-    mTevStage[0].field_0x4 = 0xC1;
+    mTevStage[0].mTevColorReg = 0xC0;
+    mTevStage[0].mTevAlphaReg = 0xC1;
     mTexNoOffset = 0;
 }
 
@@ -156,10 +156,10 @@ void J3DTevBlock2::initialize() {
     mTexNo[1] = 0xFFFF;
     mTevStageNum = 1;
 
-    mTevStage[0].field_0x0 = 0xC0;
-    mTevStage[0].field_0x4 = 0xC1;
-    mTevStage[1].field_0x0 = 0xC2;
-    mTevStage[1].field_0x4 = 0xC3;
+    mTevStage[0].mTevColorReg = 0xC0;
+    mTevStage[0].mTevAlphaReg = 0xC1;
+    mTevStage[1].mTevColorReg = 0xC2;
+    mTevStage[1].mTevAlphaReg = 0xC3;
     mTevKColorSel[0] = GX_TEV_KCSEL_K0;
     mTevKColorSel[1] = GX_TEV_KCSEL_K0;
     mTevKAlphaSel[0] = GX_TEV_KASEL_K0_A;
@@ -181,14 +181,14 @@ void J3DTevBlock4::initialize() {
     mTexNo[3] = 0xFFFF;
     mTevStageNum = 1;
 
-    mTevStage[0].field_0x0 = 0xC0;
-    mTevStage[0].field_0x4 = 0xC1;
-    mTevStage[1].field_0x0 = 0xC2;
-    mTevStage[1].field_0x4 = 0xC3;
-    mTevStage[2].field_0x0 = 0xC4;
-    mTevStage[2].field_0x4 = 0xC5;
-    mTevStage[3].field_0x0 = 0xC6;
-    mTevStage[3].field_0x4 = 0xC7;
+    mTevStage[0].mTevColorReg = 0xC0;
+    mTevStage[0].mTevAlphaReg = 0xC1;
+    mTevStage[1].mTevColorReg = 0xC2;
+    mTevStage[1].mTevAlphaReg = 0xC3;
+    mTevStage[2].mTevColorReg = 0xC4;
+    mTevStage[2].mTevAlphaReg = 0xC5;
+    mTevStage[3].mTevColorReg = 0xC6;
+    mTevStage[3].mTevAlphaReg = 0xC7;
     mTevKColorSel[0] = GX_TEV_KCSEL_K0;
     mTevKColorSel[1] = GX_TEV_KCSEL_K0;
     mTevKColorSel[2] = GX_TEV_KCSEL_K0;
@@ -220,8 +220,8 @@ void J3DTevBlock16::initialize() {
     for (u32 i = 0; i < ARRAY_SIZE(mTevKColorSel); i++)
         mTevKAlphaSel[i] = GX_TEV_KASEL_K0_A;
     for (u32 i = 0; i < ARRAY_SIZE(mTevStage); i++) {
-        mTevStage[i].field_0x0 = 0xC0 + i * 2;
-        mTevStage[i].field_0x4 = 0xC1 + i * 2;
+        mTevStage[i].mTevColorReg = 0xC0 + i * 2;
+        mTevStage[i].mTevAlphaReg = 0xC1 + i * 2;
     }
     mTexNoOffset = 0;
     mTevRegOffset = 0;