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

refresh 4

Browse Source
This commit is contained in:
n64
2019-12-01 21:52:53 -05:00
parent a7c423cb43
commit 04732af90b
729 changed files with 21400 additions and 37110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
levels/ddd/areas/1/1/model.inc.c
View File

@@ -1,42 +1,26 @@
// 0x07003800 - 0x07003808
static const Ambient ddd_seg7_light_07003800 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x07003800 - 0x07003818
static const Lights1 ddd_seg7_lights_07003800 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07003808 - 0x07003818
static const Light ddd_seg7_light_07003808 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07003818 - 0x07003830
static const Lights1 ddd_seg7_lights_07003818 = gdSPDefLights1(
0x1a, 0x1a, 0x3f,
0x69, 0x69, 0xfe, 0x28, 0x28, 0x28
);
// 0x07003818 - 0x07003820
static const Ambient ddd_seg7_light_07003818 = {
{{0x1a, 0x1a, 0x3f}, 0, {0x1a, 0x1a, 0x3f}, 0}
};
// 0x07003830 - 0x07003848
static const Lights1 ddd_seg7_lights_07003830 = gdSPDefLights1(
0x26, 0x26, 0x3f,
0x9b, 0x9b, 0xff, 0x28, 0x28, 0x28
);
// 0x07003820 - 0x07003830
static const Light ddd_seg7_light_07003820 = {
{{0x69, 0x69, 0xfe}, 0, {0x69, 0x69, 0xfe}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07003830 - 0x07003838
static const Ambient ddd_seg7_light_07003830 = {
{{0x26, 0x26, 0x3f}, 0, {0x26, 0x26, 0x3f}, 0}
};
// 0x07003838 - 0x07003848
static const Light ddd_seg7_light_07003838 = {
{{0x9b, 0x9b, 0xff}, 0, {0x9b, 0x9b, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07003848 - 0x07003850
static const Ambient ddd_seg7_light_07003848 = {
{{0x32, 0x32, 0x3f}, 0, {0x32, 0x32, 0x3f}, 0}
};
// 0x07003850 - 0x07003860
static const Light ddd_seg7_light_07003850 = {
{{0xc8, 0xc8, 0xff}, 0, {0xc8, 0xc8, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07003848 - 0x07003860
static const Lights1 ddd_seg7_lights_07003848 = gdSPDefLights1(
0x32, 0x32, 0x3f,
0xc8, 0xc8, 0xff, 0x28, 0x28, 0x28
);
// 0x07003860 - 0x07003960
static const Vtx ddd_seg7_vertex_07003860[] = {
@@ -345,8 +329,8 @@ static const Gfx ddd_seg7_dl_07004700[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09003800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_07003808, 1),
gsSPLight(&ddd_seg7_light_07003800, 2),
gsSPLight(&ddd_seg7_lights_07003800.l, 1),
gsSPLight(&ddd_seg7_lights_07003800.a, 2),
gsSPVertex(ddd_seg7_vertex_07003860, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 4, 6, 0x0, 5, 6, 7, 0x0),
@@ -367,12 +351,12 @@ static const Gfx ddd_seg7_dl_07004700[] = {
gsSP2Triangles( 2, 3, 4, 0x0, 4, 3, 5, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
gsSP1Triangle( 5, 8, 7, 0x0),
gsSPLight(&ddd_seg7_light_07003820, 1),
gsSPLight(&ddd_seg7_light_07003818, 2),
gsSPLight(&ddd_seg7_lights_07003818.l, 1),
gsSPLight(&ddd_seg7_lights_07003818.a, 2),
gsSPVertex(ddd_seg7_vertex_07003AF0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPLight(&ddd_seg7_light_07003838, 1),
gsSPLight(&ddd_seg7_light_07003830, 2),
gsSPLight(&ddd_seg7_lights_07003830.l, 1),
gsSPLight(&ddd_seg7_lights_07003830.a, 2),
gsSPVertex(ddd_seg7_vertex_07003B30, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 4, 6, 0x0),
@@ -418,8 +402,8 @@ static const Gfx ddd_seg7_dl_07004700[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 0, 4, 1, 0x0, 5, 6, 3, 0x0),
gsSP2Triangles( 5, 7, 6, 0x0, 6, 7, 8, 0x0),
gsSPLight(&ddd_seg7_light_07003850, 1),
gsSPLight(&ddd_seg7_light_07003848, 2),
gsSPLight(&ddd_seg7_lights_07003848.l, 1),
gsSPLight(&ddd_seg7_lights_07003848.a, 2),
gsSPVertex(ddd_seg7_vertex_070041C0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 4, 1, 6, 0x0),

18
levels/ddd/areas/1/2/model.inc.c
View File

@@ -1,12 +1,8 @@
// 0x07004DA8 - 0x07004DB0
static const Ambient ddd_seg7_light_07004DA8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x07004DB0 - 0x07004DC0
static const Light ddd_seg7_light_07004DB0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07004DA8 - 0x07004DC0
static const Lights1 ddd_seg7_lights_07004DA8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07004DC0 - 0x07004EC0
static const Vtx ddd_seg7_vertex_07004DC0[] = {
@@ -172,8 +168,8 @@ static const Gfx ddd_seg7_dl_07005570[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09007800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_07004DB0, 1),
gsSPLight(&ddd_seg7_light_07004DA8, 2),
gsSPLight(&ddd_seg7_lights_07004DA8.l, 1),
gsSPLight(&ddd_seg7_lights_07004DA8.a, 2),
gsSPVertex(ddd_seg7_vertex_07004DC0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),

18
levels/ddd/areas/1/3/model.inc.c
View File

@@ -1,12 +1,8 @@
// 0x07005850 - 0x07005858
static const Ambient ddd_seg7_light_07005850 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x07005858 - 0x07005868
static const Light ddd_seg7_light_07005858 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07005850 - 0x07005868
static const Lights1 ddd_seg7_lights_07005850 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07005868 - 0x07005968
static const Vtx ddd_seg7_vertex_07005868[] = {
@@ -66,8 +62,8 @@ static const Gfx ddd_seg7_dl_07005AF8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_0900B800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_07005858, 1),
gsSPLight(&ddd_seg7_light_07005850, 2),
gsSPLight(&ddd_seg7_lights_07005850.l, 1),
gsSPLight(&ddd_seg7_lights_07005850.a, 2),
gsSPVertex(ddd_seg7_vertex_07005868, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 7, 0x0, 5, 4, 6, 0x0),

118
levels/ddd/areas/2/1/model.inc.c
View File

@@ -1,52 +1,32 @@
// 0x07005FC8 - 0x07005FD0
static const Ambient ddd_seg7_light_07005FC8 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0}
};
// 0x07005FC8 - 0x07005FE0
static const Lights1 ddd_seg7_lights_07005FC8 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x07005FD0 - 0x07005FE0
static const Light ddd_seg7_light_07005FD0 = {
{{0x00, 0x00, 0x00}, 0, {0x00, 0x00, 0x00}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07005FE0 - 0x07005FF8
static const Lights1 ddd_seg7_lights_07005FE0 = gdSPDefLights1(
0x1b, 0x1b, 0x1b,
0x44, 0x44, 0x44, 0x28, 0x28, 0x28
);
// 0x07005FE0 - 0x07005FE8
static const Ambient ddd_seg7_light_07005FE0 = {
{{0x1b, 0x1b, 0x1b}, 0, {0x1b, 0x1b, 0x1b}, 0}
};
// 0x07005FF8 - 0x07006010
static const Lights1 ddd_seg7_lights_07005FF8 = gdSPDefLights1(
0x2f, 0x2f, 0x2f,
0x77, 0x77, 0x77, 0x28, 0x28, 0x28
);
// 0x07005FE8 - 0x07005FF8
static const Light ddd_seg7_light_07005FE8 = {
{{0x44, 0x44, 0x44}, 0, {0x44, 0x44, 0x44}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07006010 - 0x07006028
static const Lights1 ddd_seg7_lights_07006010 = gdSPDefLights1(
0x44, 0x44, 0x44,
0xaa, 0xaa, 0xaa, 0x28, 0x28, 0x28
);
// 0x07005FF8 - 0x07006000
static const Ambient ddd_seg7_light_07005FF8 = {
{{0x2f, 0x2f, 0x2f}, 0, {0x2f, 0x2f, 0x2f}, 0}
};
// 0x07006000 - 0x07006010
static const Light ddd_seg7_light_07006000 = {
{{0x77, 0x77, 0x77}, 0, {0x77, 0x77, 0x77}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07006010 - 0x07006018
static const Ambient ddd_seg7_light_07006010 = {
{{0x44, 0x44, 0x44}, 0, {0x44, 0x44, 0x44}, 0}
};
// 0x07006018 - 0x07006028
static const Light ddd_seg7_light_07006018 = {
{{0xaa, 0xaa, 0xaa}, 0, {0xaa, 0xaa, 0xaa}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07006028 - 0x07006030
static const Ambient ddd_seg7_light_07006028 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x07006030 - 0x07006040
static const Light ddd_seg7_light_07006030 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07006028 - 0x07006040
static const Lights1 ddd_seg7_lights_07006028 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07006040 - 0x07006080
static const Vtx ddd_seg7_vertex_07006040[] = {
@@ -363,20 +343,20 @@ static const Gfx ddd_seg7_dl_07006E20[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09007800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_07005FD0, 1),
gsSPLight(&ddd_seg7_light_07005FC8, 2),
gsSPLight(&ddd_seg7_lights_07005FC8.l, 1),
gsSPLight(&ddd_seg7_lights_07005FC8.a, 2),
gsSPVertex(ddd_seg7_vertex_07006040, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPLight(&ddd_seg7_light_07005FE8, 1),
gsSPLight(&ddd_seg7_light_07005FE0, 2),
gsSPLight(&ddd_seg7_lights_07005FE0.l, 1),
gsSPLight(&ddd_seg7_lights_07005FE0.a, 2),
gsSPVertex(ddd_seg7_vertex_07006080, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPLight(&ddd_seg7_light_07006000, 1),
gsSPLight(&ddd_seg7_light_07005FF8, 2),
gsSPLight(&ddd_seg7_lights_07005FF8.l, 1),
gsSPLight(&ddd_seg7_lights_07005FF8.a, 2),
gsSPVertex(ddd_seg7_vertex_070060C0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPLight(&ddd_seg7_light_07006018, 1),
gsSPLight(&ddd_seg7_light_07006010, 2),
gsSPLight(&ddd_seg7_lights_07006010.l, 1),
gsSPLight(&ddd_seg7_lights_07006010.a, 2),
gsSPVertex(ddd_seg7_vertex_07006100, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@@ -387,23 +367,23 @@ static const Gfx ddd_seg7_dl_07006EE0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09006800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_07005FE8, 1),
gsSPLight(&ddd_seg7_light_07005FE0, 2),
gsSPLight(&ddd_seg7_lights_07005FE0.l, 1),
gsSPLight(&ddd_seg7_lights_07005FE0.a, 2),
gsSPVertex(ddd_seg7_vertex_07006140, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
gsSPLight(&ddd_seg7_light_07006000, 1),
gsSPLight(&ddd_seg7_light_07005FF8, 2),
gsSPLight(&ddd_seg7_lights_07005FF8.l, 1),
gsSPLight(&ddd_seg7_lights_07005FF8.a, 2),
gsSPVertex(ddd_seg7_vertex_070061C0, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
gsSPLight(&ddd_seg7_light_07006018, 1),
gsSPLight(&ddd_seg7_light_07006010, 2),
gsSPLight(&ddd_seg7_lights_07006010.l, 1),
gsSPLight(&ddd_seg7_lights_07006010.a, 2),
gsSPVertex(ddd_seg7_vertex_07006240, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
gsSPLight(&ddd_seg7_light_07006030, 1),
gsSPLight(&ddd_seg7_light_07006028, 2),
gsSPLight(&ddd_seg7_lights_07006028.l, 1),
gsSPLight(&ddd_seg7_lights_07006028.a, 2),
gsSPVertex(ddd_seg7_vertex_070062C0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 4, 3, 0x0, 3, 5, 7, 0x0),
@@ -427,20 +407,20 @@ static const Gfx ddd_seg7_dl_07007080[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09003800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_07005FE8, 1),
gsSPLight(&ddd_seg7_light_07005FE0, 2),
gsSPLight(&ddd_seg7_lights_07005FE0.l, 1),
gsSPLight(&ddd_seg7_lights_07005FE0.a, 2),
gsSPVertex(ddd_seg7_vertex_07006520, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPLight(&ddd_seg7_light_07006000, 1),
gsSPLight(&ddd_seg7_light_07005FF8, 2),
gsSPLight(&ddd_seg7_lights_07005FF8.l, 1),
gsSPLight(&ddd_seg7_lights_07005FF8.a, 2),
gsSPVertex(ddd_seg7_vertex_07006560, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPLight(&ddd_seg7_light_07006018, 1),
gsSPLight(&ddd_seg7_light_07006010, 2),
gsSPLight(&ddd_seg7_lights_07006010.l, 1),
gsSPLight(&ddd_seg7_lights_07006010.a, 2),
gsSPVertex(ddd_seg7_vertex_070065A0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPLight(&ddd_seg7_light_07006030, 1),
gsSPLight(&ddd_seg7_light_07006028, 2),
gsSPLight(&ddd_seg7_lights_07006028.l, 1),
gsSPLight(&ddd_seg7_lights_07006028.a, 2),
gsSPVertex(ddd_seg7_vertex_070065E0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 6, 8, 0x0),

18
levels/ddd/areas/2/2/model.inc.c
View File

@@ -1,12 +1,8 @@
// 0x070074C8 - 0x070074D0
static const Ambient ddd_seg7_light_070074C8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x070074D0 - 0x070074E0
static const Light ddd_seg7_light_070074D0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x070074C8 - 0x070074E0
static const Lights1 ddd_seg7_lights_070074C8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x070074E0 - 0x070075E0
static const Vtx ddd_seg7_vertex_070074E0[] = {
@@ -138,8 +134,8 @@ static const Gfx ddd_seg7_dl_07007AF0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09007800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_070074D0, 1),
gsSPLight(&ddd_seg7_light_070074C8, 2),
gsSPLight(&ddd_seg7_lights_070074C8.l, 1),
gsSPLight(&ddd_seg7_lights_070074C8.a, 2),
gsSPVertex(ddd_seg7_vertex_070074E0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),

18
levels/ddd/areas/2/3/model.inc.c
View File

@@ -1,12 +1,8 @@
// 0x07007D18 - 0x07007D20
static const Ambient ddd_seg7_light_07007D18 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x07007D20 - 0x07007D30
static const Light ddd_seg7_light_07007D20 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07007D18 - 0x07007D30
static const Lights1 ddd_seg7_lights_07007D18 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07007D30 - 0x07007E20
static const Vtx ddd_seg7_vertex_07007D30[] = {
@@ -253,8 +249,8 @@ static const Gfx ddd_seg7_dl_070088F0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07001000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_07007D20, 1),
gsSPLight(&ddd_seg7_light_07007D18, 2),
gsSPLight(&ddd_seg7_lights_07007D18.l, 1),
gsSPLight(&ddd_seg7_lights_07007D18.a, 2),
gsSPVertex(ddd_seg7_vertex_07007D30, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),

18
levels/ddd/areas/2/5/model.inc.c
View File

@@ -1,12 +1,8 @@
// 0x0700B0D8 - 0x0700B0E0
static const Ambient ddd_seg7_light_0700B0D8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0700B0E0 - 0x0700B0F0
static const Light ddd_seg7_light_0700B0E0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x0700B0D8 - 0x0700B0F0
static const Lights1 ddd_seg7_lights_0700B0D8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0700B0F0 - 0x0700B1D0
static const Vtx ddd_seg7_vertex_0700B0F0[] = {
@@ -167,8 +163,8 @@ static const Gfx ddd_seg7_dl_0700B890[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07002000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_0700B0E0, 1),
gsSPLight(&ddd_seg7_light_0700B0D8, 2),
gsSPLight(&ddd_seg7_lights_0700B0D8.l, 1),
gsSPLight(&ddd_seg7_lights_0700B0D8.a, 2),
gsSPVertex(ddd_seg7_vertex_0700B0F0, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 0, 5, 0x0, 6, 7, 8, 0x0),

18
levels/ddd/areas/2/6/model.inc.c
View File

@@ -1,12 +1,8 @@
// 0x0700BB50 - 0x0700BB58
static const Ambient ddd_seg7_light_0700BB50 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x0700BB58 - 0x0700BB68
static const Light ddd_seg7_light_0700BB58 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x0700BB50 - 0x0700BB68
static const Lights1 ddd_seg7_lights_0700BB50 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0700BB68 - 0x0700BC58
static const Vtx ddd_seg7_vertex_0700BB68[] = {
@@ -312,8 +308,8 @@ static const Gfx ddd_seg7_dl_0700C9D8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_0900A000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_0700BB58, 1),
gsSPLight(&ddd_seg7_light_0700BB50, 2),
gsSPLight(&ddd_seg7_lights_0700BB50.l, 1),
gsSPLight(&ddd_seg7_lights_0700BB50.a, 2),
gsSPVertex(ddd_seg7_vertex_0700BB68, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),

2
levels/ddd/areas/2/macro.inc.c
View File

@@ -23,7 +23,7 @@ const MacroObject ddd_seg7_area_2_macro_objs[] = {
MACRO_OBJECT(/*preset*/ macro_fish_group, /*yaw*/ 0, /*pos*/ 2061, -3323, 2246),
MACRO_OBJECT(/*preset*/ macro_fish_group_2, /*yaw*/ 0, /*pos*/ 5661, -2923, -1415),
MACRO_OBJECT(/*preset*/ macro_clam_shell, /*yaw*/ 90, /*pos*/ 1273, -4106, 2320),
MACRO_OBJECT_WITH_BEH_PARAM(/*preset*/ macro_wooden_signpost, /*yaw*/ 180, /*pos*/ 3086, 110, 6120, /*behParam*/ 53),
MACRO_OBJECT_WITH_BEH_PARAM(/*preset*/ macro_wooden_signpost, /*yaw*/ 180, /*pos*/ 3086, 110, 6120, /*behParam*/ DIALOG_053),
MACRO_OBJECT(/*preset*/ macro_seaweed_bundle, /*yaw*/ 0, /*pos*/ 6420, -4106, -2026),
MACRO_OBJECT(/*preset*/ macro_seaweed_bundle, /*yaw*/ 0, /*pos*/ 6340, -4106, -1413),
MACRO_OBJECT(/*preset*/ macro_clam_shell, /*yaw*/ 135, /*pos*/ 1966, -4106, 3226),

1
levels/ddd/leveldata.c
View File

@@ -6,6 +6,7 @@
#include "macro_preset_names.h"
#include "special_preset_names.h"
#include "textures.h"
#include "dialog_ids.h"
#include "make_const_nonconst.h"
#include "levels/ddd/texture.inc.c"

18
levels/ddd/pole/model.inc.c
View File

@@ -1,12 +1,8 @@
// 0x0700CEE0 - 0x0700CEE8
static const Ambient ddd_seg7_light_0700CEE0 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x0700CEE8 - 0x0700CEF8
static const Light ddd_seg7_light_0700CEE8 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x0700CEE0 - 0x0700CEF8
static const Lights1 ddd_seg7_lights_0700CEE0 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0700CEF8 - 0x0700CFE8
static const Vtx ddd_seg7_vertex_0700CEF8[] = {
@@ -69,8 +65,8 @@ static const Gfx ddd_seg7_dl_0700D1B8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07003000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_0700CEE8, 1),
gsSPLight(&ddd_seg7_light_0700CEE0, 2),
gsSPLight(&ddd_seg7_lights_0700CEE0.l, 1),
gsSPLight(&ddd_seg7_lights_0700CEE0.a, 2),
gsSPVertex(ddd_seg7_vertex_0700CEF8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),

12
levels/ddd/script.c
View File

@@ -83,9 +83,9 @@ const LevelScript level_ddd_entry[] = {
AREA(/*index*/ 1, ddd_geo_0004C0),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ -3071, 3000, 0, /*angle*/ 0, 7, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvWarps74),
WARP_NODE(/*id*/ 0x0A, /*destLevel*/ 0x17, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0xF0, /*destLevel*/ 0x06, /*destArea*/ 0x03, /*destNode*/ 0x35, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0xF1, /*destLevel*/ 0x06, /*destArea*/ 0x03, /*destNode*/ 0x67, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_DDD, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x35, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x67, /*flags*/ WARP_NO_CHECKPOINT),
WHIRLPOOL(/*unk2*/ 0, /*unk3*/ 0, /*pos*/ -3174, -4915, 102, /*strength*/ 20),
JUMP_LINK(script_func_local_1),
JUMP_LINK(script_func_local_2),
@@ -99,9 +99,9 @@ const LevelScript level_ddd_entry[] = {
AREA(/*index*/ 2, ddd_geo_000570),
WHIRLPOOL(/*unk2*/ 0, /*unk3*/ 0, /*pos*/ 3355, -3575, -515, /*strength*/ -30),
WHIRLPOOL(/*unk2*/ 1, /*unk3*/ 2, /*pos*/ 3917, -2040, -6041, /*strength*/ 50),
WARP_NODE(/*id*/ 0xF0, /*destLevel*/ 0x06, /*destArea*/ 0x03, /*destNode*/ 0x35, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0xF1, /*destLevel*/ 0x06, /*destArea*/ 0x03, /*destNode*/ 0x67, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0xF3, /*destLevel*/ 0x10, /*destArea*/ 0x01, /*destNode*/ 0x1E, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x35, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x67, /*flags*/ WARP_NO_CHECKPOINT),
WARP_NODE(/*id*/ 0xF3, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x1E, /*flags*/ WARP_NO_CHECKPOINT),
JUMP_LINK(script_func_local_3),
JUMP_LINK(script_func_local_4),
JUMP_LINK(script_func_local_5),

18
levels/ddd/sub_door/2.inc.c
View File

@@ -1,12 +1,8 @@
// 0x07009080 - 0x07009088
static const Ambient ddd_seg7_light_07009080 = {
{{0x66, 0x66, 0x66}, 0, {0x66, 0x66, 0x66}, 0}
};
// 0x07009088 - 0x07009098
static const Light ddd_seg7_light_07009088 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07009080 - 0x07009098
static const Lights1 ddd_seg7_lights_07009080 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07009098 - 0x070090D8
static const Vtx ddd_seg7_vertex_07009098[] = {
@@ -21,8 +17,8 @@ static const Gfx ddd_seg7_dl_070090D8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07001800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_07009088, 1),
gsSPLight(&ddd_seg7_light_07009080, 2),
gsSPLight(&ddd_seg7_lights_07009080.l, 1),
gsSPLight(&ddd_seg7_lights_07009080.a, 2),
gsSPVertex(ddd_seg7_vertex_07009098, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),

90
levels/ddd/submarine/1.inc.c
View File

@@ -1,52 +1,32 @@
// 0x07009288 - 0x07009290
static const Ambient ddd_seg7_light_07009288 = {
{{0x3f, 0x1f, 0x19}, 0, {0x3f, 0x1f, 0x19}, 0}
};
// 0x07009288 - 0x070092A0
static const Lights1 ddd_seg7_lights_07009288 = gdSPDefLights1(
0x3f, 0x1f, 0x19,
0xff, 0x7f, 0x65, 0x28, 0x28, 0x28
);
// 0x07009290 - 0x070092A0
static const Light ddd_seg7_light_07009290 = {
{{0xff, 0x7f, 0x65}, 0, {0xff, 0x7f, 0x65}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x070092A0 - 0x070092B8
static const Lights1 ddd_seg7_lights_070092A0 = gdSPDefLights1(
0x2f, 0x1a, 0x0f,
0xbf, 0x6a, 0x3f, 0x28, 0x28, 0x28
);
// 0x070092A0 - 0x070092A8
static const Ambient ddd_seg7_light_070092A0 = {
{{0x2f, 0x1a, 0x0f}, 0, {0x2f, 0x1a, 0x0f}, 0}
};
// 0x070092B8 - 0x070092D0
static const Lights1 ddd_seg7_lights_070092B8 = gdSPDefLights1(
0x0c, 0x0c, 0x0c,
0x33, 0x33, 0x33, 0x28, 0x28, 0x28
);
// 0x070092A8 - 0x070092B8
static const Light ddd_seg7_light_070092A8 = {
{{0xbf, 0x6a, 0x3f}, 0, {0xbf, 0x6a, 0x3f}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x070092D0 - 0x070092E8
static const Lights1 ddd_seg7_lights_070092D0 = gdSPDefLights1(
0x1d, 0x1d, 0x1d,
0x77, 0x77, 0x77, 0x28, 0x28, 0x28
);
// 0x070092B8 - 0x070092C0
static const Ambient ddd_seg7_light_070092B8 = {
{{0x0c, 0x0c, 0x0c}, 0, {0x0c, 0x0c, 0x0c}, 0}
};
// 0x070092C0 - 0x070092D0
static const Light ddd_seg7_light_070092C0 = {
{{0x33, 0x33, 0x33}, 0, {0x33, 0x33, 0x33}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x070092D0 - 0x070092D8
static const Ambient ddd_seg7_light_070092D0 = {
{{0x1d, 0x1d, 0x1d}, 0, {0x1d, 0x1d, 0x1d}, 0}
};
// 0x070092D8 - 0x070092E8
static const Light ddd_seg7_light_070092D8 = {
{{0x77, 0x77, 0x77}, 0, {0x77, 0x77, 0x77}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x070092E8 - 0x070092F0
static const Ambient ddd_seg7_light_070092E8 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x070092F0 - 0x07009300
static const Light ddd_seg7_light_070092F0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x070092E8 - 0x07009300
static const Lights1 ddd_seg7_lights_070092E8 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07009300 - 0x07009400
static const Vtx ddd_seg7_vertex_07009300[] = {
@@ -445,8 +425,8 @@ static const Gfx ddd_seg7_dl_0700A600[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07001800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_07009290, 1),
gsSPLight(&ddd_seg7_light_07009288, 2),
gsSPLight(&ddd_seg7_lights_07009288.l, 1),
gsSPLight(&ddd_seg7_lights_07009288.a, 2),
gsSPVertex(ddd_seg7_vertex_07009300, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 3, 5, 0x0, 5, 4, 7, 0x0),
@@ -461,8 +441,8 @@ static const Gfx ddd_seg7_dl_0700A600[] = {
gsSP2Triangles( 1, 3, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 4, 6, 0x0, 4, 7, 6, 0x0),
gsSP1Triangle( 8, 7, 4, 0x0),
gsSPLight(&ddd_seg7_light_070092A8, 1),
gsSPLight(&ddd_seg7_light_070092A0, 2),
gsSPLight(&ddd_seg7_lights_070092A0.l, 1),
gsSPLight(&ddd_seg7_lights_070092A0.a, 2),
gsSPVertex(ddd_seg7_vertex_07009490, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 4, 3, 5, 0x0, 5, 3, 0, 0x0),
@@ -478,14 +458,14 @@ static const Gfx ddd_seg7_dl_0700A600[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0),
gsSP2Triangles( 0, 2, 3, 0x0, 4, 1, 0, 0x0),
gsSP1Triangle( 2, 1, 3, 0x0),
gsSPLight(&ddd_seg7_light_070092C0, 1),
gsSPLight(&ddd_seg7_light_070092B8, 2),
gsSPLight(&ddd_seg7_lights_070092B8.l, 1),
gsSPLight(&ddd_seg7_lights_070092B8.a, 2),
gsSPVertex(ddd_seg7_vertex_070095E0, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 0, 5, 3, 0x0, 0, 2, 5, 0x0),
gsSP2Triangles( 0, 6, 1, 0x0, 0, 4, 7, 0x0),
gsSPLight(&ddd_seg7_light_070092D8, 1),
gsSPLight(&ddd_seg7_light_070092D0, 2),
gsSPLight(&ddd_seg7_lights_070092D0.l, 1),
gsSPLight(&ddd_seg7_lights_070092D0.a, 2),
gsSPVertex(ddd_seg7_vertex_07009660, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 5, 0x0),
@@ -498,8 +478,8 @@ static const Gfx ddd_seg7_dl_0700A600[] = {
gsSP2Triangles( 6, 7, 2, 0x0, 7, 8, 2, 0x0),
gsSP2Triangles( 8, 9, 2, 0x0, 9, 10, 2, 0x0),
gsSP1Triangle(10, 0, 2, 0x0),
gsSPLight(&ddd_seg7_light_070092F0, 1),
gsSPLight(&ddd_seg7_light_070092E8, 2),
gsSPLight(&ddd_seg7_lights_070092E8.l, 1),
gsSPLight(&ddd_seg7_lights_070092E8.a, 2),
gsSPVertex(ddd_seg7_vertex_07009800, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 1, 4, 2, 0x0, 3, 5, 1, 0x0),

18
levels/ddd/submarine/2.inc.c
View File

@@ -1,12 +1,8 @@
// 0x0700AF78 - 0x0700AF80
static const Ambient ddd_seg7_light_0700AF78 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0700AF80 - 0x0700AF90
static const Light ddd_seg7_light_0700AF80 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x0700AF78 - 0x0700AF90
static const Lights1 ddd_seg7_lights_0700AF78 = gdSPDefLights1(
0x3f, 0x3f, 0x3f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0700AF90 - 0x0700B010
static const Vtx ddd_seg7_vertex_0700AF90[] = {
@@ -25,8 +21,8 @@ static const Gfx ddd_seg7_dl_0700B010[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07000000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&ddd_seg7_light_0700AF80, 1),
gsSPLight(&ddd_seg7_light_0700AF78, 2),
gsSPLight(&ddd_seg7_lights_0700AF78.l, 1),
gsSPLight(&ddd_seg7_lights_0700AF78.a, 2),
gsSPVertex(ddd_seg7_vertex_0700AF90, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),