From 608b72a58bfbbd4d70e28d9620790ec8e66acb90 Mon Sep 17 00:00:00 2001 From: vulcanbleh <148649099+vulcanbleh@users.noreply.github.com> Date: Sun, 18 Jan 2026 18:52:49 +0000 Subject: [PATCH] fix GXTevColorArg enum --- include/Dolphin/GX/GXEnum.h | 8 ++++---- src/JSystem/J2D/J2DPicture.cpp | 2 +- src/JSystem/J2D/J2DWindow.cpp | 2 +- src/JSystem/JParticle/JPABaseShape.cpp | 4 ++-- src/JSystem/JUtility/JUTResFont.cpp | 2 +- src/plugProjectNishimuraU/ShadowCylinder.cpp | 2 +- src/sysGCU/messageRendering.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/Dolphin/GX/GXEnum.h b/include/Dolphin/GX/GXEnum.h index e1876e178..781b27f78 100644 --- a/include/Dolphin/GX/GXEnum.h +++ b/include/Dolphin/GX/GXEnum.h @@ -841,10 +841,10 @@ typedef enum _GXTevColorArg { GX_CC_CPREV = 0, GX_CC_APREV = 1, GX_CC_C0 = 2, - GX_CC_C1 = 3, - GX_CC_C2 = 4, - GX_CC_A0 = 5, - GX_CC_A1 = 6, + GX_CC_A0 = 3, + GX_CC_C1 = 4, + GX_CC_A1 = 5, + GX_CC_C2 = 6, GX_CC_A2 = 7, GX_CC_TEXC = 8, GX_CC_TEXA = 9, diff --git a/src/JSystem/J2D/J2DPicture.cpp b/src/JSystem/J2D/J2DPicture.cpp index 76ae6b66b..fd5126864 100644 --- a/src/JSystem/J2D/J2DPicture.cpp +++ b/src/JSystem/J2D/J2DPicture.cpp @@ -877,7 +877,7 @@ void J2DPicture::setTevMode() GXSetTevOrder(GXTevStageID(i), GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR_NULL); GXSetTevColor(GX_TEVREG0, mBlack); GXSetTevColor(GX_TEVREG1, mWhite); - GXSetTevColorIn(GXTevStageID(i), GX_CC_C0, GX_CC_C2, GX_CC_CPREV, GX_CC_ZERO); + GXSetTevColorIn(GXTevStageID(i), GX_CC_C0, GX_CC_C1, GX_CC_CPREV, GX_CC_ZERO); GXSetTevAlphaIn(GXTevStageID(i), GX_CA_A0, GX_CA_A1, GX_CA_APREV, GX_CA_ZERO); GXSetTevColorOp(GXTevStageID(i), GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetTevAlphaOp(GXTevStageID(i), GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); diff --git a/src/JSystem/J2D/J2DWindow.cpp b/src/JSystem/J2D/J2DWindow.cpp index ede824cc2..064ffbbe0 100644 --- a/src/JSystem/J2D/J2DWindow.cpp +++ b/src/JSystem/J2D/J2DWindow.cpp @@ -787,7 +787,7 @@ void J2DWindow::setTevMode(JUTTexture* texture, JUtility::TColor color1, JUtilit GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL); GXSetTevColor(GX_TEVREG0, color1); GXSetTevColor(GX_TEVREG1, color2); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C0, GX_CC_C2, GX_CC_TEXC, GX_CC_ZERO); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C0, GX_CC_C1, GX_CC_TEXC, GX_CC_ZERO); if (texture->getTransparency()) { GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_A0, GX_CA_A1, GX_CA_TEXA, GX_CA_ZERO); } else { diff --git a/src/JSystem/JParticle/JPABaseShape.cpp b/src/JSystem/JParticle/JPABaseShape.cpp index 3305d6d3b..be2426f0d 100644 --- a/src/JSystem/JParticle/JPABaseShape.cpp +++ b/src/JSystem/JParticle/JPABaseShape.cpp @@ -78,8 +78,8 @@ GXTevColorArg JPABaseShape::st_ca[6][4] = { { GX_CC_ZERO, GX_CC_TEXC, GX_CC_ONE, GX_CC_ZERO }, // { GX_CC_ZERO, GX_CC_C0, GX_CC_TEXC, GX_CC_ZERO }, // { GX_CC_C0, GX_CC_ONE, GX_CC_TEXC, GX_CC_ZERO }, // - { GX_CC_C2, GX_CC_C0, GX_CC_TEXC, GX_CC_ZERO }, // - { GX_CC_ZERO, GX_CC_TEXC, GX_CC_C0, GX_CC_C2 }, // + { GX_CC_C1, GX_CC_C0, GX_CC_TEXC, GX_CC_ZERO }, // + { GX_CC_ZERO, GX_CC_TEXC, GX_CC_C0, GX_CC_C1 }, // { GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_C0 }, // }; diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/src/JSystem/JUtility/JUTResFont.cpp index 83e1247be..62ba56125 100644 --- a/src/JSystem/JUtility/JUTResFont.cpp +++ b/src/JSystem/JUtility/JUTResFont.cpp @@ -263,7 +263,7 @@ void JUTResFont::setGX(JUtility::TColor color0, JUtility::TColor color1) GXSetTevColor(GX_TEVREG0, color0); GXSetTevColor(GX_TEVREG1, color1); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C0, GX_CC_C2, GX_CC_TEXC, GX_CC_ZERO); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C0, GX_CC_C1, GX_CC_TEXC, GX_CC_ZERO); GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_A0, GX_CA_A1, GX_CA_TEXA, GX_CA_ZERO); GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); diff --git a/src/plugProjectNishimuraU/ShadowCylinder.cpp b/src/plugProjectNishimuraU/ShadowCylinder.cpp index 7094c0968..3b491bcec 100644 --- a/src/plugProjectNishimuraU/ShadowCylinder.cpp +++ b/src/plugProjectNishimuraU/ShadowCylinder.cpp @@ -523,7 +523,7 @@ void ShadowCylinder2::setupTextureFilterGX() GXColor color = {}; GXSetTevColor(GX_TEVREG0, color); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_TEXA, GX_CC_C1, GX_CC_RASC, GX_CC_ZERO); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_TEXA, GX_CC_A0, GX_CC_RASC, GX_CC_ZERO); GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_COMP_R8_GT, GX_TB_ZERO, GX_CS_SCALE_1, GX_FALSE, GX_TEVPREV); GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_TEXA, GX_CA_A0, GX_CA_RASA, GX_CA_ZERO); GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_COMP_R8_GT, GX_TB_ZERO, GX_CS_SCALE_1, GX_FALSE, GX_TEVPREV); diff --git a/src/sysGCU/messageRendering.cpp b/src/sysGCU/messageRendering.cpp index 83b0a116f..54b4b282a 100644 --- a/src/sysGCU/messageRendering.cpp +++ b/src/sysGCU/messageRendering.cpp @@ -1027,7 +1027,7 @@ void TRenderingProcessor::setImageGX() GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_NONE, GX_AF_NONE); GXSetTevColor(GX_TEVREG0, *(GXColor*)&mImageColorA); GXSetTevColor(GX_TEVREG1, *(GXColor*)&mImageColorB); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C0, GX_CC_C2, GX_CC_TEXC, GX_CC_ZERO); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C0, GX_CC_C1, GX_CC_TEXC, GX_CC_ZERO); GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_A0, GX_CA_A1, GX_CA_TEXA, GX_CA_ZERO); GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);