diff --git a/actors/coin/model.inc.c b/actors/coin/model.inc.c index 8728a56e..032e19c0 100644 --- a/actors/coin/model.inc.c +++ b/actors/coin/model.inc.c @@ -27,25 +27,25 @@ static const Vtx coin_seg3_vertex_03005740[] = { }; #else static const Vtx coin_seg3_vertex_030056C0[] = { - {{{ -32, 0, 0}, 0, { 0, 1984 }, {0xff, 0xff, 0x00, 0xff}}}, - {{{ 32, 0, 0}, 0, { 1984 , 1984 }, {0xff, 0xff, 0x00, 0xff}}}, - {{{ 32, 64, 0}, 0, { 1984 , 0}, {0xff, 0xff, 0x00, 0xff}}}, + {{{ -32, 0, 0}, 0, { 0, 1984}, {0xff, 0xff, 0x00, 0xff}}}, + {{{ 32, 0, 0}, 0, { 1984, 1984}, {0xff, 0xff, 0x00, 0xff}}}, + {{{ 32, 64, 0}, 0, { 1984, 0}, {0xff, 0xff, 0x00, 0xff}}}, {{{ -32, 64, 0}, 0, { 0, 0}, {0xff, 0xff, 0x00, 0xff}}}, }; // 0x03005700 static const Vtx coin_seg3_vertex_03005700[] = { - {{{ -50, 0, 0}, 0, { 0, 1984 }, {0x78, 0x78, 0xff, 0xff}}}, - {{{ 50, 0, 0}, 0, { 1984 , 1984 }, {0x78, 0x78, 0xff, 0xff}}}, - {{{ 50, 100, 0}, 0, { 1984 , 0}, {0x78, 0x78, 0xff, 0xff}}}, + {{{ -50, 0, 0}, 0, { 0, 1984}, {0x78, 0x78, 0xff, 0xff}}}, + {{{ 50, 0, 0}, 0, { 1984, 1984}, {0x78, 0x78, 0xff, 0xff}}}, + {{{ 50, 100, 0}, 0, { 1984, 0}, {0x78, 0x78, 0xff, 0xff}}}, {{{ -50, 100, 0}, 0, { 0, 0}, {0x78, 0x78, 0xff, 0xff}}}, }; // 0x03005740 static const Vtx coin_seg3_vertex_03005740[] = { - {{{ -35, 0, 0}, 0, { 0, 1984 }, {0xff, 0x00, 0x00, 0xff}}}, - {{{ 35, 0, 0}, 0, { 1984 , 1984 }, {0xff, 0x00, 0x00, 0xff}}}, - {{{ 35, 70, 0}, 0, { 1984 , 0}, {0xff, 0x00, 0x00, 0xff}}}, + {{{ -35, 0, 0}, 0, { 0, 1984}, {0xff, 0x00, 0x00, 0xff}}}, + {{{ 35, 0, 0}, 0, { 1984, 1984}, {0xff, 0x00, 0x00, 0xff}}}, + {{{ 35, 70, 0}, 0, { 1984, 0}, {0xff, 0x00, 0x00, 0xff}}}, {{{ -35, 70, 0}, 0, { 0, 0}, {0xff, 0x00, 0x00, 0xff}}}, }; #endif diff --git a/levels/ttc/areas/1/1/model.inc.c b/levels/ttc/areas/1/1/model.inc.c index d538b8c1..b08076be 100644 --- a/levels/ttc/areas/1/1/model.inc.c +++ b/levels/ttc/areas/1/1/model.inc.c @@ -3269,7 +3269,7 @@ const Gfx ttc_seg7_dl_0700AD38[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/areas/1/3/model.inc.c b/levels/ttc/areas/1/3/model.inc.c index 0b58febd..d7593dcf 100644 --- a/levels/ttc/areas/1/3/model.inc.c +++ b/levels/ttc/areas/1/3/model.inc.c @@ -1105,7 +1105,7 @@ const Gfx ttc_seg7_dl_0700E878[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_PASS2), gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK), diff --git a/levels/ttc/areas/1/movtext.inc.c b/levels/ttc/areas/1/movtext.inc.c index b96bc92d..10acbadd 100644 --- a/levels/ttc/areas/1/movtext.inc.c +++ b/levels/ttc/areas/1/movtext.inc.c @@ -16,7 +16,7 @@ const Gfx ttc_dl_surface_treadmill_begin[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsSPLight(&ttc_lights_surface_treadmill.l, 1), diff --git a/levels/ttc/clock_hand/model.inc.c b/levels/ttc/clock_hand/model.inc.c index 3e390642..987b744c 100644 --- a/levels/ttc/clock_hand/model.inc.c +++ b/levels/ttc/clock_hand/model.inc.c @@ -113,7 +113,7 @@ const Gfx ttc_seg7_dl_07011B38[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/elevator_platform/model.inc.c b/levels/ttc/elevator_platform/model.inc.c index e03e462c..a0bc623f 100644 --- a/levels/ttc/elevator_platform/model.inc.c +++ b/levels/ttc/elevator_platform/model.inc.c @@ -77,7 +77,7 @@ const Gfx ttc_seg7_dl_070116A8[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/large_gear/model.inc.c b/levels/ttc/large_gear/model.inc.c index e4955ff2..4af0127a 100644 --- a/levels/ttc/large_gear/model.inc.c +++ b/levels/ttc/large_gear/model.inc.c @@ -23,7 +23,7 @@ const Gfx ttc_seg7_dl_07012278[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_PASS2), gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK), diff --git a/levels/ttc/large_treadmill/model.inc.c b/levels/ttc/large_treadmill/model.inc.c index 5cabf7d4..083ee561 100644 --- a/levels/ttc/large_treadmill/model.inc.c +++ b/levels/ttc/large_treadmill/model.inc.c @@ -108,7 +108,7 @@ const Gfx ttc_seg7_dl_0700FBB8[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/pendulum/model.inc.c b/levels/ttc/pendulum/model.inc.c index 8a80af7a..d9428c55 100644 --- a/levels/ttc/pendulum/model.inc.c +++ b/levels/ttc/pendulum/model.inc.c @@ -161,7 +161,7 @@ const Gfx ttc_seg7_dl_0700F760[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/pit_block/model.inc.c b/levels/ttc/pit_block/model.inc.c index ae65e377..28bea8b2 100644 --- a/levels/ttc/pit_block/model.inc.c +++ b/levels/ttc/pit_block/model.inc.c @@ -69,7 +69,7 @@ const Gfx ttc_seg7_dl_07011040[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/pit_block_2/model.inc.c b/levels/ttc/pit_block_2/model.inc.c index 175629d8..17177c1f 100644 --- a/levels/ttc/pit_block_2/model.inc.c +++ b/levels/ttc/pit_block_2/model.inc.c @@ -69,7 +69,7 @@ const Gfx ttc_seg7_dl_07011360[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/push_block/model.inc.c b/levels/ttc/push_block/model.inc.c index a1530d33..70dc9275 100644 --- a/levels/ttc/push_block/model.inc.c +++ b/levels/ttc/push_block/model.inc.c @@ -64,7 +64,7 @@ const Gfx ttc_seg7_dl_070102B8[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/rotating_cube/model.inc.c b/levels/ttc/rotating_cube/model.inc.c index 2de1c703..a6647e36 100644 --- a/levels/ttc/rotating_cube/model.inc.c +++ b/levels/ttc/rotating_cube/model.inc.c @@ -96,7 +96,7 @@ const Gfx ttc_seg7_dl_0700ECB8[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/rotating_hexagon/model.inc.c b/levels/ttc/rotating_hexagon/model.inc.c index d19a7953..df315117 100644 --- a/levels/ttc/rotating_hexagon/model.inc.c +++ b/levels/ttc/rotating_hexagon/model.inc.c @@ -120,7 +120,7 @@ const Gfx ttc_seg7_dl_07010868[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/rotating_prism/model.inc.c b/levels/ttc/rotating_prism/model.inc.c index fce629a2..06fd5dd0 100644 --- a/levels/ttc/rotating_prism/model.inc.c +++ b/levels/ttc/rotating_prism/model.inc.c @@ -71,7 +71,7 @@ const Gfx ttc_seg7_dl_0700EFE0[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/rotating_triangle/model.inc.c b/levels/ttc/rotating_triangle/model.inc.c index 5ac22eca..726fb28e 100644 --- a/levels/ttc/rotating_triangle/model.inc.c +++ b/levels/ttc/rotating_triangle/model.inc.c @@ -106,7 +106,7 @@ const Gfx ttc_seg7_dl_07010D38[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/small_gear/model.inc.c b/levels/ttc/small_gear/model.inc.c index 26037a85..413e9b26 100644 --- a/levels/ttc/small_gear/model.inc.c +++ b/levels/ttc/small_gear/model.inc.c @@ -23,7 +23,7 @@ const Gfx ttc_seg7_dl_07012148[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_PASS2), gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK), diff --git a/levels/ttc/small_treadmill/model.inc.c b/levels/ttc/small_treadmill/model.inc.c index 8eb61c4e..a6ee1a60 100644 --- a/levels/ttc/small_treadmill/model.inc.c +++ b/levels/ttc/small_treadmill/model.inc.c @@ -106,7 +106,7 @@ const Gfx ttc_seg7_dl_0700FFE8[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), diff --git a/levels/ttc/spinner/model.inc.c b/levels/ttc/spinner/model.inc.c index 6d11606b..9471395b 100644 --- a/levels/ttc/spinner/model.inc.c +++ b/levels/ttc/spinner/model.inc.c @@ -104,7 +104,7 @@ const Gfx ttc_seg7_dl_07012028[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), gsDPSetDepthSource(G_ZS_PIXEL), gsDPSetFogColor(200, 255, 255, 255), - gsSPFogPosition(900, 1000), + gsSPFogPosition(970, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD),