Refresh 3

2026-01-21 10:38:08 -08:00 · 2019-11-03 14:36:27 -05:00
parent 6b8bc9b9ec
commit a7c423cb43
4603 changed files with 475500 additions and 437701 deletions
--- a/actors/mist/collision.s
+++ b/actors/mist/collision.s
@@ -1,2 +0,0 @@
-# Mist
-
--- a/actors/mist/geo.inc.c
+++ b/actors/mist/geo.inc.c
@@ -0,0 +1,19 @@
+// 0x16000000
+const GeoLayout mist_geo[] = {
+   GEO_NODE_START(),
+   GEO_OPEN_NODE(),
+      GEO_ASM(0, Geo18_8029D924),
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mist_seg3_dl_03000880),
+   GEO_CLOSE_NODE(),
+   GEO_END(),
+};
+
+// 0x16000020
+const GeoLayout white_puff_geo[] = {
+   GEO_NODE_START(),
+   GEO_OPEN_NODE(),
+      GEO_ASM(0, Geo18_8029D924),
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mist_seg3_dl_03000920),
+   GEO_CLOSE_NODE(),
+   GEO_END(),
+};
--- a/actors/mist/geo.s
+++ b/actors/mist/geo.s
@@ -1,15 +0,0 @@
-glabel mist_geo # 0x16000000
-   geo_node_start
-   geo_open_node
-      geo_asm 0, Geo18_8029D924
-      geo_display_list LAYER_TRANSPARENT, mist_seg3_dl_03000880
-   geo_close_node
-   geo_end
-
-glabel white_puff_geo # 0x16000020
-   geo_node_start
-   geo_open_node
-      geo_asm 0, Geo18_8029D924
-      geo_display_list LAYER_TRANSPARENT, mist_seg3_dl_03000920
-   geo_close_node
-   geo_end
--- a/actors/mist/model.inc.c
+++ b/actors/mist/model.inc.c
@@ -0,0 +1,56 @@
+// Mist
+
+// 0x03000000
+static const Vtx mist_seg3_vertex_03000000[] = {
+    {{{   -25,    -25,      0}, 0, {     0,    992}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{    25,    -25,      0}, 0, {   992,    992}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{    25,     25,      0}, 0, {   992,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   -25,     25,      0}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
+};
+
+// 0x03000040
+static const Vtx mist_seg3_vertex_03000040[] = {
+    {{{   -25,    -25,      0}, 0, {     0,    992}, {0x22, 0x1a, 0x1c, 0xff}}},
+    {{{    25,    -25,      0}, 0, {   992,    992}, {0x22, 0x1a, 0x1c, 0xff}}},
+    {{{    25,     25,      0}, 0, {   992,      0}, {0x22, 0x1a, 0x1c, 0xff}}},
+    {{{   -25,     25,      0}, 0, {     0,      0}, {0x22, 0x1a, 0x1c, 0xff}}},
+};
+
+// 0x03000080
+ALIGNED8 static const u8 mist_seg3_texture_03000080[] = {
+#include "actors/mist/mist.ia16.inc.c"
+};
+
+// 0x03000880 - 0x03000920
+const Gfx mist_seg3_dl_03000880[] = {
+    gsDPPipeSync(),
+    gsSPClearGeometryMode(G_LIGHTING),
+    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPLoadTextureBlock(mist_seg3_texture_03000080, G_IM_FMT_IA, G_IM_SIZ_16b, 32, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsSPVertex(mist_seg3_vertex_03000000, 4, 0),
+    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPSetGeometryMode(G_LIGHTING),
+    gsDPSetEnvColor(255, 255, 255, 255),
+    gsSPEndDisplayList(),
+};
+
+// 0x03000920 - 0x030009C0
+const Gfx mist_seg3_dl_03000920[] = {
+    gsDPPipeSync(),
+    gsSPClearGeometryMode(G_LIGHTING),
+    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPLoadTextureBlock(mist_seg3_texture_03000080, G_IM_FMT_IA, G_IM_SIZ_16b, 32, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsSPVertex(mist_seg3_vertex_03000040, 4, 0),
+    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPSetGeometryMode(G_LIGHTING),
+    gsDPSetEnvColor(255, 255, 255, 255),
+    gsSPEndDisplayList(),
+};
--- a/actors/mist/model.s
+++ b/actors/mist/model.s
@@ -1,58 +0,0 @@
-# Mist
-
-mist_seg3_vertex_03000000: # 0x03000000
-vertex    -25,    -25,      0,      0,    992,  0xFF, 0xFF, 0xFF, 0xFF
-vertex     25,    -25,      0,    992,    992,  0xFF, 0xFF, 0xFF, 0xFF
-vertex     25,     25,      0,    992,      0,  0xFF, 0xFF, 0xFF, 0xFF
-vertex    -25,     25,      0,      0,      0,  0xFF, 0xFF, 0xFF, 0xFF
-
-mist_seg3_vertex_03000040: # 0x03000040
-vertex    -25,    -25,      0,      0,    992,  0x22, 0x1A, 0x1C, 0xFF
-vertex     25,    -25,      0,    992,    992,  0x22, 0x1A, 0x1C, 0xFF
-vertex     25,     25,      0,    992,      0,  0x22, 0x1A, 0x1C, 0xFF
-vertex    -25,     25,      0,      0,      0,  0x22, 0x1A, 0x1C, 0xFF
-
-mist_seg3_texture_03000080: # 0x03000080
-.incbin "actors/mist/mist.ia16"
-
-glabel mist_seg3_dl_03000880 # 0x03000880 - 0x03000920
-gsDPPipeSync
-gsSPClearGeometryMode G_LIGHTING
-gsDPSetCombineModeLERP1Cycle G_CCMUX_TEXEL0, G_CCMUX_0, G_CCMUX_SHADE, G_CCMUX_0, G_ACMUX_TEXEL0, G_ACMUX_0, G_ACMUX_ENVIRONMENT, G_ACMUX_0
-gsDPSetTextureImage G_IM_FMT_IA, G_IM_SIZ_16b, 1, mist_seg3_texture_03000080
-gsDPSetTile G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_CLAMP | G_TX_NOMIRROR, 5, G_TX_NOLOD
-gsDPLoadSync
-gsDPLoadBlock 7, 0, 0, 0x3FF, 0x100
-gsDPPipeSync
-gsDPSetTile G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_CLAMP | G_TX_NOMIRROR, 5, G_TX_NOLOD
-gsDPSetTileSize 0, 0, 0, 124, 124
-gsSPTexture -1, -1, 0, 0, 1
-gsSPVertex mist_seg3_vertex_03000000, 4, 0
-gsSP2Triangles  0,  1,  2, 0x0,  0,  2,  3, 0x0
-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_LIGHTING
-gsDPSetEnvColor 255, 255, 255, 255
-gsSPEndDisplayList
-
-glabel mist_seg3_dl_03000920 # 0x03000920 - 0x030009C0
-gsDPPipeSync
-gsSPClearGeometryMode G_LIGHTING
-gsDPSetCombineModeLERP1Cycle G_CCMUX_TEXEL0, G_CCMUX_0, G_CCMUX_SHADE, G_CCMUX_0, G_ACMUX_TEXEL0, G_ACMUX_0, G_ACMUX_ENVIRONMENT, G_ACMUX_0
-gsDPSetTextureImage G_IM_FMT_IA, G_IM_SIZ_16b, 1, mist_seg3_texture_03000080
-gsDPSetTile G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_CLAMP | G_TX_NOMIRROR, 5, G_TX_NOLOD
-gsDPLoadSync
-gsDPLoadBlock 7, 0, 0, 0x3FF, 0x100
-gsDPPipeSync
-gsDPSetTile G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_CLAMP | G_TX_NOMIRROR, 5, G_TX_NOLOD
-gsDPSetTileSize 0, 0, 0, 124, 124
-gsSPTexture -1, -1, 0, 0, 1
-gsSPVertex mist_seg3_vertex_03000040, 4, 0
-gsSP2Triangles  0,  1,  2, 0x0,  0,  2,  3, 0x0
-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_LIGHTING
-gsDPSetEnvColor 255, 255, 255, 255
-gsSPEndDisplayList