diff --git a/Source/Project64-video/Combine.cpp b/Source/Project64-video/Combine.cpp index b6720ae86..3bb46c2b2 100644 --- a/Source/Project64-video/Combine.cpp +++ b/Source/Project64-video/Combine.cpp @@ -767,7 +767,7 @@ static void cc_one() CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); // CC (0xFFFFFF00); CC(0xFFFFFF00); } @@ -777,7 +777,7 @@ static void cc_zero() CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CC(0x00000000); } @@ -791,7 +791,7 @@ static void cc_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); float fog = (rdp.fog_color & 0xFF) / 255.0f; uint32_t R = (uint32_t)(((rdp.blend_color >> 24) & 0xFF)*fog); uint32_t G = (uint32_t)(((rdp.blend_color >> 16) & 0xFF)*fog); @@ -803,7 +803,7 @@ static void cc_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC(rdp.fog_color); A_USE_T0(); } @@ -812,7 +812,7 @@ static void cc_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } } else @@ -820,7 +820,7 @@ static void cc_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } USE_T0(); } @@ -830,7 +830,7 @@ static void cc_t0a() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); USE_T0(); A_USE_T0(); CC(0xFFFFFF00); @@ -841,7 +841,7 @@ static void cc_t1() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T1(); } @@ -850,7 +850,7 @@ static void cc_t0_mul_t1() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_MUL_T1(); } @@ -859,7 +859,7 @@ static void cc_t0_mul_t1_add_t0() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_MUL_T1_ADD_T0(); } @@ -869,7 +869,7 @@ static void cc_t1_inter__env_inter_t0_using_k5__using_t1a () CCMB (GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, -GR_COMBINE_OTHER_TEXTURE); +GFX_COMBINE_OTHER_TEXTURE); uint32_t col1 = (rdp.K5<<24) | (rdp.K5<<16) | (rdp.K5<<8); MOD_0 (TMOD_COL_INTER_TEX_USING_COL1); MOD_0_COL (rdp.env_color & 0xFFFFFF00); @@ -888,7 +888,7 @@ static void cc_t1_inter_t0_using_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (!cmb.combine_ext) { T1_INTER_T0_USING_FACTOR((rdp.env_color & 0xFF)); @@ -923,7 +923,7 @@ static void cc_prim() CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CC_PRIM(); } @@ -932,7 +932,7 @@ static void cc_env() CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CC_ENV(); } @@ -941,7 +941,7 @@ static void cc_scale() CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CC(rdp.SCALE); } @@ -950,7 +950,7 @@ static void cc_shade() CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); } static void cc_one_mul_shade() @@ -960,7 +960,7 @@ static void cc_one_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC(0x20202000); USE_T0(); } @@ -975,7 +975,7 @@ static void cc_shadea() CCMB(GFX_COMBINE_FUNCTION_LOCAL_ALPHA, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); } static void cc_t0_mul_prim() @@ -983,7 +983,7 @@ static void cc_t0_mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T0(); } @@ -993,7 +993,7 @@ static void cc_t0_mul_prima() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIMA(); USE_T0(); } @@ -1003,7 +1003,7 @@ static void cc_t1_mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); if ((rdp.cycle1 & 0xFFFF) == (rdp.cycle2 & 0xFFFF)) // 1 cycle, use t0 { @@ -1020,7 +1020,7 @@ static void cc_t0a_mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); A_USE_T0(); } @@ -1031,7 +1031,7 @@ static void cc__t1_inter_t0_using_enva__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T1_INTER_T0_USING_FACTOR(factor); @@ -1042,7 +1042,7 @@ static void cc__t0_inter_one_using_t1__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); rdp.best_tex = 0; cmb.tex |= 3; @@ -1056,7 +1056,7 @@ static void cc__t0_inter_one_using_primlod__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); if (cmb.combine_ext) { @@ -1082,7 +1082,7 @@ static void cc__t1_inter_one_using_env__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); if (cmb.combine_ext) { @@ -1108,7 +1108,7 @@ static void cc__t1_inter_one_using_enva__mul_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T1CCMBEXT(GFX_CMBX_TMU_CCOLOR, GFX_FUNC_MODE_X, @@ -1141,7 +1141,7 @@ static void cc_prim_mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_PRIM(); } @@ -1151,7 +1151,7 @@ static void cc_prim_mul_prima() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_PRIMA(); } @@ -1161,7 +1161,7 @@ static void cc_t1_mul_prima() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIMA(); USE_T1(); } @@ -1171,7 +1171,7 @@ static void cc_t1_mul_enva() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENVA(); USE_T1(); } @@ -1181,7 +1181,7 @@ static void cc_t0_mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T0(); } @@ -1191,7 +1191,7 @@ static void cc_t1_mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T1(); } @@ -1202,7 +1202,7 @@ static void cc_t0_mul_enva() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENVA(); USE_T0(); } @@ -1212,7 +1212,7 @@ static void cc_t0_mul_scale() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC(rdp.SCALE); USE_T0(); } @@ -1222,7 +1222,7 @@ static void cc_t0_mul_enva_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); SETSHADE_PRIM(); CC_ENVA(); USE_T0(); @@ -1233,7 +1233,7 @@ static void cc_t0_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -1242,7 +1242,7 @@ static void cc_f1_sky() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); MULSHADE_SHADEA(); MULSHADE_ENVSUBPRIM(); ADDSHADE_PRIM(); @@ -1254,7 +1254,7 @@ static void cc_t0_mul_shadea() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_SHADE_A(); USE_T0(); } @@ -1264,7 +1264,7 @@ static void cc_t0_mul_k5() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_K5(); USE_T0(); } @@ -1274,7 +1274,7 @@ static void cc_t1_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T1(); } @@ -1284,7 +1284,7 @@ static void cc__t0_add_t1__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_ADD_T1(); } @@ -1308,7 +1308,7 @@ static void cc__t0_mul_shade__add__t1_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } } @@ -1340,7 +1340,7 @@ static void cc__t0_mul_prim__inter_env_using_enva() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); INTERSHADE_2(rdp.env_color & 0xFFFFFF00, rdp.env_color & 0xFF); USE_T0(); @@ -1355,7 +1355,7 @@ static void cc__t1_inter_t0_using_t1__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T1CCMBEXT(GFX_CMBX_LOCAL_TEXTURE_RGB, GFX_FUNC_MODE_ZERO, @@ -1380,7 +1380,7 @@ static void cc__t1_inter_t0_using_enva__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T1_INTER_T0_USING_FACTOR(factor); } @@ -1406,7 +1406,7 @@ static void cc__t0_inter_one_using_prim__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T0CCMBEXT(GFX_CMBX_TMU_CCOLOR, GFX_FUNC_MODE_ZERO, @@ -1430,7 +1430,7 @@ static void cc__t0_inter_one_using_primlod__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T0CCMBEXT(GFX_CMBX_OTHER_TEXTURE_RGB, GFX_FUNC_MODE_ZERO, @@ -1457,7 +1457,7 @@ static void cc__t0_inter_env_using_enva__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T0CCMBEXT(GFX_CMBX_TMU_CCOLOR, GFX_FUNC_MODE_X, @@ -1520,7 +1520,7 @@ static void cc__t0_mul_prim_add_env__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_TEX_SCALE_COL_ADD_COL); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); MOD_0_COL1(rdp.env_color & 0xFFFFFF00); @@ -1554,7 +1554,7 @@ static void cc__t1_sub_t0_mul_primlod_add_prim__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(lod_frac); } } @@ -1564,7 +1564,7 @@ static void cc__t1_sub_prim_mul_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T1CCMBEXT(GFX_CMBX_LOCAL_TEXTURE_RGB, GFX_FUNC_MODE_ZERO, @@ -1589,7 +1589,7 @@ static void cc__t1_sub_t0_mul_t0_add_shade__mul_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T1CCMBEXT(GFX_CMBX_LOCAL_TEXTURE_RGB, GFX_FUNC_MODE_ZERO, @@ -1627,7 +1627,7 @@ static void cc__one_sub_shade_mul_t0_add_shade__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } } @@ -1637,7 +1637,7 @@ static void cc__t0_sub_prim_mul_t1_add_t1__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (rdp.prim_color & 0xFFFFFF00) { MOD_0(TMOD_TEX_SUB_COL); @@ -1666,7 +1666,7 @@ static void cc__t1_sub_env_mul_t0_add_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T1CCMBEXT(GFX_CMBX_LOCAL_TEXTURE_RGB, GFX_FUNC_MODE_X, @@ -1693,7 +1693,7 @@ static void cc__t0_mul_prima_add_prim_mul__shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T0CCMBEXT(GFX_CMBX_LOCAL_TEXTURE_RGB, GFX_FUNC_MODE_X, @@ -1734,7 +1734,7 @@ static void cc__t0_inter_prim_using_prima__inter_env_using_enva() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBENVA(); SETSHADE_ENV(); SETSHADE_ENVA(); @@ -1774,7 +1774,7 @@ static void cc__prim_inter_t0_using_t0a__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T0CCMBEXT(GFX_CMBX_LOCAL_TEXTURE_RGB, GFX_FUNC_MODE_X, @@ -1814,7 +1814,7 @@ static void cc__prim_inter_t0_using_t0a__inter_env_using_enva() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBENVA(); SETSHADE_ENV(); SETSHADE_ENVA(); @@ -1831,7 +1831,7 @@ static void cc__prim_inter_t0_using_shadea__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); PRIM_INTER_T0_USING_SHADEA(); } @@ -1873,7 +1873,7 @@ static void cc__prim_inter_env_using_enva__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC(col); } @@ -1883,7 +1883,7 @@ static void cc_prim_mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); } @@ -1893,7 +1893,7 @@ static void cc_prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); } @@ -1902,7 +1902,7 @@ static void cc_prim_mul_shadea() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); SETSHADE_SHADE_A(); CC_PRIM(); } @@ -1912,7 +1912,7 @@ static void cc_env_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); } @@ -1921,7 +1921,7 @@ static void cc_env_mul_enva() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_OTHER_ALPHA, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); CA_ENV(); } @@ -1931,7 +1931,7 @@ static void cc_scale_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC(rdp.SCALE); } @@ -1942,7 +1942,7 @@ static void cc_t0_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T0(); } @@ -1952,7 +1952,7 @@ static void cc__t0_mul_t1__add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_MUL_T1(); } @@ -1962,7 +1962,7 @@ static void cc_t0_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T0(); } @@ -1973,7 +1973,7 @@ static void cc__t0_mul_t1__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); T0_MUL_T1(); } @@ -2006,7 +2006,7 @@ static void cc_t0_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -2015,7 +2015,7 @@ static void cc__t0_mul_t1__add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_MUL_T1(); } @@ -2024,7 +2024,7 @@ static void cc_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); } @@ -2079,7 +2079,7 @@ static void cc_prim_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); } @@ -2088,7 +2088,7 @@ static void cc_env_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); } @@ -2097,7 +2097,7 @@ static void cc_shade_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); } // ** A-B ** @@ -2106,7 +2106,7 @@ static void cc__t0_inter_t1_using_enva__sub_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -2117,7 +2117,7 @@ static void cc_t0_sub__shade_mul_center() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE(rdp.CENTER); USE_T0(); } @@ -2149,7 +2149,7 @@ static void cc_env_sub__t0_sub_t1_mul_primlod__mul_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); T1_INTER_T0_USING_FACTOR(lod_frac); @@ -2208,7 +2208,7 @@ static void cc_t0_add_env_mul_k5() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); float scale = rdp.K5 / 255.0f; uint8_t r = (uint8_t)(rdp.env_color >> 24) & 0xFF; r = (uint8_t)(r*scale); @@ -2225,7 +2225,7 @@ static void cc_t0_add_shade_mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_ENV(); USE_T0(); } @@ -2235,7 +2235,7 @@ static void cc__t1_mul_t0_add_t0__add_prim_mul_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); rdp.best_tex = 0; cmb.tex |= 3; @@ -2267,7 +2267,7 @@ static void cc__t0_sub_env_mul_enva__add_prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); MOD_0(TMOD_TEX_SUB_COL_MUL_FAC); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -2283,7 +2283,7 @@ static void cc_t0_mul_prim_add_t1() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T1CCMBEXT(GFX_CMBX_LOCAL_TEXTURE_RGB, GFX_FUNC_MODE_ZERO, @@ -2311,7 +2311,7 @@ static void cc_shirt() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { /* @@ -2346,7 +2346,7 @@ static void cc_t1_mul_prim_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_PRIM(); USE_T0(); @@ -2358,7 +2358,7 @@ static void cc_t0_mul_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); USE_T0(); @@ -2370,7 +2370,7 @@ static void cc_t1_mul_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); USE_T1(); @@ -2399,7 +2399,7 @@ static void cc__t0_add_primlod__mul_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIMLOD(); MOD_0(TMOD_TEX_ADD_COL); MOD_0_COL(cmb.ccolor & 0xFFFFFF00); @@ -2415,7 +2415,7 @@ static void cc_t0_mul_prim_mul_shade_add_prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); USE_T0(); } @@ -2426,7 +2426,7 @@ static void cc__t0_inter_t1_using_primlod__mul_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -2437,7 +2437,7 @@ static void cc__t1_sub_prim_mul_enva_add_t0__mul_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); if (cmb.combine_ext) @@ -2470,7 +2470,7 @@ static void cc__t0_inter_t1_using_primlod__mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -2481,7 +2481,7 @@ static void cc__t1_sub_prim_mul_primlod_add_t0__mul_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); T1_SUB_PRIM_MUL_PRIMLOD_ADD_T0(); @@ -2493,7 +2493,7 @@ static void cc__t0_mul_t1__mul_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIM(); T0_MUL_T1(); @@ -2525,7 +2525,7 @@ static void cc__t0_mul_t1__sub_prim_mul_env_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); T0_MUL_T1(); } @@ -2536,7 +2536,7 @@ static void cc__t0_sub_prim_mul_t1_add_t1__mul_env_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); if (rdp.prim_color & 0xFFFFFF00) { @@ -2566,7 +2566,7 @@ static void cc__t0_mul_t1__mul_shade_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); T0_MUL_T1(); } @@ -2592,7 +2592,7 @@ static void cc__t0_mul_shadea_add_env__mul_shade_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); MULSHADE_SHADEA(); CC_PRIM(); USE_T0(); @@ -2604,7 +2604,7 @@ static void cc__t0_mul_t1__mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); T0_MUL_T1(); } @@ -2615,7 +2615,7 @@ static void cc__t0_add_t1__mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); T0_ADD_T1(); } @@ -2625,7 +2625,7 @@ static void cc__t1_mul_prima_add_t0__mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); T1_MUL_PRIMA_ADD_T0(); } @@ -2635,7 +2635,7 @@ static void cc__t0_inter_t1_using_enva__mul_shade_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -2646,7 +2646,7 @@ static void cc__t0_inter_t1_using_enva__mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -2658,7 +2658,7 @@ static void cc_t0_mul_primlod_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); SETSHADE_PRIM(); CC_PRIMLOD(); USE_T0(); @@ -2669,7 +2669,7 @@ static void cc__t0_mul_primlod__add__prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); CC_PRIMLOD(); USE_T0(); @@ -2681,7 +2681,7 @@ static void cc_t0_mul_primlod_add_prim_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); ADDSHADE_ENV(); CC_PRIMLOD(); @@ -2694,7 +2694,7 @@ static void cc_t1_mul_primlod_add_prim_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); ADDSHADE_ENV(); CC_PRIMLOD(); @@ -2706,7 +2706,7 @@ static void cc__t0_inter_t1_using_primlod__mul_shade_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -2716,7 +2716,7 @@ static void cc__t1_inter_t0_using_primlod__mul_shade_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); T1_INTER_T0_USING_FACTOR(lod_frac); } @@ -2748,7 +2748,7 @@ static void cc__t1_sub_t0_mul_primlod_add_prim__mul_shade_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(lod_frac); } } @@ -2759,7 +2759,7 @@ static void cc__t0_inter_t1_using_half__mul_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); T0_INTER_T1_USING_FACTOR(0x7F); @@ -2771,7 +2771,7 @@ static void cc__t0_inter_t1_using_t1__mul_prim_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); T0_INTER_T1_USING_T1(); } @@ -2782,7 +2782,7 @@ static void cc_one_sub_t1_mul_t0a_add_t0_mul_env_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_TEX_MUL_COL); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -2800,7 +2800,7 @@ static void cc__t0_inter_t1_using_t1__mul_shade_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); T0_INTER_T1_USING_T1(); } @@ -2811,7 +2811,7 @@ static void cc_t0_mul_prim_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); USE_T0(); } @@ -2821,7 +2821,7 @@ static void cc_t1_mul_prim_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); USE_T1(); } @@ -2832,7 +2832,7 @@ static void cc_t0_mul_env_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_ENV(); CC_PRIM(); USE_T0(); @@ -2844,7 +2844,7 @@ static void cc_t1_mul_env_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_ENV(); CC_PRIM(); USE_T1(); @@ -2855,7 +2855,7 @@ static void cc_t0_mul_scale_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE(rdp.SCALE); CC_PRIM(); USE_T0(); @@ -2867,7 +2867,7 @@ static void cc__t0_mul_t1__mul_env_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_ENV(); CC_PRIM(); T0_MUL_T1(); @@ -2880,7 +2880,7 @@ static void cc__t0_add__t1_mul_scale__mul_env_sub_center_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_C1SUBC2(rdp.env_color, rdp.CENTER); SETSHADE_PRIM(); MOD_1(TMOD_TEX_MUL_COL); @@ -2894,7 +2894,7 @@ static void cc__t1_sub_t0__mul_env_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_ENV(); CC_PRIM(); T1_SUB_T0(); @@ -2906,7 +2906,7 @@ static void cc_t0_mul_env_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); USE_T0(); } @@ -2916,7 +2916,7 @@ static void cc_t0_mul_shade_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); USE_T0(); } @@ -2926,7 +2926,7 @@ static void cc__t0_mul_enva_add_t1__mul_shade_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); if (cmb.combine_ext) { @@ -2953,7 +2953,7 @@ static void cc_t0_mul_shade_add_prima() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIMA(); USE_T0(); } @@ -2963,7 +2963,7 @@ static void cc_t1_mul_shade_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); USE_T1(); } @@ -2973,7 +2973,7 @@ static void cc_t0_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); USE_T0(); } @@ -2993,7 +2993,7 @@ static void cc__t0_add_prim__mul_shade_add_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); // MOD_0 (TMOD_TEX_ADD_COL); // MOD_0_COL (rdp.prim_color & 0xFFFFFF00); } @@ -3024,7 +3024,7 @@ static void cc__t0_add_prim__mul_shade_add_t1() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); T0_ADD_T1(); } @@ -3056,7 +3056,7 @@ static void cc__t0_add_primlod__mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); uint32_t color = (lod_frac << 24) | (lod_frac << 16) | (lod_frac << 8); MOD_0(TMOD_TEX_ADD_COL); MOD_0_COL(color & 0xFFFFFF00); @@ -3070,7 +3070,7 @@ static void cc__t0_mul_prima_add_prim_mul__shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); if (cmb.combine_ext) { @@ -3096,7 +3096,7 @@ static void cc_t0_mul_shadea_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -3105,7 +3105,7 @@ static void cc_prim_mul_prima_add_prim() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); CA_PRIM(); SETSHADE_PRIM(); @@ -3116,7 +3116,7 @@ static void cc_prim_mul_prima_add_t0() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_PRIMA(); USE_T0(); @@ -3127,7 +3127,7 @@ static void cc_prim_mul_env_add_t0() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_ENV(); USE_T0(); @@ -3138,7 +3138,7 @@ static void cc_prim_mul_shade_add_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); USE_T0(); } @@ -3148,7 +3148,7 @@ static void cc_prim_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIM(); } @@ -3158,7 +3158,7 @@ static void cc_env_mul_shade_add_env() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_ENV(); } @@ -3169,7 +3169,7 @@ static void cc_t0_mul_prim_add_one_sub_prim_mul_shade() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); MULSHADE_1MPRIM(); USE_T0(); @@ -3180,7 +3180,7 @@ static void cc_t0_mul_prim_add_shade_sub_env_mul_prim() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SUBSHADE_ENV() MULSHADE_PRIM(); @@ -3192,7 +3192,7 @@ static void cc_t0_mul_prim_add_shade_mul_shadea_mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); MULSHADE_PRIM(); MULSHADE_SHADEA(); @@ -3204,7 +3204,7 @@ static void cc__t0_mul_t1__mul_prim_add_prim_mul_shade() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); CC_PRIM(); T0_MUL_T1(); @@ -3215,7 +3215,7 @@ static void cc_t0_mul_env_add_prim_mul_shade() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); CC_ENV(); USE_T0(); @@ -3226,7 +3226,7 @@ static void cc_t0_mul_enva_add_prim_mul_shade() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); CC_ENVA(); USE_T0(); @@ -3237,7 +3237,7 @@ static void cc_t0_mul_shade_add_prim_mul_env() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIMMULENV(); USE_T0(); } @@ -3247,7 +3247,7 @@ static void cc_prim_mul_env_add_one_sub_prim_mul_shade() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); MULSHADE_1MPRIM(); CC_PRIMMULENV(); } @@ -3259,7 +3259,7 @@ static void cc_t0_mul_prim_mul_prim() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_PRIM(); USE_T0(); @@ -3270,7 +3270,7 @@ static void cc_t0_mul_prim_mul_prima() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_PRIMA(); USE_T0(); @@ -3281,7 +3281,7 @@ static void cc_t0_mul_enva_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_ENVA(); USE_T0(); } @@ -3291,7 +3291,7 @@ static void cc_t0_mul_primlod_mul_prim() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_COLMULBYTE(rdp.prim_color, rdp.prim_lodfrac); USE_T0(); } @@ -3301,7 +3301,7 @@ static void cc_t0_mul_primlod_mul_shade() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIMLOD(); USE_T0(); } @@ -3311,7 +3311,7 @@ static void cc__t0_mul_t1__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_MUL_T1(); } @@ -3321,7 +3321,7 @@ static void cc__t1_mul_t1_add_t0__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); if (cmb.combine_ext) { @@ -3346,7 +3346,7 @@ static void cc__t0_mul_t1__mul_prima() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIMA(); T0_MUL_T1(); } @@ -3356,7 +3356,7 @@ static void cc__t0_mul_t1__mul_env() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); T0_MUL_T1(); } @@ -3366,7 +3366,7 @@ static void cc__t0_mul_t1__mul_enva() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENVA(); T0_MUL_T1(); } @@ -3376,7 +3376,7 @@ static void cc__t0_mul_t1__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_MUL_T1(); } @@ -3385,7 +3385,7 @@ static void cc__t0a_mul_t1__mul_prim() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0A_MUL_T1(); } @@ -3395,7 +3395,7 @@ static void cc__t0_mul_t1a__mul_shade() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_MUL_T1A(); } @@ -3404,7 +3404,7 @@ static void cc__t0a_mul_t1__mul_shade() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0A_MUL_T1(); } @@ -3413,7 +3413,7 @@ static void cc_t0_mul_prim_mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_ENV(); // notice that setshade multiplies USE_T0(); @@ -3424,7 +3424,7 @@ static void cc_t0_mul_prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); USE_T0(); } @@ -3434,7 +3434,7 @@ static void cc_t0_mul_prim_mul_shadea() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); MULSHADE_SHADEA(); USE_T0(); @@ -3445,7 +3445,7 @@ static void cc_t0_mul_prima_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIMA(); USE_T0(); } @@ -3455,7 +3455,7 @@ static void cc_t1_mul__one_sub_prim_mul_shade_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_1MPRIM(); ADDSHADE_PRIM(); USE_T1(); @@ -3466,7 +3466,7 @@ static void cc_t0_mul_one_sub_env_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_1MENV(); USE_T0(); } @@ -3476,7 +3476,7 @@ static void cc_t1_mul_prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); USE_T1(); } @@ -3487,7 +3487,7 @@ static void cc_t0_mul_1mprim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_1MPRIM(); USE_T0(); } @@ -3497,7 +3497,7 @@ static void cc_t0_mul_env_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_ENV(); USE_T0(); } @@ -3507,7 +3507,7 @@ static void cc_t0_mul_scale_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE(rdp.SCALE); USE_T0(); } @@ -3517,7 +3517,7 @@ static void cc_t0_mul_shade_mul_shadea() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_SHADEA(); USE_T0(); } @@ -3527,7 +3527,7 @@ static void cc_prim_mul_env_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIM(); } @@ -3537,7 +3537,7 @@ static void cc_prim_mul_one_sub_env_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_1SUBENV(); MULSHADE_PRIM(); } @@ -3548,7 +3548,7 @@ static void cc_t0_mul_prim_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIM(); USE_T0(); @@ -3560,7 +3560,7 @@ static void cc_t0_mul_prim_mul_shadea_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); SETSHADE_ENV(); MULSHADE_A_PRIM(); @@ -3589,7 +3589,7 @@ static void cc__t0_mul_prim_add_shade__mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_ENV(); MOD_0(TMOD_TEX_MUL_COL); CC_PRIMMULENV(); @@ -3603,7 +3603,7 @@ static void cc__t0a_mul_prim_add_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_MUL_TEXA_ADD_TEX); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); USE_T0(); @@ -3614,7 +3614,7 @@ static void cc__t0a_mul_env_add_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_MUL_TEXA_ADD_TEX); MOD_0_COL(rdp.env_color & 0xFFFFFF00); USE_T0(); @@ -3664,7 +3664,7 @@ static void cc__t0_sub_t1__mul_prim_mul_shade_add_prim_mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIMMULENV(); MULSHADE_PRIM(); } @@ -3674,7 +3674,7 @@ static void cc__t0_mul_prim_mul_env__add__prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIMMULENV(); MULSHADE_PRIM(); USE_T0(); @@ -3685,7 +3685,7 @@ static void cc__t1_mul_prim_mul_env__add__prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIMMULENV(); MULSHADE_PRIM(); USE_T1(); @@ -3697,7 +3697,7 @@ static void cc_t0_mul_one_sub_prim_mul_shade_add_prim_mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIMMULENV(); MULSHADE_1MPRIM(); USE_T0(); @@ -3709,7 +3709,7 @@ static void cc_t0_mul_one_sub_prim_mul_shadea_add_prim_mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIMMULENV(); SETSHADE_1MPRIM(); MULSHADE_SHADEA(); @@ -3722,7 +3722,7 @@ static void cc_t0_mul_one_sub_env_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_1MENV(); USE_T0(); @@ -3733,7 +3733,7 @@ static void cc_t0_mul_prima_mul_shade_add_prim_mul_one_sub_prima() //Aded by Go CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); MULSHADE_PRIMA(); USE_T0(); uint8_t fac = 255 - (uint8_t)(rdp.prim_color & 0xFF); @@ -3750,7 +3750,7 @@ static void cc_t0_mul_1menv_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_1MENV(); USE_T0(); @@ -3778,7 +3778,7 @@ static void cc_t0_mul_scale_add_prim__mul_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_TEX_ADD_COL); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); USE_T0(); @@ -3800,7 +3800,7 @@ static void cc__t0_mul_t1_add_prim__mul_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); } T0_MUL_T1(); @@ -3811,7 +3811,7 @@ static void cc_t0_mul__prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); ADDSHADE_ENV(); USE_T0(); @@ -3825,7 +3825,7 @@ static void cc_t0_mul__prim_mul_primlod_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); float prim_lod = rdp.prim_lodfrac / 65025.0f; rdp.col[0] *= ((rdp.prim_color & 0xFF000000) >> 24) * prim_lod; rdp.col[1] *= ((rdp.prim_color & 0x00FF0000) >> 16) * prim_lod; @@ -3864,7 +3864,7 @@ static void cc_t0_sub_prim_mul_shadea() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); USE_T0(); } @@ -3906,7 +3906,7 @@ static void cc_t0_sub_prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (rdp.prim_color & 0xFFFFFF00) { MOD_0(TMOD_TEX_SUB_COL); @@ -3931,7 +3931,7 @@ static void cc__t0_mul_t1__sub_prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } T0_MUL_T1(); } @@ -3951,7 +3951,7 @@ static void cc_t0_sub_env_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (rdp.env_color & 0xFFFFFF00) { MOD_0(TMOD_TEX_SUB_COL); @@ -4000,7 +4000,7 @@ static void cc__t1_inter_t0_using_primlod__sub_shade_mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); } T1_INTER_T0_USING_FACTOR(lod_frac); @@ -4021,7 +4021,7 @@ static void cc__t0_inter_t1_using_enva__sub_shade_mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); } uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -4034,7 +4034,7 @@ static void cc_t0_sub_shade_mul_shadea() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -4043,7 +4043,7 @@ static void cc_one_sub_t0_mul_prim() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CC_PRIM(); USE_T0(); } @@ -4053,7 +4053,7 @@ static void cc_one_sub_prim_mul_prima() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC(~rdp.prim_color); SETSHADE_PRIMA(); } @@ -4063,7 +4063,7 @@ static void cc_shade_sub_prim_mul_t0() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); USE_T0(); } @@ -4073,7 +4073,7 @@ static void cc_shade_sub_prim_mul_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SUBSHADE_PRIM(); } @@ -4083,7 +4083,7 @@ static void cc_shade_sub_env_mul_t0() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); USE_T0(); } @@ -4093,7 +4093,7 @@ static void cc_shade_sub_prim_mul__t0_inter_t1_using_primlod() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -4103,7 +4103,7 @@ static void cc_shade_sub_env_mul__t0_inter_t1_using_primlod() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -4113,7 +4113,7 @@ static void cc_shade_sub_env_mul_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); SUBSHADE_ENV(); } @@ -4123,7 +4123,7 @@ static void cc_shade_sub__prim_mul_prima() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_C1MULC2(rdp.prim_color, (rdp.prim_color & 0xFF)); } @@ -4132,7 +4132,7 @@ static void cc_one_sub__t0_mul_t1__mul_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC(0); T0_MUL_T1(); } @@ -4157,7 +4157,7 @@ static void cc_one_sub__t0_mul_shadea__mul_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); cmb.tmu0_invert = TRUE; } @@ -4168,7 +4168,7 @@ static void cc_one_sub_env_mul_t0() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T0(); } @@ -4178,7 +4178,7 @@ static void cc_one_sub_env_mul__t0_inter_t1_using_primlod() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -4188,7 +4188,7 @@ static void cc_one_sub_env_mul_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); } @@ -4198,7 +4198,7 @@ static void cc_one_sub_env_mul_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); } @@ -4208,7 +4208,7 @@ static void cc_t0_mul_env_add_1mt0_mul_shade() CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); USE_T0(); } @@ -4219,7 +4219,7 @@ static void cc_one_sub_shade_mul__t1_sub_prim_mul_primlod_add_t0__add_shade() // CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T1_SUB_PRIM_MUL_PRIMLOD_ADD_T0(); } @@ -4229,7 +4229,7 @@ static void cc_one_sub_t0_mul_prim_mul_shade() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); MULSHADE_PRIM(); USE_T0(); } @@ -4240,7 +4240,7 @@ static void cc_prim_sub_env_mul_t0_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); MULSHADE_PRIMSUBENV(); USE_T0(); } @@ -4270,7 +4270,7 @@ static void cc_t0_sub_t1_mul_prim_mul_shade_add_t1() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_ADD_T1(); } @@ -4281,7 +4281,7 @@ static void cc_t0_sub_prim_mul_t0a_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T0(); } @@ -4310,7 +4310,7 @@ static void cc_t0_sub_prim_mul_t1_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_TEX_SUB_COL); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); T0_MUL_T1(); @@ -4334,7 +4334,7 @@ static void cc_t0_sub_prim_mul_primlod_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); SETSHADE_PRIM(); SETSHADE_1MPRIMLOD(); CC_PRIMLOD(); @@ -4348,7 +4348,7 @@ static void cc_t0_sub_prim_mul_prima_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); SETSHADE_PRIM(); SETSHADE_1MPRIMA(); CC_PRIMA(); @@ -4361,7 +4361,7 @@ static void cc_t0_sub_prim_mul_shadea_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); USE_T0(); } @@ -4407,7 +4407,7 @@ static void cc__t0_inter_t1_using_shadea__sub_prim_mul_env_add_shade() //Aded b CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); } CC_ENV(); SUBSHADE_PRIMMULENV(); @@ -4419,7 +4419,7 @@ static void cc_t0_sub_prim_mul_env_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); SETSHADE_1MENV(); @@ -4442,7 +4442,7 @@ static void cc_t0_sub_prim_mul_enva_add_prim() //Aded by Gonetz41 CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_TEX_SUB_COL_MUL_FAC); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -4456,7 +4456,7 @@ static void cc_t0_sub_prim_mul_primlod_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); MOD_0(TMOD_TEX_SUB_COL_MUL_FAC); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -4471,7 +4471,7 @@ static void cc_t0_sub__prim_mul_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CC_PRIM(); } else @@ -4479,7 +4479,7 @@ static void cc_t0_sub__prim_mul_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_ENV(); } @@ -4492,7 +4492,7 @@ static void cc__t0_mul_t1__sub_prim_mul__t0t1a__add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_MUL_T1(); A_T0_MUL_T1(); @@ -4504,7 +4504,7 @@ static void cc__t1_inter_t0_using_enva__sub_prim_mul_prima_add_prim() //Aded by CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); CA_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -4532,7 +4532,7 @@ static void cc_t0_sub_prim_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MOD_0(TMOD_TEX_SUB_COL); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -4565,7 +4565,7 @@ static void cc_t1_sub_prim_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MOD_1(TMOD_TEX_SUB_COL); MOD_1_COL(rdp.prim_color & 0xFFFFFF00); @@ -4600,7 +4600,7 @@ static void cc_t1_sub_k4_mul_prima_add_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_ADD_T1(); } } @@ -4626,7 +4626,7 @@ static void cc__t0_sub_prim_mul_shade_add_env__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MOD_0(TMOD_TEX_SUB_COL); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -4655,7 +4655,7 @@ static void cc__t0_sub_prim_mul_shade_add_env__mul_shadea() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); MULSHADE_SHADEA(); CC_ENV(); MOD_0(TMOD_TEX_SUB_COL); @@ -4671,7 +4671,7 @@ static void cc__t0_mul_shade__sub_env_mul_shadea_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_OTHER_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); } else if (rdp.tiles(rdp.cur_tile).format == 2) @@ -4679,7 +4679,7 @@ static void cc__t0_mul_shade__sub_env_mul_shadea_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } else @@ -4693,7 +4693,7 @@ static void cc_t0_sub_env_mul_k5_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_TEX_SUB_COL_MUL_FAC); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -4740,7 +4740,7 @@ static void cc__t0_inter_t1_using_t0__sub_shade_mul_prima_add_shade() //Aded by CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_A_PRIM(); T1_INTER_T0_USING_T0(); //strange, but this one looks better } @@ -4752,7 +4752,7 @@ static void cc_t0_sub__prim_mul_shade__mul_enva_add__prim_mul_shade() //Aded by CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); SETSHADE_A_ENV(); USE_T0(); @@ -4763,7 +4763,7 @@ static void cc_t0_sub_env_mul_t0_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T0(); //(t0-env)*t0+env = t0*t0 + (1-t0)*env @@ -4792,7 +4792,7 @@ static void cc_t0_sub_env_mul_prima_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } static void cc_t0_sub_env_mul_k5_add_env() //Aded by Gonetz @@ -4800,7 +4800,7 @@ static void cc_t0_sub_env_mul_k5_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); cmb.ccolor = (rdp.env_color & 0xFFFFFF00) | rdp.K5; USE_T0(); } @@ -4810,7 +4810,7 @@ static void cc_t0_sub_env_mul_prim_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); MOD_0(TMOD_TEX_SUB_COL); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -4822,7 +4822,7 @@ static void cc_t0_sub_env_mul_shade_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); if (cmb.combine_ext) { @@ -4952,7 +4952,7 @@ static void cc__t0_inter_t1_using_primlod__sub_env_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); } CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -4963,7 +4963,7 @@ static void cc_t0_sub_env_mul_enva_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_TEX_SUB_COL_MUL_FAC); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -4976,7 +4976,7 @@ static void cc_one_sub_t0_mul_prim_add_t0() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T0(); //(1-t)*prim+t == (1-prim)*t+prim @@ -4987,7 +4987,7 @@ static void cc_one_sub_t1_mul_prim_add_t1() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T1(); //(1-t)*prim+t == (1-prim)*t+prim @@ -4998,7 +4998,7 @@ static void cc_one_sub_t1_mul_env_add_t1() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T1(); //(1-t)*env+t == (1-env)*t+env @@ -5009,7 +5009,7 @@ static void cc_one_sub_t0_mul_primlod_add_t0() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIMLOD(); USE_T0(); //(1-t)*primlod+t == (1-primlod)*t+primlod @@ -5020,7 +5020,7 @@ static void cc_one_sub_t0_mul_prima_add_t0() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); USE_T0(); //(1-t)*prima+t == (1-prima)*t+prima @@ -5031,7 +5031,7 @@ static void cc_one_sub__t0_inter_t1_using_enva__mul_prim_add__t0_inter_t1_using_ CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -5043,7 +5043,7 @@ static void cc_one_sub_t0_mul_shade_add_t0() CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC(0xFFFFFFFF); USE_T0(); } @@ -5053,7 +5053,7 @@ static void cc_one_sub_prim_mul_t0_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T0(); } @@ -5072,7 +5072,7 @@ static void cc_one_sub_prim_mul_t0a_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_COL1_USING_TEXA); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); MOD_0_COL1(0xFFFFFF00); @@ -5085,7 +5085,7 @@ static void cc_one_sub_prim_mul__t0_inter_t1_using_primlod__add_prim() //Aded by CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -5095,7 +5095,7 @@ static void cc__one_sub_prim_mul_shade__mul_t0_add__prim_mul_shade() //Aded by G CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); USE_T0(); } @@ -5105,7 +5105,7 @@ static void cc_one_sub_shade_mul__t0_inter_t1_using_primlod__add_shade() //Aded CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -5114,7 +5114,7 @@ static void cc_one_sub_prim_mul_t1_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T1(); } @@ -5124,7 +5124,7 @@ static void cc_one_sub_prim_mul_env_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_ENV(); } @@ -5144,7 +5144,7 @@ static void cc_t0_sub_prim_mul_shade_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (rdp.prim_color & 0xFFFFFF00) { MOD_0(TMOD_TEX_SUB_COL); @@ -5188,7 +5188,7 @@ static void cc__t0_mul_t1__sub_prim_mul_shade_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } T0_MUL_T1(); } @@ -5208,7 +5208,7 @@ static void cc__t0_mul_t1__sub_env_mul_shade_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } T0_MUL_T1(); } @@ -5218,7 +5218,7 @@ static void cc_one_sub_prim_mul_shade_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); } @@ -5227,7 +5227,7 @@ static void cc_t0_inter_env_using_prima() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); MOD_0(TMOD_TEX_INTER_COLOR_USING_FACTOR); @@ -5241,7 +5241,7 @@ static void cc_t0_inter_env_using_enva() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T0CCMBEXT(GFX_CMBX_TMU_CCOLOR, GFX_FUNC_MODE_X, @@ -5265,7 +5265,7 @@ static void cc_t0_inter_noise_using_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); MOD_0(TMOD_TEX_INTER_NOISE_USING_COL); @@ -5278,7 +5278,7 @@ static void cc_t0_inter_noise_using_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); MOD_0(TMOD_TEX_INTER_NOISE_USING_COL); @@ -5291,7 +5291,7 @@ static void cc_t0_sub_env_mul_enva_add_env() CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); CA_ENV(); USE_T0(); @@ -5303,7 +5303,7 @@ static void cc_one_sub_prim_mul__t0_mul_t1__add__prim_mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); SETSHADE_PRIM(); SETSHADE_ENV(); @@ -5316,7 +5316,7 @@ static void cc_one_sub_prim_mul__t0_mul_t1__add__prim_mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); MULSHADE_PRIM(); T0_MUL_T1(); @@ -5328,7 +5328,7 @@ static void cc_one_sub_prim_mul__t0_inter_t1_using_enva__add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); SETSHADE_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -5340,7 +5340,7 @@ static void cc_one_sub_env_mul__t0_inter_t1_using_primlod__add_env() //Aded by G CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -5350,7 +5350,7 @@ static void cc_one_sub_env_mul__t1_sub_prim_mul_primlod_add_t0__add_env() //Aded CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); T1_SUB_PRIM_MUL_PRIMLOD_ADD_T0(); } @@ -5360,7 +5360,7 @@ static void cc_one_sub_env_mul_t0_add_prim_mul_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBENV(); SETSHADE_PRIM(); SETSHADE_ENV(); @@ -5372,7 +5372,7 @@ static void cc_one_sub_env_mul_t0_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T0(); } @@ -5382,7 +5382,7 @@ static void cc_one_sub_env_mul_t0_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBENV(); USE_T0(); } @@ -5392,7 +5392,7 @@ static void cc_one_sub_env_mul_prim_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); } @@ -5402,7 +5402,7 @@ static void cc_one_sub_env_mul_prim_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBENV(); CC_C1MULC2(rdp.prim_color, cmb.ccolor); } @@ -5412,7 +5412,7 @@ static void cc_one_sub_env_mul_shade_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); } @@ -5421,7 +5421,7 @@ static void cc_one_sub_env_mul_prim_add__t0_inter_t1_using_env() //Aded by Gonet CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_1MENV(); T0_INTER_T1_USING_ENV(); @@ -5432,7 +5432,7 @@ static void cc_one_sub_shade_mul_t0_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -5441,7 +5441,7 @@ static void cc_one_sub_shade_mul__t0_mul_shadea__add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T0CCMBEXT(GFX_CMBX_LOCAL_TEXTURE_RGB, GFX_FUNC_MODE_ZERO, @@ -5461,7 +5461,7 @@ static void cc_one_sub_shade_mul_env_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); } @@ -5470,7 +5470,7 @@ static void cc_one_sub_shade_mul_shadea_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC(0xFFFFFFFF); } @@ -5480,7 +5480,7 @@ static void cc_t0_sub_env_mul_prim_add_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); SETSHADE_1MPRIM(); SETSHADE_ENV(); CC_PRIM(); @@ -5493,7 +5493,7 @@ static void cc__t0_inter_t1_using_t1a__sub_env_mul_enva_add_env() //Aded by Gon CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); cmb.ccolor = rdp.env_color; T0_INTER_T1_USING_T1A(); } @@ -5503,7 +5503,7 @@ static void cc_t0_sub_shade_mul_t0a_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); A_USE_T0(); } @@ -5514,7 +5514,7 @@ static void cc_t0_sub_shade_mul_prima_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_A_PRIM(); USE_T0(); } @@ -5525,7 +5525,7 @@ static void cc_t0_sub_shade_mul_shadea_add_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -5552,7 +5552,7 @@ static void cc__t0_mul_t1_add_env__mul_shadea_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } static void cc_prim_sub_t0_mul_env_add_t0() //Aded by Gonetz @@ -5560,7 +5560,7 @@ static void cc_prim_sub_t0_mul_env_add_t0() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBENV(); SETSHADE_PRIM(); SETSHADE_ENV(); @@ -5596,7 +5596,7 @@ static void cc_env_sub_t0_mul_prim_add_t0() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); SETSHADE_PRIM(); SETSHADE_ENV(); @@ -5624,7 +5624,7 @@ static void cc_prim_sub_env_mul_t0_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_PRIMSUBENV(); USE_T0(); @@ -5635,7 +5635,7 @@ static void cc_prim_sub_env_mul_t0_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); USE_T0(); @@ -5687,7 +5687,7 @@ static void cc_prim_sub_env_mul__t0_mul_t1a__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); T0_MUL_T1A(); @@ -5698,7 +5698,7 @@ static void cc_prim_sub_env_mul__t0_mul_prim__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); if (cmb.combine_ext) @@ -5730,7 +5730,7 @@ static void cc_prim_sub_env_mul_t0_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); } else @@ -5744,7 +5744,7 @@ static void cc_prim_sub_env_mul__t0_sub_t0_mul_prima__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); rdp.best_tex = 0; @@ -5760,7 +5760,7 @@ static void cc_prim_sub_env_mul__one_sub_t0_mul_primlod_add_prim__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); if (cmb.combine_ext) @@ -5784,7 +5784,7 @@ static void cc_prim_sub_env_mul__t0_add_t1a__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); rdp.best_tex = 0; @@ -5800,7 +5800,7 @@ static void cc_prim_sub_env_mul__t0_sub_prim_mul_enva_add_t0__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); USE_T0(); @@ -5816,7 +5816,7 @@ static void cc_prim_sub_env_mul__t1_sub_prim_mul_enva_add_t0__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); if (cmb.combine_ext) @@ -5862,7 +5862,7 @@ static void cc_prim_sub_env_mul__t1_sub_prim_mul_prima_add_t0__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); if (cmb.combine_ext) @@ -5893,7 +5893,7 @@ static void cc__prim_sub_env_mul_t0_add_env__mul_primlod() CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); float factor = (float)rdp.prim_lodfrac / 255.0f; uint8_t r = (uint8_t)((rdp.prim_color >> 24) & 0xFF); r = (uint8_t)((float)r * factor); @@ -5912,7 +5912,7 @@ static void cc__prim_sub_env_mul_t0_add_env__mul_k5() CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); float factor = (float)rdp.K5 / 255.0f; uint8_t r = (uint8_t)((rdp.prim_color >> 24) & 0xFF); r = (uint8_t)((float)r * factor); @@ -5931,7 +5931,7 @@ static void cc_prim_sub_env_mul_t1_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); if (rdp.cycle_mode == 0 || (g_settings->hacks(CSettings::hack_KI) && (rdp.cycle2 & 0x0FFFFFFF) == 0x01FF1FFF)) @@ -5949,7 +5949,7 @@ static void cc_prim_sub_env_mul_t1_add_env_mul_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_1(TMOD_COL_INTER_COL1_USING_TEX); MOD_1_COL(rdp.env_color & 0xFFFFFF00); MOD_1_COL1(rdp.prim_color & 0xFFFFFF00); @@ -5961,7 +5961,7 @@ static void cc_prim_sub_env_mul_t0a_add_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIMSUBENV(); if (cmb.combine_ext) { @@ -5986,7 +5986,7 @@ static void cc_prim_sub_env_mul_t0a_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); USE_T0(); @@ -5998,7 +5998,7 @@ static void cc_prim_sub_env_mul_t1a_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); USE_T1(); @@ -6010,7 +6010,7 @@ static void cc_prim_sub_env_mul__t0_mul_t1__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); T0_MUL_T1(); @@ -6022,7 +6022,7 @@ static void cc_prim_sub_env_mul__t0_add_t1__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); T0_ADD_T1(); @@ -6034,7 +6034,7 @@ static void cc_prim_sub_env_mul__t0_mul_enva__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIMSUBENV(); SETSHADE_ENVA(); @@ -6047,7 +6047,7 @@ static void cc_prim_sub_env_mul__t0_mul_shade__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIMSUBENV(); USE_T0(); @@ -6059,7 +6059,7 @@ static void cc_prim_sub_env_mul__prim_inter_t0_using_shadea__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); if (cmb.combine_ext) { @@ -6080,7 +6080,7 @@ static void cc_prim_sub_env_mul__t0_sub_prim_mul_primlod_add_t0__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); if (cmb.combine_ext) @@ -6165,7 +6165,7 @@ static void cc_lavatex_sub_prim_mul_shade_add_lavatex() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_ADD_T1(); } } @@ -6176,7 +6176,7 @@ static void cc_prim_sub_env_mul__t0_sub_prim_mul_primlod_add_t1__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); T0_SUB_PRIM_MUL_PRIMLOD_ADD_T1(); @@ -6188,7 +6188,7 @@ static void cc_prim_sub_env_mul__t1_sub_prim_mul_primlod_add_t0__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); T1_SUB_PRIM_MUL_PRIMLOD_ADD_T0(); @@ -6200,7 +6200,7 @@ static void cc_prim_sub_env_mul__t0_inter_t1_using_t1__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); T0_INTER_T1_USING_T1(); @@ -6212,7 +6212,7 @@ static void cc_prim_sub_env_mul__t0_inter_t1_using_enva_alpha__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -6228,7 +6228,7 @@ static void cc__env_inter_prim_using_t0__sub_shade_mul_t0a_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_COL1_USING_TEX); MOD_0_COL(rdp.env_color & 0xFFFFFF00); MOD_0_COL1(rdp.prim_color & 0xFFFFFF00); @@ -6259,7 +6259,7 @@ static void cc_prim_sub_env_mul_shade_add_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_PRIMSUBENV(); USE_T0(); } @@ -6283,7 +6283,7 @@ static void cc_prim_sub_env_mul_prima_add_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIMSUBENV(); SETSHADE_PRIMA(); } @@ -6298,7 +6298,7 @@ static void cc_prim_sub_env_mul_prima_add_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); } USE_T0(); @@ -6310,7 +6310,7 @@ static void cc_prim_sub_env_mul_shade_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIMSUBENV(); } @@ -6321,7 +6321,7 @@ static void cc_prim_sub_env_mul_shadea_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_OTHER_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); } @@ -6332,7 +6332,7 @@ static void cc_prim_sub_env_mul__t0_inter_t1_using_prima__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); @@ -6345,7 +6345,7 @@ static void cc_prim_sub_env_mul__t1_inter_t0_using_prima__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); @@ -6357,7 +6357,7 @@ static void cc_prim_sub_env_mul__t0_inter_t1_using_enva__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -6369,7 +6369,7 @@ static void cc_prim_sub_center_mul__t0_inter_t1_using_enva__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_C1SUBC2(rdp.prim_color, rdp.CENTER); SETSHADE_ENV(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -6381,7 +6381,7 @@ static void cc_prim_sub_env_mul__t1_inter_t0_using_enva__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -6393,7 +6393,7 @@ static void cc_prim_sub_env_mul__t0_mul_enva_add_t1__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); if (cmb.combine_ext) @@ -6421,7 +6421,7 @@ static void cc_prim_sub_env_mul__t1_mul_enva_add_t0__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); T1_MUL_ENVA_ADD_T0(); @@ -6433,7 +6433,7 @@ static void cc_prim_sub_env_mul_primlod_add__t0_inter_t1_using_primlod() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIMSUBENV(); CC_COLMULBYTE(cmb.ccolor, rdp.prim_lodfrac); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -6444,7 +6444,7 @@ static void cc_prim_sub_env_mul__t0_inter_t1_using_primlod__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -6455,7 +6455,7 @@ static void cc_prim_sub_env_mul__t1_inter_t0_using_primlod__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); T1_INTER_T0_USING_FACTOR(lod_frac); @@ -6466,7 +6466,7 @@ static void cc_prim_sub_env_mul__t1_mul_primlod_add_t0__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); T1_MUL_PRIMLOD_ADD_T0(); @@ -6477,7 +6477,7 @@ static void cc_prim_sub_env_mul__t1_sub_prim_mul_t0_add_t0__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); if (cmb.combine_ext) @@ -6524,7 +6524,7 @@ static void cc__prim_sub_env_mul_prim_add_t0__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIMSUBENV(); SETSHADE_PRIM(); USE_T0(); @@ -6548,7 +6548,7 @@ static void cc_prim_sub_env_mul_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIMSUBENV(); SETSHADE_PRIM(); CC_ENV(); @@ -6578,7 +6578,7 @@ static void cc_prim_sub_env_mul_primlod_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIMSUBENV(); SETSHADE_PRIMLOD(); CC_ENV(); @@ -6591,7 +6591,7 @@ static void cc_prim_sub_env_mul_enva_add_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIMSUBENV(); SETSHADE_ENVA(); USE_T0(); @@ -6620,7 +6620,7 @@ static void cc_prim_sub_env_mul_enva_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIMSUBENV(); SETSHADE_ENVA(); CC_ENV(); @@ -6633,7 +6633,7 @@ static void cc_prim_sub_shade_mul_t0_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); COLSUBSHADE_PRIM(); USE_T0(); @@ -6645,7 +6645,7 @@ static void cc_prim_sub_shade_mul__t1_sub_prim_mul_primlod_add_t0__add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); T1_SUB_PRIM_MUL_PRIMLOD_ADD_T0(); } @@ -6655,7 +6655,7 @@ static void cc_prim_sub_shade_mul_t1a_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); USE_T1(); } @@ -6666,7 +6666,7 @@ static void cc_prim_sub_shade_mul_t0_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); USE_T0(); } @@ -6677,7 +6677,7 @@ static void cc_prim_sub_shade_mul_t1_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); USE_T1(); } @@ -6688,7 +6688,7 @@ static void cc_prim_sub_shade_mul__t0a_mul_t1__add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); T0A_MUL_T1(); } @@ -6699,7 +6699,7 @@ static void cc_prim_sub_shade_mul__t0_inter_t1_using_enva__add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -6720,7 +6720,7 @@ static void cc_prim_sub_shade_mul__t0_inter_t1_using_shadea__add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); } CC_PRIM(); T0_INTER_T1_USING_SHADEA(); @@ -6732,7 +6732,7 @@ static void cc_prim_sub_shade_mul_prima_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_OTHER_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); CA_PRIM(); } @@ -6743,7 +6743,7 @@ static void cc_prim_sub_shade_mul_env_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIMMULENV(); MULSHADE_1MENV(); } @@ -6754,7 +6754,7 @@ static void cc_prim_sub_shade_mul_shadea_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); } @@ -6763,7 +6763,7 @@ static void cc_env_sub_prim_mul_t0_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); USE_T0(); @@ -6774,7 +6774,7 @@ static void cc_env_sub_prim_mul_t1_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); USE_T1(); @@ -6785,7 +6785,7 @@ static void cc_env_sub_prim_mul_t0a_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); A_USE_T0(); @@ -6796,7 +6796,7 @@ static void cc_env_sub_prim_mul_t1a_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); A_USE_T1(); @@ -6807,7 +6807,7 @@ static void cc_env_sub_prim_mul__t0_add_t1__add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); T0_ADD_T1(); @@ -6818,7 +6818,7 @@ static void cc_env_sub_prim_mul__t0_mul_t1__add_prim() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); T0_MUL_T1(); @@ -6829,7 +6829,7 @@ static void cc_env_sub_prim_mul__t0t1a__add_prim() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); A_T0_MUL_T1(); @@ -6840,7 +6840,7 @@ static void cc_env_sub_prim_mul__t0_inter_t1_using_t1__add_prim() //Added by Gon CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); T0_INTER_T1_USING_T1(); @@ -6851,7 +6851,7 @@ static void cc_env_sub_prim_mul__t0_inter_t1_using_half__add_prim() //Added by G CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); T0_INTER_T1_USING_FACTOR(0x7F); @@ -6862,7 +6862,7 @@ static void cc_env_sub_prim_mul__t1_inter_t0_using_t0__add_prim() //Added by Gon CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); T1_INTER_T0_USING_T0(); @@ -6873,7 +6873,7 @@ static void cc_env_sub_shade_mul__t0_mul_t1__add_shade() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); T0_MUL_T1(); } @@ -6883,7 +6883,7 @@ static void cc_env_sub_prim_mul__t0a_mul_t1a__add_prim() CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_ENV(); A_T0_MUL_T1(); @@ -6895,7 +6895,7 @@ static void cc_env_sub_prim_mul_prima_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); CA_PRIM(); SETSHADE_ENV(); @@ -6907,7 +6907,7 @@ static void cc_env_sub_prim_mul_enva_add_prim() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_OTHER_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); CA_ENV(); SETSHADE_PRIM(); @@ -6940,7 +6940,7 @@ static void cc_env_sub_prim_mul_shade_add_prim() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); MULSHADE_ENVSUBPRIM(); } @@ -6950,7 +6950,7 @@ static void cc_env_sub_prim_mul_shadea_add_prim() //Added by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_ENVSUBPRIM(); MULSHADE_SHADEA(); @@ -6961,7 +6961,7 @@ static void cc_env_sub_prim_mul__t0_inter_t1_using_prima__add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); @@ -6973,7 +6973,7 @@ static void cc_env_sub_prim_mul__t0_inter_t1_using_primlod__add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -6984,7 +6984,7 @@ static void cc_env_sub_primshade_mul_t0_add_primshade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); MULSHADE_PRIM(); USE_T0(); @@ -6997,7 +6997,7 @@ static void cc_env_sub_primshade_mul_t1_add_primshade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); MULSHADE_PRIM(); USE_T0(); @@ -7008,7 +7008,7 @@ static void cc_env_sub_shade_mul_t0_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); USE_T0(); } @@ -7034,7 +7034,7 @@ static void cc__env_sub_shade_mul_t0_add_shade__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); MULSHADE_PRIM(); USE_T0(); @@ -7046,7 +7046,7 @@ static void cc_env_sub_shade_mul_t1_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); USE_T1(); } @@ -7066,7 +7066,7 @@ static void cc_env_sub_shade_mul__t0_inter_t1_using_shadea__add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); } CC_ENV(); T0_INTER_T1_USING_SHADEA(); @@ -7078,7 +7078,7 @@ static void cc_env_sub_shade_mul_enva_add_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_OTHER_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); cmb.ccolor = rdp.env_color; } @@ -7088,7 +7088,7 @@ static void cc_shade_sub_t0_mul_shadea_add_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_SHADEA(); USE_T0(); } @@ -7124,7 +7124,7 @@ static void cc_shade_sub_prim_mul__t0_inter_t1_using_primlod__add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -7134,7 +7134,7 @@ static void cc_shade_sub_prim_mul_t0_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); USE_T0(); } @@ -7145,7 +7145,7 @@ static void cc_shade_sub_prim_mul_t1_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); USE_T1(); } @@ -7180,7 +7180,7 @@ static void cc_shade_sub_env_mul_t0_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); SUBSHADE_ENV(); USE_T0(); @@ -7192,7 +7192,7 @@ static void cc_shade_sub_env_mul__t0_inter_t1_using_primlod__add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIM(); SUBSHADE_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -7204,7 +7204,7 @@ static void cc_shade_sub_env_mul__t0_inter_t1_using_primlod__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -7215,7 +7215,7 @@ static void cc_shade_sub_env_mul__t0_mul_t1__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); T0_MUL_T1(); } @@ -7226,7 +7226,7 @@ static void cc_shade_sub_env_mul__t1_sub_prim_mul_primlod_add_t0__add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_ENV(); T1_SUB_PRIM_MUL_PRIMLOD_ADD_T0(); @@ -7238,7 +7238,7 @@ static void cc_shade_sub_env_mul_t0_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); USE_T0(); } @@ -7249,7 +7249,7 @@ static void cc_shade_sub_env_mul_t0_mul_prim_add_prim_mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_PRIMMULENV(); SUBSHADE_ENV(); MULSHADE_PRIM() @@ -7262,7 +7262,7 @@ static void cc_shade_sub_env_mul_t1_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENV(); USE_T1(); } @@ -7273,7 +7273,7 @@ static void cc_shade_sub_env_mul_prim_add_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SUBSHADE_ENV(); MULSHADE_PRIM(); USE_T0(); @@ -7328,7 +7328,7 @@ static void cc_shade_sub_env_mul_prim_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SUBSHADE_ENV(); MULSHADE_PRIM(); CC_ENV(); @@ -7340,7 +7340,7 @@ static void cc_shade_sub_env_mul_prima_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SUBSHADE_ENV(); MULSHADE_PRIMA(); CC_PRIM(); @@ -7351,7 +7351,7 @@ static void cc_shade_sub_env_mul_k5_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SUBSHADE_ENV(); uint32_t temp = rdp.prim_color; rdp.prim_color = rdp.K5; @@ -7366,7 +7366,7 @@ static void cc_t0_inter_t1_using_t1a() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_T1A(); } @@ -7375,7 +7375,7 @@ static void cc_t0_inter_t1_using_prima() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); } @@ -7385,7 +7385,7 @@ static void cc_t1_inter_t0_using_prima() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T1_INTER_T0_USING_FACTOR(factor); } @@ -7395,7 +7395,7 @@ static void cc_t1_inter_t0_using_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_PRIM(); } @@ -7404,7 +7404,7 @@ static void cc_t0_inter_t1_using_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_ENV(); } @@ -7413,7 +7413,7 @@ static void cc_t0_inter_t1_using_enva() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); } @@ -7491,7 +7491,7 @@ static void cc_t0_inter_t1_using_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(0x7F); } } @@ -7520,7 +7520,7 @@ static void cc_t1_inter_t0_using_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(0x7F); } } @@ -7540,7 +7540,7 @@ static void cc_t1_inter_t0_using_shadea() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } T1_INTER_T0_USING_SHADEA(); } @@ -7551,7 +7551,7 @@ static void cc_t0_inter_t1_using_primlod() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -7561,7 +7561,7 @@ static void cc_t1_inter_t0_using_primlod() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_FACTOR(lod_frac); } @@ -7571,7 +7571,7 @@ static void cc_t1_inter_t0_using_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_T0(); } @@ -7581,7 +7581,7 @@ static void cc_t0_inter_t1_using_k5() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(rdp.K5); } @@ -7590,7 +7590,7 @@ static void cc_t0_inter_env_using_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); MOD_0(TMOD_TEX_INTER_COL_USING_COL1); @@ -7604,7 +7604,7 @@ static void cc_t0_inter_prim_using_primlod() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); MOD_0(TMOD_TEX_INTER_COLOR_USING_FACTOR); @@ -7629,7 +7629,7 @@ static void cc_t0_inter_shade_using_t0a() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); rdp.best_tex = 1; cmb.tex = 1; cmb.tmu0_func = GFX_COMBINE_FUNCTION_BLEND_LOCAL; @@ -7642,7 +7642,7 @@ static void cc_t0_inter_shade_using_primlod() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIMLOD(); cmb.ccolor = (~cmb.ccolor) & 0xFFFFFF00; MULSHADE_PRIMLOD(); @@ -7657,7 +7657,7 @@ static void cc__env_inter_t0_using_primlod__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); cmb.ccolor = ((((cmb.ccolor & 0xFF000000) >> 24) * (lod_frac & 0xFF)) << 24) | ((((cmb.ccolor & 0x00FF0000) >> 16) * (lod_frac & 0xFF)) << 16) | ((((cmb.ccolor & 0x0000FF00) >> 8) * (lod_frac & 0xFF)) << 8); SETSHADE_PRIM(); @@ -7695,7 +7695,7 @@ static void cc_env_inter_prim_using_primlod() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_PRIMSUBENV(); SETSHADE_PRIMLOD(); CC_ENV(); @@ -7705,7 +7705,7 @@ static void cc_env_inter_prim_using_primlod() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); SETSHADE_ENV(); SETSHADE_PRIMLOD(); CC_ENV(); @@ -7735,7 +7735,7 @@ static void cc_prim_inter__t0_mul_t1_add_env__using_shadea() CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); } @@ -7784,7 +7784,7 @@ static void cc_one_sub_env_mul_prim_add__t0_mul_env() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_1MENV(); SETSHADE_PRIM(); @@ -7814,7 +7814,7 @@ static void cc_t0_sub_env_mul_prim_mul_shade_add_prim_mul_shade() //Aded by Gone CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (rdp.env_color & 0xFFFFFF00) { MOD_0(TMOD_TEX_SUB_COL); @@ -7851,7 +7851,7 @@ static void cc__t1_sub_prim_mul_t0_add_env__mul_shade() //Aded by Gonetz CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (rdp.prim_color & 0xFFFFFF00) { MOD_1(TMOD_TEX_SUB_COL); @@ -7868,7 +7868,7 @@ static void cc__t0_inter_t1_using_prima__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); CC_PRIM(); @@ -7880,7 +7880,7 @@ static void cc__t1_inter_t0_using_prima__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T1_INTER_T0_USING_FACTOR(factor); CC_PRIM(); @@ -7892,7 +7892,7 @@ static void cc__t0_inter_t1_using_prim__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_PRIM(); } @@ -7902,7 +7902,7 @@ static void cc__t0_inter_t1_using_prima__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); } @@ -7913,7 +7913,7 @@ static void cc__t1_inter_t0_using_prima__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T1_INTER_T0_USING_FACTOR(factor); } @@ -7923,7 +7923,7 @@ static void cc__t0_inter_t1_using_env__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_ENV(); } @@ -7932,7 +7932,7 @@ static void cc__t0_inter_t1_using_enva__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); } @@ -7942,7 +7942,7 @@ static void cc__t0_inter_t1_using_enva__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -7954,7 +7954,7 @@ static void cc__t0_inter_t1_using_enva__mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -7966,7 +7966,7 @@ static void cc__t0_inter_t1_using_primlod__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -7977,7 +7977,7 @@ static void cc__t0_inter_t1_using_primlod__mul_prima() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIMA(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -7988,7 +7988,7 @@ static void cc__t1_mul_primlod_add_t0__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); T1_MUL_PRIMLOD_ADD_T0(); } @@ -7999,7 +7999,7 @@ static void cc__t0_inter_t1_using_primlod__mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -8010,7 +8010,7 @@ static void cc__t1_mul_primlod_add_t0__mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); T1_MUL_PRIMLOD_ADD_T0(); } @@ -8021,7 +8021,7 @@ static void cc__t1_inter_t0_using_prim__mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); T1_INTER_T0_USING_PRIM(); } @@ -8046,7 +8046,7 @@ static void cc__one_sub_shade_mul_t0_add_shade__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } } @@ -8071,7 +8071,7 @@ static void cc__one_sub_shade_mul_t0_add_shade__mul_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); USE_T0(); } } @@ -8081,7 +8081,7 @@ static void cc__t1_inter_t0_using_prim__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_PRIM(); } @@ -8098,7 +8098,7 @@ static void cc__t0_inter_t1_using_primlod__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -8107,7 +8107,7 @@ static void cc__t1_inter_t0_using_primlod__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_FACTOR(lod_frac); } @@ -8116,7 +8116,7 @@ static void cc__t0_inter_t1_using_half__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(0x7F); } @@ -8125,7 +8125,7 @@ static void cc__t0_inter_t1_using_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_T0(); } @@ -8134,7 +8134,7 @@ static void cc__t0_inter_t1_using_t1a__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_T1A(); } @@ -8152,7 +8152,7 @@ static void cc__t0_inter_t1_using_shadea__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } T0_INTER_T1_USING_SHADEA(); } @@ -8162,7 +8162,7 @@ static void cc__t0_inter_t1_using_k5__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(rdp.K5); } @@ -8171,7 +8171,7 @@ static void cc__t1_inter_t0_using_k5__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_FACTOR(rdp.K5); } @@ -8188,14 +8188,14 @@ static void cc_t0_inter_prim_using_prima() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } else { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBPRIMA(); SETSHADE_PRIM(); SETSHADE_PRIMA(); @@ -8208,7 +8208,7 @@ static void cc__t0_inter_prim_using_t0a__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_TEX_INTER_COL_USING_TEXA); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); USE_T0(); @@ -8220,7 +8220,7 @@ static void cc__env_inter_prim_using_t0__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_COL_INTER_COL1_USING_TEX); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -8241,7 +8241,7 @@ static void cc__env_inter_prim_using_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL2_INTER__COL_INTER_COL1_USING_TEX__USING_TEXA); MOD_0_COL(rdp.env_color & 0xFFFFFF00); MOD_0_COL1(rdp.prim_color & 0xFFFFFF00); @@ -8257,7 +8257,7 @@ static void cc__env_inter_prim_using_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } static void cc__env_inter_one_using_t0__mul_shade() @@ -8282,7 +8282,7 @@ static void cc__env_inter_one_using_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } static void cc_env_inter_one_using__one_sub_t0_mul_primlod() @@ -8307,7 +8307,7 @@ static void cc_env_inter_one_using__one_sub_t0_mul_primlod() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_ENV(); } @@ -8327,7 +8327,7 @@ static void cc__env_inter_prim_using_prima__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); } static void cc__prim_inter_t0_using_env__mul_shade() @@ -8357,7 +8357,7 @@ static void cc__prim_inter_t0_using_env__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_TEX_USING_COL1); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); MOD_0_COL1(rdp.env_color & 0xFFFFFF00); @@ -8400,7 +8400,7 @@ static void cc__one_inter_prim_using_t1__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (g_settings->hacks(CSettings::hack_BAR) && rdp.cur_tile == 1) { MOD_0(TMOD_COL_INTER_COL1_USING_TEX); @@ -8445,7 +8445,7 @@ static void cc_prim_sub__prim_sub_t0_mul_prima__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_TEX_USING_COL1); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); uint8_t prima = (uint8_t)(rdp.prim_color & 0xFF); @@ -8460,7 +8460,7 @@ static void cc__prim_inter_env_using_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_COL1_USING_TEX); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); MOD_0_COL1(rdp.env_color & 0xFFFFFF00); @@ -8488,7 +8488,7 @@ static void cc__prim_inter_one_using_env__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); CC_C1MULC2(cmb.ccolor, rdp.env_color); cmb.ccolor = (uint8_t)(minval(255, (int)((cmb.ccolor & 0xFF000000) >> 24) + (int)((rdp.prim_color & 0xFF000000) >> 24))) << 24 | @@ -8501,7 +8501,7 @@ static void cc__env_inter_prim_using_t0a__mul_t0() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_COL1_USING_TEXA__MUL_TEX); MOD_0_COL(rdp.env_color & 0xFFFFFF00); MOD_0_COL1(rdp.prim_color & 0xFFFFFF00); @@ -8513,7 +8513,7 @@ static void cc__env_inter_prim_using_t0a__mul_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_COL_INTER_COL1_USING_TEXA); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -8537,7 +8537,7 @@ static void cc__env_inter_prim_using__t0_sub_shade_mul_primlod_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); } @@ -8546,7 +8546,7 @@ static void cc__env_inter_prim_using__t0_sub_shade_mul_primlod_add_env() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE,//TEXTURE_RGB, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE);//CONSTANT); + GFX_COMBINE_OTHER_TEXTURE);//CONSTANT); MOD_0(TMOD_COL_INTER_COL1_USING_TEX); MOD_0_COL(rdp.env_color & 0xFFFFFF00); MOD_0_COL1(rdp.prim_color & 0xFFFFFF00); @@ -8562,7 +8562,7 @@ static void cc__prim_inter_t0_using_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_TEX_USING_TEX); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); USE_T0(); @@ -8573,7 +8573,7 @@ static void cc__env_inter_t0_using_t0a__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_TEX_USING_TEXA); MOD_0_COL(rdp.env_color & 0xFFFFFF00); USE_T0(); @@ -8584,7 +8584,7 @@ static void cc__env_inter_t0_using_prima__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_TEX_USING_COL1); MOD_0_COL(rdp.env_color & 0xFFFFFF00); uint32_t prima = rdp.prim_color & 0xFF; @@ -8597,7 +8597,7 @@ static void cc_shade_mul_prima() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); MULSHADE_PRIMA(); } @@ -8606,7 +8606,7 @@ static void cc_shade_mul_shadea() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); MULSHADE_SHADEA(); } @@ -8638,7 +8638,7 @@ static void cc__t0_mul_shade__inter_env_using_enva() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); INTERSHADE_2(rdp.env_color & 0xFFFFFF00, rdp.env_color & 0xFF); USE_T0(); MOD_0(TMOD_TEX_INTER_COLOR_USING_FACTOR); @@ -8652,7 +8652,7 @@ static void cc__t0_mul_shade__inter_one_using_enva() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CC_ENVA(); MULSHADE_1MENVA(); USE_T0(); @@ -8683,7 +8683,7 @@ static void cc__prim_mul_shade__inter_env_using_enva() CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); MULSHADE_PRIM(); SETSHADE_A_ENV(); @@ -8694,7 +8694,7 @@ static void cc__prim_mul_shade__inter_env_using__prim_mul_shade_alpha() CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CC_ENV(); MULSHADE_PRIM(); MULSHADE_A_PRIM(); @@ -8707,7 +8707,7 @@ static void ac_one() ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); cmb.ccolor |= 0xFF; } @@ -8721,7 +8721,7 @@ static void ac_t0() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA(rdp.fog_color); } else if (blend_mode == 0x55f0) //cmem*afog + cfog*1ma @@ -8729,7 +8729,7 @@ static void ac_t0() ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CA(~rdp.fog_color); } else @@ -8737,7 +8737,7 @@ static void ac_t0() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } } else @@ -8745,7 +8745,7 @@ static void ac_t0() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } A_USE_T0(); } @@ -8760,7 +8760,7 @@ static void ac_zero() ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); cmb.ccolor &= 0xFFFFFF00; } @@ -8769,7 +8769,7 @@ static void ac_t1() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (g_settings->hacks(CSettings::hack_BAR) && rdp.tiles(rdp.cur_tile).format == 3) A_USE_T0(); else @@ -8781,7 +8781,7 @@ static void ac_prim() ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CA_PRIM(); } @@ -8790,7 +8790,7 @@ static void ac_primlod() ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CA_PRIMLOD(); } @@ -8799,7 +8799,7 @@ static void ac_one_sub_t0() ACMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CA(0xFF); A_USE_T0(); } @@ -8809,7 +8809,7 @@ static void ac_one_sub_prim() ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CA_INVPRIM(); } @@ -8818,7 +8818,7 @@ static void ac_env() ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CA_ENV(); } @@ -8827,7 +8827,7 @@ static void ac_shade() ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); } // ** A+B ** @@ -8836,7 +8836,7 @@ static void ac_t0_add_t1() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_ADD_T1(); } @@ -8847,7 +8847,7 @@ static void ac__t0_mul_prim__add__t1_mul_primlod() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_USE_T0(); } @@ -8856,7 +8856,7 @@ static void ac__t0_mul_prim__add__t1_mul_primlod() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); A_USE_T1(); } @@ -8865,7 +8865,7 @@ static void ac__t0_mul_prim__add__t1_mul_primlod() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T1_MUL_PRIMLOD_ADD_T0(); } else @@ -8873,7 +8873,7 @@ static void ac__t0_mul_prim__add__t1_mul_primlod() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_ADD_T1(); } @@ -8884,7 +8884,7 @@ static void ac_t0_add_prim() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_USE_T0(); } @@ -8894,7 +8894,7 @@ static void ac_t0_add_env() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); A_USE_T0(); } @@ -8904,7 +8904,7 @@ static void ac_t1_add_env() //Added by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); A_USE_T1(); } @@ -8914,7 +8914,7 @@ static void ac__t0_add_t1__add_prim() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_ADD_T1(); } @@ -8924,7 +8924,7 @@ static void ac_prim_add_shade() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIM(); } @@ -8933,7 +8933,7 @@ static void ac_env_add_shade() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_ENV(); } @@ -8943,7 +8943,7 @@ static void ac_t0_mul_t0() //Added by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_USE_T0(); } @@ -8952,7 +8952,7 @@ static void ac_t0_mul_t1() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_MUL_T1(); } @@ -8961,7 +8961,7 @@ static void ac_t0_mul_t1_add_t1() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T1ACMBEXT(GFX_CMBX_LOCAL_TEXTURE_ALPHA, GFX_FUNC_MODE_ZERO, @@ -8985,7 +8985,7 @@ static void ac_t0_mul_t1_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_MUL_T1(); } @@ -8995,7 +8995,7 @@ static void ac_t0_mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_USE_T0(); } @@ -9005,7 +9005,7 @@ static void ac_t0_mul_prim_mul_primlod() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM_MUL_PRIMLOD(); A_USE_T0(); } @@ -9015,7 +9015,7 @@ static void ac_t1_mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (rdp.cycle_mode == 0) A_USE_T0(); @@ -9050,7 +9050,7 @@ static void ac__t1_sub_one_mul_primlod_add_t0__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); cmb.dc0_detailmax = cmb.dc1_detailmax = percent; cmb.tex |= 3; @@ -9061,7 +9061,7 @@ static void ac__t0_sub_t1_mul_enva_add_t0__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) { @@ -9087,7 +9087,7 @@ static void ac__t0_sub_one_mul_enva_add_t0__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) { @@ -9110,7 +9110,7 @@ static void ac__t0_sub_t1_mul_primlod_add_t0__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) { @@ -9137,7 +9137,7 @@ static void ac__t1_sub_prim_mul_primlod_add_t0__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) { @@ -9165,7 +9165,7 @@ static void ac__t1_sub_t0_mul_enva_add_t1__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) { @@ -9192,7 +9192,7 @@ static void ac__t1_sub_t0_mul_primlod__mul_env_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) { @@ -9243,7 +9243,7 @@ static void ac__t0_sub_one_mul_enva_add_t1__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_A_PRIM(); SETSHADE_A_ENV(); A_T0_MUL_T1(); @@ -9255,7 +9255,7 @@ static void ac__t1_mul_prima_add_t0__mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T1_MUL_PRIMA_ADD_T0(); } @@ -9265,7 +9265,7 @@ static void ac__t1_mul_enva_add_t0__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T1_MUL_ENVA_ADD_T0(); } @@ -9275,7 +9275,7 @@ static void ac_t0_mul_primlod() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); A_USE_T0(); } @@ -9285,7 +9285,7 @@ static void ac_t1_mul_primlod() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); A_USE_T1(); } @@ -9296,7 +9296,7 @@ static void ac__t0_add_t1__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_ADD_T1(); } @@ -9307,7 +9307,7 @@ static void ac__t0_add_t1__mul_primlod() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); A_T0_ADD_T1(); } @@ -9318,7 +9318,7 @@ static void ac__t0_mul_t1__mul_primlod() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); A_T0_MUL_T1(); } @@ -9328,7 +9328,7 @@ static void ac_t0_mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); A_USE_T0(); } @@ -9338,7 +9338,7 @@ static void ac_t0_mul_env_mul_primlod() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV_MUL_PRIMLOD(); A_USE_T0(); } @@ -9348,7 +9348,7 @@ static void ac_t1_mul_env() //Added by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); // if ((g_settings->hacks&hack_Powerpuff) && (rdp.last_tile == 0)) if (rdp.cycle_mode == 0) @@ -9383,7 +9383,7 @@ static void ac__t1_sub_one_mul_primlod_add_t0__mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); cmb.dc0_detailmax = cmb.dc1_detailmax = percent; cmb.tex |= 3; @@ -9394,7 +9394,7 @@ static void ac_t0_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_USE_T0(); } @@ -9403,7 +9403,7 @@ static void ac_t1_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_USE_T1(); } @@ -9413,7 +9413,7 @@ static void ac__t0_add_t1__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_ADD_T1(); } @@ -9422,7 +9422,7 @@ static void ac__t0_mul_primlod_add_t0__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T0ACMBEXT(GFX_CMBX_LOCAL_TEXTURE_ALPHA, GFX_FUNC_MODE_ZERO, @@ -9444,7 +9444,7 @@ static void ac__t1_mul_prima_add_t0__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T1_MUL_PRIMA_ADD_T0(); } @@ -9454,7 +9454,7 @@ static void ac__t0_sub_t1__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T1ACMBEXT(GFX_CMBX_LOCAL_TEXTURE_ALPHA, GFX_FUNC_MODE_ZERO, @@ -9478,7 +9478,7 @@ static void ac__t1_mul_t1_add_t1__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T1ACMBEXT(GFX_CMBX_LOCAL_TEXTURE_ALPHA, GFX_FUNC_MODE_ZERO, @@ -9502,7 +9502,7 @@ static void ac__t1_mul_enva_add_t0__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T1_MUL_ENVA_ADD_T0(); } @@ -9532,7 +9532,7 @@ static void ac__t1_sub_one_mul_primlod_add_t0__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); cmb.dc0_detailmax = cmb.dc1_detailmax = percent; cmb.tex |= 3; } @@ -9542,7 +9542,7 @@ static void ac__t1_sub_shade_mul_primlod_add_t0__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) { @@ -9570,7 +9570,7 @@ static void ac_prim_mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_PRIM(); SETSHADE_A_PRIM(); } @@ -9581,7 +9581,7 @@ static void ac_prim_mul_primlod() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_PRIMLOD(); SETSHADE_A_PRIM(); } @@ -9591,7 +9591,7 @@ static void ac_prim_mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_ENV(); SETSHADE_A_PRIM(); } @@ -9617,7 +9617,7 @@ static void ac__prim_sub_one_mul_primlod_add_t0__mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); } @@ -9626,7 +9626,7 @@ static void ac_prim_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_PRIM(); } @@ -9635,7 +9635,7 @@ static void ac_env_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_ENV(); } @@ -9644,7 +9644,7 @@ static void ac_primlod_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_PRIMLOD(); } @@ -9654,7 +9654,7 @@ static void ac_prim_sub_t0() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_USE_T0(); MOD_0(TMOD_FULL_COLOR_SUB_TEX); @@ -9682,7 +9682,7 @@ static void ac_t1_mul_prim_add_t0() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T1_MUL_PRIMA_ADD_T0(); } @@ -9701,7 +9701,7 @@ static void ac__t0_inter_t1_using_t1a__mul_prim_add__t0_inter_t1_using_t1a() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); } A_T0_INTER_T1_USING_T1A(); @@ -9722,7 +9722,7 @@ static void ac__t1_inter_t0_using_t0a__mul_prim_add__t1_inter_t0_using_t0a() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); } A_T1_INTER_T0_USING_T0A(); @@ -9734,7 +9734,7 @@ static void ac_t0_mul_prim_add_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_A_PRIM(); CA_ENV(); A_USE_T0(); @@ -9746,7 +9746,7 @@ static void ac__t0_add_t1__mul_prim_add_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_A_PRIM(); CA_ENV(); A_T0_ADD_T1(); @@ -9758,7 +9758,7 @@ static void ac__t0_inter_t1_using_enva__mul_prim_add_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_A_PRIM(); CA_ENV(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -9771,7 +9771,7 @@ static void ac_t0_mul_primlod_add_t0() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T0ACMBEXT(GFX_CMBX_LOCAL_TEXTURE_ALPHA, GFX_FUNC_MODE_ZERO, @@ -9794,7 +9794,7 @@ static void ac_t1_mul_primlod_add_t0() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T1_MUL_PRIMLOD_ADD_T0(); } @@ -9804,7 +9804,7 @@ static void ac_t0_mul_primlod_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIMLOD(); SETSHADE_A_PRIM(); A_USE_T0(); @@ -9815,7 +9815,7 @@ static void ac_t0_mul_primlod_add_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIMLOD(); SETSHADE_A_ENV(); A_USE_T0(); @@ -9827,7 +9827,7 @@ static void ac__t0_add_t1__mul_primlod_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIMLOD(); SETSHADE_A_PRIM(); A_T0_ADD_T1(); @@ -9839,7 +9839,7 @@ static void ac_t0_mul_env_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_A_ENV(); CA_PRIM(); A_USE_T0(); @@ -9851,7 +9851,7 @@ static void ac_t1_mul_prim_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_A_PRIM(); CA_PRIM(); A_USE_T1(); @@ -9863,7 +9863,7 @@ static void ac_prim_mul_shade_add_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIM(); } @@ -9873,7 +9873,7 @@ static void ac_t0_mul_shade_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_PRIM(); A_USE_T0(); } @@ -9883,7 +9883,7 @@ static void ac_t0_mul_shade_add_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_ENV(); A_USE_T0(); } @@ -9893,7 +9893,7 @@ static void ac_one_sub_prim_mul__t0_mul_t1__add__prim_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_INVPRIM(); MULSHADE_A_PRIM(); A_T0_MUL_T1(); @@ -9905,7 +9905,7 @@ static void ac_t0_mul_prim_add_shade_mul_one_minus_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); MULSHADE_A_1MPRIM(); CA_PRIM(); A_USE_T0(); @@ -9933,7 +9933,7 @@ static void ac__t0_mul_primlod_add_shade__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_USE_T0(); } } @@ -9963,7 +9963,7 @@ static void ac__t1_mul_primlod_add_shade__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_USE_T1(); } } @@ -9994,7 +9994,7 @@ static void ac__t0_sub_t1_mul_prim_add_shade__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL_ALPHA, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIM(); A_T1_SUB_T0(); } @@ -10025,7 +10025,7 @@ static void ac__t1_sub_t0_mul_prim_add_shade__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL_ALPHA, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIM(); A_T1_SUB_T0(); } @@ -10037,7 +10037,7 @@ static void ac__t0_mul_t1__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (voodoo.sup_large_tex || rdp.tiles(1).lr_s < 256) //hack for RR64 pause screen { @@ -10054,7 +10054,7 @@ static void ac__t0_mul_t1__mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T0_MUL_T1(); } @@ -10064,7 +10064,7 @@ static void ac__t0_mul_t1__mul_env_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_ENV(); A_T0_MUL_T1(); } @@ -10074,7 +10074,7 @@ static void ac__t0_mul_t1__mul_prim_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_T0_MUL_T1(); } @@ -10084,7 +10084,7 @@ static void ac__t0_mul_t1__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_MUL_T1(); } @@ -10109,7 +10109,7 @@ static void ac__t0_add_prim_mul_shade__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_USE_T0(); } @@ -10121,7 +10121,7 @@ static void ac_t0_mul_prim_mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_A_PRIM(); SETSHADE_A_PRIM(); A_USE_T0(); @@ -10132,7 +10132,7 @@ static void ac_t0_mul_prim_mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIMENV(); A_USE_T0(); } @@ -10142,7 +10142,7 @@ static void ac_t0_mul_prim_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_USE_T0(); } @@ -10152,7 +10152,7 @@ static void ac_t1_mul_prim_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_USE_T1(); } @@ -10168,7 +10168,7 @@ static void ac_t0_mul_env_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_ENV(); A_USE_T0(); } @@ -10178,7 +10178,7 @@ static void ac_t1_mul_env_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_ENV(); A_USE_T1(); } @@ -10188,7 +10188,7 @@ static void ac_t0_mul_primlod_mul_prim() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); cmb.ccolor |= (uint32_t)(lod_frac * (rdp.prim_color & 0xFF) / 255); A_USE_T0(); } @@ -10199,7 +10199,7 @@ static void ac_prim_add_env_mul_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); SETSHADE_A_PRIM(); ADDSHADE_A_ENV(); A_USE_T0(); @@ -10210,7 +10210,7 @@ static void ac_t1_add_prim_mul_env() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_ENV(); SETSHADE_A_PRIM(); SETSHADE_A_ENV(); @@ -10238,7 +10238,7 @@ static void ac_t0_sub_prim_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_USE_T0(); } @@ -10264,7 +10264,7 @@ static void ac_t0_sub_prim_mul_shade_mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); MULSHADE_A_ENV(); A_USE_T0(); @@ -10290,7 +10290,7 @@ static void ac_t0_sub_shade_mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_USE_T0(); } @@ -10311,7 +10311,7 @@ static void ac__t0_mul_t1__sub_prim_mul_shade() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } A_T0_MUL_T1(); } @@ -10341,7 +10341,7 @@ static void ac__one_sub_t1_mul_t0_add_shade__sub_prim_mul_shade() //Aded by Gon ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_MUL_T1(); } } @@ -10361,7 +10361,7 @@ static void ac__t1_mul_primlod_add_t0__sub_prim_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } A_T1_MUL_PRIMLOD_ADD_T0(); } @@ -10382,7 +10382,7 @@ static void ac__t1_mul_primlod_add_t0__sub_env_mul_prim() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); } A_T1_MUL_PRIMLOD_ADD_T0(); @@ -10403,7 +10403,7 @@ static void ac__t1_mul_prima_add_t0__sub_env_mul_shade() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } A_T1_MUL_PRIMA_ADD_T0(); } @@ -10413,7 +10413,7 @@ static void ac_one_sub_t0_mul_prim() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); CA_PRIM(); A_USE_T0(); } @@ -10425,7 +10425,7 @@ static void ac_one_sub_t0_mul_shade() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); A_USE_T0(); } else @@ -10437,7 +10437,7 @@ static void ac_one_sub_prim_mul_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_USE_T0(); } @@ -10447,7 +10447,7 @@ static void ac_one_sub_env_mul_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); A_USE_T0(); } @@ -10457,7 +10457,7 @@ static void ac_one_sub_shade_mul_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_USE_T0(); } @@ -10466,7 +10466,7 @@ static void ac_one_sub_shade_mul_env() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_ENV(); } @@ -10475,7 +10475,7 @@ static void ac_prim_sub_shade_mul_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIM(); A_USE_T0(); } @@ -10501,7 +10501,7 @@ static void ac_prim_sub_shade_mul_prim() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIM(); } } @@ -10512,7 +10512,7 @@ static void ac_shade_sub_env_mul_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_ENV(); A_USE_T0(); } @@ -10523,7 +10523,7 @@ static void ac_one_sub_t0_mul_prim_mul_shade() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); MULSHADE_A_PRIM(); A_USE_T0(); } @@ -10561,7 +10561,7 @@ static void ac__t0_mul_t1__sub_env_mul_prim_add__t0_mul_t1() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } A_T0_MUL_T1(); } @@ -10588,7 +10588,7 @@ static void ac__t0_sub_prim_mul_shade_add_shade__mul_env() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_ENV(); MOD_0(TMOD_TEX_SUB_COL); MOD_0_COL(rdp.prim_color & 0xFF); @@ -10601,7 +10601,7 @@ static void ac_t0_sub_t1_mul_env_add_env() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T0_SUB_T1(); } @@ -10623,7 +10623,7 @@ static void ac_t0_sub_one_mul_enva_add_t1() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); } else @@ -10657,7 +10657,7 @@ static void ac_t1_sub_one_mul_enva_add_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_USE_T0(); } } @@ -10667,7 +10667,7 @@ static void ac_t1_sub_one_mul_primlod_add_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { T1ACMBEXT(GFX_CMBX_LOCAL_TEXTURE_ALPHA, GFX_FUNC_MODE_ZERO, @@ -10721,7 +10721,7 @@ static void ac_t1_sub_prim_mul_shade_add_prim() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_PRIM(); MOD_1(TMOD_TEX_SUB_COL); MOD_1_COL(rdp.prim_color & 0xFF); @@ -10734,7 +10734,7 @@ static void ac_t0_sub_env_mul_prim_add_env() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_A_PRIM(); CA_ENV1MPRIM(); A_USE_T0(); @@ -10765,7 +10765,7 @@ static void ac__one_sub_t0_mul_t1_add_t0__mul_prim() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); rdp.best_tex = 0; cmb.tex |= 3; @@ -10779,7 +10779,7 @@ static void ac_one_sub_t0_mul_prim_add_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); SETSHADE_A_PRIM(); CA(0xFF); A_USE_T0(); @@ -10790,7 +10790,7 @@ static void ac_one_sub_t0_mul_env_add_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); SETSHADE_A_ENV(); CA(0xFF); A_USE_T0(); @@ -10801,7 +10801,7 @@ static void ac_one_sub_t0_mul_primlod_add_prim() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); SETSHADE_A_PRIM(); CA_PRIMLOD(); A_USE_T0(); @@ -10812,7 +10812,7 @@ static void ac_prim_sub_t0_mul_env_add_t0() //Aded by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_INVENV(); SETSHADE_A_PRIM(); SETSHADE_A_ENV(); @@ -10825,7 +10825,7 @@ static void ac_prim_sub_env_mul_t0_add_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIM(); SETSHADE_A_ENV(); A_USE_T0(); @@ -10836,7 +10836,7 @@ static void ac_prim_sub_env_mul_t1_add_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIM(); SETSHADE_A_ENV(); A_USE_T1(); @@ -10847,7 +10847,7 @@ static void ac_prim_sub_env_mul_t0_add_one() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA(0xFF); SETSHADE_A_PRIMSUBENV(); A_USE_T0(); @@ -10859,7 +10859,7 @@ static void ac_prim_sub_env_mul_shade_add_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_ENV(); MULSHADE_A_PRIMSUBENV(); } @@ -10870,7 +10870,7 @@ static void ac_prim_sub_env_mul_shade_add_env_mul_t1() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_ENV(); MULSHADE_A_PRIMSUBENV(); A_USE_T1(); @@ -10882,7 +10882,7 @@ static void ac_prim_sub_shade_mul_t0_add_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_PRIM(); A_USE_T0(); } @@ -10893,7 +10893,7 @@ static void ac_one_sub_shade_mul_t1_add_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_USE_T1(); } @@ -10903,7 +10903,7 @@ static void ac_one_sub_env_mul_shade_add_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_ENV(); } @@ -10913,7 +10913,7 @@ static void ac_env_sub_prim_mul_t0_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_ENV(); SETSHADE_A_PRIM(); A_USE_T0(); @@ -10936,14 +10936,14 @@ static void ac_one_sub_t1_add_t0_mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } else { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T0_ADD_T1(); cmb.tmu1_a_invert = FXTRUE; @@ -10955,7 +10955,7 @@ static void ac_env_sub_prim_mul_shade_add_prim() //Added by Gonetz ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_PRIM(); MULSHADE_A_ENVSUBPRIM(); } @@ -10965,7 +10965,7 @@ static void ac_env_sub_primshade_mul_t1_add_primshade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_ENV(); MULSHADE_A_PRIM(); A_USE_T1(); @@ -10976,7 +10976,7 @@ static void ac_one_sub_prim_mul_t0_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA(0xFF); SETSHADE_A_PRIM(); A_USE_T0(); @@ -10987,7 +10987,7 @@ static void ac_one_sub_prim_mul_t0_add__prim_mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_CONSTANT); + GFX_COMBINE_OTHER_CONSTANT); CA_INVPRIM(); SETSHADE_A_PRIM(); SETSHADE_A_ENV(); @@ -11019,7 +11019,7 @@ static void ac_shade_sub_env_mul_t0_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SUBSHADE_A_ENV(); CA_PRIM(); A_USE_T0(); @@ -11031,7 +11031,7 @@ static void ac_t0_inter_t1_using_prima() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); } @@ -11041,7 +11041,7 @@ static void ac_t1_inter_t0_using_prima() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); A_T1_INTER_T0_USING_FACTOR(factor); } @@ -11051,7 +11051,7 @@ static void ac_t0_inter_t1_using_primlod() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -11060,7 +11060,7 @@ static void ac_t0_inter_t1_using_enva() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); } @@ -11070,7 +11070,7 @@ static void ac_t1_inter_t0_using_enva() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); A_T1_INTER_T0_USING_FACTOR(factor); } @@ -11081,7 +11081,7 @@ static void ac_t0_inter_t1_using_t0a() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_T0A(); } @@ -11091,7 +11091,7 @@ static void ac_t0_inter_t1_using_t1a() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_T1A(); } @@ -11110,7 +11110,7 @@ static void ac_t0_inter_t1_using_shadea() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); } A_T0_INTER_T1_USING_SHADEA(); } @@ -11122,7 +11122,7 @@ static void ac__t0_inter_t1_using_primlod__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -11132,7 +11132,7 @@ static void ac__t1_mul_primlod_add_t0__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T1_MUL_PRIMLOD_ADD_T0(); } @@ -11142,7 +11142,7 @@ static void ac__t0_inter_t1_using_primlod__mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -11152,7 +11152,7 @@ static void ac__t1_mul_primlod_add_t0__mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T1_MUL_PRIMLOD_ADD_T0(); } @@ -11168,7 +11168,7 @@ static void ac__t0_inter_t1_using_primlod__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -11177,7 +11177,7 @@ static void ac__t1_mul_primlod_add_t0__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T1_MUL_PRIMLOD_ADD_T0(); } @@ -11187,7 +11187,7 @@ static void ac__t0_inter_t1_using_prima__mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); @@ -11199,7 +11199,7 @@ static void ac__t1_inter_t0_using_t0a__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T1_INTER_T0_USING_T0A(); } @@ -11209,7 +11209,7 @@ static void ac__t1_inter_t0_using_primlod__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -11219,7 +11219,7 @@ static void ac__t1_inter_t0_using_prima__mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_ENV(); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); A_T1_INTER_T0_USING_FACTOR(factor); @@ -11231,7 +11231,7 @@ static void ac__t0_inter_t1_using_prima__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); } @@ -11241,7 +11241,7 @@ static void ac__t1_inter_t0_using_prima__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); A_T1_INTER_T0_USING_FACTOR(factor); } @@ -11251,7 +11251,7 @@ static void ac__t0_inter_t1_using_enva__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); @@ -11262,7 +11262,7 @@ static void ac__env_sub_one_mul_t1_add_t0__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) { @@ -11290,7 +11290,7 @@ static void ac__t0_inter_t1_using_enva__mul_primlod() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); @@ -11311,7 +11311,7 @@ static void ac__t1_mul_enva_add_t0__sub_prim_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); } A_T1_MUL_ENVA_ADD_T0(); @@ -11323,7 +11323,7 @@ static void ac__t0_inter_t1_using_t0a__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_INTER_T1_USING_T0A(); } @@ -11334,7 +11334,7 @@ static void ac__t0_inter_t1_using_t1a__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_INTER_T1_USING_T1A(); } @@ -11344,7 +11344,7 @@ static void ac__t0_inter_t1_using_t1a__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_T1A(); } @@ -11364,7 +11364,7 @@ static void ac__t0_inter_t1_using_shadea__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_FACTOR(0x7F); } CA_PRIM(); @@ -11386,7 +11386,7 @@ static void ac__t0_inter_t1_using_shadea__mul_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_FACTOR(0x7F); } CA_ENV(); @@ -11413,7 +11413,7 @@ static void ac__t0_inter_t1_using_enva__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); } @@ -11423,7 +11423,7 @@ static void ac__t0_inter_t1_using_primlod__mul_prim_add_env() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_ENV(); SETSHADE_A_PRIM(); A_T0_INTER_T1_USING_FACTOR(lod_frac); @@ -11435,7 +11435,7 @@ static void ac__t0_inter_t1_using_primlod__mul_shade_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); CA_PRIM(); A_T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -11456,7 +11456,7 @@ static void ac__t0_inter_t1_using_primlod__mul_env_add__t0_inter_t1_using_primlo ACMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_A_ENV(); CA(0xFF); } @@ -11468,7 +11468,7 @@ static void ac__t1_sub_one_mul_enva_add_t0__mul_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) { @@ -11522,7 +11522,7 @@ static void ac__t1_sub_one_mul_enva_add_t0__mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_TEXTURE); + GFX_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) { @@ -11551,7 +11551,7 @@ static void ac_zero_sub_prim_mul_t0_add_prim() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_ITERATED); + GFX_COMBINE_OTHER_ITERATED); SETSHADE_A(0); CA_PRIM(); A_USE_T0(); @@ -11562,7 +11562,7 @@ static void ac_one_sub_t0_mul_primshade() ACMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_NONE); + GFX_COMBINE_OTHER_NONE); MULSHADE_A_PRIM(); A_USE_T0(); } @@ -15930,15 +15930,15 @@ void ColorCombinerToExtension() }; switch (cmb.c_oth) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: ext_other = GFX_CMBX_ITRGB; ext_other_a = GFX_CMBX_ITALPHA; break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: ext_other = GFX_CMBX_TEXTURE_RGB; ext_other_a = GFX_CMBX_TEXTURE_ALPHA; break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: ext_other = GFX_CMBX_CONSTANT_COLOR; ext_other_a = GFX_CMBX_CONSTANT_ALPHA; break; @@ -16114,13 +16114,13 @@ void AlphaCombinerToExtension() }; switch (cmb.a_oth) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: ext_other = GFX_CMBX_ITALPHA; break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: ext_other = GFX_CMBX_TEXTURE_ALPHA; break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: ext_other = GFX_CMBX_CONSTANT_ALPHA; break; default: diff --git a/Source/Project64-video/Combine.h b/Source/Project64-video/Combine.h index 38fa94514..e3602210b 100644 --- a/Source/Project64-video/Combine.h +++ b/Source/Project64-video/Combine.h @@ -48,10 +48,11 @@ typedef struct gfxCombineFunction_t c_fnc; gfxCombineFactor_t c_fac; gfxCombineLocal_t c_loc; - uint32_t c_oth; // gfxColorCombine flags + gfxCombineOther_t c_oth; // grColorCombine flags gfxCombineFunction_t a_fnc; gfxCombineFactor_t a_fac; gfxCombineLocal_t a_loc; + gfxCombineOther_t a_oth; // gfxAlphaCombine flags gfxCombineFunction_t tmu0_func; gfxCombineFactor_t tmu0_fac; gfxCombineFunction_t tmu1_func; @@ -60,7 +61,6 @@ typedef struct gfxCombineFactor_t tmu0_a_fac; gfxCombineFunction_t tmu1_a_func; gfxCombineFactor_t tmu1_a_fac; - uint32_t a_oth; // gfxAlphaCombine flags uint32_t tex, tmu0_invert, tmu1_invert; uint32_t tmu0_a_invert, tmu1_a_invert; int dc0_lodbias, dc1_lodbias; diff --git a/Source/Project64-video/FBtoScreen.cpp b/Source/Project64-video/FBtoScreen.cpp index 519daa833..a6d4cee6f 100644 --- a/Source/Project64-video/FBtoScreen.cpp +++ b/Source/Project64-video/FBtoScreen.cpp @@ -55,13 +55,13 @@ static gfxChipID_t SetupFBtoScreenCombiner(uint32_t texture_size, uint32_t opaqu gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, - // GR_COMBINE_OTHER_CONSTANT, + GFX_COMBINE_OTHER_TEXTURE, + // GFX_COMBINE_OTHER_CONSTANT, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, + GFX_COMBINE_OTHER_TEXTURE, FXFALSE); if (opaque) { @@ -400,7 +400,7 @@ static void DrawDepthBufferToScreen256(FB_TO_SCREEN_INFO & fb_info) gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_CONSTANT, + GFX_COMBINE_OTHER_CONSTANT, FXFALSE); uint16_t * src = (uint16_t*)image; src += fb_info.ul_x + fb_info.ul_y * fb_info.width; @@ -470,12 +470,12 @@ static void DrawHiresDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info) gfxColorCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE, + GFX_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, + GFX_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_SRC_ALPHA, GR_BLEND_ONE_MINUS_SRC_ALPHA, @@ -582,7 +582,7 @@ void DrawDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info) gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_CONSTANT, + GFX_COMBINE_OTHER_CONSTANT, FXFALSE); gfxTexDownloadMipMap(tmu, voodoo.tex_min_addr[tmu] + voodoo.tmem_ptr[tmu], GR_MIPMAPLEVELMASK_BOTH, &t_info); gfxTexSource(tmu, voodoo.tex_min_addr[tmu] + voodoo.tmem_ptr[tmu], GR_MIPMAPLEVELMASK_BOTH, &t_info); diff --git a/Source/Project64-video/Renderer/OGLEScombiner.cpp b/Source/Project64-video/Renderer/OGLEScombiner.cpp index 0b8c18d75..fa2014b47 100644 --- a/Source/Project64-video/Renderer/OGLEScombiner.cpp +++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp @@ -364,13 +364,13 @@ void compile_chroma_shader() switch (chroma_other_alpha) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: strcat(fragment_shader_chroma, "float alpha = vFrontColor.a; \n"); break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: strcat(fragment_shader_chroma, "float alpha = ctexture1.a; \n"); break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: strcat(fragment_shader_chroma, "float alpha = constant_color.a; \n"); break; default: @@ -379,13 +379,13 @@ void compile_chroma_shader() switch (chroma_other_color) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: strcat(fragment_shader_chroma, "vec4 color = vec4(vec3(vFrontColor),alpha); \n"); break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: strcat(fragment_shader_chroma, "vec4 color = vec4(vec3(ctexture1),alpha); \n"); break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: strcat(fragment_shader_chroma, "vec4 color = vec4(vec3(constant_color),alpha); \n"); break; default: @@ -707,13 +707,13 @@ void writeGLSLColorOther(int other) { switch (other) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: strcat(fragment_shader_color_combiner, "vec4 color_other = vFrontColor; \n"); break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: strcat(fragment_shader_color_combiner, "vec4 color_other = ctexture1; \n"); break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: strcat(fragment_shader_color_combiner, "vec4 color_other = constant_color; \n"); break; default: @@ -784,7 +784,7 @@ void writeGLSLColorFactor(int factor, int local, int need_local, int other, int } } -void gfxColorCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, GrCombineOther_t other, bool invert) +void gfxColorCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, gfxCombineOther_t other, bool invert) { WriteTrace(TraceGlitch, TraceDebug, "function: %d factor: %d local: %d other: %d invert: %d", function, factor, local, other, invert); static int last_function = 0; @@ -879,13 +879,13 @@ int setOtherAlphaSource(int other) { switch(other) { -case GR_COMBINE_OTHER_ITERATED: +case GFX_COMBINE_OTHER_ITERATED: return GL_PRIMARY_COLOR_ARB; break; -case GR_COMBINE_OTHER_TEXTURE: +case GFX_COMBINE_OTHER_TEXTURE: return GL_PREVIOUS_ARB; break; -case GR_COMBINE_OTHER_CONSTANT: +case GFX_COMBINE_OTHER_CONSTANT: return GL_CONSTANT_ARB; break; default: @@ -915,13 +915,13 @@ void writeGLSLAlphaOther(int other) { switch (other) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: strcat(fragment_shader_alpha_combiner, "float alpha_other = vFrontColor.a; \n"); break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: strcat(fragment_shader_alpha_combiner, "float alpha_other = ctexture1.a; \n"); break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: strcat(fragment_shader_alpha_combiner, "float alpha_other = constant_color.a; \n"); break; default: @@ -989,7 +989,7 @@ void writeGLSLAlphaFactor(int factor, int local, int need_local, int other, int } } -void gfxAlphaCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, GrCombineOther_t other, bool invert) +void gfxAlphaCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, gfxCombineOther_t other, bool invert) { WriteTrace(TraceGlitch, TraceDebug, "function: %d factor: %d local: %d other: %d invert: %d", function, factor, local, other, invert); static int last_function = 0; diff --git a/Source/Project64-video/Renderer/OGLcombiner.cpp b/Source/Project64-video/Renderer/OGLcombiner.cpp index d46739c68..92788002e 100644 --- a/Source/Project64-video/Renderer/OGLcombiner.cpp +++ b/Source/Project64-video/Renderer/OGLcombiner.cpp @@ -319,13 +319,13 @@ void compile_chroma_shader() switch (chroma_other_alpha) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: strcat(fragment_shader_chroma, "float alpha = gl_Color.a; \n"); break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: strcat(fragment_shader_chroma, "float alpha = ctexture1.a; \n"); break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: strcat(fragment_shader_chroma, "float alpha = constant_color.a; \n"); break; default: @@ -334,13 +334,13 @@ void compile_chroma_shader() switch (chroma_other_color) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: strcat(fragment_shader_chroma, "vec4 color = vec4(vec3(gl_Color),alpha); \n"); break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: strcat(fragment_shader_chroma, "vec4 color = vec4(vec3(ctexture1),alpha); \n"); break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: strcat(fragment_shader_chroma, "vec4 color = vec4(vec3(constant_color),alpha); \n"); break; default: @@ -610,13 +610,13 @@ int setOtherColorSource(int other) { switch (other) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: return GL_PRIMARY_COLOR_ARB; break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: return GL_PREVIOUS_ARB; break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: return GL_CONSTANT_ARB; break; default: @@ -645,13 +645,13 @@ void writeGLSLColorOther(int other) { switch (other) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: strcat(fragment_shader_color_combiner, "vec4 color_other = gl_Color; \n"); break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: strcat(fragment_shader_color_combiner, "vec4 color_other = ctexture1; \n"); break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: strcat(fragment_shader_color_combiner, "vec4 color_other = constant_color; \n"); break; default: @@ -722,7 +722,7 @@ void writeGLSLColorFactor(int factor, int local, int need_local, int other, int } } -void gfxColorCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, GrCombineOther_t other, bool invert) +void gfxColorCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, gfxCombineOther_t other, bool invert) { WriteTrace(TraceGlitch, TraceDebug, "function: %d factor: %d local: %d other: %d invert: %d", function, factor, local, other, invert); @@ -817,13 +817,13 @@ int setOtherAlphaSource(int other) { switch (other) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: return GL_PRIMARY_COLOR_ARB; break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: return GL_PREVIOUS_ARB; break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: return GL_CONSTANT_ARB; break; default: @@ -852,13 +852,13 @@ void writeGLSLAlphaOther(int other) { switch (other) { - case GR_COMBINE_OTHER_ITERATED: + case GFX_COMBINE_OTHER_ITERATED: strcat(fragment_shader_alpha_combiner, "float alpha_other = gl_Color.a; \n"); break; - case GR_COMBINE_OTHER_TEXTURE: + case GFX_COMBINE_OTHER_TEXTURE: strcat(fragment_shader_alpha_combiner, "float alpha_other = ctexture1.a; \n"); break; - case GR_COMBINE_OTHER_CONSTANT: + case GFX_COMBINE_OTHER_CONSTANT: strcat(fragment_shader_alpha_combiner, "float alpha_other = constant_color.a; \n"); break; default: @@ -926,7 +926,7 @@ void writeGLSLAlphaFactor(int factor, int local, int need_local, int other, int } } -void gfxAlphaCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, GrCombineOther_t other, bool invert) +void gfxAlphaCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, gfxCombineOther_t other, bool invert) { WriteTrace(TraceGlitch, TraceDebug, "function: %d factor: %d local: %d other: %d invert: %d", function, factor, local, other, invert); static int last_function = 0; diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h index 15f79d148..040599386 100644 --- a/Source/Project64-video/Renderer/Renderer.h +++ b/Source/Project64-video/Renderer/Renderer.h @@ -23,8 +23,8 @@ void gfxTextureBufferExt(gfxChipID_t tmu, uint32_t startAddress, gfxLOD_t lodmin uint32_t gfxTexMaxAddress(gfxChipID_t tmu); uint32_t gfxTexTextureMemRequired(uint32_t evenOdd, gfxTexInfo *info); void gfxConstantColorValue(gfxColor_t value); -void gfxColorCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, GrCombineOther_t other, bool invert); -void gfxAlphaCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, GrCombineOther_t other, bool invert); +void gfxColorCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, gfxCombineOther_t other, bool invert); +void gfxAlphaCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, gfxCombineOther_t other, bool invert); void gfxTexCombine(gfxChipID_t tmu, gfxCombineFunction_t rgb_function, gfxCombineFactor_t rgb_factor, gfxCombineFunction_t alpha_function, gfxCombineFactor_t alpha_factor, bool rgb_invert, bool alpha_invert); void gfxAlphaBlendFunction(GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendFnc_t rgb_df, GrAlphaBlendFnc_t alpha_sf, GrAlphaBlendFnc_t alpha_df); void gfxAlphaTestReferenceValue(gfxAlpha_t value); diff --git a/Source/Project64-video/Renderer/types.h b/Source/Project64-video/Renderer/types.h index 6b9b238e4..446253457 100644 --- a/Source/Project64-video/Renderer/types.h +++ b/Source/Project64-video/Renderer/types.h @@ -154,6 +154,14 @@ enum gfxCombineLocal_t GFX_COMBINE_LOCAL_DEPTH = 0x2, }; +enum gfxCombineOther_t +{ + GFX_COMBINE_OTHER_ITERATED = 0x0, + GFX_COMBINE_OTHER_TEXTURE = 0x1, + GFX_COMBINE_OTHER_CONSTANT = 0x2, + GFX_COMBINE_OTHER_NONE = GFX_COMBINE_OTHER_CONSTANT, +}; + enum GFX_CMBX { GFX_CMBX_ZERO = 0x00, diff --git a/Source/Project64-video/TexBuffer.cpp b/Source/Project64-video/TexBuffer.cpp index 98975c8cc..c7f90b8d1 100644 --- a/Source/Project64-video/TexBuffer.cpp +++ b/Source/Project64-video/TexBuffer.cpp @@ -326,13 +326,13 @@ static gfxTextureFormat_t TexBufSetupCombiner(int force_rgb = FALSE) gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, - // GR_COMBINE_OTHER_CONSTANT, + GFX_COMBINE_OTHER_TEXTURE, + // GFX_COMBINE_OTHER_CONSTANT, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, + GFX_COMBINE_OTHER_TEXTURE, FXFALSE); // gfxConstantColorValue (0xFFFFFFFF); gfxAlphaBlendFunction(GR_BLEND_ONE, // use alpha compare, but not T0 alpha diff --git a/Source/Project64-video/Util.cpp b/Source/Project64-video/Util.cpp index 08553c0f3..4e3e15124 100644 --- a/Source/Project64-video/Util.cpp +++ b/Source/Project64-video/Util.cpp @@ -1955,12 +1955,12 @@ void set_message_combiner() gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, + GFX_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, + GFX_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_ONE, GR_BLEND_ZERO, diff --git a/Source/Project64-video/rdp.cpp b/Source/Project64-video/rdp.cpp index 98f6963d2..908ccc6a2 100644 --- a/Source/Project64-video/rdp.cpp +++ b/Source/Project64-video/rdp.cpp @@ -2505,13 +2505,13 @@ void rdp_fillrect() gfxColorCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE, + GFX_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE, + GFX_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_ONE, GR_BLEND_ZERO, GR_BLEND_ONE, GR_BLEND_ZERO); @@ -2543,7 +2543,7 @@ void rdp_fillrect() gfxAlphaCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE, + GFX_COMBINE_OTHER_NONE, FXFALSE); gfxConstantColorValue((cmb.ccolor & 0xFFFFFF00) | (rdp.fog_color & 0xFF)); rdp.update |= UPDATE_COMBINE; @@ -3121,12 +3121,12 @@ void SetWireframeCol() gfxColorCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_NONE, + GFX_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_ITERATED, - GR_COMBINE_OTHER_NONE, + GFX_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_ONE, GR_BLEND_ZERO, @@ -3149,12 +3149,12 @@ void SetWireframeCol() gfxColorCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE, + GFX_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, GFX_COMBINE_LOCAL_CONSTANT, - GR_COMBINE_OTHER_NONE, + GFX_COMBINE_OTHER_NONE, FXFALSE); gfxConstantColorValue(0xFF0000FF); gfxAlphaBlendFunction(GR_BLEND_ONE, diff --git a/Source/Project64-video/ucode06.cpp b/Source/Project64-video/ucode06.cpp index 53545fe90..9b3b93f27 100644 --- a/Source/Project64-video/ucode06.cpp +++ b/Source/Project64-video/ucode06.cpp @@ -75,12 +75,12 @@ float set_sprite_combine_mode() gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, + GFX_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, + GFX_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_ONE, GR_BLEND_ZERO, @@ -161,12 +161,12 @@ void DrawHiresDepthImage(const DRAWIMAGE & d) gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, + GFX_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, GFX_COMBINE_LOCAL_NONE, - GR_COMBINE_OTHER_TEXTURE, + GFX_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_ONE, GR_BLEND_ZERO,