print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into experimental

Browse Source
This commit is contained in:
Fazana
2021-09-08 14:53:55 +01:00
parent f0fd048e5b 27b90244c6
commit 00f2afa279
19 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
actors/coin/model.inc.c
View File

@@ -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

2
levels/ttc/areas/1/1/model.inc.c
View File

@@ -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),

2
levels/ttc/areas/1/3/model.inc.c
View File

@@ -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),

2
levels/ttc/areas/1/movtext.inc.c
View File

@@ -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),

2
levels/ttc/clock_hand/model.inc.c
View File

@@ -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),

2
levels/ttc/elevator_platform/model.inc.c
View File

@@ -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),

2
levels/ttc/large_gear/model.inc.c
View File

@@ -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),

2
levels/ttc/large_treadmill/model.inc.c
View File

@@ -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),

2
levels/ttc/pendulum/model.inc.c
View File

@@ -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),

2
levels/ttc/pit_block/model.inc.c
View File

@@ -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),

2
levels/ttc/pit_block_2/model.inc.c
View File

@@ -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),

2
levels/ttc/push_block/model.inc.c
View File

@@ -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),

2
levels/ttc/rotating_cube/model.inc.c
View File

@@ -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),

2
levels/ttc/rotating_hexagon/model.inc.c
View File

@@ -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),

2
levels/ttc/rotating_prism/model.inc.c
View File

@@ -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),

2
levels/ttc/rotating_triangle/model.inc.c
View File

@@ -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),

2
levels/ttc/small_gear/model.inc.c
View File

@@ -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),

2
levels/ttc/small_treadmill/model.inc.c
View File

@@ -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),

2
levels/ttc/spinner/model.inc.c
View File

@@ -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),