misc

bates64 · Mar 23, 2024 · 0ba479e · 0ba479e
1 parent 595dd83
commit 0ba479e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/include/macros.h b/include/macros.h
@@ -377,9 +377,10 @@
 #define PM_CC_23        1, TEXEL0, PRIMITIVE, TEXEL0, 0, 0, 0, TEXEL0
 #define PM_CC1_24       1, TEXEL0, PRIMITIVE, TEXEL0, 1, TEXEL0, TEXEL1, TEXEL0
 #define PM_CC2_24       1, TEXEL1, TEXEL0, COMBINED, 0, 0, 0, COMBINED
-#define PM_CC_26        0, 0, 0, 0, TEXEL0, TEXEL1, SHADE, 0
-#define PM_CC_27        0, 0, 0, SHADE, 0, 0, 0, COMBINED
-#define PM_CC_28        SHADE, 0, PRIMITIVE, ENVIRONMENT, 0, 0, 0, COMBINED
+
+#define PM_CC_TEX_COMBINE_3A        0, 0, 0, 0, TEXEL0, TEXEL1, SHADE, 0
+#define PM_CC_TEX_COMBINE_3B        0, 0, 0, SHADE, 0, 0, 0, COMBINED
+#define PM_CC_TEX_COMBINE_3C        SHADE, 0, PRIMITIVE, ENVIRONMENT, 0, 0, 0, COMBINED
 
 #define PM_CC1_29        TEXEL0, SHADE,    TEXEL0,       TEXEL0, 1, TEXEL1, TEXEL0, TEXEL1
 #define PM_CC2_29        TEXEL0, COMBINED, TEXEL0_ALPHA, TEXEL0, 1, TEXEL0, TEXEL1, TEXEL0

diff --git a/src/model.c b/src/model.c
@@ -346,11 +346,11 @@ Gfx SolidCombineModes[][5] = {
 
     // shaded color multiplied main/aux textures for alpha
     [TEX_COMBINE_3] {
-        [TINT_COMBINE_NONE]     gsDPSetCombineMode(PM_CC_26, PM_CC_27),
-        [TINT_COMBINE_FOG]      gsDPSetCombineMode(PM_CC_26, PM_CC_27),
-        [TINT_COMBINE_SHROUD]   gsDPSetCombineMode(PM_CC_26, PM_CC_27),
-        [TINT_COMBINE_DEPTH]    gsDPSetCombineMode(PM_CC_26, PM_CC_27),
-        [TINT_COMBINE_REMAP]    gsDPSetCombineMode(PM_CC_26, PM_CC_28),
+        [TINT_COMBINE_NONE]     gsDPSetCombineMode(PM_CC_TEX_COMBINE_3A, PM_CC_TEX_COMBINE_3B),
+        [TINT_COMBINE_FOG]      gsDPSetCombineMode(PM_CC_TEX_COMBINE_3A, PM_CC_TEX_COMBINE_3B),
+        [TINT_COMBINE_SHROUD]   gsDPSetCombineMode(PM_CC_TEX_COMBINE_3A, PM_CC_TEX_COMBINE_3B),
+        [TINT_COMBINE_DEPTH]    gsDPSetCombineMode(PM_CC_TEX_COMBINE_3A, PM_CC_TEX_COMBINE_3B),
+        [TINT_COMBINE_REMAP]    gsDPSetCombineMode(PM_CC_TEX_COMBINE_3A, PM_CC_TEX_COMBINE_3C),
     },
     // lerp between main/aux textures with shade alpha
     [TEX_COMBINE_4] {
@@ -505,11 +505,11 @@ Gfx AlphaTestCombineModes[][5] = {
     },
 
     [TEX_COMBINE_3] {
-        [TINT_COMBINE_NONE]     gsDPSetCombineMode(PM_CC_26, PM_CC_27),
-        [TINT_COMBINE_FOG]      gsDPSetCombineMode(PM_CC_26, PM_CC_27),
-        [TINT_COMBINE_SHROUD]   gsDPSetCombineMode(PM_CC_26, PM_CC_27),
-        [TINT_COMBINE_DEPTH]    gsDPSetCombineMode(PM_CC_26, PM_CC_27),
-        [TINT_COMBINE_REMAP]    gsDPSetCombineMode(PM_CC_26, PM_CC_28),
+        [TINT_COMBINE_NONE]     gsDPSetCombineMode(PM_CC_TEX_COMBINE_3A, PM_CC_TEX_COMBINE_3B),
+        [TINT_COMBINE_FOG]      gsDPSetCombineMode(PM_CC_TEX_COMBINE_3A, PM_CC_TEX_COMBINE_3B),
+        [TINT_COMBINE_SHROUD]   gsDPSetCombineMode(PM_CC_TEX_COMBINE_3A, PM_CC_TEX_COMBINE_3B),
+        [TINT_COMBINE_DEPTH]    gsDPSetCombineMode(PM_CC_TEX_COMBINE_3A, PM_CC_TEX_COMBINE_3B),
+        [TINT_COMBINE_REMAP]    gsDPSetCombineMode(PM_CC_TEX_COMBINE_3A, PM_CC_TEX_COMBINE_3C),
     },
     [TEX_COMBINE_4] {
         [TINT_COMBINE_NONE]     gsDPSetCombineMode(PM_CC_22, G_CC_PASS2),