Refresh 3

actors/leaves/collision.s

@@ -1,2 +0,0 @@
-# Leaves
-

actors/leaves/geo.inc.c

@@ -0,0 +1,8 @@
+// 0x16000C8C
+const GeoLayout leaves_geo[] = {
+   GEO_NODE_START(),
+   GEO_OPEN_NODE(),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, leaves_seg3_dl_0301CDE0),
+   GEO_CLOSE_NODE(),
+   GEO_END(),
+};

actors/leaves/geo.s

@@ -1,6 +0,0 @@
-glabel leaves_geo # 0x16000C8C
-   geo_node_start
-   geo_open_node
-      geo_display_list LAYER_ALPHA, leaves_seg3_dl_0301CDE0
-   geo_close_node
-   geo_end

actors/leaves/model.inc.c

@@ -0,0 +1,29 @@
+// Leaves
+
+// 0x0301CBA0
+static const Vtx leaves_seg3_vertex_0301CBA0[] = {
+    {{{   -10,    -10,      0}, 0, {     0,    480}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{    10,    -10,      0}, 0, {   480,    480}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{    10,     10,      0}, 0, {   480,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   -10,     10,      0}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
+};
+
+// 0x0301CBE0
+ALIGNED8 static const u8 leaves_seg3_texture_0301CBE0[] = {
+#include "actors/leaves/leaf.rgba16.inc.c"
+};
+
+// 0x0301CDE0 - 0x0301CE70
+const Gfx leaves_seg3_dl_0301CDE0[] = {
+    gsDPPipeSync(),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPLoadTextureBlock(leaves_seg3_texture_0301CBE0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_CLAMP, G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD),
+    gsSPVertex(leaves_seg3_vertex_0301CBA0, 4, 0),
+    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPEndDisplayList(),
+};

actors/leaves/model.s

@@ -1,29 +0,0 @@
-# Leaves
-
-leaves_seg3_vertex_0301CBA0: # 0x0301CBA0
-vertex    -10,    -10,      0,      0,    480,  0xFF, 0xFF, 0xFF, 0xFF
-vertex     10,    -10,      0,    480,    480,  0xFF, 0xFF, 0xFF, 0xFF
-vertex     10,     10,      0,    480,      0,  0xFF, 0xFF, 0xFF, 0xFF
-vertex    -10,     10,      0,      0,      0,  0xFF, 0xFF, 0xFF, 0xFF
-
-leaves_seg3_texture_0301CBE0: # 0x0301CBE0
-.incbin "actors/leaves/leaf.rgba16"
-
-glabel leaves_seg3_dl_0301CDE0 # 0x0301CDE0 - 0x0301CE70
-gsDPPipeSync
-gsSPClearGeometryMode G_LIGHTING | G_CULL_BACK
-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, leaves_seg3_texture_0301CBE0
-gsDPSetTile G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_CLAMP | G_TX_NOMIRROR, 4, G_TX_NOLOD, G_TX_CLAMP | G_TX_NOMIRROR, 4, G_TX_NOLOD
-gsDPLoadSync
-gsDPLoadBlock 7, 0, 0, 0x0FF, 0x200
-gsDPPipeSync
-gsDPSetTile G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP | G_TX_NOMIRROR, 4, G_TX_NOLOD, G_TX_CLAMP | G_TX_NOMIRROR, 4, G_TX_NOLOD
-gsDPSetTileSize 0, 0, 0, 60, 60
-gsSPVertex leaves_seg3_vertex_0301CBA0, 4, 0
-gsSP2Triangles  0,  1,  2, 0x0,  0,  2,  3, 0x0
-gsSPTexture -1, -1, 0, 0, 0
-gsSPSetGeometryMode G_LIGHTING | G_CULL_BACK
-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