Dirt particle & cartoon star particle dl names

This commit is contained in:
Arceveti
2021-09-28 14:02:13 -07:00
parent 3e8aa7fada
commit baceb79c89
3 changed files with 70 additions and 70 deletions

View File

@@ -50,18 +50,18 @@ extern const Gfx coin_seg3_dl_030079B8[];
extern const GeoLayout dirt_animation_geo[];
extern const GeoLayout cartoon_star_geo[];
extern const Gfx dirt_seg3_dl_0302BFF8[];
extern const Gfx dirt_seg3_dl_0302C028[];
extern const Gfx dirt_seg3_dl_0302C238[];
extern const Gfx dirt_seg3_dl_0302C298[];
extern const Gfx dirt_seg3_dl_0302C2B8[];
extern const Gfx dirt_seg3_dl_0302C2D8[];
extern const Gfx dirt_seg3_dl_0302C2F8[];
extern const Gfx dirt_seg3_dl_0302C318[];
extern const Gfx dirt_seg3_dl_0302C378[];
extern const Gfx dirt_seg3_dl_0302C3B0[];
extern const Gfx dirt_seg3_dl_0302C3E8[];
extern const Gfx dirt_seg3_dl_0302C420[];
extern const Gfx dirt_seg3_dl_0302C458[];
extern const Gfx dirt_seg3_dl_dirt_particle[];
extern const Gfx dirt_seg3_sub_dl_cartoon_star[];
extern const Gfx dirt_seg3_dl_cartoon_star_red[];
extern const Gfx dirt_seg3_dl_cartoon_star_green[];
extern const Gfx dirt_seg3_dl_cartoon_star_blue[];
extern const Gfx dirt_seg3_dl_cartoon_star_yellow[];
extern const Gfx dirt_seg3_dl_cartoon_star_billboard[];
extern const Gfx dirt_seg3_dl_tiny_particle_red[];
extern const Gfx dirt_seg3_dl_tiny_particle_green[];
extern const Gfx dirt_seg3_dl_tiny_particle_blue[];
extern const Gfx dirt_seg3_dl_tiny_particle_yellow[];
extern const Gfx dirt_seg3_dl_tiny_particle_billboard[];
// door
extern const GeoLayout castle_door_geo[];

View File

@@ -4,12 +4,12 @@ const GeoLayout dirt_animation_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(6, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C378),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C3B0),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C3E8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, dirt_seg3_dl_0302C028),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C420),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C458),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_tiny_particle_red),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_tiny_particle_green),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_tiny_particle_blue),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_ALPHA, dirt_seg3_dl_dirt_particle),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_tiny_particle_yellow),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_tiny_particle_billboard),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),
@@ -22,11 +22,11 @@ const GeoLayout cartoon_star_geo[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(5, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C298),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C2B8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C2D8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C2F8),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_0302C318),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_cartoon_star_red),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_cartoon_star_green),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_cartoon_star_blue),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_cartoon_star_yellow),
GEO_DISPLAY_LIST(LAYER_OCCLUDE_SILHOUETTE_OPAQUE, dirt_seg3_dl_cartoon_star_billboard),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_END(),

View File

@@ -1,25 +1,25 @@
// Dirt
// 0x0302BD68
static const Lights1 dirt_seg3_lights_0302BD68 = gdSPDefLights1(
static const Lights1 dirt_seg3_lights_red = gdSPDefLights1(
0x3f, 0x19, 0x19,
0xff, 0x64, 0x64, 0x28, 0x28, 0x28
);
// 0x0302BD80
static const Lights1 dirt_seg3_lights_0302BD80 = gdSPDefLights1(
static const Lights1 dirt_seg3_lights_green = gdSPDefLights1(
0x19, 0x3f, 0x19,
0x64, 0xff, 0x64, 0x28, 0x28, 0x28
);
// 0x0302BD98
static const Lights1 dirt_seg3_lights_0302BD98 = gdSPDefLights1(
static const Lights1 dirt_seg3_lights_blue = gdSPDefLights1(
0x19, 0x19, 0x3f,
0x64, 0x64, 0xff, 0x28, 0x28, 0x28
);
// 0x0302BDB0
static const Lights1 dirt_seg3_lights_0302BDB0 = gdSPDefLights1(
static const Lights1 dirt_seg3_lights_yellow = gdSPDefLights1(
0x3f, 0x3f, 0x19,
0xff, 0xff, 0x64, 0x28, 0x28, 0x28
);
@@ -47,7 +47,7 @@ const Gfx dirt_seg3_dl_0302BFF8[] = {
};
// 0x0302C028 - 0x0302C098
const Gfx dirt_seg3_dl_0302C028[] = {
const Gfx dirt_seg3_dl_dirt_particle[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
gsSPClearGeometryMode(G_CULL_BACK),
@@ -65,21 +65,21 @@ const Gfx dirt_seg3_dl_0302C028[] = {
};
// 0x0302C098
static const Vtx dirt_seg3_vertex_0302C098[] = {
static const Vtx dirt_seg3_vertex_tiny_particle[] = {
{{{ -10, 0, 10}, 0, { 0, 0}, {0x00, 0x7f, 0x00, 0x00}}},
{{{ 10, 0, 10}, 0, { 0, 0}, {0x00, 0x7f, 0x00, 0x00}}},
{{{ 0, 0, -10}, 0, { 0, 0}, {0x00, 0x7f, 0x00, 0x00}}},
};
// 0x0302C0C8
static const Vtx dirt_seg3_vertex_0302C0C8[] = {
static const Vtx dirt_seg3_vertex_tiny_particle_billboard[] = {
{{{ -10, 10, 0}, 0, { 0, 0}, {0xff, 0xff, 0x00, 0xff}}},
{{{ 10, 10, 0}, 0, { 0, 0}, {0xff, 0xff, 0x00, 0xff}}},
{{{ 0, -10, 0}, 0, { 0, 0}, {0xff, 0xff, 0x00, 0xff}}},
};
// 0x0302C0F8
static const Vtx dirt_seg3_vertex_0302C0F8[] = {
static const Vtx dirt_seg3_vertex_cartoon_star[] = {
{{{ 0, -8, 0}, 0, { 0, 0}, {0x00, 0x00, 0x81, 0x00}}},
{{{ -32, 80, 0}, 0, { 0, 0}, {0x00, 0x00, 0x81, 0x00}}},
{{{ 32, 80, 0}, 0, { 0, 0}, {0x00, 0x00, 0x81, 0x00}}},
@@ -93,7 +93,7 @@ static const Vtx dirt_seg3_vertex_0302C0F8[] = {
};
// 0x0302C198
static const Vtx dirt_seg3_vertex_0302C198[] = {
static const Vtx dirt_seg3_vertex_cartoon_star_billboard[] = {
{{{ 0, -8, 0}, 0, { 0, 0}, {0xff, 0xff, 0x00, 0xff}}},
{{{ -32, 80, 0}, 0, { 0, 0}, {0xff, 0xff, 0x00, 0xff}}},
{{{ 32, 80, 0}, 0, { 0, 0}, {0xff, 0xff, 0x00, 0xff}}},
@@ -107,9 +107,9 @@ static const Vtx dirt_seg3_vertex_0302C198[] = {
};
// 0x0302C238 - 0x0302C298
const Gfx dirt_seg3_dl_0302C238[] = {
const Gfx dirt_seg3_sub_dl_cartoon_star[] = {
gsSPClearGeometryMode(G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C0F8, 10, 0),
gsSPVertex(dirt_seg3_vertex_cartoon_star, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0),
gsSP2Triangles( 0, 5, 3, 0x0, 6, 7, 0, 0x0),
gsSP2Triangles( 2, 8, 6, 0x0, 1, 9, 2, 0x0),
@@ -119,41 +119,41 @@ const Gfx dirt_seg3_dl_0302C238[] = {
};
// 0x0302C298 - 0x0302C2B8
const Gfx dirt_seg3_dl_0302C298[] = {
gsSPLight(&dirt_seg3_lights_0302BD68.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD68.a, 2),
gsSPDisplayList(dirt_seg3_dl_0302C238),
const Gfx dirt_seg3_dl_cartoon_star_red[] = {
gsSPLight(&dirt_seg3_lights_red.l, 1),
gsSPLight(&dirt_seg3_lights_red.a, 2),
gsSPDisplayList(dirt_seg3_sub_dl_cartoon_star),
gsSPEndDisplayList(),
};
// 0x0302C2B8 - 0x0302C2D8
const Gfx dirt_seg3_dl_0302C2B8[] = {
gsSPLight(&dirt_seg3_lights_0302BD80.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD80.a, 2),
gsSPDisplayList(dirt_seg3_dl_0302C238),
const Gfx dirt_seg3_dl_cartoon_star_green[] = {
gsSPLight(&dirt_seg3_lights_green.l, 1),
gsSPLight(&dirt_seg3_lights_green.a, 2),
gsSPDisplayList(dirt_seg3_sub_dl_cartoon_star),
gsSPEndDisplayList(),
};
// 0x0302C2D8 - 0x0302C2F8
const Gfx dirt_seg3_dl_0302C2D8[] = {
gsSPLight(&dirt_seg3_lights_0302BD98.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD98.a, 2),
gsSPDisplayList(dirt_seg3_dl_0302C238),
const Gfx dirt_seg3_dl_cartoon_star_blue[] = {
gsSPLight(&dirt_seg3_lights_blue.l, 1),
gsSPLight(&dirt_seg3_lights_blue.a, 2),
gsSPDisplayList(dirt_seg3_sub_dl_cartoon_star),
gsSPEndDisplayList(),
};
// 0x0302C2F8 - 0x0302C318
const Gfx dirt_seg3_dl_0302C2F8[] = {
gsSPLight(&dirt_seg3_lights_0302BDB0.l, 1),
gsSPLight(&dirt_seg3_lights_0302BDB0.a, 2),
gsSPDisplayList(dirt_seg3_dl_0302C238),
const Gfx dirt_seg3_dl_cartoon_star_yellow[] = {
gsSPLight(&dirt_seg3_lights_yellow.l, 1),
gsSPLight(&dirt_seg3_lights_yellow.a, 2),
gsSPDisplayList(dirt_seg3_sub_dl_cartoon_star),
gsSPEndDisplayList(),
};
// 0x0302C318 - 0x0302C378
const Gfx dirt_seg3_dl_0302C318[] = {
const Gfx dirt_seg3_dl_cartoon_star_billboard[] = {
gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C198, 10, 0),
gsSPVertex(dirt_seg3_vertex_cartoon_star_billboard, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0),
gsSP2Triangles( 0, 5, 3, 0x0, 6, 7, 0, 0x0),
gsSP2Triangles( 2, 8, 6, 0x0, 1, 9, 2, 0x0),
@@ -163,53 +163,53 @@ const Gfx dirt_seg3_dl_0302C318[] = {
};
// 0x0302C378 - 0x0302C3B0
const Gfx dirt_seg3_dl_0302C378[] = {
gsSPLight(&dirt_seg3_lights_0302BD68.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD68.a, 2),
const Gfx dirt_seg3_dl_tiny_particle_red[] = {
gsSPLight(&dirt_seg3_lights_red.l, 1),
gsSPLight(&dirt_seg3_lights_red.a, 2),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C098, 3, 0),
gsSPVertex(dirt_seg3_vertex_tiny_particle, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPSetGeometryMode(G_CULL_BACK),
gsSPEndDisplayList(),
};
// 0x0302C3B0 - 0x0302C3E8
const Gfx dirt_seg3_dl_0302C3B0[] = {
gsSPLight(&dirt_seg3_lights_0302BD80.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD80.a, 2),
const Gfx dirt_seg3_dl_tiny_particle_green[] = {
gsSPLight(&dirt_seg3_lights_green.l, 1),
gsSPLight(&dirt_seg3_lights_green.a, 2),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C098, 3, 0),
gsSPVertex(dirt_seg3_vertex_tiny_particle, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPSetGeometryMode(G_CULL_BACK),
gsSPEndDisplayList(),
};
// 0x0302C3E8 - 0x0302C420
const Gfx dirt_seg3_dl_0302C3E8[] = {
gsSPLight(&dirt_seg3_lights_0302BD98.l, 1),
gsSPLight(&dirt_seg3_lights_0302BD98.a, 2),
const Gfx dirt_seg3_dl_tiny_particle_blue[] = {
gsSPLight(&dirt_seg3_lights_blue.l, 1),
gsSPLight(&dirt_seg3_lights_blue.a, 2),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C098, 3, 0),
gsSPVertex(dirt_seg3_vertex_tiny_particle, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPSetGeometryMode(G_CULL_BACK),
gsSPEndDisplayList(),
};
// 0x0302C420 - 0x0302C458
const Gfx dirt_seg3_dl_0302C420[] = {
gsSPLight(&dirt_seg3_lights_0302BDB0.l, 1),
gsSPLight(&dirt_seg3_lights_0302BDB0.a, 2),
const Gfx dirt_seg3_dl_tiny_particle_yellow[] = {
gsSPLight(&dirt_seg3_lights_yellow.l, 1),
gsSPLight(&dirt_seg3_lights_yellow.a, 2),
gsSPClearGeometryMode(G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C098, 3, 0),
gsSPVertex(dirt_seg3_vertex_tiny_particle, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPSetGeometryMode(G_CULL_BACK),
gsSPEndDisplayList(),
};
// 0x0302C458 - 0x0302C480
const Gfx dirt_seg3_dl_0302C458[] = {
const Gfx dirt_seg3_dl_tiny_particle_billboard[] = {
gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPVertex(dirt_seg3_vertex_0302C0C8, 3, 0),
gsSPVertex(dirt_seg3_vertex_tiny_particle_billboard, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPEndDisplayList(),