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/actors/bubble/collision.s
+++ b/actors/bubble/collision.s
@@ -1,2 +0,0 @@
-# Bubble
-
--- a/actors/bubble/geo.inc.c
+++ b/actors/bubble/geo.inc.c
@@ -0,0 +1,17 @@
+// 0x17000000
+const GeoLayout bubble_geo[] = {
+   GEO_SWITCH_CASE(1, geo_switch_anim_state),
+   GEO_OPEN_NODE(),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, bubble_seg4_dl_0401DD60),
+   GEO_CLOSE_NODE(),
+   GEO_END(),
+};
+
+// 0x1700001C
+const GeoLayout purple_marble_geo[] = {
+   GEO_SWITCH_CASE(1, geo_switch_anim_state),
+   GEO_OPEN_NODE(),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, bubble_seg4_dl_0401DDE0),
+   GEO_CLOSE_NODE(),
+   GEO_END(),
+};
--- a/actors/bubble/geo.s
+++ b/actors/bubble/geo.s
@@ -1,13 +0,0 @@
-glabel bubble_geo # 0x17000000
-   geo_switch_case 1, geo_switch_anim_state
-   geo_open_node
-      geo_display_list LAYER_ALPHA, bubble_seg4_dl_0401DD60
-   geo_close_node
-   geo_end
-
-glabel purple_marble_geo # 0x1700001C
-   geo_switch_case 1, geo_switch_anim_state
-   geo_open_node
-      geo_display_list LAYER_ALPHA, bubble_seg4_dl_0401DDE0
-   geo_close_node
-   geo_end
--- a/actors/bubble/model.inc.c
+++ b/actors/bubble/model.inc.c
@@ -0,0 +1,45 @@
+// Bubble
+
+// 0x0401CD20
+static const Vtx bubble_seg4_vertex_0401CD20[] = {
+    {{{   -16,      0,      0}, 0, {     0,    992}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{    16,      0,      0}, 0, {   992,    992}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{    16,     32,      0}, 0, {   992,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   -16,     32,      0}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
+};
+
+// 0x0401CD60
+ALIGNED8 static const u8 bubble_seg4_texture_0401CD60[] = {
+#include "actors/bubble/bubble.rgba16.inc.c"
+};
+
+// 0x0401D560
+ALIGNED8 static const u8 bubble_seg4_texture_0401D560[] = {
+#include "actors/bubble/mr_i_bubble.rgba16.inc.c"
+};
+
+// 0x0401DD60 - 0x0401DDE0
+const Gfx bubble_seg4_dl_0401DD60[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPLoadTextureBlock(bubble_seg4_texture_0401CD60, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsSPVertex(bubble_seg4_vertex_0401CD20, 4, 0),
+    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPEndDisplayList(),
+};
+
+// 0x0401DDE0 - 0x0401DE60
+const Gfx bubble_seg4_dl_0401DDE0[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPLoadTextureBlock(bubble_seg4_texture_0401D560, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_CLAMP, G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
+    gsSPVertex(bubble_seg4_vertex_0401CD20, 4, 0),
+    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPEndDisplayList(),
+};
--- a/actors/bubble/model.s
+++ b/actors/bubble/model.s
@@ -1,47 +0,0 @@
-# Bubble
-
-bubble_seg4_vertex_0401CD20: # 0x0401CD20
-vertex    -16,      0,      0,      0,    992,  0xFF, 0xFF, 0xFF, 0xFF
-vertex     16,      0,      0,    992,    992,  0xFF, 0xFF, 0xFF, 0xFF
-vertex     16,     32,      0,    992,      0,  0xFF, 0xFF, 0xFF, 0xFF
-vertex    -16,     32,      0,      0,      0,  0xFF, 0xFF, 0xFF, 0xFF
-
-bubble_seg4_texture_0401CD60: # 0x0401CD60
-.incbin "actors/bubble/bubble.rgba16"
-
-bubble_seg4_texture_0401D560: # 0x0401D560
-.incbin "actors/bubble/mr_i_bubble.rgba16"
-
-glabel bubble_seg4_dl_0401DD60 # 0x0401DD60 - 0x0401DDE0
-gsDPPipeSync
-gsDPSetCombineModeLERP1Cycle G_CCMUX_0, G_CCMUX_0, G_CCMUX_0, G_CCMUX_TEXEL0, G_ACMUX_0, G_ACMUX_0, G_ACMUX_0, G_ACMUX_TEXEL0
-gsSPTexture -1, -1, 0, 0, 1
-gsDPSetTextureImage G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bubble_seg4_texture_0401CD60
-gsDPSetTile G_IM_FMT_RGBA, 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_RGBA, 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
-gsSPVertex bubble_seg4_vertex_0401CD20, 4, 0
-gsSP2Triangles  0,  1,  2, 0x0,  0,  2,  3, 0x0
-gsSPTexture -1, -1, 0, 0, 0
-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
-gsSPEndDisplayList
-
-glabel bubble_seg4_dl_0401DDE0 # 0x0401DDE0 - 0x0401DE60
-gsDPPipeSync
-gsDPSetCombineModeLERP1Cycle G_CCMUX_0, G_CCMUX_0, G_CCMUX_0, G_CCMUX_TEXEL0, G_ACMUX_0, G_ACMUX_0, G_ACMUX_0, G_ACMUX_TEXEL0
-gsSPTexture -1, -1, 0, 0, 1
-gsDPSetTextureImage G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bubble_seg4_texture_0401D560
-gsDPSetTile G_IM_FMT_RGBA, 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_RGBA, 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
-gsSPVertex bubble_seg4_vertex_0401CD20, 4, 0
-gsSP2Triangles  0,  1,  2, 0x0,  0,  2,  3, 0x0
-gsSPTexture -1, -1, 0, 0, 0
-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
-gsSPEndDisplayList