Refresh 3

2026-01-21 10:17:19 -08:00 · 2019-11-03 14:36:27 -05:00
parent 6b8bc9b9ec
commit a7c423cb43
4603 changed files with 475500 additions and 437701 deletions
--- a/levels/lll/sinking_rectangular_platform/collision.inc.c
+++ b/levels/lll/sinking_rectangular_platform/collision.inc.c
@@ -0,0 +1,18 @@
+// 0x0701D408 - 0x0701D450
+const Collision lll_seg7_collision_slow_tilting_platform[] = {
+    COL_INIT(),
+    COL_VERTEX_INIT(0x6),
+    COL_VERTEX(-383, 0, -1023),
+    COL_VERTEX(5, 41, 1024),
+    COL_VERTEX(5, 41, -1023),
+    COL_VERTEX(-383, 0, 1024),
+    COL_VERTEX(384, 0, -1023),
+    COL_VERTEX(384, 0, 1024),
+    COL_TRI_INIT(SURFACE_DEFAULT, 4),
+    COL_TRI(0, 1, 2),
+    COL_TRI(0, 3, 1),
+    COL_TRI(1, 4, 2),
+    COL_TRI(1, 5, 4),
+    COL_TRI_STOP(),
+    COL_END(),
+};
--- a/levels/lll/sinking_rectangular_platform/collision.s
+++ b/levels/lll/sinking_rectangular_platform/collision.s
@@ -1,16 +0,0 @@
-glabel lll_seg7_collision_slow_tilting_platform # 0x0701D408 - 0x0701D450
-colInit
-colVertexInit 0x6
-colVertex -383, 0, -1023
-colVertex 5, 41, 1024
-colVertex 5, 41, -1023
-colVertex -383, 0, 1024
-colVertex 384, 0, -1023
-colVertex 384, 0, 1024
-colTriInit SURFACE_DEFAULT, 4
-colTri 0, 1, 2
-colTri 0, 3, 1
-colTri 1, 4, 2
-colTri 1, 5, 4
-colTriStop
-colEnd
--- a/levels/lll/sinking_rectangular_platform/geo.inc.c
+++ b/levels/lll/sinking_rectangular_platform/geo.inc.c
@@ -0,0 +1,8 @@
+// 0x0E000BC8
+const GeoLayout lll_geo_000BC8[] = {
+   GEO_CULLING_RADIUS(1400),
+   GEO_OPEN_NODE(),
+      GEO_DISPLAY_LIST(LAYER_OPAQUE, lll_seg7_dl_07019C08),
+   GEO_CLOSE_NODE(),
+   GEO_END(),
+};
--- a/levels/lll/sinking_rectangular_platform/geo.s
+++ b/levels/lll/sinking_rectangular_platform/geo.s
@@ -1,6 +0,0 @@
-glabel lll_geo_000BC8 # 0x0E000BC8
-   geo_culling_radius 1400
-   geo_open_node
-      geo_display_list LAYER_OPAQUE, lll_seg7_dl_07019C08
-   geo_close_node
-   geo_end
--- a/levels/lll/sinking_rectangular_platform/model.inc.c
+++ b/levels/lll/sinking_rectangular_platform/model.inc.c
@@ -0,0 +1,63 @@
+// 0x07019A98 - 0x07019B18
+static const Vtx lll_seg7_vertex_07019A98[] = {
+    {{{     5,     41,   1024}, 0, {   -26,   1000}, {0x0d, 0x7e, 0x00, 0xff}}},
+    {{{   384,      0,  -1023}, 0, {  1006,  -4116}, {0x0d, 0x7e, 0x00, 0xff}}},
+    {{{     5,     41,  -1023}, 0, {   -14,  -4108}, {0x0d, 0x7e, 0x00, 0xff}}},
+    {{{   384,      0,   1024}, 0, {   994,    992}, {0x0d, 0x7e, 0x00, 0xff}}},
+    {{{  -383,      0,  -1023}, 0, {   -48,  -4040}, {0xf3, 0x7e, 0x00, 0xff}}},
+    {{{     5,     41,   1024}, 0, {  1008,    994}, {0xf3, 0x7e, 0x00, 0xff}}},
+    {{{     5,     41,  -1023}, 0, {   984,  -4052}, {0xf3, 0x7e, 0x00, 0xff}}},
+    {{{  -383,      0,   1024}, 0, {   -26,   1006}, {0xf3, 0x7e, 0x00, 0xff}}},
+};
+
+// 0x07019B18 - 0x07019B78
+static const Vtx lll_seg7_vertex_07019B18[] = {
+    {{{  -383,      0,  -1023}, 0, {  7122,    990}, {0x00, 0x00, 0x81, 0xff}}},
+    {{{     5,     41,  -1023}, 0, {  4016,    662}, {0x00, 0x00, 0x81, 0xff}}},
+    {{{   384,      0,  -1023}, 0, {   990,    990}, {0x00, 0x00, 0x81, 0xff}}},
+    {{{   384,      0,   1024}, 0, {  6100,      0}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{     5,     41,   1024}, 0, {  3074,   -360}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{  -380,      0,   1024}, 0, {    -8,    -34}, {0x00, 0x00, 0x7f, 0xff}}},
+};
+
+// 0x07019B78 - 0x07019BD0
+static const Gfx lll_seg7_dl_07019B78[] = {
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09004000),
+    gsDPLoadSync(),
+    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsSPLight(&lll_seg7_light_0700FC08, 1),
+    gsSPLight(&lll_seg7_light_0700FC00, 2),
+    gsSPVertex(lll_seg7_vertex_07019A98, 8, 0),
+    gsSP2Triangles( 0,  1,  2, 0x0,  0,  3,  1, 0x0),
+    gsSP2Triangles( 4,  5,  6, 0x0,  4,  7,  5, 0x0),
+    gsSPEndDisplayList(),
+};
+
+// 0x07019BD0 - 0x07019C08
+static const Gfx lll_seg7_dl_07019BD0[] = {
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09006000),
+    gsDPLoadSync(),
+    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsSPVertex(lll_seg7_vertex_07019B18, 6, 0),
+    gsSP2Triangles( 0,  1,  2, 0x0,  3,  4,  5, 0x0),
+    gsSPEndDisplayList(),
+};
+
+// 0x07019C08 - 0x07019C80
+const Gfx lll_seg7_dl_07019C08[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB),
+    gsSPClearGeometryMode(G_SHADING_SMOOTH),
+    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),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPTileSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD),
+    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsSPDisplayList(lll_seg7_dl_07019B78),
+    gsSPDisplayList(lll_seg7_dl_07019BD0),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPSetGeometryMode(G_SHADING_SMOOTH),
+    gsSPEndDisplayList(),
+};
--- a/levels/lll/sinking_rectangular_platform/model.s
+++ b/levels/lll/sinking_rectangular_platform/model.s
@@ -1,53 +0,0 @@
-lll_seg7_vertex_07019A98: # 0x07019A98 - 0x07019B18
-vertex      5,     41,   1024,    -26,   1000,  0x0D, 0x7E, 0x00, 0xFF
-vertex    384,      0,  -1023,   1006,  -4116,  0x0D, 0x7E, 0x00, 0xFF
-vertex      5,     41,  -1023,    -14,  -4108,  0x0D, 0x7E, 0x00, 0xFF
-vertex    384,      0,   1024,    994,    992,  0x0D, 0x7E, 0x00, 0xFF
-vertex   -383,      0,  -1023,    -48,  -4040,  0xF3, 0x7E, 0x00, 0xFF
-vertex      5,     41,   1024,   1008,    994,  0xF3, 0x7E, 0x00, 0xFF
-vertex      5,     41,  -1023,    984,  -4052,  0xF3, 0x7E, 0x00, 0xFF
-vertex   -383,      0,   1024,    -26,   1006,  0xF3, 0x7E, 0x00, 0xFF
-
-lll_seg7_vertex_07019B18: # 0x07019B18 - 0x07019B78
-vertex   -383,      0,  -1023,   7122,    990,  0x00, 0x00, 0x81, 0xFF
-vertex      5,     41,  -1023,   4016,    662,  0x00, 0x00, 0x81, 0xFF
-vertex    384,      0,  -1023,    990,    990,  0x00, 0x00, 0x81, 0xFF
-vertex    384,      0,   1024,   6100,      0,  0x00, 0x00, 0x7F, 0xFF
-vertex      5,     41,   1024,   3074,   -360,  0x00, 0x00, 0x7F, 0xFF
-vertex   -380,      0,   1024,     -8,    -34,  0x00, 0x00, 0x7F, 0xFF
-
-lll_seg7_dl_07019B78: # 0x07019B78 - 0x07019BD0
-gsDPSetTextureImage G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09004000
-gsDPLoadSync
-gsDPLoadBlock 7, 0, 0, 0x3FF, 0x100
-gsSPLight lll_seg7_light_0700FC08, 1
-gsSPLight lll_seg7_light_0700FC00, 2
-gsSPVertex lll_seg7_vertex_07019A98, 8, 0
-gsSP2Triangles  0,  1,  2, 0x0,  0,  3,  1, 0x0
-gsSP2Triangles  4,  5,  6, 0x0,  4,  7,  5, 0x0
-gsSPEndDisplayList
-
-lll_seg7_dl_07019BD0: # 0x07019BD0 - 0x07019C08
-gsDPSetTextureImage G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09006000
-gsDPLoadSync
-gsDPLoadBlock 7, 0, 0, 0x3FF, 0x100
-gsSPVertex lll_seg7_vertex_07019B18, 6, 0
-gsSP2Triangles  0,  1,  2, 0x0,  3,  4,  5, 0x0
-gsSPEndDisplayList
-
-glabel lll_seg7_dl_07019C08 # 0x07019C08 - 0x07019C80
-gsDPPipeSync
-gsDPSetCombineModeLERP1Cycle G_CCMUX_TEXEL0, G_CCMUX_0, G_CCMUX_SHADE, G_CCMUX_0, G_ACMUX_0, G_ACMUX_0, G_ACMUX_0, G_ACMUX_SHADE
-gsSPClearGeometryMode G_SHADING_SMOOTH
-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
-gsSPTexture -1, -1, 0, 0, 1
-gsDPTileSync
-gsDPSetTile G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD
-gsDPSetTileSize 0, 0, 0, 124, 124
-gsSPDisplayList lll_seg7_dl_07019B78
-gsSPDisplayList lll_seg7_dl_07019BD0
-gsSPTexture -1, -1, 0, 0, 0
-gsDPPipeSync
-gsDPSetCombineModeLERP1Cycle G_CCMUX_0, G_CCMUX_0, G_CCMUX_0, G_CCMUX_SHADE, G_ACMUX_0, G_ACMUX_0, G_ACMUX_0, G_ACMUX_SHADE
-gsSPSetGeometryMode G_SHADING_SMOOTH
-gsSPEndDisplayList