diff --git a/Source/Project64-video/Combine.cpp b/Source/Project64-video/Combine.cpp index 4d00df5bd..b6720ae86 100644 --- a/Source/Project64-video/Combine.cpp +++ b/Source/Project64-video/Combine.cpp @@ -766,7 +766,7 @@ static void cc_one() { CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); // CC (0xFFFFFF00); CC(0xFFFFFF00); @@ -776,7 +776,7 @@ static void cc_zero() { CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CC(0x00000000); } @@ -790,7 +790,7 @@ static void cc_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); float fog = (rdp.fog_color & 0xFF) / 255.0f; uint32_t R = (uint32_t)(((rdp.blend_color >> 24) & 0xFF)*fog); @@ -802,7 +802,7 @@ static void cc_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_CONSTANT); CC(rdp.fog_color); A_USE_T0(); @@ -811,7 +811,7 @@ static void cc_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); } } @@ -819,7 +819,7 @@ static void cc_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); } USE_T0(); @@ -829,7 +829,7 @@ static void cc_t0a() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_CONSTANT); USE_T0(); A_USE_T0(); @@ -840,7 +840,7 @@ static void cc_t1() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); USE_T1(); } @@ -849,7 +849,7 @@ static void cc_t0_mul_t1() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T0_MUL_T1(); } @@ -858,7 +858,7 @@ static void cc_t0_mul_t1_add_t0() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T0_MUL_T1_ADD_T0(); } @@ -868,7 +868,7 @@ static void cc_t1_inter__env_inter_t0_using_k5__using_t1a () { CCMB (GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, -GR_COMBINE_LOCAL_NONE, +GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); uint32_t col1 = (rdp.K5<<24) | (rdp.K5<<16) | (rdp.K5<<8); MOD_0 (TMOD_COL_INTER_TEX_USING_COL1); @@ -887,7 +887,7 @@ static void cc_t1_inter_t0_using_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); if (!cmb.combine_ext) { @@ -922,7 +922,7 @@ static void cc_prim() { CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CC_PRIM(); } @@ -931,7 +931,7 @@ static void cc_env() { CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CC_ENV(); } @@ -940,7 +940,7 @@ static void cc_scale() { CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CC(rdp.SCALE); } @@ -949,7 +949,7 @@ static void cc_shade() { CCMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_NONE); } @@ -959,7 +959,7 @@ static void cc_one_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC(0x20202000); USE_T0(); @@ -974,7 +974,7 @@ static void cc_shadea() { CCMB(GFX_COMBINE_FUNCTION_LOCAL_ALPHA, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_NONE); } @@ -982,7 +982,7 @@ static void cc_t0_mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T0(); @@ -992,7 +992,7 @@ static void cc_t0_mul_prima() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIMA(); USE_T0(); @@ -1002,7 +1002,7 @@ static void cc_t1_mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); if ((rdp.cycle1 & 0xFFFF) == (rdp.cycle2 & 0xFFFF)) // 1 cycle, use t0 @@ -1019,7 +1019,7 @@ static void cc_t0a_mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); A_USE_T0(); @@ -1030,7 +1030,7 @@ static void cc__t1_inter_t0_using_enva__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -1041,7 +1041,7 @@ static void cc__t0_inter_one_using_t1__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); rdp.best_tex = 0; @@ -1055,7 +1055,7 @@ static void cc__t0_inter_one_using_primlod__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); if (cmb.combine_ext) @@ -1081,7 +1081,7 @@ static void cc__t1_inter_one_using_env__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); if (cmb.combine_ext) @@ -1107,7 +1107,7 @@ static void cc__t1_inter_one_using_enva__mul_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -1140,7 +1140,7 @@ static void cc_prim_mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_PRIM(); @@ -1150,7 +1150,7 @@ static void cc_prim_mul_prima() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_PRIMA(); @@ -1160,7 +1160,7 @@ static void cc_t1_mul_prima() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIMA(); USE_T1(); @@ -1170,7 +1170,7 @@ static void cc_t1_mul_enva() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENVA(); USE_T1(); @@ -1180,7 +1180,7 @@ static void cc_t0_mul_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T0(); @@ -1190,7 +1190,7 @@ static void cc_t1_mul_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T1(); @@ -1201,7 +1201,7 @@ static void cc_t0_mul_enva() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENVA(); USE_T0(); @@ -1211,7 +1211,7 @@ static void cc_t0_mul_scale() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC(rdp.SCALE); USE_T0(); @@ -1221,7 +1221,7 @@ static void cc_t0_mul_enva_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); SETSHADE_PRIM(); CC_ENVA(); @@ -1232,7 +1232,7 @@ static void cc_t0_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -1241,7 +1241,7 @@ static void cc_f1_sky() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); MULSHADE_SHADEA(); MULSHADE_ENVSUBPRIM(); @@ -1253,7 +1253,7 @@ static void cc_t0_mul_shadea() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_SHADE_A(); USE_T0(); @@ -1263,7 +1263,7 @@ static void cc_t0_mul_k5() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_K5(); USE_T0(); @@ -1273,7 +1273,7 @@ static void cc_t1_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T1(); } @@ -1283,7 +1283,7 @@ static void cc__t0_add_t1__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_ADD_T1(); } @@ -1307,7 +1307,7 @@ static void cc__t0_mul_shade__add__t1_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -1339,7 +1339,7 @@ static void cc__t0_mul_prim__inter_env_using_enva() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); INTERSHADE_2(rdp.env_color & 0xFFFFFF00, rdp.env_color & 0xFF); @@ -1354,7 +1354,7 @@ static void cc__t1_inter_t0_using_t1__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -1379,7 +1379,7 @@ static void cc__t1_inter_t0_using_enva__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T1_INTER_T0_USING_FACTOR(factor); @@ -1405,7 +1405,7 @@ static void cc__t0_inter_one_using_prim__mul_shade() // (1-t0)*prim+t0, (cmb-0)*shade+0 CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -1429,7 +1429,7 @@ static void cc__t0_inter_one_using_primlod__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -1456,7 +1456,7 @@ static void cc__t0_inter_env_using_enva__mul_shade() // (env-t0)*env_a+t0, (cmb-0)*shade+0 CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -1519,7 +1519,7 @@ static void cc__t0_mul_prim_add_env__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_TEX_SCALE_COL_ADD_COL); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -1553,7 +1553,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -1563,7 +1563,7 @@ static void cc__t1_sub_prim_mul_t0__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -1588,7 +1588,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -1626,7 +1626,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -1636,7 +1636,7 @@ static void cc__t0_sub_prim_mul_t1_add_t1__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (rdp.prim_color & 0xFFFFFF00) { @@ -1665,7 +1665,7 @@ static void cc__t1_sub_env_mul_t0_add_t0__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -1692,7 +1692,7 @@ static void cc__t0_mul_prima_add_prim_mul__shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -1733,7 +1733,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBENVA(); SETSHADE_ENV(); @@ -1773,7 +1773,7 @@ static void cc__prim_inter_t0_using_t0a__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -1813,7 +1813,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBENVA(); SETSHADE_ENV(); @@ -1830,7 +1830,7 @@ static void cc__prim_inter_t0_using_shadea__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); PRIM_INTER_T0_USING_SHADEA(); } @@ -1872,7 +1872,7 @@ static void cc__prim_inter_env_using_enva__mul_shade() uint32_t col = (r << 24) | (g << 16) | (b << 8) | 0xFF; CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC(col); } @@ -1882,7 +1882,7 @@ static void cc_prim_mul_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -1892,7 +1892,7 @@ static void cc_prim_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); } @@ -1901,7 +1901,7 @@ static void cc_prim_mul_shadea() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); SETSHADE_SHADE_A(); CC_PRIM(); @@ -1911,7 +1911,7 @@ static void cc_env_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); } @@ -1920,7 +1920,7 @@ static void cc_env_mul_enva() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_OTHER_ALPHA, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); CA_ENV(); @@ -1930,7 +1930,7 @@ static void cc_scale_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC(rdp.SCALE); } @@ -1941,7 +1941,7 @@ static void cc_t0_add_prim() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T0(); @@ -1951,7 +1951,7 @@ static void cc__t0_mul_t1__add_prim() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_MUL_T1(); @@ -1961,7 +1961,7 @@ static void cc_t0_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T0(); @@ -1972,7 +1972,7 @@ static void cc__t0_mul_t1__add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); T0_MUL_T1(); @@ -2005,7 +2005,7 @@ static void cc_t0_add_shade() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -2014,7 +2014,7 @@ static void cc__t0_mul_t1__add_shade() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_MUL_T1(); } @@ -2023,7 +2023,7 @@ static void cc_prim_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -2078,7 +2078,7 @@ static void cc_prim_add_shade() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); } @@ -2087,7 +2087,7 @@ static void cc_env_add_shade() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); } @@ -2096,7 +2096,7 @@ static void cc_shade_add_shade() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_ITERATED); } @@ -2105,7 +2105,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -2116,7 +2116,7 @@ static void cc_t0_sub__shade_mul_center() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE(rdp.CENTER); USE_T0(); @@ -2148,7 +2148,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); @@ -2207,7 +2207,7 @@ static void cc_t0_add_env_mul_k5() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); float scale = rdp.K5 / 255.0f; uint8_t r = (uint8_t)(rdp.env_color >> 24) & 0xFF; @@ -2224,7 +2224,7 @@ static void cc_t0_add_shade_mul_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_ENV(); USE_T0(); @@ -2234,7 +2234,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); rdp.best_tex = 0; @@ -2266,7 +2266,7 @@ static void cc__t0_sub_env_mul_enva__add_prim_mul_shade() else { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); MOD_0(TMOD_TEX_SUB_COL_MUL_FAC); @@ -2282,7 +2282,7 @@ static void cc_t0_mul_prim_add_t1() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -2310,7 +2310,7 @@ static void cc_shirt() // (t1-0)*prim+0, (1-t0)*t1+cmb CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -2345,7 +2345,7 @@ static void cc_t1_mul_prim_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_PRIM(); @@ -2357,7 +2357,7 @@ static void cc_t0_mul_prim_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); @@ -2369,7 +2369,7 @@ static void cc_t1_mul_prim_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); @@ -2398,7 +2398,7 @@ static void cc__t0_add_primlod__mul_prim_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIMLOD(); MOD_0(TMOD_TEX_ADD_COL); @@ -2414,7 +2414,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); USE_T0(); @@ -2425,7 +2425,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); @@ -2436,7 +2436,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -2469,7 +2469,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -2480,7 +2480,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); @@ -2492,7 +2492,7 @@ static void cc__t0_mul_t1__mul_prim_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIM(); @@ -2524,7 +2524,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); T0_MUL_T1(); @@ -2535,7 +2535,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); if (rdp.prim_color & 0xFFFFFF00) @@ -2565,7 +2565,7 @@ static void cc__t0_mul_t1__mul_shade_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); T0_MUL_T1(); @@ -2591,7 +2591,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); MULSHADE_SHADEA(); CC_PRIM(); @@ -2603,7 +2603,7 @@ static void cc__t0_mul_t1__mul_shade_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); T0_MUL_T1(); @@ -2614,7 +2614,7 @@ static void cc__t0_add_t1__mul_shade_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); T0_ADD_T1(); @@ -2624,7 +2624,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); T1_MUL_PRIMA_ADD_T0(); @@ -2634,7 +2634,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -2645,7 +2645,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -2657,7 +2657,7 @@ static void cc_t0_mul_primlod_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); SETSHADE_PRIM(); CC_PRIMLOD(); @@ -2668,7 +2668,7 @@ static void cc__t0_mul_primlod__add__prim_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); CC_PRIMLOD(); @@ -2680,7 +2680,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); ADDSHADE_ENV(); @@ -2693,7 +2693,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); ADDSHADE_ENV(); @@ -2705,7 +2705,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -2715,7 +2715,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); T1_INTER_T0_USING_FACTOR(lod_frac); @@ -2747,7 +2747,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -2758,7 +2758,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIM(); CC_ENV(); @@ -2770,7 +2770,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); T0_INTER_T1_USING_T1(); @@ -2781,7 +2781,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_TEX_MUL_COL); @@ -2799,7 +2799,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); T0_INTER_T1_USING_T1(); @@ -2810,7 +2810,7 @@ static void cc_t0_mul_prim_add_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); USE_T0(); @@ -2820,7 +2820,7 @@ static void cc_t1_mul_prim_add_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); USE_T1(); @@ -2831,7 +2831,7 @@ static void cc_t0_mul_env_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_ENV(); CC_PRIM(); @@ -2843,7 +2843,7 @@ static void cc_t1_mul_env_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_ENV(); CC_PRIM(); @@ -2854,7 +2854,7 @@ static void cc_t0_mul_scale_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE(rdp.SCALE); CC_PRIM(); @@ -2866,7 +2866,7 @@ static void cc__t0_mul_t1__mul_env_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_ENV(); CC_PRIM(); @@ -2879,7 +2879,7 @@ static void cc__t0_add__t1_mul_scale__mul_env_sub_center_add_prim() // (t1-0)*scale+t0, (env-center)*cmb+prim CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_C1SUBC2(rdp.env_color, rdp.CENTER); SETSHADE_PRIM(); @@ -2893,7 +2893,7 @@ static void cc__t1_sub_t0__mul_env_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_ENV(); CC_PRIM(); @@ -2905,7 +2905,7 @@ static void cc_t0_mul_env_add_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); USE_T0(); @@ -2915,7 +2915,7 @@ static void cc_t0_mul_shade_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); USE_T0(); @@ -2925,7 +2925,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); if (cmb.combine_ext) @@ -2952,7 +2952,7 @@ static void cc_t0_mul_shade_add_prima() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIMA(); USE_T0(); @@ -2962,7 +2962,7 @@ static void cc_t1_mul_shade_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); USE_T1(); @@ -2972,7 +2972,7 @@ static void cc_t0_mul_shade_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); USE_T0(); @@ -2992,7 +2992,7 @@ static void cc__t0_add_prim__mul_shade_add_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); // MOD_0 (TMOD_TEX_ADD_COL); // MOD_0_COL (rdp.prim_color & 0xFFFFFF00); @@ -3023,7 +3023,7 @@ static void cc__t0_add_prim__mul_shade_add_t1() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); T0_ADD_T1(); @@ -3055,7 +3055,7 @@ static void cc__t0_add_primlod__mul_shade_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); uint32_t color = (lod_frac << 24) | (lod_frac << 16) | (lod_frac << 8); MOD_0(TMOD_TEX_ADD_COL); @@ -3069,7 +3069,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); if (cmb.combine_ext) @@ -3095,7 +3095,7 @@ static void cc_t0_mul_shadea_add_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -3104,7 +3104,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); CA_PRIM(); @@ -3115,7 +3115,7 @@ static void cc_prim_mul_prima_add_t0() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_PRIMA(); @@ -3126,7 +3126,7 @@ static void cc_prim_mul_env_add_t0() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_ENV(); @@ -3137,7 +3137,7 @@ static void cc_prim_mul_shade_add_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); USE_T0(); @@ -3147,7 +3147,7 @@ static void cc_prim_mul_shade_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIM(); @@ -3157,7 +3157,7 @@ static void cc_env_mul_shade_add_env() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_ENV(); @@ -3168,7 +3168,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); MULSHADE_1MPRIM(); @@ -3179,7 +3179,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SUBSHADE_ENV() @@ -3191,7 +3191,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); MULSHADE_PRIM(); @@ -3203,7 +3203,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); CC_PRIM(); @@ -3214,7 +3214,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); CC_ENV(); @@ -3225,7 +3225,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); MULSHADE_PRIM(); CC_ENVA(); @@ -3236,7 +3236,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIMMULENV(); USE_T0(); @@ -3246,7 +3246,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); MULSHADE_1MPRIM(); CC_PRIMMULENV(); @@ -3258,7 +3258,7 @@ static void cc_t0_mul_prim_mul_prim() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_PRIM(); @@ -3269,7 +3269,7 @@ static void cc_t0_mul_prim_mul_prima() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_PRIMA(); @@ -3280,7 +3280,7 @@ static void cc_t0_mul_enva_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_ENVA(); USE_T0(); @@ -3290,7 +3290,7 @@ static void cc_t0_mul_primlod_mul_prim() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_COLMULBYTE(rdp.prim_color, rdp.prim_lodfrac); USE_T0(); @@ -3300,7 +3300,7 @@ static void cc_t0_mul_primlod_mul_shade() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIMLOD(); USE_T0(); @@ -3310,7 +3310,7 @@ static void cc__t0_mul_t1__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_MUL_T1(); @@ -3320,7 +3320,7 @@ static void cc__t1_mul_t1_add_t0__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); if (cmb.combine_ext) @@ -3345,7 +3345,7 @@ static void cc__t0_mul_t1__mul_prima() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIMA(); T0_MUL_T1(); @@ -3355,7 +3355,7 @@ static void cc__t0_mul_t1__mul_env() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); T0_MUL_T1(); @@ -3365,7 +3365,7 @@ static void cc__t0_mul_t1__mul_enva() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENVA(); T0_MUL_T1(); @@ -3375,7 +3375,7 @@ static void cc__t0_mul_t1__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_MUL_T1(); } @@ -3384,7 +3384,7 @@ static void cc__t0a_mul_t1__mul_prim() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0A_MUL_T1(); @@ -3394,7 +3394,7 @@ static void cc__t0_mul_t1a__mul_shade() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_MUL_T1A(); } @@ -3403,7 +3403,7 @@ static void cc__t0a_mul_t1__mul_shade() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0A_MUL_T1(); } @@ -3412,7 +3412,7 @@ static void cc_t0_mul_prim_mul_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_ENV(); // notice that setshade multiplies @@ -3423,7 +3423,7 @@ static void cc_t0_mul_prim_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); USE_T0(); @@ -3433,7 +3433,7 @@ static void cc_t0_mul_prim_mul_shadea() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); MULSHADE_SHADEA(); @@ -3444,7 +3444,7 @@ static void cc_t0_mul_prima_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIMA(); USE_T0(); @@ -3454,7 +3454,7 @@ static void cc_t1_mul__one_sub_prim_mul_shade_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_1MPRIM(); ADDSHADE_PRIM(); @@ -3465,7 +3465,7 @@ static void cc_t0_mul_one_sub_env_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_1MENV(); USE_T0(); @@ -3475,7 +3475,7 @@ static void cc_t1_mul_prim_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); USE_T1(); @@ -3486,7 +3486,7 @@ static void cc_t0_mul_1mprim_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_1MPRIM(); USE_T0(); @@ -3496,7 +3496,7 @@ static void cc_t0_mul_env_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_ENV(); USE_T0(); @@ -3506,7 +3506,7 @@ static void cc_t0_mul_scale_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE(rdp.SCALE); USE_T0(); @@ -3516,7 +3516,7 @@ static void cc_t0_mul_shade_mul_shadea() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_SHADEA(); USE_T0(); @@ -3526,7 +3526,7 @@ static void cc_prim_mul_env_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIM(); @@ -3536,7 +3536,7 @@ static void cc_prim_mul_one_sub_env_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_1SUBENV(); MULSHADE_PRIM(); @@ -3547,7 +3547,7 @@ static void cc_t0_mul_prim_mul_shade_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIM(); @@ -3559,7 +3559,7 @@ static void cc_t0_mul_prim_mul_shadea_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); SETSHADE_ENV(); @@ -3588,7 +3588,7 @@ static void cc__t0_mul_prim_add_shade__mul_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_ENV(); MOD_0(TMOD_TEX_MUL_COL); @@ -3602,7 +3602,7 @@ static void cc__t0a_mul_prim_add_t0__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_MUL_TEXA_ADD_TEX); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -3613,7 +3613,7 @@ static void cc__t0a_mul_env_add_t0__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_MUL_TEXA_ADD_TEX); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -3663,7 +3663,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIMMULENV(); MULSHADE_PRIM(); @@ -3673,7 +3673,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIMMULENV(); MULSHADE_PRIM(); @@ -3684,7 +3684,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIMMULENV(); MULSHADE_PRIM(); @@ -3696,7 +3696,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIMMULENV(); MULSHADE_1MPRIM(); @@ -3708,7 +3708,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIMMULENV(); SETSHADE_1MPRIM(); @@ -3721,7 +3721,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_1MENV(); @@ -3732,7 +3732,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); MULSHADE_PRIMA(); USE_T0(); @@ -3749,7 +3749,7 @@ static void cc_t0_mul_1menv_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_1MENV(); @@ -3777,7 +3777,7 @@ static void cc_t0_mul_scale_add_prim__mul_shade() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_TEX_ADD_COL); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -3799,7 +3799,7 @@ static void cc__t0_mul_t1_add_prim__mul_shade() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); } @@ -3810,7 +3810,7 @@ static void cc_t0_mul__prim_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); ADDSHADE_ENV(); @@ -3824,7 +3824,7 @@ static void cc_t0_mul__prim_mul_primlod_add_env() //Aded by Gonetz //actually, the game uses t0 instead of t1 here. t1 does not set at all this moment. CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); float prim_lod = rdp.prim_lodfrac / 65025.0f; rdp.col[0] *= ((rdp.prim_color & 0xFF000000) >> 24) * prim_lod; @@ -3863,7 +3863,7 @@ static void cc_t0_sub_prim_mul_shadea() //Aded by Gonetz // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); USE_T0(); @@ -3905,7 +3905,7 @@ static void cc_t0_sub_prim_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (rdp.prim_color & 0xFFFFFF00) { @@ -3930,7 +3930,7 @@ static void cc__t0_mul_t1__sub_prim_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); } T0_MUL_T1(); @@ -3950,7 +3950,7 @@ static void cc_t0_sub_env_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (rdp.env_color & 0xFFFFFF00) { @@ -3999,7 +3999,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); } @@ -4020,7 +4020,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); } @@ -4033,7 +4033,7 @@ static void cc_t0_sub_shade_mul_shadea() //Aded by Gonetz // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -4042,7 +4042,7 @@ static void cc_one_sub_t0_mul_prim() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CC_PRIM(); USE_T0(); @@ -4052,7 +4052,7 @@ static void cc_one_sub_prim_mul_prima() //Added by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC(~rdp.prim_color); SETSHADE_PRIMA(); @@ -4062,7 +4062,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); USE_T0(); @@ -4072,7 +4072,7 @@ static void cc_shade_sub_prim_mul_env() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SUBSHADE_PRIM(); @@ -4082,7 +4082,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); USE_T0(); @@ -4092,7 +4092,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -4102,7 +4102,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -4112,7 +4112,7 @@ static void cc_shade_sub_env_mul_prim() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); SUBSHADE_ENV(); @@ -4122,7 +4122,7 @@ static void cc_shade_sub__prim_mul_prima() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_C1MULC2(rdp.prim_color, (rdp.prim_color & 0xFF)); } @@ -4131,7 +4131,7 @@ static void cc_one_sub__t0_mul_t1__mul_shade() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC(0); T0_MUL_T1(); @@ -4156,7 +4156,7 @@ static void cc_one_sub__t0_mul_shadea__mul_shade() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); cmb.tmu0_invert = TRUE; @@ -4167,7 +4167,7 @@ static void cc_one_sub_env_mul_t0() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T0(); @@ -4177,7 +4177,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -4187,7 +4187,7 @@ static void cc_one_sub_env_mul_prim() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -4197,7 +4197,7 @@ static void cc_one_sub_env_mul_shade() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); } @@ -4207,7 +4207,7 @@ static void cc_t0_mul_env_add_1mt0_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); USE_T0(); @@ -4218,7 +4218,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T1_SUB_PRIM_MUL_PRIMLOD_ADD_T0(); } @@ -4228,7 +4228,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_NONE); MULSHADE_PRIM(); USE_T0(); @@ -4239,7 +4239,7 @@ static void cc_prim_sub_env_mul_t0_mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_ITERATED); MULSHADE_PRIMSUBENV(); USE_T0(); @@ -4269,7 +4269,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_ADD_T1(); @@ -4280,7 +4280,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T0(); @@ -4309,7 +4309,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_TEX_SUB_COL); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -4333,7 +4333,7 @@ static void cc_t0_sub_prim_mul_primlod_add_prim() //Aded by Gonetz // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); SETSHADE_PRIM(); SETSHADE_1MPRIMLOD(); @@ -4347,7 +4347,7 @@ static void cc_t0_sub_prim_mul_prima_add_prim() //Aded by Gonetz // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); SETSHADE_PRIM(); SETSHADE_1MPRIMA(); @@ -4360,7 +4360,7 @@ static void cc_t0_sub_prim_mul_shadea_add_prim() //Aded by Gonetz // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); USE_T0(); @@ -4406,7 +4406,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); } CC_ENV(); @@ -4418,7 +4418,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -4441,7 +4441,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_TEX_SUB_COL_MUL_FAC); @@ -4455,7 +4455,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); MOD_0(TMOD_TEX_SUB_COL_MUL_FAC); @@ -4470,7 +4470,7 @@ static void cc_t0_sub__prim_mul_env() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CC_PRIM(); } @@ -4478,7 +4478,7 @@ static void cc_t0_sub__prim_mul_env() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_ENV(); @@ -4491,7 +4491,7 @@ static void cc__t0_mul_t1__sub_prim_mul__t0t1a__add_prim() //Aded by Gonetz // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_MUL_T1(); @@ -4503,7 +4503,7 @@ static void cc__t1_inter_t0_using_enva__sub_prim_mul_prima_add_prim() //Aded by // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); CA_PRIM(); @@ -4531,7 +4531,7 @@ static void cc_t0_sub_prim_mul_shade_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MOD_0(TMOD_TEX_SUB_COL); @@ -4564,7 +4564,7 @@ static void cc_t1_sub_prim_mul_shade_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MOD_1(TMOD_TEX_SUB_COL); @@ -4599,7 +4599,7 @@ static void cc_t1_sub_k4_mul_prima_add_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T0_ADD_T1(); } @@ -4625,7 +4625,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MOD_0(TMOD_TEX_SUB_COL); @@ -4654,7 +4654,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); MULSHADE_SHADEA(); CC_ENV(); @@ -4670,7 +4670,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); } @@ -4678,7 +4678,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -4692,7 +4692,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_TEX_SUB_COL_MUL_FAC); @@ -4739,7 +4739,7 @@ static void cc__t0_inter_t1_using_t0__sub_shade_mul_prima_add_shade() //Aded by // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_A_PRIM(); T1_INTER_T0_USING_T0(); //strange, but this one looks better @@ -4751,7 +4751,7 @@ static void cc_t0_sub__prim_mul_shade__mul_enva_add__prim_mul_shade() //Aded by // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); SETSHADE_A_ENV(); @@ -4762,7 +4762,7 @@ static void cc_t0_sub_env_mul_t0_add_env() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T0(); @@ -4791,7 +4791,7 @@ static void cc_t0_sub_env_mul_prima_add_env() //Aded by Gonetz } CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); } @@ -4799,7 +4799,7 @@ static void cc_t0_sub_env_mul_k5_add_env() //Aded by Gonetz { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); cmb.ccolor = (rdp.env_color & 0xFFFFFF00) | rdp.K5; USE_T0(); @@ -4809,7 +4809,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); MOD_0(TMOD_TEX_SUB_COL); @@ -4821,7 +4821,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); if (cmb.combine_ext) @@ -4951,7 +4951,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); } CC_ENV(); @@ -4962,7 +4962,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_TEX_SUB_COL_MUL_FAC); @@ -4975,7 +4975,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T0(); @@ -4986,7 +4986,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T1(); @@ -4997,7 +4997,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T1(); @@ -5008,7 +5008,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIMLOD(); USE_T0(); @@ -5019,7 +5019,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); USE_T0(); @@ -5030,7 +5030,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -5042,7 +5042,7 @@ static void cc_one_sub_t0_mul_shade_add_t0() { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC(0xFFFFFFFF); USE_T0(); @@ -5052,7 +5052,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T0(); @@ -5071,7 +5071,7 @@ static void cc_one_sub_prim_mul_t0a_add_prim() else { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_COL1_USING_TEXA); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -5084,7 +5084,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -5094,7 +5094,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIM(); USE_T0(); @@ -5104,7 +5104,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -5113,7 +5113,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); USE_T1(); @@ -5123,7 +5123,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_ENV(); @@ -5143,7 +5143,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (rdp.prim_color & 0xFFFFFF00) { @@ -5187,7 +5187,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); } T0_MUL_T1(); @@ -5207,7 +5207,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); } T0_MUL_T1(); @@ -5217,7 +5217,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); } @@ -5226,7 +5226,7 @@ static void cc_t0_inter_env_using_prima() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); USE_T0(); @@ -5240,7 +5240,7 @@ static void cc_t0_inter_env_using_enva() //(env-t0)*env_a+t0 CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -5264,7 +5264,7 @@ static void cc_t0_inter_noise_using_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); USE_T0(); @@ -5277,7 +5277,7 @@ static void cc_t0_inter_noise_using_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); USE_T0(); @@ -5290,7 +5290,7 @@ static void cc_t0_sub_env_mul_enva_add_env() { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); CA_ENV(); @@ -5302,7 +5302,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); SETSHADE_PRIM(); @@ -5315,7 +5315,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); MULSHADE_PRIM(); @@ -5327,7 +5327,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); SETSHADE_PRIM(); @@ -5339,7 +5339,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -5349,7 +5349,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); T1_SUB_PRIM_MUL_PRIMLOD_ADD_T0(); @@ -5359,7 +5359,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBENV(); SETSHADE_PRIM(); @@ -5371,7 +5371,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); USE_T0(); @@ -5381,7 +5381,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBENV(); USE_T0(); @@ -5391,7 +5391,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -5401,7 +5401,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBENV(); CC_C1MULC2(rdp.prim_color, cmb.ccolor); @@ -5411,7 +5411,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); } @@ -5420,7 +5420,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); SETSHADE_1MENV(); @@ -5431,7 +5431,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -5440,7 +5440,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -5460,7 +5460,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); } @@ -5469,7 +5469,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC(0xFFFFFFFF); } @@ -5479,7 +5479,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); SETSHADE_1MPRIM(); SETSHADE_ENV(); @@ -5492,7 +5492,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); cmb.ccolor = rdp.env_color; T0_INTER_T1_USING_T1A(); @@ -5502,7 +5502,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); A_USE_T0(); @@ -5513,7 +5513,7 @@ static void cc_t0_sub_shade_mul_prima_add_shade() //Aded by Gonetz // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_A_PRIM(); USE_T0(); @@ -5524,7 +5524,7 @@ static void cc_t0_sub_shade_mul_shadea_add_shade() //Aded by Gonetz // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -5551,7 +5551,7 @@ static void cc__t0_mul_t1_add_env__mul_shadea_add_shade() // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); } @@ -5559,7 +5559,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBENV(); SETSHADE_PRIM(); @@ -5595,7 +5595,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); SETSHADE_PRIM(); @@ -5623,7 +5623,7 @@ static void cc_prim_sub_env_mul_t0_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_PRIMSUBENV(); @@ -5634,7 +5634,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -5686,7 +5686,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -5697,7 +5697,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -5729,7 +5729,7 @@ static void cc_prim_sub_env_mul_t0_mul_shade_add_env() cmb.tex |= 1; CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); } @@ -5743,7 +5743,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -5759,7 +5759,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -5783,7 +5783,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -5799,7 +5799,7 @@ static void cc_prim_sub_env_mul__t0_sub_prim_mul_enva_add_t0__add_env() // (t0-prim)*env_a+t0, (prim-env)*cmb+env CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -5815,7 +5815,7 @@ static void cc_prim_sub_env_mul__t1_sub_prim_mul_enva_add_t0__add_env() //(t1-prim)*env_a+t0, (prim-env)*cmb+env CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -5861,7 +5861,7 @@ static void cc_prim_sub_env_mul__t1_sub_prim_mul_prima_add_t0__add_env() // (t1-prim)*prim_a+t0, (prim-env)*cmb+env CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -5892,7 +5892,7 @@ static void cc__prim_sub_env_mul_t0_add_env__mul_primlod() { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); float factor = (float)rdp.prim_lodfrac / 255.0f; uint8_t r = (uint8_t)((rdp.prim_color >> 24) & 0xFF); @@ -5911,7 +5911,7 @@ static void cc__prim_sub_env_mul_t0_add_env__mul_k5() { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); float factor = (float)rdp.K5 / 255.0f; uint8_t r = (uint8_t)((rdp.prim_color >> 24) & 0xFF); @@ -5930,7 +5930,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -5948,7 +5948,7 @@ static void cc_prim_sub_env_mul_t1_add_env_mul_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); MOD_1(TMOD_COL_INTER_COL1_USING_TEX); MOD_1_COL(rdp.env_color & 0xFFFFFF00); @@ -5960,7 +5960,7 @@ static void cc_prim_sub_env_mul_t0a_add_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); CC_PRIMSUBENV(); if (cmb.combine_ext) @@ -5985,7 +5985,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -5997,7 +5997,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6009,7 +6009,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -6021,7 +6021,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -6033,7 +6033,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIMSUBENV(); @@ -6046,7 +6046,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIMSUBENV(); @@ -6058,7 +6058,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); if (cmb.combine_ext) @@ -6079,7 +6079,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -6164,7 +6164,7 @@ static void cc_lavatex_sub_prim_mul_shade_add_lavatex() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T0_ADD_T1(); } @@ -6175,7 +6175,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -6187,7 +6187,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -6199,7 +6199,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -6211,7 +6211,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -6227,7 +6227,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_COL1_USING_TEX); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -6258,7 +6258,7 @@ static void cc_prim_sub_env_mul_shade_add_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_PRIMSUBENV(); USE_T0(); @@ -6282,7 +6282,7 @@ static void cc_prim_sub_env_mul_prima_add_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIMSUBENV(); SETSHADE_PRIMA(); @@ -6297,7 +6297,7 @@ static void cc_prim_sub_env_mul_prima_add_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); } @@ -6309,7 +6309,7 @@ static void cc_prim_sub_env_mul_shade_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); MULSHADE_PRIMSUBENV(); @@ -6320,7 +6320,7 @@ static void cc_prim_sub_env_mul_shadea_add_env() // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_OTHER_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6331,7 +6331,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6344,7 +6344,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6356,7 +6356,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6368,7 +6368,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_C1SUBC2(rdp.prim_color, rdp.CENTER); SETSHADE_ENV(); @@ -6380,7 +6380,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6392,7 +6392,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6420,7 +6420,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6432,7 +6432,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIMSUBENV(); CC_COLMULBYTE(cmb.ccolor, rdp.prim_lodfrac); @@ -6443,7 +6443,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6454,7 +6454,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6465,7 +6465,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6476,7 +6476,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_PRIM(); @@ -6523,7 +6523,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIMSUBENV(); SETSHADE_PRIM(); @@ -6547,7 +6547,7 @@ static void cc_prim_sub_env_mul_prim_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIMSUBENV(); SETSHADE_PRIM(); @@ -6577,7 +6577,7 @@ static void cc_prim_sub_env_mul_primlod_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIMSUBENV(); SETSHADE_PRIMLOD(); @@ -6590,7 +6590,7 @@ static void cc_prim_sub_env_mul_enva_add_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIMSUBENV(); SETSHADE_ENVA(); @@ -6619,7 +6619,7 @@ static void cc_prim_sub_env_mul_enva_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIMSUBENV(); SETSHADE_ENVA(); @@ -6632,7 +6632,7 @@ static void cc_prim_sub_shade_mul_t0_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); COLSUBSHADE_PRIM(); @@ -6644,7 +6644,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); T1_SUB_PRIM_MUL_PRIMLOD_ADD_T0(); @@ -6654,7 +6654,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); USE_T1(); @@ -6665,7 +6665,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); USE_T0(); @@ -6676,7 +6676,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); USE_T1(); @@ -6687,7 +6687,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); T0A_MUL_T1(); @@ -6698,7 +6698,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -6719,7 +6719,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); } CC_PRIM(); @@ -6731,7 +6731,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); CA_PRIM(); @@ -6742,7 +6742,7 @@ static void cc_prim_sub_shade_mul_env_add_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIMMULENV(); MULSHADE_1MENV(); @@ -6753,7 +6753,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); } @@ -6762,7 +6762,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6773,7 +6773,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6784,7 +6784,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6795,7 +6795,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6806,7 +6806,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6817,7 +6817,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6828,7 +6828,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6839,7 +6839,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6850,7 +6850,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6861,7 +6861,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6872,7 +6872,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); T0_MUL_T1(); @@ -6882,7 +6882,7 @@ static void cc_env_sub_prim_mul__t0a_mul_t1a__add_prim() { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_ENV(); @@ -6894,7 +6894,7 @@ static void cc_env_sub_prim_mul_prima_add_prim() //Aded by Gonetz // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); CA_PRIM(); @@ -6906,7 +6906,7 @@ static void cc_env_sub_prim_mul_enva_add_prim() //Aded by Gonetz // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_OTHER_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); CA_ENV(); @@ -6939,7 +6939,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); MULSHADE_ENVSUBPRIM(); @@ -6949,7 +6949,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); SETSHADE_ENVSUBPRIM(); @@ -6960,7 +6960,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6972,7 +6972,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_PRIM(); @@ -6983,7 +6983,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); MULSHADE_PRIM(); @@ -6996,7 +6996,7 @@ static void cc_env_sub_primshade_mul_t1_add_primshade() // return; CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); MULSHADE_PRIM(); @@ -7007,7 +7007,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); USE_T0(); @@ -7033,7 +7033,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); MULSHADE_PRIM(); @@ -7045,7 +7045,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); USE_T1(); @@ -7065,7 +7065,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); } CC_ENV(); @@ -7077,7 +7077,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); cmb.ccolor = rdp.env_color; } @@ -7087,7 +7087,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_SHADEA(); USE_T0(); @@ -7123,7 +7123,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -7133,7 +7133,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); USE_T0(); @@ -7144,7 +7144,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); USE_T1(); @@ -7179,7 +7179,7 @@ static void cc_shade_sub_env_mul_t0_add_prim() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); SUBSHADE_ENV(); @@ -7191,7 +7191,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIM(); SUBSHADE_ENV(); @@ -7203,7 +7203,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -7214,7 +7214,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); T0_MUL_T1(); @@ -7225,7 +7225,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); SETSHADE_ENV(); @@ -7237,7 +7237,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); USE_T0(); @@ -7248,7 +7248,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_PRIMMULENV(); SUBSHADE_ENV(); @@ -7261,7 +7261,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENV(); USE_T1(); @@ -7272,7 +7272,7 @@ static void cc_shade_sub_env_mul_prim_add_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SUBSHADE_ENV(); MULSHADE_PRIM(); @@ -7327,7 +7327,7 @@ static void cc_shade_sub_env_mul_prim_add_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SUBSHADE_ENV(); MULSHADE_PRIM(); @@ -7339,7 +7339,7 @@ static void cc_shade_sub_env_mul_prima_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SUBSHADE_ENV(); MULSHADE_PRIMA(); @@ -7350,7 +7350,7 @@ static void cc_shade_sub_env_mul_k5_add_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SUBSHADE_ENV(); uint32_t temp = rdp.prim_color; @@ -7365,7 +7365,7 @@ static void cc_t0_inter_t1_using_t1a() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_T1A(); } @@ -7374,7 +7374,7 @@ static void cc_t0_inter_t1_using_prima() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -7384,7 +7384,7 @@ static void cc_t1_inter_t0_using_prima() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T1_INTER_T0_USING_FACTOR(factor); @@ -7394,7 +7394,7 @@ static void cc_t1_inter_t0_using_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_PRIM(); } @@ -7403,7 +7403,7 @@ static void cc_t0_inter_t1_using_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_ENV(); } @@ -7412,7 +7412,7 @@ static void cc_t0_inter_t1_using_enva() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -7490,7 +7490,7 @@ static void cc_t0_inter_t1_using_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(0x7F); } @@ -7519,7 +7519,7 @@ static void cc_t1_inter_t0_using_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(0x7F); } @@ -7539,7 +7539,7 @@ static void cc_t1_inter_t0_using_shadea() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); } T1_INTER_T0_USING_SHADEA(); @@ -7550,7 +7550,7 @@ static void cc_t0_inter_t1_using_primlod() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -7560,7 +7560,7 @@ static void cc_t1_inter_t0_using_primlod() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_FACTOR(lod_frac); } @@ -7570,7 +7570,7 @@ static void cc_t1_inter_t0_using_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_T0(); } @@ -7580,7 +7580,7 @@ static void cc_t0_inter_t1_using_k5() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(rdp.K5); } @@ -7589,7 +7589,7 @@ static void cc_t0_inter_env_using_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); USE_T0(); @@ -7603,7 +7603,7 @@ static void cc_t0_inter_prim_using_primlod() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); USE_T0(); @@ -7628,7 +7628,7 @@ static void cc_t0_inter_shade_using_t0a() //(shade-t0)*t0a+t0 = t0*(1-t0a)+shade*t0a CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); rdp.best_tex = 1; cmb.tex = 1; @@ -7641,7 +7641,7 @@ static void cc_t0_inter_shade_using_primlod() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIMLOD(); cmb.ccolor = (~cmb.ccolor) & 0xFFFFFF00; @@ -7656,7 +7656,7 @@ static void cc__env_inter_t0_using_primlod__mul_prim() //((t0-env)*primlod+env)*prim = t0*prim*primlod+env*prim*(1-primlod); CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_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); @@ -7694,7 +7694,7 @@ static void cc_env_inter_prim_using_primlod() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_PRIMSUBENV(); SETSHADE_PRIMLOD(); @@ -7704,7 +7704,7 @@ static void cc_env_inter_prim_using_primlod() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); SETSHADE_ENV(); SETSHADE_PRIMLOD(); @@ -7734,7 +7734,7 @@ static void cc_prim_inter__t0_mul_t1_add_env__using_shadea() // * not guaranteed to work if another iterated alpha is set CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_PRIM(); } @@ -7783,7 +7783,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); SETSHADE_1MENV(); @@ -7813,7 +7813,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (rdp.env_color & 0xFFFFFF00) { @@ -7850,7 +7850,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (rdp.prim_color & 0xFFFFFF00) { @@ -7867,7 +7867,7 @@ static void cc__t0_inter_t1_using_prima__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -7879,7 +7879,7 @@ static void cc__t1_inter_t0_using_prima__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T1_INTER_T0_USING_FACTOR(factor); @@ -7891,7 +7891,7 @@ static void cc__t0_inter_t1_using_prim__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_PRIM(); } @@ -7901,7 +7901,7 @@ static void cc__t0_inter_t1_using_prima__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -7912,7 +7912,7 @@ static void cc__t1_inter_t0_using_prima__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); T1_INTER_T0_USING_FACTOR(factor); @@ -7922,7 +7922,7 @@ static void cc__t0_inter_t1_using_env__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_ENV(); } @@ -7931,7 +7931,7 @@ static void cc__t0_inter_t1_using_enva__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); T0_INTER_T1_USING_FACTOR(factor); @@ -7941,7 +7941,7 @@ static void cc__t0_inter_t1_using_enva__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -7953,7 +7953,7 @@ static void cc__t0_inter_t1_using_enva__mul_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -7965,7 +7965,7 @@ static void cc__t0_inter_t1_using_primlod__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -7976,7 +7976,7 @@ static void cc__t0_inter_t1_using_primlod__mul_prima() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIMA(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -7987,7 +7987,7 @@ static void cc__t1_mul_primlod_add_t0__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); T1_MUL_PRIMLOD_ADD_T0(); @@ -7998,7 +7998,7 @@ static void cc__t0_inter_t1_using_primlod__mul_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); T0_INTER_T1_USING_FACTOR(lod_frac); @@ -8009,7 +8009,7 @@ static void cc__t1_mul_primlod_add_t0__mul_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); T1_MUL_PRIMLOD_ADD_T0(); @@ -8020,7 +8020,7 @@ static void cc__t1_inter_t0_using_prim__mul_env() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); T1_INTER_T0_USING_PRIM(); @@ -8045,7 +8045,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -8070,7 +8070,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); USE_T0(); } @@ -8080,7 +8080,7 @@ static void cc__t1_inter_t0_using_prim__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_PRIM(); } @@ -8097,7 +8097,7 @@ static void cc__t0_inter_t1_using_primlod__mul_shade() lod_frac = rdp.prim_lodfrac; CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -8106,7 +8106,7 @@ static void cc__t1_inter_t0_using_primlod__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_FACTOR(lod_frac); } @@ -8115,7 +8115,7 @@ static void cc__t0_inter_t1_using_half__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(0x7F); } @@ -8124,7 +8124,7 @@ static void cc__t0_inter_t1_using_t0__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_T0(); } @@ -8133,7 +8133,7 @@ static void cc__t0_inter_t1_using_t1a__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_T1A(); } @@ -8151,7 +8151,7 @@ static void cc__t0_inter_t1_using_shadea__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); } T0_INTER_T1_USING_SHADEA(); @@ -8161,7 +8161,7 @@ static void cc__t0_inter_t1_using_k5__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T0_INTER_T1_USING_FACTOR(rdp.K5); } @@ -8170,7 +8170,7 @@ static void cc__t1_inter_t0_using_k5__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); T1_INTER_T0_USING_FACTOR(rdp.K5); } @@ -8187,14 +8187,14 @@ static void cc_t0_inter_prim_using_prima() cmb.tex |= 1; CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); } else { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBPRIMA(); SETSHADE_PRIM(); @@ -8207,7 +8207,7 @@ static void cc__t0_inter_prim_using_t0a__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_TEX_INTER_COL_USING_TEXA); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -8219,7 +8219,7 @@ static void cc__env_inter_prim_using_t0__mul_prim() // (prim-env)*t0+env, (cmb-0)*prim+0 CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_COL_INTER_COL1_USING_TEX); @@ -8240,7 +8240,7 @@ static void cc__env_inter_prim_using_t0__mul_shade() CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL2_INTER__COL_INTER_COL1_USING_TEX__USING_TEXA); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -8256,7 +8256,7 @@ static void cc__env_inter_prim_using_t0__mul_shade() USE_T0(); CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); } @@ -8281,7 +8281,7 @@ static void cc__env_inter_one_using_t0__mul_shade() } CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); } @@ -8306,7 +8306,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_ENV(); } @@ -8326,7 +8326,7 @@ static void cc__env_inter_prim_using_prima__mul_shade() cmb.ccolor = (r << 24) | (g << 16) | (b << 8); CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); } @@ -8356,7 +8356,7 @@ static void cc__prim_inter_t0_using_env__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_TEX_USING_COL1); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -8399,7 +8399,7 @@ static void cc__one_inter_prim_using_t1__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (g_settings->hacks(CSettings::hack_BAR) && rdp.cur_tile == 1) { @@ -8444,7 +8444,7 @@ static void cc_prim_sub__prim_sub_t0_mul_prima__mul_shade() } CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_TEX_USING_COL1); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -8459,7 +8459,7 @@ static void cc__prim_inter_env_using_t0__mul_shade() // (env-prim)*t0+prim, (cmb-0)*shade+0 CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_COL1_USING_TEX); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -8487,7 +8487,7 @@ static void cc__prim_inter_one_using_env__mul_shade() } CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_1SUBPRIM(); CC_C1MULC2(cmb.ccolor, rdp.env_color); @@ -8500,7 +8500,7 @@ static void cc__env_inter_prim_using_t0a__mul_t0() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_COL1_USING_TEXA__MUL_TEX); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -8512,7 +8512,7 @@ static void cc__env_inter_prim_using_t0a__mul_prim() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CC_PRIM(); MOD_0(TMOD_COL_INTER_COL1_USING_TEXA); @@ -8536,7 +8536,7 @@ static void cc__env_inter_prim_using__t0_sub_shade_mul_primlod_add_env() cmb.tex |= 1; CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_PRIM(); SETSHADE_ENV(); @@ -8545,7 +8545,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE);//CONSTANT); MOD_0(TMOD_COL_INTER_COL1_USING_TEX); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -8561,7 +8561,7 @@ static void cc__prim_inter_t0_using_t0__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_TEX_USING_TEX); MOD_0_COL(rdp.prim_color & 0xFFFFFF00); @@ -8572,7 +8572,7 @@ static void cc__env_inter_t0_using_t0a__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_TEX_USING_TEXA); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -8583,7 +8583,7 @@ static void cc__env_inter_t0_using_prima__mul_shade() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MOD_0(TMOD_COL_INTER_TEX_USING_COL1); MOD_0_COL(rdp.env_color & 0xFFFFFF00); @@ -8596,7 +8596,7 @@ static void cc_shade_mul_prima() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_ITERATED); MULSHADE_PRIMA(); } @@ -8605,7 +8605,7 @@ static void cc_shade_mul_shadea() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_ITERATED); MULSHADE_SHADEA(); } @@ -8637,7 +8637,7 @@ static void cc__t0_mul_shade__inter_env_using_enva() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); INTERSHADE_2(rdp.env_color & 0xFFFFFF00, rdp.env_color & 0xFF); USE_T0(); @@ -8651,7 +8651,7 @@ static void cc__t0_mul_shade__inter_one_using_enva() { CCMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_RGB, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CC_ENVA(); MULSHADE_1MENVA(); @@ -8682,7 +8682,7 @@ static void cc__prim_mul_shade__inter_env_using_enva() { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); MULSHADE_PRIM(); @@ -8693,7 +8693,7 @@ static void cc__prim_mul_shade__inter_env_using__prim_mul_shade_alpha() { CCMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_LOCAL_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CC_ENV(); MULSHADE_PRIM(); @@ -8706,7 +8706,7 @@ static void ac_one() { ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); cmb.ccolor |= 0xFF; } @@ -8720,7 +8720,7 @@ static void ac_t0() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA(rdp.fog_color); } @@ -8728,7 +8728,7 @@ static void ac_t0() { ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CA(~rdp.fog_color); } @@ -8736,7 +8736,7 @@ static void ac_t0() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); } } @@ -8744,7 +8744,7 @@ static void ac_t0() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); } A_USE_T0(); @@ -8759,7 +8759,7 @@ static void ac_zero() } ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); cmb.ccolor &= 0xFFFFFF00; } @@ -8768,7 +8768,7 @@ static void ac_t1() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); if (g_settings->hacks(CSettings::hack_BAR) && rdp.tiles(rdp.cur_tile).format == 3) A_USE_T0(); @@ -8780,7 +8780,7 @@ static void ac_prim() { ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CA_PRIM(); } @@ -8789,7 +8789,7 @@ static void ac_primlod() { ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CA_PRIMLOD(); } @@ -8798,7 +8798,7 @@ static void ac_one_sub_t0() { ACMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CA(0xFF); A_USE_T0(); @@ -8808,7 +8808,7 @@ static void ac_one_sub_prim() { ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CA_INVPRIM(); } @@ -8817,7 +8817,7 @@ static void ac_env() { ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CA_ENV(); } @@ -8826,7 +8826,7 @@ static void ac_shade() { ACMB(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_NONE); } @@ -8835,7 +8835,7 @@ static void ac_t0_add_t1() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_T0_ADD_T1(); } @@ -8846,7 +8846,7 @@ static void ac__t0_mul_prim__add__t1_mul_primlod() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_USE_T0(); @@ -8855,7 +8855,7 @@ static void ac__t0_mul_prim__add__t1_mul_primlod() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); A_USE_T1(); @@ -8864,7 +8864,7 @@ static void ac__t0_mul_prim__add__t1_mul_primlod() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_T1_MUL_PRIMLOD_ADD_T0(); } @@ -8872,7 +8872,7 @@ static void ac__t0_mul_prim__add__t1_mul_primlod() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_ADD_T1(); @@ -8883,7 +8883,7 @@ static void ac_t0_add_prim() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_USE_T0(); @@ -8893,7 +8893,7 @@ static void ac_t0_add_env() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); A_USE_T0(); @@ -8903,7 +8903,7 @@ static void ac_t1_add_env() //Added by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); A_USE_T1(); @@ -8913,7 +8913,7 @@ static void ac__t0_add_t1__add_prim() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_ADD_T1(); @@ -8923,7 +8923,7 @@ static void ac_prim_add_shade() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIM(); } @@ -8932,7 +8932,7 @@ static void ac_env_add_shade() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_ENV(); } @@ -8942,7 +8942,7 @@ static void ac_t0_mul_t0() //Added by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_USE_T0(); } @@ -8951,7 +8951,7 @@ static void ac_t0_mul_t1() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_T0_MUL_T1(); } @@ -8960,7 +8960,7 @@ static void ac_t0_mul_t1_add_t1() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -8984,7 +8984,7 @@ static void ac_t0_mul_t1_add_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_MUL_T1(); @@ -8994,7 +8994,7 @@ static void ac_t0_mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_USE_T0(); @@ -9004,7 +9004,7 @@ static void ac_t0_mul_prim_mul_primlod() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM_MUL_PRIMLOD(); A_USE_T0(); @@ -9014,7 +9014,7 @@ static void ac_t1_mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (rdp.cycle_mode == 0) @@ -9049,7 +9049,7 @@ static void ac__t1_sub_one_mul_primlod_add_t0__mul_prim() } ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); cmb.dc0_detailmax = cmb.dc1_detailmax = percent; @@ -9060,7 +9060,7 @@ static void ac__t0_sub_t1_mul_enva_add_t0__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) @@ -9086,7 +9086,7 @@ static void ac__t0_sub_one_mul_enva_add_t0__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) @@ -9109,7 +9109,7 @@ static void ac__t0_sub_t1_mul_primlod_add_t0__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) @@ -9136,7 +9136,7 @@ static void ac__t1_sub_prim_mul_primlod_add_t0__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) @@ -9164,7 +9164,7 @@ static void ac__t1_sub_t0_mul_enva_add_t1__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) @@ -9191,7 +9191,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) @@ -9242,7 +9242,7 @@ static void ac__t0_sub_one_mul_enva_add_t1__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_A_PRIM(); SETSHADE_A_ENV(); @@ -9254,7 +9254,7 @@ static void ac__t1_mul_prima_add_t0__mul_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T1_MUL_PRIMA_ADD_T0(); @@ -9264,7 +9264,7 @@ static void ac__t1_mul_enva_add_t0__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T1_MUL_ENVA_ADD_T0(); @@ -9274,7 +9274,7 @@ static void ac_t0_mul_primlod() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); A_USE_T0(); @@ -9284,7 +9284,7 @@ static void ac_t1_mul_primlod() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); A_USE_T1(); @@ -9295,7 +9295,7 @@ static void ac__t0_add_t1__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_ADD_T1(); @@ -9306,7 +9306,7 @@ static void ac__t0_add_t1__mul_primlod() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); A_T0_ADD_T1(); @@ -9317,7 +9317,7 @@ static void ac__t0_mul_t1__mul_primlod() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); A_T0_MUL_T1(); @@ -9327,7 +9327,7 @@ static void ac_t0_mul_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); A_USE_T0(); @@ -9337,7 +9337,7 @@ static void ac_t0_mul_env_mul_primlod() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV_MUL_PRIMLOD(); A_USE_T0(); @@ -9347,7 +9347,7 @@ static void ac_t1_mul_env() //Added by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); // if ((g_settings->hacks&hack_Powerpuff) && (rdp.last_tile == 0)) @@ -9382,7 +9382,7 @@ static void ac__t1_sub_one_mul_primlod_add_t0__mul_env() } ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); cmb.dc0_detailmax = cmb.dc1_detailmax = percent; @@ -9393,7 +9393,7 @@ static void ac_t0_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_USE_T0(); } @@ -9402,7 +9402,7 @@ static void ac_t1_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_USE_T1(); } @@ -9412,7 +9412,7 @@ static void ac__t0_add_t1__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_T0_ADD_T1(); } @@ -9421,7 +9421,7 @@ static void ac__t0_mul_primlod_add_t0__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -9443,7 +9443,7 @@ static void ac__t1_mul_prima_add_t0__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_T1_MUL_PRIMA_ADD_T0(); } @@ -9453,7 +9453,7 @@ static void ac__t0_sub_t1__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -9477,7 +9477,7 @@ static void ac__t1_mul_t1_add_t1__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -9501,7 +9501,7 @@ static void ac__t1_mul_enva_add_t0__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_T1_MUL_ENVA_ADD_T0(); } @@ -9531,7 +9531,7 @@ static void ac__t1_sub_one_mul_primlod_add_t0__mul_shade() } ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); cmb.dc0_detailmax = cmb.dc1_detailmax = percent; cmb.tex |= 3; @@ -9541,7 +9541,7 @@ static void ac__t1_sub_shade_mul_primlod_add_t0__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) @@ -9569,7 +9569,7 @@ static void ac_prim_mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_PRIM(); SETSHADE_A_PRIM(); @@ -9580,7 +9580,7 @@ static void ac_prim_mul_primlod() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_PRIMLOD(); SETSHADE_A_PRIM(); @@ -9590,7 +9590,7 @@ static void ac_prim_mul_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_ENV(); SETSHADE_A_PRIM(); @@ -9616,7 +9616,7 @@ static void ac__prim_sub_one_mul_primlod_add_t0__mul_env() } ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); } @@ -9625,7 +9625,7 @@ static void ac_prim_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_PRIM(); } @@ -9634,7 +9634,7 @@ static void ac_env_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_ENV(); } @@ -9643,7 +9643,7 @@ static void ac_primlod_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_PRIMLOD(); } @@ -9653,7 +9653,7 @@ static void ac_prim_sub_t0() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_USE_T0(); @@ -9681,7 +9681,7 @@ static void ac_t1_mul_prim_add_t0() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_T1_MUL_PRIMA_ADD_T0(); } @@ -9700,7 +9700,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); } @@ -9721,7 +9721,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); } @@ -9733,7 +9733,7 @@ static void ac_t0_mul_prim_add_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_A_PRIM(); CA_ENV(); @@ -9745,7 +9745,7 @@ static void ac__t0_add_t1__mul_prim_add_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_A_PRIM(); CA_ENV(); @@ -9757,7 +9757,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_A_PRIM(); CA_ENV(); @@ -9770,7 +9770,7 @@ static void ac_t0_mul_primlod_add_t0() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -9793,7 +9793,7 @@ static void ac_t1_mul_primlod_add_t0() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_T1_MUL_PRIMLOD_ADD_T0(); } @@ -9803,7 +9803,7 @@ static void ac_t0_mul_primlod_add_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIMLOD(); SETSHADE_A_PRIM(); @@ -9814,7 +9814,7 @@ static void ac_t0_mul_primlod_add_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIMLOD(); SETSHADE_A_ENV(); @@ -9826,7 +9826,7 @@ static void ac__t0_add_t1__mul_primlod_add_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIMLOD(); SETSHADE_A_PRIM(); @@ -9838,7 +9838,7 @@ static void ac_t0_mul_env_add_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_A_ENV(); CA_PRIM(); @@ -9850,7 +9850,7 @@ static void ac_t1_mul_prim_add_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_A_PRIM(); CA_PRIM(); @@ -9862,7 +9862,7 @@ static void ac_prim_mul_shade_add_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIM(); } @@ -9872,7 +9872,7 @@ static void ac_t0_mul_shade_add_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_PRIM(); A_USE_T0(); @@ -9882,7 +9882,7 @@ static void ac_t0_mul_shade_add_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_ENV(); A_USE_T0(); @@ -9892,7 +9892,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_INVPRIM(); MULSHADE_A_PRIM(); @@ -9904,7 +9904,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); MULSHADE_A_1MPRIM(); CA_PRIM(); @@ -9932,7 +9932,7 @@ static void ac__t0_mul_primlod_add_shade__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_USE_T0(); } @@ -9962,7 +9962,7 @@ static void ac__t1_mul_primlod_add_shade__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_USE_T1(); } @@ -9993,7 +9993,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIM(); A_T1_SUB_T0(); @@ -10024,7 +10024,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIM(); A_T1_SUB_T0(); @@ -10036,7 +10036,7 @@ static void ac__t0_mul_t1__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (voodoo.sup_large_tex || rdp.tiles(1).lr_s < 256) //hack for RR64 pause screen @@ -10053,7 +10053,7 @@ static void ac__t0_mul_t1__mul_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T0_MUL_T1(); @@ -10063,7 +10063,7 @@ static void ac__t0_mul_t1__mul_env_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_ENV(); A_T0_MUL_T1(); @@ -10073,7 +10073,7 @@ static void ac__t0_mul_t1__mul_prim_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_T0_MUL_T1(); @@ -10083,7 +10083,7 @@ static void ac__t0_mul_t1__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_T0_MUL_T1(); } @@ -10108,7 +10108,7 @@ static void ac__t0_add_prim_mul_shade__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_USE_T0(); @@ -10120,7 +10120,7 @@ static void ac_t0_mul_prim_mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_A_PRIM(); SETSHADE_A_PRIM(); @@ -10131,7 +10131,7 @@ static void ac_t0_mul_prim_mul_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIMENV(); A_USE_T0(); @@ -10141,7 +10141,7 @@ static void ac_t0_mul_prim_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_USE_T0(); @@ -10151,7 +10151,7 @@ static void ac_t1_mul_prim_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_USE_T1(); @@ -10167,7 +10167,7 @@ static void ac_t0_mul_env_mul_shade() ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_ENV(); A_USE_T0(); @@ -10177,7 +10177,7 @@ static void ac_t1_mul_env_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_ENV(); A_USE_T1(); @@ -10187,7 +10187,7 @@ static void ac_t0_mul_primlod_mul_prim() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); cmb.ccolor |= (uint32_t)(lod_frac * (rdp.prim_color & 0xFF) / 255); A_USE_T0(); @@ -10198,7 +10198,7 @@ static void ac_prim_add_env_mul_t0() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); SETSHADE_A_PRIM(); ADDSHADE_A_ENV(); @@ -10209,7 +10209,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_ENV(); SETSHADE_A_PRIM(); @@ -10237,7 +10237,7 @@ static void ac_t0_sub_prim_mul_shade() else { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_USE_T0(); @@ -10263,7 +10263,7 @@ static void ac_t0_sub_prim_mul_shade_mul_env() else { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); MULSHADE_A_ENV(); @@ -10289,7 +10289,7 @@ static void ac_t0_sub_shade_mul_prim() else { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); A_USE_T0(); @@ -10310,7 +10310,7 @@ static void ac__t0_mul_t1__sub_prim_mul_shade() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); } A_T0_MUL_T1(); @@ -10340,7 +10340,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_T0_MUL_T1(); } @@ -10360,7 +10360,7 @@ static void ac__t1_mul_primlod_add_t0__sub_prim_mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); } A_T1_MUL_PRIMLOD_ADD_T0(); @@ -10381,7 +10381,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); } @@ -10402,7 +10402,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); } A_T1_MUL_PRIMA_ADD_T0(); @@ -10412,7 +10412,7 @@ static void ac_one_sub_t0_mul_prim() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE); CA_PRIM(); A_USE_T0(); @@ -10424,7 +10424,7 @@ static void ac_one_sub_t0_mul_shade() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_NONE); A_USE_T0(); } @@ -10436,7 +10436,7 @@ static void ac_one_sub_prim_mul_t0() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_USE_T0(); @@ -10446,7 +10446,7 @@ static void ac_one_sub_env_mul_t0() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); A_USE_T0(); @@ -10456,7 +10456,7 @@ static void ac_one_sub_shade_mul_t0() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_USE_T0(); } @@ -10465,7 +10465,7 @@ static void ac_one_sub_shade_mul_env() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE_MINUS_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_ENV(); } @@ -10474,7 +10474,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIM(); A_USE_T0(); @@ -10500,7 +10500,7 @@ static void ac_prim_sub_shade_mul_prim() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIM(); } @@ -10511,7 +10511,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_ENV(); A_USE_T0(); @@ -10522,7 +10522,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_NONE); MULSHADE_A_PRIM(); A_USE_T0(); @@ -10560,7 +10560,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, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); } A_T0_MUL_T1(); @@ -10587,7 +10587,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_ENV(); MOD_0(TMOD_TEX_SUB_COL); @@ -10600,7 +10600,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T0_SUB_T1(); @@ -10622,7 +10622,7 @@ static void ac_t0_sub_one_mul_enva_add_t1() //Aded by Gonetz cmb.tex |= 3; ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); } @@ -10656,7 +10656,7 @@ static void ac_t1_sub_one_mul_enva_add_t0() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_USE_T0(); } @@ -10666,7 +10666,7 @@ static void ac_t1_sub_one_mul_primlod_add_t0() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); if (cmb.combine_ext) { @@ -10720,7 +10720,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_PRIM(); MOD_1(TMOD_TEX_SUB_COL); @@ -10733,7 +10733,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_A_PRIM(); CA_ENV1MPRIM(); @@ -10764,7 +10764,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); rdp.best_tex = 0; @@ -10778,7 +10778,7 @@ static void ac_one_sub_t0_mul_prim_add_t0() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); SETSHADE_A_PRIM(); CA(0xFF); @@ -10789,7 +10789,7 @@ static void ac_one_sub_t0_mul_env_add_t0() //Aded by Gonetz { ACMB(GFX_COMBINE_FUNCTION_BLEND, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); SETSHADE_A_ENV(); CA(0xFF); @@ -10800,7 +10800,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); SETSHADE_A_PRIM(); CA_PRIMLOD(); @@ -10811,7 +10811,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_INVENV(); SETSHADE_A_PRIM(); @@ -10824,7 +10824,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIM(); SETSHADE_A_ENV(); @@ -10835,7 +10835,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIM(); SETSHADE_A_ENV(); @@ -10846,7 +10846,7 @@ static void ac_prim_sub_env_mul_t0_add_one() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA(0xFF); SETSHADE_A_PRIMSUBENV(); @@ -10858,7 +10858,7 @@ static void ac_prim_sub_env_mul_shade_add_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_ENV(); MULSHADE_A_PRIMSUBENV(); @@ -10869,7 +10869,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_ENV(); MULSHADE_A_PRIMSUBENV(); @@ -10881,7 +10881,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_PRIM(); A_USE_T0(); @@ -10892,7 +10892,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_USE_T1(); } @@ -10902,7 +10902,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_ENV(); } @@ -10912,7 +10912,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_ENV(); SETSHADE_A_PRIM(); @@ -10935,14 +10935,14 @@ static void ac_one_sub_t1_add_t0_mul_env() cmb.tex |= 3; ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); } else { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T0_ADD_T1(); @@ -10954,7 +10954,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_PRIM(); MULSHADE_A_ENVSUBPRIM(); @@ -10964,7 +10964,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_ENV(); MULSHADE_A_PRIM(); @@ -10975,7 +10975,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA(0xFF); SETSHADE_A_PRIM(); @@ -10986,7 +10986,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_CONSTANT); CA_INVPRIM(); SETSHADE_A_PRIM(); @@ -11018,7 +11018,7 @@ static void ac_shade_sub_env_mul_t0_add_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SUBSHADE_A_ENV(); CA_PRIM(); @@ -11030,7 +11030,7 @@ static void ac_t0_inter_t1_using_prima() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); @@ -11040,7 +11040,7 @@ static void ac_t1_inter_t0_using_prima() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); A_T1_INTER_T0_USING_FACTOR(factor); @@ -11050,7 +11050,7 @@ static void ac_t0_inter_t1_using_primlod() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -11059,7 +11059,7 @@ static void ac_t0_inter_t1_using_enva() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); @@ -11069,7 +11069,7 @@ static void ac_t1_inter_t0_using_enva() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); A_T1_INTER_T0_USING_FACTOR(factor); @@ -11080,7 +11080,7 @@ static void ac_t0_inter_t1_using_t0a() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_T0A(); } @@ -11090,7 +11090,7 @@ static void ac_t0_inter_t1_using_t1a() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_T1A(); } @@ -11109,7 +11109,7 @@ static void ac_t0_inter_t1_using_shadea() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE); } A_T0_INTER_T1_USING_SHADEA(); @@ -11121,7 +11121,7 @@ static void ac__t0_inter_t1_using_primlod__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_INTER_T1_USING_FACTOR(lod_frac); @@ -11131,7 +11131,7 @@ static void ac__t1_mul_primlod_add_t0__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T1_MUL_PRIMLOD_ADD_T0(); @@ -11141,7 +11141,7 @@ static void ac__t0_inter_t1_using_primlod__mul_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T0_INTER_T1_USING_FACTOR(lod_frac); @@ -11151,7 +11151,7 @@ static void ac__t1_mul_primlod_add_t0__mul_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); A_T1_MUL_PRIMLOD_ADD_T0(); @@ -11167,7 +11167,7 @@ static void ac__t0_inter_t1_using_primlod__mul_shade() } ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_FACTOR(lod_frac); } @@ -11176,7 +11176,7 @@ static void ac__t1_mul_primlod_add_t0__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_T1_MUL_PRIMLOD_ADD_T0(); } @@ -11186,7 +11186,7 @@ static void ac__t0_inter_t1_using_prima__mul_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); @@ -11198,7 +11198,7 @@ static void ac__t1_inter_t0_using_t0a__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T1_INTER_T0_USING_T0A(); @@ -11208,7 +11208,7 @@ static void ac__t1_inter_t0_using_primlod__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_INTER_T1_USING_FACTOR(lod_frac); @@ -11218,7 +11218,7 @@ static void ac__t1_inter_t0_using_prima__mul_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_ENV(); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); @@ -11230,7 +11230,7 @@ static void ac__t0_inter_t1_using_prima__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); @@ -11240,7 +11240,7 @@ static void ac__t1_inter_t0_using_prima__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.prim_color & 0xFF); A_T1_INTER_T0_USING_FACTOR(factor); @@ -11250,7 +11250,7 @@ static void ac__t0_inter_t1_using_enva__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -11261,7 +11261,7 @@ static void ac__env_sub_one_mul_t1_add_t0__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) @@ -11289,7 +11289,7 @@ static void ac__t0_inter_t1_using_enva__mul_primlod() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIMLOD(); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); @@ -11310,7 +11310,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, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); MULSHADE_A_PRIM(); } @@ -11322,7 +11322,7 @@ static void ac__t0_inter_t1_using_t0a__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_INTER_T1_USING_T0A(); @@ -11333,7 +11333,7 @@ static void ac__t0_inter_t1_using_t1a__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); A_T0_INTER_T1_USING_T1A(); @@ -11343,7 +11343,7 @@ static void ac__t0_inter_t1_using_t1a__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_T1A(); } @@ -11363,7 +11363,7 @@ static void ac__t0_inter_t1_using_shadea__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_FACTOR(0x7F); } @@ -11385,7 +11385,7 @@ static void ac__t0_inter_t1_using_shadea__mul_env() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); A_T0_INTER_T1_USING_FACTOR(0x7F); } @@ -11412,7 +11412,7 @@ static void ac__t0_inter_t1_using_enva__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); uint8_t factor = (uint8_t)(rdp.env_color & 0xFF); A_T0_INTER_T1_USING_FACTOR(factor); @@ -11422,7 +11422,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_ENV(); SETSHADE_A_PRIM(); @@ -11434,7 +11434,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); CA_PRIM(); A_T0_INTER_T1_USING_FACTOR(lod_frac); @@ -11455,7 +11455,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_A_ENV(); CA(0xFF); @@ -11467,7 +11467,7 @@ static void ac__t1_sub_one_mul_enva_add_t0__mul_prim() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) @@ -11521,7 +11521,7 @@ static void ac__t1_sub_one_mul_enva_add_t0__mul_shade() { ACMB(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_LOCAL, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_TEXTURE); CA_PRIM(); if (cmb.combine_ext) @@ -11550,7 +11550,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, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_ITERATED); SETSHADE_A(0); CA_PRIM(); @@ -11561,7 +11561,7 @@ static void ac_one_sub_t0_mul_primshade() { ACMB(GFX_COMBINE_FUNCTION_BLEND_LOCAL, GFX_COMBINE_FACTOR_TEXTURE_ALPHA, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_NONE); MULSHADE_A_PRIM(); A_USE_T0(); @@ -15915,11 +15915,11 @@ void ColorCombinerToExtension() switch (cmb.c_loc) { - case GR_COMBINE_LOCAL_ITERATED: + case GFX_COMBINE_LOCAL_ITERATED: ext_local = GFX_CMBX_ITRGB; ext_local_a = GFX_CMBX_ITALPHA; break; - case GR_COMBINE_LOCAL_CONSTANT: + case GFX_COMBINE_LOCAL_CONSTANT: ext_local = GFX_CMBX_CONSTANT_COLOR; ext_local_a = GFX_CMBX_CONSTANT_ALPHA; break; @@ -16103,10 +16103,10 @@ void AlphaCombinerToExtension() uint32_t ext_local, ext_other; switch (cmb.a_loc) { - case GR_COMBINE_LOCAL_ITERATED: + case GFX_COMBINE_LOCAL_ITERATED: ext_local = GFX_CMBX_ITALPHA; break; - case GR_COMBINE_LOCAL_CONSTANT: + case GFX_COMBINE_LOCAL_CONSTANT: ext_local = GFX_CMBX_CONSTANT_ALPHA; break; default: diff --git a/Source/Project64-video/Combine.h b/Source/Project64-video/Combine.h index 26110a696..38fa94514 100644 --- a/Source/Project64-video/Combine.h +++ b/Source/Project64-video/Combine.h @@ -47,9 +47,11 @@ typedef struct uint32_t ccolor; // constant color to set at the end, color and alpha gfxCombineFunction_t c_fnc; gfxCombineFactor_t c_fac; - uint32_t c_loc, c_oth; // gfxColorCombine flags + gfxCombineLocal_t c_loc; + uint32_t c_oth; // gfxColorCombine flags gfxCombineFunction_t a_fnc; gfxCombineFactor_t a_fac; + gfxCombineLocal_t a_loc; gfxCombineFunction_t tmu0_func; gfxCombineFactor_t tmu0_fac; gfxCombineFunction_t tmu1_func; @@ -58,7 +60,7 @@ typedef struct gfxCombineFactor_t tmu0_a_fac; gfxCombineFunction_t tmu1_a_func; gfxCombineFactor_t tmu1_a_fac; - uint32_t a_loc, a_oth; // gfxAlphaCombine flags + 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 14605a1a8..519daa833 100644 --- a/Source/Project64-video/FBtoScreen.cpp +++ b/Source/Project64-video/FBtoScreen.cpp @@ -54,13 +54,13 @@ static gfxChipID_t SetupFBtoScreenCombiner(uint32_t texture_size, uint32_t opaqu // gfxConstantColorValue (0xFFFFFFFF); gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, // GR_COMBINE_OTHER_CONSTANT, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, FXFALSE); if (opaque) @@ -399,7 +399,7 @@ static void DrawDepthBufferToScreen256(FB_TO_SCREEN_INFO & fb_info) gfxConstantColorValue(rdp.fog_color); gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_CONSTANT, FXFALSE); uint16_t * src = (uint16_t*)image; @@ -469,12 +469,12 @@ static void DrawHiresDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info) gfxConstantColorValue(rdp.fog_color); gfxColorCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_SRC_ALPHA, @@ -581,7 +581,7 @@ void DrawDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info) gfxConstantColorValue(rdp.fog_color); gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_CONSTANT, FXFALSE); gfxTexDownloadMipMap(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 54e02a35b..0b8c18d75 100644 --- a/Source/Project64-video/Renderer/OGLEScombiner.cpp +++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp @@ -725,10 +725,10 @@ void writeGLSLColorLocal(int local) { switch (local) { - case GR_COMBINE_LOCAL_ITERATED: + case GFX_COMBINE_LOCAL_ITERATED: strcat(fragment_shader_color_combiner, "vec4 color_local = vFrontColor; \n"); break; - case GR_COMBINE_LOCAL_CONSTANT: + case GFX_COMBINE_LOCAL_CONSTANT: strcat(fragment_shader_color_combiner, "vec4 color_local = 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, GrCombineLocal_t local, GrCombineOther_t other, bool invert) +void gfxColorCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, GrCombineOther_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; @@ -898,10 +898,10 @@ int setLocalAlphaSource(int local) { switch(local) { -case GR_COMBINE_LOCAL_ITERATED: +case GFX_COMBINE_LOCAL_ITERATED: return GL_PRIMARY_COLOR_ARB; break; -case GR_COMBINE_LOCAL_CONSTANT: +case GFX_COMBINE_LOCAL_CONSTANT: return GL_CONSTANT_ARB; break; default: @@ -933,10 +933,10 @@ void writeGLSLAlphaLocal(int local) { switch (local) { - case GR_COMBINE_LOCAL_ITERATED: + case GFX_COMBINE_LOCAL_ITERATED: strcat(fragment_shader_alpha_combiner, "float alpha_local = vFrontColor.a; \n"); break; - case GR_COMBINE_LOCAL_CONSTANT: + case GFX_COMBINE_LOCAL_CONSTANT: strcat(fragment_shader_alpha_combiner, "float alpha_local = 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, GrCombineLocal_t local, GrCombineOther_t other, bool invert) +void gfxAlphaCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, GrCombineOther_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 ecdbfa261..d46739c68 100644 --- a/Source/Project64-video/Renderer/OGLcombiner.cpp +++ b/Source/Project64-video/Renderer/OGLcombiner.cpp @@ -629,10 +629,10 @@ int setLocalColorSource(int local) { switch (local) { - case GR_COMBINE_LOCAL_ITERATED: + case GFX_COMBINE_LOCAL_ITERATED: return GL_PRIMARY_COLOR_ARB; break; - case GR_COMBINE_LOCAL_CONSTANT: + case GFX_COMBINE_LOCAL_CONSTANT: return GL_CONSTANT_ARB; break; default: @@ -663,10 +663,10 @@ void writeGLSLColorLocal(int local) { switch (local) { - case GR_COMBINE_LOCAL_ITERATED: + case GFX_COMBINE_LOCAL_ITERATED: strcat(fragment_shader_color_combiner, "vec4 color_local = gl_Color; \n"); break; - case GR_COMBINE_LOCAL_CONSTANT: + case GFX_COMBINE_LOCAL_CONSTANT: strcat(fragment_shader_color_combiner, "vec4 color_local = 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, GrCombineLocal_t local, GrCombineOther_t other, bool invert) +void gfxColorCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, GrCombineOther_t other, bool invert) { WriteTrace(TraceGlitch, TraceDebug, "function: %d factor: %d local: %d other: %d invert: %d", function, factor, local, other, invert); @@ -836,10 +836,10 @@ int setLocalAlphaSource(int local) { switch (local) { - case GR_COMBINE_LOCAL_ITERATED: + case GFX_COMBINE_LOCAL_ITERATED: return GL_PRIMARY_COLOR_ARB; break; - case GR_COMBINE_LOCAL_CONSTANT: + case GFX_COMBINE_LOCAL_CONSTANT: return GL_CONSTANT_ARB; break; default: @@ -870,10 +870,10 @@ void writeGLSLAlphaLocal(int local) { switch (local) { - case GR_COMBINE_LOCAL_ITERATED: + case GFX_COMBINE_LOCAL_ITERATED: strcat(fragment_shader_alpha_combiner, "float alpha_local = gl_Color.a; \n"); break; - case GR_COMBINE_LOCAL_CONSTANT: + case GFX_COMBINE_LOCAL_CONSTANT: strcat(fragment_shader_alpha_combiner, "float alpha_local = 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, GrCombineLocal_t local, GrCombineOther_t other, bool invert) +void gfxAlphaCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, gfxCombineLocal_t local, GrCombineOther_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 fa87eaa0f..15f79d148 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, GrCombineLocal_t local, GrCombineOther_t other, bool invert); -void gfxAlphaCombine(gfxCombineFunction_t function, gfxCombineFactor_t factor, GrCombineLocal_t local, GrCombineOther_t other, bool invert); +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 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 cf0b77997..6b9b238e4 100644 --- a/Source/Project64-video/Renderer/types.h +++ b/Source/Project64-video/Renderer/types.h @@ -146,6 +146,14 @@ enum gfxCombineFactor_t GFX_COMBINE_FACTOR_ONE_MINUS_LOD_FRACTION = 0xd, }; +enum gfxCombineLocal_t +{ + GFX_COMBINE_LOCAL_ITERATED = 0x0, + GFX_COMBINE_LOCAL_CONSTANT = 0x1, + GFX_COMBINE_LOCAL_NONE = GFX_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_DEPTH = 0x2, +}; + enum GFX_CMBX { GFX_CMBX_ZERO = 0x00, diff --git a/Source/Project64-video/TexBuffer.cpp b/Source/Project64-video/TexBuffer.cpp index 48bab1de6..98975c8cc 100644 --- a/Source/Project64-video/TexBuffer.cpp +++ b/Source/Project64-video/TexBuffer.cpp @@ -325,13 +325,13 @@ static gfxTextureFormat_t TexBufSetupCombiner(int force_rgb = FALSE) { gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, // GR_COMBINE_OTHER_CONSTANT, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, FXFALSE); // gfxConstantColorValue (0xFFFFFFFF); diff --git a/Source/Project64-video/Util.cpp b/Source/Project64-video/Util.cpp index 713d4d3fc..08553c0f3 100644 --- a/Source/Project64-video/Util.cpp +++ b/Source/Project64-video/Util.cpp @@ -1954,12 +1954,12 @@ void set_message_combiner() { gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_ONE, diff --git a/Source/Project64-video/rdp.cpp b/Source/Project64-video/rdp.cpp index 7949116d6..98f6963d2 100644 --- a/Source/Project64-video/rdp.cpp +++ b/Source/Project64-video/rdp.cpp @@ -2504,13 +2504,13 @@ void rdp_fillrect() gfxColorCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE, FXFALSE); @@ -2542,7 +2542,7 @@ void rdp_fillrect() { gfxAlphaCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE, FXFALSE); gfxConstantColorValue((cmb.ccolor & 0xFFFFFF00) | (rdp.fog_color & 0xFF)); @@ -3120,12 +3120,12 @@ void SetWireframeCol() case CSettings::wfmode_VertexColors: gfxColorCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_ITERATED, + GFX_COMBINE_LOCAL_ITERATED, GR_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_ONE, @@ -3148,12 +3148,12 @@ void SetWireframeCol() case CSettings::wfmode_RedOnly: gfxColorCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_LOCAL, GFX_COMBINE_FACTOR_NONE, - GR_COMBINE_LOCAL_CONSTANT, + GFX_COMBINE_LOCAL_CONSTANT, GR_COMBINE_OTHER_NONE, FXFALSE); gfxConstantColorValue(0xFF0000FF); diff --git a/Source/Project64-video/ucode06.cpp b/Source/Project64-video/ucode06.cpp index f90280b77..53545fe90 100644 --- a/Source/Project64-video/ucode06.cpp +++ b/Source/Project64-video/ucode06.cpp @@ -74,12 +74,12 @@ float set_sprite_combine_mode() { gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_ONE, @@ -160,12 +160,12 @@ void DrawHiresDepthImage(const DRAWIMAGE & d) FXFALSE); gfxColorCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaCombine(GFX_COMBINE_FUNCTION_SCALE_OTHER, GFX_COMBINE_FACTOR_ONE, - GR_COMBINE_LOCAL_NONE, + GFX_COMBINE_LOCAL_NONE, GR_COMBINE_OTHER_TEXTURE, FXFALSE); gfxAlphaBlendFunction(GR_BLEND_ONE,