Updated Player Characters (#85)

* Update Player Characters

* Oops...

* Slipped through

* Hopefully this is good now?

actors/luigi/geo_header.h

@@ -98,6 +98,7 @@ extern const Gfx luigi_right_hand_cap_wings_half_1_dl[];
 extern const Gfx luigi_right_hand_cap_wings_half_2_dl[];
 extern const Gfx luigi_right_hand_cap_wings_intial_dl[];
 extern const Gfx luigi_right_hand_cap_wings_transparent_intial_dl[];
+extern const Gfx luigi_right_hand_cap_metal_wings_intial_dl[];
 extern const Gfx luigi_right_hand_cap_wings_end_dl[];
 extern const Gfx luigi_right_hand_cap[];
 extern const Gfx luigi_right_hand_cap_wings[];

actors/luigi_cap/geo_header.h

@@ -9,6 +9,7 @@ extern const Gfx luigi_cap_seg3_dl_03022D10[];
 extern const Gfx luigi_cap_seg3_dl_03022E78[];
 extern const Gfx luigi_cap_seg3_dl_03022EA8[];
 extern const Gfx luigi_cap_seg3_dl_03022ED8[];
+extern const Gfx luigi_cap_seg3_dl_03022ED8_metal[];
 extern const Gfx luigi_cap_seg3_dl_03022F20[];
 extern const Gfx luigi_cap_l_logo_decal[];
 extern const Gfx luigi_cap_seg3_dl_03022F48[];

actors/luigi_cap/model.inc.c

@@ -1,24 +1,6 @@
 #include "pc/rom_assets.h"
 // Mario Cap (Normal Cap, Metal, Winged, etc)
 
-// 0x0301CF08
-static const Lights1 luigi_cap_seg3_lights_0301CF08 = gdSPDefLights1(
-    0x00, 0x39, 0x00,
-    0x00, 0x73, 0x00, 0x28, 0x28, 0x28
-);
-
-// 0x0301CF20
-static const Lights1 luigi_cap_seg3_lights_0301CF20 = gdSPDefLights1(
-    0x7f, 0x7f, 0x7f,
-    0xff, 0xff, 0xff, 0x28, 0x28, 0x28
-);
-
-// 0x0301CF38
-static const Lights1 luigi_cap_seg3_lights_0301CF38 = gdSPDefLights1(
-    0x00, 0x7f, 0x00,
-    0x00, 0xff, 0x00, 0x28, 0x28, 0x28
-);
-
 static const Lights1 luigi_cap_black_lights_group = gdSPDefLights1(
     0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x28, 0x28, 0x28
@@ -26,16 +8,17 @@ static const Lights1 luigi_cap_black_lights_group = gdSPDefLights1(
 
 #include "actors/mario/mario_externs.h"
 #include "actors/luigi/luigi_externs.h"
-#define luigi_cap_texture_metal_shade        mario_texture_metal_shade
+#define luigi_cap_texture_metal_shade              mario_texture_metal_shade
-#define luigi_cap_texture_metal_light        mario_texture_metal_light
+#define luigi_cap_texture_metal_light              mario_texture_metal_light
-#define luigi_cap_texture_l_logo             luigi_texture_l_logo
+#define luigi_cap_texture_l_logo                   luigi_texture_l_logo
-#define luigi_cap_texture_l_blend            luigi_texture_l_blend
+#define luigi_cap_texture_l_blend                  luigi_texture_l_blend
-#define luigi_cap_texture_l_cap              luigi_texture_l_cap
+#define luigi_cap_texture_l_cap                    luigi_texture_l_cap
-#define luigi_cap_texture_wings_half_1       mario_texture_wings_half_1
+#define luigi_cap_texture_wings_half_1             mario_texture_wings_half_1
-#define luigi_cap_texture_wings_half_2       mario_texture_wings_half_2
+#define luigi_cap_texture_wings_half_2             mario_texture_wings_half_2
-#define luigi_cap_texture_metal_wings_half_1 mario_texture_metal_wings_half_1
+#define luigi_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
-#define luigi_cap_texture_metal_wings_half_2 mario_texture_metal_wings_half_2
+#define luigi_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
-#define luigi_cap_texture_cap_inside         mario_texture_cap_inside
+#define luigi_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
+#define luigi_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
 
 // 0x03022750
 ROM_ASSET_LOAD_VTX(luigi_cap_seg3_vertex_03022750, 0x00114750, 78432, 0x0001bf50, 112);
@@ -102,16 +85,10 @@ const Gfx luigi_cap_seg3_dl_03022CC8[] = {
 // 0x03022D10 - 0x03022D38
 const Gfx luigi_cap_seg3_dl_03022D10[] = {
     gsSPDisplayList(luigi_cap_seg3_dl_03022B68),
-    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPSetCombineLERP(SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT),
-    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(65535, 65535, 0, 0, 1),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPSetPrimColor(0, 0, 115, 115, 115, 255),
-    gsDPTileSync(),
+    gsSPCopyLightsPlayerPart(CAP),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (8 - 1) << G_TEXTURE_IMAGE_FRAC, (8 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, luigi_cap_texture_cap_inside),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_16b_BYTES)),
-    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&luigi_cap_seg3_lights_0301CF08.a, 2),
     gsSPDisplayList(luigi_cap_seg3_dl_03022CC8),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -176,6 +153,16 @@ const Gfx luigi_cap_seg3_dl_03022ED8[] = {
     gsSPEndDisplayList(),
 };
 
+const Gfx luigi_cap_seg3_dl_03022ED8_metal[] = {
+    gsDPPipeSync(),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPLight(&luigi_cap_black_lights_group.l, 1),
+    gsSPCopyLightEXT(2, 17),
+    gsSPEndDisplayList(),
+};
+
 // 0x03022F20 - 0x03022F48
 const Gfx luigi_cap_seg3_dl_03022F20[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
@@ -187,10 +174,8 @@ const Gfx luigi_cap_seg3_dl_03022F20[] = {
 
 const Gfx luigi_cap_l_logo_decal[] = {
     gsDPPipeSync(),
-    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, TEXEL0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0),
-    gsDPSetCycleType(G_CYC_2CYCLE),
     gsSPTexture(65535, 65535, 0, 0, 1),
-    gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
     gsSPLight(&luigi_cap_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 17),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_l_logo),
@@ -204,19 +189,21 @@ const Gfx luigi_cap_l_logo_decal[] = {
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(luigi_cap_seg3_dl_03022B30),
-    gsDPSetCycleType(G_CYC_1CYCLE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0),
-    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(65535, 65535, 0, 0, 1),
-    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_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, luigi_cap_texture_l_cap),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPCopyLightsPlayerPart(CAP),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_l_logo),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_l_cap),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(luigi_cap_seg3_dl_03022B30),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -284,14 +271,28 @@ const Gfx luigi_cap_seg3_dl_030230B0[] = {
 
 // 0x03023108 - 0x03023160
 const Gfx luigi_cap_seg3_dl_03023108[] = {
-    gsSPDisplayList(luigi_cap_seg3_dl_03022ED8),
+    gsSPDisplayList(luigi_cap_seg3_dl_03022ED8_metal),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, luigi_cap_texture_metal_wings_half_1),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(luigi_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, luigi_cap_texture_metal_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(luigi_cap_seg3_dl_03022EA8),
     gsSPDisplayList(luigi_cap_seg3_dl_03022F20),
     gsSPEndDisplayList(),
@@ -329,40 +330,53 @@ const Gfx luigi_cap_seg3_dl_03023160[] = {
 
 // 0x03023298 - 0x030233D0
 const Gfx luigi_cap_seg3_dl_03023298[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
-	gsSPSetGeometryMode(G_TEXTURE_GEN),
+    gsSPSetGeometryMode(G_TEXTURE_GEN),
-	gsSPTexture(4032, 1984, 0, 0, 1),
+    gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&luigi_cap_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 17),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_shade),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_shade),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 2047, 128),
+    gsDPLoadBlock(7, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(0, 0, 0, 252, 124),
+    gsDPSetTileSize(0, 0, 0, 252, 124),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_light),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_light),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(6, 0, 0, 2047, 128),
+    gsDPLoadBlock(6, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(1, 0, 0, 252, 124),
+    gsDPSetTileSize(1, 0, 0, 252, 124),
     gsSPDisplayList(luigi_cap_seg3_dl_03022B30),
     gsSPDisplayList(luigi_cap_seg3_dl_03022B68),
     gsSPDisplayList(luigi_cap_seg3_dl_03022CC8),
     gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsSPClearGeometryMode(G_TEXTURE_GEN | G_LIGHTING | G_CULL_BACK),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
-    gsDPSetCombineMode(G_CC_DECALFADEA, G_CC_DECALFADEA),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-    gsDPTileSync(),
+    gsSPLight(&luigi_cap_black_lights_group.l, 1),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
+    gsSPCopyLightEXT(2, 17),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1_shade),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, luigi_cap_texture_metal_wings_half_1),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadSync(),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(luigi_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, luigi_cap_texture_metal_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(luigi_cap_seg3_dl_03022EA8),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),

actors/mario/geo_header.h

@@ -98,6 +98,7 @@ extern const Gfx mario_right_hand_cap_wings_half_1_dl[];
 extern const Gfx mario_right_hand_cap_wings_half_2_dl[];
 extern const Gfx mario_right_hand_cap_wings_intial_dl[];
 extern const Gfx mario_right_hand_cap_wings_transparent_intial_dl[];
+extern const Gfx mario_right_hand_cap_metal_wings_intial_dl[];
 extern const Gfx mario_right_hand_cap_wings_end_dl[];
 extern const Gfx mario_right_hand_cap[];
 extern const Gfx mario_right_hand_cap_wings[];

actors/mario/mario_externs.h

@@ -1,4 +1,3 @@
-extern ALIGNED8 const Texture mario_texture_metal[];
 extern ALIGNED8 const Texture mario_texture_metal_shade[];
 extern ALIGNED8 const Texture mario_texture_metal_light[];
 extern ALIGNED8 const Texture mario_texture_yellow_button[];
@@ -19,6 +18,7 @@ extern ALIGNED8 const Texture mario_texture_eyes_down[];
 extern ALIGNED8 const Texture mario_texture_eyes_dead[];
 extern ALIGNED8 const Texture mario_texture_wings_half_1[];
 extern ALIGNED8 const Texture mario_texture_wings_half_2[];
-extern ALIGNED8 const Texture mario_texture_metal_wings_half_1[];
+extern ALIGNED8 const Texture mario_texture_metal_wings_half_1_shade[];
-extern ALIGNED8 const Texture mario_texture_metal_wings_half_2[];
+extern ALIGNED8 const Texture mario_texture_metal_wings_half_1_light[];
-extern ALIGNED8 const Texture mario_texture_cap_inside[];
+extern ALIGNED8 const Texture mario_texture_metal_wings_half_2_shade[];
+extern ALIGNED8 const Texture mario_texture_metal_wings_half_2_light[];

actors/mario/model.inc.c

@@ -42,8 +42,6 @@ static const Lights1 mario_black_lights_group = gdSPDefLights1(
     0x00, 0x00, 0x00, 0x28, 0x28, 0x28
 );
 
-ROM_ASSET_LOAD_TEXTURE(mario_texture_metal, "actors/mario/mario_metal.rgba16.inc.c", 0x00114750, 78432, 0x00000090, 4096);
-
 ALIGNED8 const Texture mario_texture_metal_shade[] = {
 #include "actors/mario/custom_mario_metal_shade.rgba16.inc.c"
 };
@@ -67,11 +65,11 @@ ALIGNED8 const Texture mario_texture_m_cap[] = {
 };
 
 ALIGNED8 const Texture mario_texture_hair_sideburn[] = {
-#include "actors/mario/custom_mario_sideburn.rgba32.inc.c"
+#include "actors/mario/custom_mario_sideburn.rgba16.inc.c"
 };
 
 ALIGNED8 const Texture mario_texture_add_sideburn[] = {
-#include "actors/mario/custom_mario_sideburn_add.rgba32.inc.c"
+#include "actors/mario/custom_mario_sideburn_add.rgba16.inc.c"
 };
 
 ALIGNED8 const Texture mario_texture_skin_sideburn[] = {
@@ -100,12 +98,20 @@ ROM_ASSET_LOAD_TEXTURE(mario_texture_wings_half_1, "actors/mario/mario_wing.rgba
 
 ROM_ASSET_LOAD_TEXTURE(mario_texture_wings_half_2, "actors/mario/mario_wing_tip.rgba16.inc.c", 0x00114750, 78432, 0x00009090, 4096);
 
-ROM_ASSET_LOAD_TEXTURE(mario_texture_metal_wings_half_1, "actors/mario/mario_metal_wing_unused.rgba16.inc.c", 0x00114750, 78432, 0x0000a090, 4096);
+ALIGNED8 const Texture mario_texture_metal_wings_half_1_shade[] = {
+#include "actors/mario/custom_mario_metal_wing_shade.rgba16.inc.c"
+};
 
-ROM_ASSET_LOAD_TEXTURE(mario_texture_metal_wings_half_2, "actors/mario/mario_metal_wing_tip_unused.rgba16.inc.c", 0x00114750, 78432, 0x0000b090, 4096);
+ALIGNED8 const Texture mario_texture_metal_wings_half_1_light[] = {
+#include "actors/mario/custom_mario_metal_wing_light.rgba16.inc.c"
+};
 
-ALIGNED8 const Texture mario_texture_cap_inside[] = {
+ALIGNED8 const Texture mario_texture_metal_wings_half_2_shade[] = {
-#include "actors/mario/custom_mario_cap_inside.rgba32.inc.c"
+#include "actors/mario/custom_mario_metal_wing_tip_shade.rgba16.inc.c"
+};
+
+ALIGNED8 const Texture mario_texture_metal_wings_half_2_light[] = {
+#include "actors/mario/custom_mario_metal_wing_tip_light.rgba16.inc.c"
 };
 
 // 0x0400C090
@@ -202,22 +208,22 @@ const Gfx mario_butt[] = {
 
 // 0x0400CCC8 - 0x0400CD40
 const Gfx mario_metal_butt[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
-	gsSPSetGeometryMode(G_TEXTURE_GEN),
+    gsSPSetGeometryMode(G_TEXTURE_GEN),
-	gsSPTexture(4032, 1984, 0, 0, 1),
+    gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&mario_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 17),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_shade),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_shade),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 2047, 128),
+    gsDPLoadBlock(7, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(0, 0, 0, 252, 124),
+    gsDPSetTileSize(0, 0, 0, 252, 124),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_light),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_light),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(6, 0, 0, 2047, 128),
+    gsDPLoadBlock(6, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(1, 0, 0, 252, 124),
+    gsDPSetTileSize(1, 0, 0, 252, 124),
     gsSPDisplayList(mario_butt_dl),
     gsSPEndDisplayList(),
 };
@@ -519,22 +525,22 @@ const Gfx mario_left_thigh[] = {
 
 // 0x0400E7E0 - 0x0400E858
 const Gfx mario_metal_left_thigh[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
-	gsSPSetGeometryMode(G_TEXTURE_GEN),
+    gsSPSetGeometryMode(G_TEXTURE_GEN),
-	gsSPTexture(4032, 1984, 0, 0, 1),
+    gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&mario_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 17),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_shade),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_shade),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 2047, 128),
+    gsDPLoadBlock(7, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(0, 0, 0, 252, 124),
+    gsDPSetTileSize(0, 0, 0, 252, 124),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_light),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_light),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(6, 0, 0, 2047, 128),
+    gsDPLoadBlock(6, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(1, 0, 0, 252, 124),
+    gsDPSetTileSize(1, 0, 0, 252, 124),
     gsSPDisplayList(mario_left_thigh_dl),
     gsSPEndDisplayList(),
 };
@@ -1071,30 +1077,28 @@ const Gfx mario_hair_sideburn_decal_cap_on[] = {
     gsSPTexture(65535, 65535, 0, 0, 1),
     gsSPLight(&mario_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 11),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, mario_texture_hair_sideburn),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_hair_sideburn),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(7, 0, 0, 1023, 128),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPSetTileSize(0, 0, 0, 124, 124),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, mario_texture_add_sideburn),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_add_sideburn),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(6, 0, 0, 1023, 128),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(mario_hair_sideburn_cap_on_dl),
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0),
-    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(65535, 65535, 0, 0, 1),
-    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_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_skin_sideburn),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPCopyLightsPlayerPart(SKIN),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_skin_sideburn),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
     gsSPDisplayList(mario_hair_sideburn_cap_on_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -1104,39 +1108,36 @@ const Gfx mario_hair_sideburn_decal_cap_on[] = {
 
 const Gfx mario_m_logo_decal[] = {
     gsDPPipeSync(),
-    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, TEXEL0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0),
-    gsDPSetCycleType(G_CYC_2CYCLE),
     gsSPTexture(65535, 65535, 0, 0, 1),
-    gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
     gsSPLight(&mario_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 17),
-
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_m_logo),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
     gsDPLoadBlock(7, 0, 0, 1023, 256),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPSetTileSize(0, 0, 0, 124, 124),
-
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_m_blend),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
     gsDPLoadBlock(6, 0, 0, 1023, 256),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPSetTileSize(1, 0, 0, 124, 124),
-    
     gsSPDisplayList(mario_m_logo_dl),
-    gsDPSetCycleType(G_CYC_1CYCLE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0),
-    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(65535, 65535, 0, 0, 1),
-    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_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_m_cap),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPCopyLightsPlayerPart(CAP),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_m_logo),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_m_cap),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(mario_m_logo_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -1583,30 +1584,28 @@ const Gfx mario_hair_sideburn_decal_cap_off[] = {
     gsSPTexture(65535, 65535, 0, 0, 1),
     gsSPLight(&mario_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 11),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, mario_texture_hair_sideburn),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_hair_sideburn),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(7, 0, 0, 1023, 128),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPSetTileSize(0, 0, 0, 124, 124),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, mario_texture_add_sideburn),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_add_sideburn),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(6, 0, 0, 1023, 128),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(mario_hair_sideburn_cap_off_dl),
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0),
-    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(65535, 65535, 0, 0, 1),
-    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_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_skin_sideburn),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPCopyLightsPlayerPart(SKIN),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_skin_sideburn),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
     gsSPDisplayList(mario_hair_sideburn_cap_off_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -2093,10 +2092,8 @@ const Gfx mario_right_hand_cap_bottom_dl[] = {
 
 const Gfx mario_right_hand_cap_decal[] = {
     gsDPPipeSync(),
-    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, TEXEL0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0),
-    gsDPSetCycleType(G_CYC_2CYCLE),
     gsSPTexture(65535, 65535, 0, 0, 1),
-    gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
     gsSPLight(&mario_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 17),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_m_logo),
@@ -2110,19 +2107,21 @@ const Gfx mario_right_hand_cap_decal[] = {
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(mario_right_hand_cap_m_logo_dl),
-    gsDPSetCycleType(G_CYC_1CYCLE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0),
-    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(65535, 65535, 0, 0, 1),
-    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_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_m_cap),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPCopyLightsPlayerPart(CAP),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_m_logo),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_m_cap),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(mario_right_hand_cap_m_logo_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -2136,15 +2135,9 @@ const Gfx mario_right_hand_cap_dl[] = {
     gsSPDisplayList(mario_right_hand_cap_top_dl),
     gsSPCopyLightsPlayerPart(GLOVES), // glove light, set in mario_misc.c
     gsSPDisplayList(mario_right_hand_cap_hand_position_dl),
-    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPSetCombineLERP(SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b, 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(65535, 65535, 0, 0, 1),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPSetPrimColor(0, 0, 115, 115, 115, 255),
-    gsDPTileSync(),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (8 - 1) << G_TEXTURE_IMAGE_FRAC, (8 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b, 1, mario_texture_cap_inside),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_32b_BYTES)),
     gsSPCopyLightsPlayerPart(CAP),
     gsSPDisplayList(mario_right_hand_cap_bottom_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
@@ -2224,6 +2217,16 @@ const Gfx mario_right_hand_cap_wings_transparent_intial_dl[] = {
     gsSPEndDisplayList(),
 };
 
+const Gfx mario_right_hand_cap_metal_wings_intial_dl[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPLight(&mario_black_lights_group.l, 1),
+    gsSPCopyLightEXT(2, 17),
+    gsSPEndDisplayList(),
+};
+
 // 0x0401B138 - 0x0401B158
 const Gfx mario_right_hand_cap_wings_end_dl[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
@@ -2285,28 +2288,56 @@ const Gfx mario_metal_right_hand_cap_shared_dl[] = {
 
 // 0x0401B278 - 0x0401B2D0
 const Gfx mario_metal_right_hand_cap_shared_dl_wings[] = {
-    gsSPDisplayList(mario_right_hand_cap_wings_intial_dl),
+    gsSPDisplayList(mario_right_hand_cap_metal_wings_intial_dl),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_metal_wings_half_1),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_1_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_right_hand_cap_wings_half_1_dl),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_metal_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_right_hand_cap_wings_half_2_dl),
     gsSPDisplayList(mario_right_hand_cap_wings_end_dl),
     gsSPEndDisplayList(),
 };
 
 const Gfx mario_metal_right_hand_cap_shared_dl_wings_transparent[] = {
-    gsSPDisplayList(mario_right_hand_cap_wings_transparent_intial_dl),
+    gsSPDisplayList(mario_right_hand_cap_metal_wings_intial_dl),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_metal_wings_half_1),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_1_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_right_hand_cap_wings_half_1_dl),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_metal_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_right_hand_cap_wings_half_2_dl),
     gsSPDisplayList(mario_right_hand_cap_wings_end_dl),
     gsSPEndDisplayList(),
@@ -2488,7 +2519,7 @@ const Gfx mario_cap_wings_transparent[] = {
     gsSPDisplayList(mario_wings_half_2_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
     gsSPEndDisplayList(),
 };
@@ -2496,22 +2527,32 @@ const Gfx mario_cap_wings_transparent[] = {
 // 0x0401CB70 - 0x0401CC28
 const Gfx mario_metal_cap_wings[] = {
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATERGBA, G_CC_MODULATERGBA),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
-    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
-    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(65535, 65535, 0, 0, 1),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsSPLight(&mario_black_lights_group.l, 1),
-    gsDPTileSync(),
+    gsSPCopyLightEXT(2, 17),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_1_shade),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsSPLight(&mario_white_lights_group.l, 1),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
-    gsSPLight(&mario_white_lights_group.a, 2),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_metal_wings_half_1),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
-    gsDPLoadSync(),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_1_light),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_wings_half_1_dl),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_metal_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_wings_half_2_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -2523,22 +2564,32 @@ const Gfx mario_metal_cap_wings[] = {
 // 0x0401CC28 - 0x0401CD20
 const Gfx mario_metal_cap_wings_transparent[] = {
     gsDPPipeSync(),
-    gsSPClearGeometryMode(G_TEXTURE_GEN),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
-    gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
-    gsDPSetCombineMode(G_CC_DECALFADEA, G_CC_DECALFADEA),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
+    gsSPLight(&mario_black_lights_group.l, 1),
-    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),
+    gsSPCopyLightEXT(2, 17),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_1_shade),
-    gsDPTileSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_metal_wings_half_1),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
-    gsDPLoadSync(),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_1_light),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_wings_half_1_dl),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_metal_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_wings_half_2_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),

actors/mario_cap/geo_header.h

@@ -9,6 +9,7 @@ extern const Gfx mario_cap_seg3_dl_03022D10[];
 extern const Gfx mario_cap_seg3_dl_03022E78[];
 extern const Gfx mario_cap_seg3_dl_03022EA8[];
 extern const Gfx mario_cap_seg3_dl_03022ED8[];
+extern const Gfx mario_cap_seg3_dl_03022ED8_metal[];
 extern const Gfx mario_cap_seg3_dl_03022F20[];
 extern const Gfx mario_cap_m_logo_decal[];
 extern const Gfx mario_cap_seg3_dl_03022F48[];

actors/mario_cap/model.inc.c

@@ -25,16 +25,17 @@ static const Lights1 mario_cap_black_lights_group = gdSPDefLights1(
 );
 
 #include "actors/mario/mario_externs.h"
-#define mario_cap_texture_metal_shade        mario_texture_metal_shade
+#define mario_cap_texture_metal_shade              mario_texture_metal_shade
-#define mario_cap_texture_metal_light        mario_texture_metal_light
+#define mario_cap_texture_metal_light              mario_texture_metal_light
-#define mario_cap_texture_m_logo             mario_texture_m_logo
+#define mario_cap_texture_m_logo                   mario_texture_m_logo
-#define mario_cap_texture_m_blend            mario_texture_m_blend
+#define mario_cap_texture_m_blend                  mario_texture_m_blend
-#define mario_cap_texture_m_cap              mario_texture_m_cap
+#define mario_cap_texture_m_cap                    mario_texture_m_cap
-#define mario_cap_texture_wings_half_1       mario_texture_wings_half_1
+#define mario_cap_texture_wings_half_1             mario_texture_wings_half_1
-#define mario_cap_texture_wings_half_2       mario_texture_wings_half_2
+#define mario_cap_texture_wings_half_2             mario_texture_wings_half_2
-#define mario_cap_texture_metal_wings_half_1 mario_texture_metal_wings_half_1
+#define mario_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
-#define mario_cap_texture_metal_wings_half_2 mario_texture_metal_wings_half_2
+#define mario_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
-#define mario_cap_texture_cap_inside         mario_texture_cap_inside
+#define mario_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
+#define mario_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
 
 // 0x0301CF50
 ROM_ASSET_LOAD_TEXTURE(mario_cap_seg3_texture_0301CF50, "actors/mario_cap/mario_cap_metal.rgba16.inc.c", 0x00114750, 78432, 0x00000090, 4096);
@@ -119,16 +120,10 @@ const Gfx mario_cap_seg3_dl_03022CC8[] = {
 // 0x03022D10 - 0x03022D38
 const Gfx mario_cap_seg3_dl_03022D10[] = {
     gsSPDisplayList(mario_cap_seg3_dl_03022B68),
-    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPSetCombineLERP(SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT),
-    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(65535, 65535, 0, 0, 1),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPSetPrimColor(0, 0, 115, 115, 115, 255),
-    gsDPTileSync(),
+    gsSPCopyLightsPlayerPart(CAP),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (8 - 1) << G_TEXTURE_IMAGE_FRAC, (8 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_cap_inside),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_16b_BYTES)),
-    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&mario_cap_seg3_lights_0301CF08.a, 2),
     gsSPDisplayList(mario_cap_seg3_dl_03022CC8),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -193,6 +188,16 @@ const Gfx mario_cap_seg3_dl_03022ED8[] = {
     gsSPEndDisplayList(),
 };
 
+const Gfx mario_cap_seg3_dl_03022ED8_metal[] = {
+    gsDPPipeSync(),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPLight(&mario_cap_black_lights_group.l, 1),
+    gsSPCopyLightEXT(2, 17),
+    gsSPEndDisplayList(),
+};
+
 // 0x03022F20 - 0x03022F48
 const Gfx mario_cap_seg3_dl_03022F20[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
@@ -204,10 +209,8 @@ const Gfx mario_cap_seg3_dl_03022F20[] = {
 
 const Gfx mario_cap_m_logo_decal[] = {
     gsDPPipeSync(),
-    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, TEXEL0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0),
-    gsDPSetCycleType(G_CYC_2CYCLE),
     gsSPTexture(65535, 65535, 0, 0, 1),
-    gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
     gsSPLight(&mario_cap_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 17),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_m_logo),
@@ -221,19 +224,21 @@ const Gfx mario_cap_m_logo_decal[] = {
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(mario_cap_seg3_dl_03022B30),
-    gsDPSetCycleType(G_CYC_1CYCLE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0),
-    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(65535, 65535, 0, 0, 1),
-    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_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_texture_m_cap),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPCopyLightsPlayerPart(CAP),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_m_logo),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_m_cap),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(mario_cap_seg3_dl_03022B30),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -256,22 +261,22 @@ const Gfx mario_cap_seg3_dl_03022F48[] = {
 
 // 0x03022FF8 - 0x030230B0
 const Gfx mario_cap_seg3_dl_03022FF8[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
-	gsSPSetGeometryMode(G_TEXTURE_GEN),
+    gsSPSetGeometryMode(G_TEXTURE_GEN),
-	gsSPTexture(4032, 1984, 0, 0, 1),
+    gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&mario_cap_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 17),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_shade),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_shade),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 2047, 128),
+    gsDPLoadBlock(7, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(0, 0, 0, 252, 124),
+    gsDPSetTileSize(0, 0, 0, 252, 124),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_light),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_light),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(6, 0, 0, 2047, 128),
+    gsDPLoadBlock(6, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(1, 0, 0, 252, 124),
+    gsDPSetTileSize(1, 0, 0, 252, 124),
     gsSPDisplayList(mario_cap_seg3_dl_03022B30),
     gsSPDisplayList(mario_cap_seg3_dl_03022B68),
     gsSPDisplayList(mario_cap_seg3_dl_03022CC8),
@@ -301,14 +306,28 @@ const Gfx mario_cap_seg3_dl_030230B0[] = {
 
 // 0x03023108 - 0x03023160
 const Gfx mario_cap_seg3_dl_03023108[] = {
-    gsSPDisplayList(mario_cap_seg3_dl_03022ED8),
+    gsSPDisplayList(mario_cap_seg3_dl_03022ED8_metal),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_texture_metal_wings_half_1),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_texture_metal_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_cap_seg3_dl_03022EA8),
     gsSPDisplayList(mario_cap_seg3_dl_03022F20),
     gsSPEndDisplayList(),
@@ -346,40 +365,53 @@ const Gfx mario_cap_seg3_dl_03023160[] = {
 
 // 0x03023298 - 0x030233D0
 const Gfx mario_cap_seg3_dl_03023298[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
-	gsSPSetGeometryMode(G_TEXTURE_GEN),
+    gsSPSetGeometryMode(G_TEXTURE_GEN),
-	gsSPTexture(4032, 1984, 0, 0, 1),
+    gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&mario_cap_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 17),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_shade),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_shade),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 2047, 128),
+    gsDPLoadBlock(7, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(0, 0, 0, 252, 124),
+    gsDPSetTileSize(0, 0, 0, 252, 124),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_light),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_light),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(6, 0, 0, 2047, 128),
+    gsDPLoadBlock(6, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(1, 0, 0, 252, 124),
+    gsDPSetTileSize(1, 0, 0, 252, 124),
     gsSPDisplayList(mario_cap_seg3_dl_03022B30),
     gsSPDisplayList(mario_cap_seg3_dl_03022B68),
     gsSPDisplayList(mario_cap_seg3_dl_03022CC8),
     gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsSPClearGeometryMode(G_TEXTURE_GEN | G_LIGHTING | G_CULL_BACK),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
-    gsDPSetCombineMode(G_CC_DECALFADEA, G_CC_DECALFADEA),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-    gsDPTileSync(),
+    gsSPLight(&mario_cap_black_lights_group.l, 1),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
+    gsSPCopyLightEXT(2, 17),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1_shade),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_texture_metal_wings_half_1),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadSync(),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_texture_metal_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(mario_cap_seg3_dl_03022EA8),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),

actors/toad_cap/geo.inc.c

@@ -14,13 +14,13 @@ const GeoLayout toads_cap_geo[] = {
 				GEO_OPEN_NODE(),
 					GEO_NODE_START(),
 					GEO_OPEN_NODE(),
-						GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_cap_Cap_mesh_layer_1),
+						GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_cap_mesh_layer_1),
-						GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_Cap_mesh_layer_5),
+						GEO_DISPLAY_LIST(LAYER_ALPHA, toad_cap_mesh_layer_5),
 					GEO_CLOSE_NODE(),
 					GEO_NODE_START(),
 					GEO_OPEN_NODE(),
-						GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_Cap_mesh_layer_1),
+						GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_mesh_layer_1),
-						GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_Cap_mesh_layer_5),
+						GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_mesh_layer_5),
 					GEO_CLOSE_NODE(),
 				GEO_CLOSE_NODE(),
 			GEO_CLOSE_NODE(),
@@ -80,8 +80,8 @@ const GeoLayout toads_wing_cap_geo[] = {
 					GEO_OPEN_NODE(),
 						GEO_NODE_START(),
 						GEO_OPEN_NODE(),
-							GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_cap_Cap_mesh_layer_1),
+							GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_cap_mesh_layer_1),
-							GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_Cap_mesh_layer_5),
+							GEO_DISPLAY_LIST(LAYER_ALPHA, toad_cap_mesh_layer_5),
 							GEO_DISPLAY_LIST(LAYER_ALPHA, toad_cap_Wing_Cap_Wings_mesh_layer_4),
 						GEO_CLOSE_NODE(),
 					GEO_CLOSE_NODE(),
@@ -89,8 +89,8 @@ const GeoLayout toads_wing_cap_geo[] = {
 					GEO_OPEN_NODE(),
 						GEO_NODE_START(),
 						GEO_OPEN_NODE(),
-							GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_Cap_mesh_layer_1),
+							GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_mesh_layer_1),
-							GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_Cap_mesh_layer_5),
+							GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_mesh_layer_5),
 							GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_Wing_Cap_Wings_mesh_layer_4),
 						GEO_CLOSE_NODE(),
 					GEO_CLOSE_NODE(),

actors/toad_cap/geo_header.h

@@ -2,22 +2,22 @@ extern const GeoLayout toads_cap_geo[];
 extern const GeoLayout toads_metal_cap_geo[];
 extern const GeoLayout toads_wing_cap_geo[];
 extern const GeoLayout toads_winged_metal_cap_geo[];
-extern const Vtx toad_cap_Cap_mesh_layer_1_vtx_0[94];
+extern const Vtx toad_cap_mesh_layer_1_vtx_0[94];
-extern const Gfx toad_cap_Cap_mesh_layer_1_tri_0[];
+extern const Gfx toad_cap_mesh_layer_1_tri_0[];
-extern const Vtx toad_cap_Cap_mesh_layer_1_vtx_1[6];
+extern const Vtx toad_cap_mesh_layer_1_vtx_1[6];
-extern const Gfx toad_cap_Cap_mesh_layer_1_tri_1[];
+extern const Gfx toad_cap_mesh_layer_1_tri_1[];
-extern const Vtx toad_cap_Cap_mesh_layer_5_vtx_0[100];
+extern const Vtx toad_cap_mesh_layer_5_vtx_0[100];
-extern const Gfx toad_cap_Cap_mesh_layer_5_tri_0[];
+extern const Gfx toad_cap_mesh_layer_5_tri_0[];
 extern const Vtx toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_0[8];
 extern const Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_0[];
 extern const Vtx toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_1[8];
 extern const Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_1[];
 extern const Gfx mat_toad_cap_metal[];
 extern const Gfx mat_revert_toad_cap_metal[];
-extern const Gfx mat_toad_cap_cap_base[];
+extern const Gfx mat_toad_cap_base[];
 extern const Gfx mat_toad_cap_toad_cap_inside[];
-extern const Gfx mat_toad_cap_cap_spots[];
+extern const Gfx mat_toad_cap_spots[];
-extern const Gfx mat_revert_toad_cap_cap_spots[];
+extern const Gfx mat_revert_toad_cap_spots[];
 extern const Gfx mat_toad_cap_wing[];
 extern const Gfx mat_revert_toad_cap_wing[];
 extern const Gfx mat_toad_cap_wing_tip[];
@@ -26,8 +26,8 @@ extern const Gfx mat_toad_cap_metal_wing[];
 extern const Gfx mat_revert_toad_cap_metal_wing[];
 extern const Gfx mat_toad_cap_metal_wing_tip[];
 extern const Gfx mat_revert_toad_cap_metal_wing_tip[];
-extern const Gfx toad_cap_Cap_mesh_layer_1[];
+extern const Gfx toad_cap_mesh_layer_1[];
-extern const Gfx toad_cap_Cap_mesh_layer_5[];
+extern const Gfx toad_cap_mesh_layer_5[];
 extern const Gfx toad_cap_Metal_Cap_mesh_layer_1[];
 extern const Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4[];
 extern const Gfx toad_cap_Winged_Metal_Cap_Wings_mesh_layer_4[];

actors/toad_cap/model.inc.c

@@ -5,526 +5,542 @@ static const Lights1 toad_cap_black_lights_group = gdSPDefLights1(
 
 #include "actors/mario/mario_externs.h"
 #include "actors/toad_player/toad_player_externs.h"
-#define toad_cap_texture_metal_shade        mario_texture_metal_shade
+#define toad_cap_texture_metal_shade              mario_texture_metal_shade
-#define toad_cap_texture_metal_light        mario_texture_metal_light
+#define toad_cap_texture_metal_light              mario_texture_metal_light
-#define toad_cap_texture_cap                toad_player_texture_cap
+#define toad_cap_texture_cap                      toad_player_texture_cap
-#define toad_cap_texture_spots              toad_player_texture_spots
+#define toad_cap_texture_spots                    toad_player_texture_spots
-#define toad_cap_texture_wings_half_1       mario_texture_wings_half_1
+#define toad_cap_texture_wings_half_1             mario_texture_wings_half_1
-#define toad_cap_texture_wings_half_2       mario_texture_wings_half_2
+#define toad_cap_texture_wings_half_2             mario_texture_wings_half_2
-#define toad_cap_texture_metal_wings_half_1 mario_texture_metal_wings_half_1
+#define toad_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
-#define toad_cap_texture_metal_wings_half_2 mario_texture_metal_wings_half_2
+#define toad_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
-#define toad_cap_texture_cap_inside         mario_texture_cap_inside
+#define toad_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
+#define toad_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
 
-Vtx toad_cap_Cap_mesh_layer_1_vtx_0[94] = {
+Vtx toad_cap_mesh_layer_1_vtx_0[94] = {
-	{{ {-175, 118, 0}, 0, {-418, 482}, {134, 35, 0, 0} }},
+    {{ {-175, 118, 0}, 0, {-418, 482}, {134, 35, 0, 0} }},
-	{{ {-70, 167, 123}, 0, {178, 72}, {212, 90, 78, 0} }},
+    {{ {-70, 167, 123}, 0, {178, 72}, {212, 90, 78, 0} }},
-	{{ {-141, 167, 0}, 0, {-280, 152}, {166, 90, 0, 0} }},
+    {{ {-141, 167, 0}, 0, {-280, 152}, {166, 90, 0, 0} }},
-	{{ {43, 0, 75}, 0, {751, 1673}, {9, 130, 17, 0} }},
+    {{ {43, 0, 75}, 0, {751, 1673}, {9, 130, 17, 0} }},
-	{{ {89, 0, 0}, 0, {610, 1852}, {20, 131, 0, 0} }},
+    {{ {89, 0, 0}, 0, {610, 1852}, {20, 131, 0, 0} }},
-	{{ {142, 13, 0}, 0, {624, 1980}, {81, 158, 0, 0} }},
+    {{ {142, 13, 0}, 0, {624, 1980}, {81, 158, 0, 0} }},
-	{{ {71, 13, -123}, 0, {306, 1880}, {40, 158, 186, 0} }},
+    {{ {71, 13, -123}, 0, {306, 1880}, {40, 158, 186, 0} }},
-	{{ {43, 0, -75}, 0, {408, 1776}, {9, 130, 240, 0} }},
+    {{ {43, 0, -75}, 0, {408, 1776}, {9, 130, 240, 0} }},
-	{{ {-70, 13, -123}, 0, {250, 1518}, {216, 158, 186, 0} }},
+    {{ {-70, 13, -123}, 0, {250, 1518}, {216, 158, 186, 0} }},
-	{{ {-43, 0, -75}, 0, {375, 1557}, {247, 130, 240, 0} }},
+    {{ {-43, 0, -75}, 0, {375, 1557}, {247, 130, 240, 0} }},
-	{{ {-141, 13, 0}, 0, {508, 1254}, {175, 158, 0, 0} }},
+    {{ {-141, 13, 0}, 0, {508, 1254}, {175, 158, 0, 0} }},
-	{{ {-89, 0, 0}, 0, {531, 1396}, {236, 131, 0, 0} }},
+    {{ {-89, 0, 0}, 0, {531, 1396}, {236, 131, 0, 0} }},
-	{{ {-70, 13, 120}, 0, {826, 1356}, {217, 157, 69, 0} }},
+    {{ {-70, 13, 120}, 0, {826, 1356}, {217, 157, 69, 0} }},
-	{{ {-43, 0, 75}, 0, {724, 1458}, {247, 130, 17, 0} }},
+    {{ {-43, 0, 75}, 0, {724, 1458}, {247, 130, 17, 0} }},
-	{{ {88, 63, 152}, 0, {-92, 952}, {61, 220, 106, 0} }},
+    {{ {88, 63, 152}, 0, {-92, 952}, {61, 220, 106, 0} }},
-	{{ {176, 63, 0}, 0, {1016, 906}, {122, 222, 0, 0} }},
+    {{ {176, 63, 0}, 0, {1016, 906}, {122, 222, 0, 0} }},
-	{{ {176, 118, 0}, 0, {1010, 594}, {122, 35, 0, 0} }},
+    {{ {176, 118, 0}, 0, {1010, 594}, {122, 35, 0, 0} }},
-	{{ {88, 118, 152}, 0, {-98, 640}, {61, 34, 106, 0} }},
+    {{ {88, 118, 152}, 0, {-98, 640}, {61, 34, 106, 0} }},
-	{{ {142, 167, 0}, 0, {892, 212}, {90, 90, 0, 0} }},
+    {{ {142, 167, 0}, 0, {892, 212}, {90, 90, 0, 0} }},
-	{{ {71, 167, 123}, 0, {2, 250}, {45, 90, 78, 0} }},
+    {{ {71, 167, 123}, 0, {2, 250}, {45, 90, 78, 0} }},
-	{{ {79, 201, 0}, 0, {688, -162}, {47, 118, 0, 0} }},
+    {{ {79, 201, 0}, 0, {688, -162}, {47, 118, 0, 0} }},
-	{{ {39, 201, 69}, 0, {194, -140}, {23, 118, 40, 0} }},
+    {{ {39, 201, 69}, 0, {194, -140}, {23, 118, 40, 0} }},
-	{{ {176, 63, 0}, 0, {-196, 438}, {122, 222, 0, 0} }},
+    {{ {176, 63, 0}, 0, {-196, 438}, {122, 222, 0, 0} }},
-	{{ {88, 118, -152}, 0, {1220, 36}, {61, 36, 150, 0} }},
+    {{ {88, 118, -152}, 0, {1220, 36}, {61, 36, 150, 0} }},
-	{{ {176, 118, 0}, 0, {-198, -10}, {122, 35, 0, 0} }},
+    {{ {176, 118, 0}, 0, {-198, -10}, {122, 35, 0, 0} }},
-	{{ {88, 63, -153}, 0, {1222, 482}, {61, 222, 150, 0} }},
+    {{ {88, 63, -153}, 0, {1222, 482}, {61, 222, 150, 0} }},
-	{{ {142, 13, 0}, 0, {-54, 916}, {81, 158, 0, 0} }},
+    {{ {142, 13, 0}, 0, {-54, 916}, {81, 158, 0, 0} }},
-	{{ {71, 13, -123}, 0, {1084, 952}, {40, 158, 186, 0} }},
+    {{ {71, 13, -123}, 0, {1084, 952}, {40, 158, 186, 0} }},
-	{{ {-70, 13, 120}, 0, {184, 1066}, {217, 157, 69, 0} }},
+    {{ {-70, 13, 120}, 0, {184, 1066}, {217, 157, 69, 0} }},
-	{{ {88, 63, 152}, 0, {1214, 712}, {61, 220, 106, 0} }},
+    {{ {88, 63, 152}, 0, {1214, 712}, {61, 220, 106, 0} }},
-	{{ {-88, 63, 152}, 0, {34, 812}, {195, 220, 106, 0} }},
+    {{ {-88, 63, 152}, 0, {34, 812}, {195, 220, 106, 0} }},
-	{{ {88, 118, 152}, 0, {1186, 352}, {61, 34, 106, 0} }},
+    {{ {88, 118, 152}, 0, {1186, 352}, {61, 34, 106, 0} }},
-	{{ {-88, 118, 152}, 0, {6, 452}, {195, 35, 106, 0} }},
+    {{ {-88, 118, 152}, 0, {6, 452}, {195, 35, 106, 0} }},
-	{{ {71, 167, 123}, 0, {1050, -18}, {45, 90, 78, 0} }},
+    {{ {71, 167, 123}, 0, {1050, -18}, {45, 90, 78, 0} }},
-	{{ {-70, 167, 123}, 0, {104, 62}, {212, 90, 78, 0} }},
+    {{ {-70, 167, 123}, 0, {104, 62}, {212, 90, 78, 0} }},
-	{{ {39, 201, 69}, 0, {780, -272}, {23, 118, 40, 0} }},
+    {{ {39, 201, 69}, 0, {780, -272}, {23, 118, 40, 0} }},
-	{{ {-38, 201, 69}, 0, {304, -170}, {233, 118, 40, 0} }},
+    {{ {-38, 201, 69}, 0, {304, -170}, {233, 118, 40, 0} }},
-	{{ {71, 167, 123}, 0, {1036, -112}, {45, 90, 78, 0} }},
+    {{ {71, 167, 123}, 0, {1036, -112}, {45, 90, 78, 0} }},
-	{{ {-141, 167, 0}, 0, {456, 1066}, {166, 90, 0, 0} }},
+    {{ {-141, 167, 0}, 0, {456, 1066}, {166, 90, 0, 0} }},
-	{{ {-70, 167, 123}, 0, {1404, 676}, {212, 90, 78, 0} }},
+    {{ {-70, 167, 123}, 0, {1404, 676}, {212, 90, 78, 0} }},
-	{{ {-38, 201, 69}, 0, {1000, 266}, {233, 118, 40, 0} }},
+    {{ {-38, 201, 69}, 0, {1000, 266}, {233, 118, 40, 0} }},
-	{{ {-78, 201, 0}, 0, {474, 484}, {210, 118, 0, 0} }},
+    {{ {-78, 201, 0}, 0, {474, 484}, {210, 118, 0, 0} }},
-	{{ {0, 213, 0}, 0, {490, -104}, {0, 127, 0, 0} }},
+    {{ {0, 213, 0}, 0, {490, -104}, {0, 127, 0, 0} }},
-	{{ {-38, 201, -66}, 0, {-38, 168}, {234, 119, 216, 0} }},
+    {{ {-38, 201, -66}, 0, {-38, 168}, {234, 119, 216, 0} }},
-	{{ {-70, 167, -122}, 0, {-462, 496}, {212, 91, 179, 0} }},
+    {{ {-70, 167, -122}, 0, {-462, 496}, {212, 91, 179, 0} }},
-	{{ {-38, 201, 69}, 0, {-16, -16}, {233, 118, 40, 0} }},
+    {{ {-38, 201, 69}, 0, {-16, -16}, {233, 118, 40, 0} }},
-	{{ {39, 201, 69}, 0, {-16, -16}, {23, 118, 40, 0} }},
+    {{ {39, 201, 69}, 0, {-16, -16}, {23, 118, 40, 0} }},
-	{{ {0, 213, 0}, 0, {-16, -16}, {0, 127, 0, 0} }},
+    {{ {0, 213, 0}, 0, {-16, -16}, {0, 127, 0, 0} }},
-	{{ {79, 201, 0}, 0, {-16, -16}, {47, 118, 0, 0} }},
+    {{ {79, 201, 0}, 0, {-16, -16}, {47, 118, 0, 0} }},
-	{{ {-141, 13, 0}, 0, {-184, 898}, {175, 158, 0, 0} }},
+    {{ {-141, 13, 0}, 0, {-184, 898}, {175, 158, 0, 0} }},
-	{{ {-70, 13, 120}, 0, {1120, 942}, {217, 157, 69, 0} }},
+    {{ {-70, 13, 120}, 0, {1120, 942}, {217, 157, 69, 0} }},
-	{{ {-88, 63, 152}, 0, {1264, 448}, {195, 220, 106, 0} }},
+    {{ {-88, 63, 152}, 0, {1264, 448}, {195, 220, 106, 0} }},
-	{{ {-175, 63, 0}, 0, {-362, 392}, {134, 222, 0, 0} }},
+    {{ {-175, 63, 0}, 0, {-362, 392}, {134, 222, 0, 0} }},
-	{{ {-88, 118, 152}, 0, {1258, -4}, {195, 35, 106, 0} }},
+    {{ {-88, 118, 152}, 0, {1258, -4}, {195, 35, 106, 0} }},
-	{{ {-175, 118, 0}, 0, {-370, -58}, {134, 35, 0, 0} }},
+    {{ {-175, 118, 0}, 0, {-370, -58}, {134, 35, 0, 0} }},
-	{{ {-70, 167, 123}, 0, {1100, -320}, {212, 90, 78, 0} }},
+    {{ {-70, 167, 123}, 0, {1100, -320}, {212, 90, 78, 0} }},
-	{{ {71, 167, -122}, 0, {-26, 196}, {44, 91, 179, 0} }},
+    {{ {71, 167, -122}, 0, {-26, 196}, {44, 91, 179, 0} }},
-	{{ {-70, 167, -122}, 0, {888, 166}, {212, 91, 179, 0} }},
+    {{ {-70, 167, -122}, 0, {888, 166}, {212, 91, 179, 0} }},
-	{{ {-38, 201, -66}, 0, {646, -188}, {234, 119, 216, 0} }},
+    {{ {-38, 201, -66}, 0, {646, -188}, {234, 119, 216, 0} }},
-	{{ {88, 118, -152}, 0, {-106, 592}, {61, 36, 150, 0} }},
+    {{ {88, 118, -152}, 0, {-106, 592}, {61, 36, 150, 0} }},
-	{{ {-88, 118, -152}, 0, {1032, 556}, {195, 36, 151, 0} }},
+    {{ {-88, 118, -152}, 0, {1032, 556}, {195, 36, 151, 0} }},
-	{{ {88, 63, -153}, 0, {-88, 942}, {61, 222, 150, 0} }},
+    {{ {88, 63, -153}, 0, {-88, 942}, {61, 222, 150, 0} }},
-	{{ {-88, 63, -153}, 0, {1050, 906}, {195, 222, 150, 0} }},
+    {{ {-88, 63, -153}, 0, {1050, 906}, {195, 222, 150, 0} }},
-	{{ {-70, 13, -123}, 0, {-96, 882}, {216, 158, 186, 0} }},
+    {{ {-70, 13, -123}, 0, {-96, 882}, {216, 158, 186, 0} }},
-	{{ {-141, 13, 0}, 0, {1122, 1024}, {175, 158, 0, 0} }},
+    {{ {-141, 13, 0}, 0, {1122, 1024}, {175, 158, 0, 0} }},
-	{{ {-175, 63, 0}, 0, {1320, 596}, {134, 222, 0, 0} }},
+    {{ {-175, 63, 0}, 0, {1320, 596}, {134, 222, 0, 0} }},
-	{{ {-88, 63, -153}, 0, {-198, 414}, {195, 222, 150, 0} }},
+    {{ {-88, 63, -153}, 0, {-198, 414}, {195, 222, 150, 0} }},
-	{{ {-175, 118, 0}, 0, {1372, 98}, {134, 35, 0, 0} }},
+    {{ {-175, 118, 0}, 0, {1372, 98}, {134, 35, 0, 0} }},
-	{{ {-88, 118, -152}, 0, {-146, -82}, {195, 36, 151, 0} }},
+    {{ {-88, 118, -152}, 0, {-146, -82}, {195, 36, 151, 0} }},
-	{{ {176, 118, 0}, 0, {-16, -16}, {122, 35, 0, 0} }},
+    {{ {176, 118, 0}, 0, {-16, -16}, {122, 35, 0, 0} }},
-	{{ {71, 167, -122}, 0, {-16, -16}, {44, 91, 179, 0} }},
+    {{ {71, 167, -122}, 0, {-16, -16}, {44, 91, 179, 0} }},
-	{{ {142, 167, 0}, 0, {-16, -16}, {90, 90, 0, 0} }},
+    {{ {142, 167, 0}, 0, {-16, -16}, {90, 90, 0, 0} }},
-	{{ {88, 118, -152}, 0, {-16, -16}, {61, 36, 150, 0} }},
+    {{ {88, 118, -152}, 0, {-16, -16}, {61, 36, 150, 0} }},
-	{{ {71, 13, -123}, 0, {-16, -16}, {40, 158, 186, 0} }},
+    {{ {71, 13, -123}, 0, {-16, -16}, {40, 158, 186, 0} }},
-	{{ {-88, 63, -153}, 0, {-16, -16}, {195, 222, 150, 0} }},
+    {{ {-88, 63, -153}, 0, {-16, -16}, {195, 222, 150, 0} }},
-	{{ {88, 63, -153}, 0, {-16, -16}, {61, 222, 150, 0} }},
+    {{ {88, 63, -153}, 0, {-16, -16}, {61, 222, 150, 0} }},
-	{{ {-70, 13, -123}, 0, {-16, -16}, {216, 158, 186, 0} }},
+    {{ {-70, 13, -123}, 0, {-16, -16}, {216, 158, 186, 0} }},
-	{{ {-88, 118, -152}, 0, {-16, -16}, {195, 36, 151, 0} }},
+    {{ {-88, 118, -152}, 0, {-16, -16}, {195, 36, 151, 0} }},
-	{{ {-141, 167, 0}, 0, {-16, -16}, {166, 90, 0, 0} }},
+    {{ {-141, 167, 0}, 0, {-16, -16}, {166, 90, 0, 0} }},
-	{{ {-70, 167, -122}, 0, {-16, -16}, {212, 91, 179, 0} }},
+    {{ {-70, 167, -122}, 0, {-16, -16}, {212, 91, 179, 0} }},
-	{{ {-175, 118, 0}, 0, {-16, -16}, {134, 35, 0, 0} }},
+    {{ {-175, 118, 0}, 0, {-16, -16}, {134, 35, 0, 0} }},
-	{{ {43, 0, 75}, 0, {-11, 790}, {9, 130, 17, 0} }},
+    {{ {43, 0, 75}, 0, {-11, 790}, {9, 130, 17, 0} }},
-	{{ {142, 13, 0}, 0, {1024, 984}, {81, 158, 0, 0} }},
+    {{ {142, 13, 0}, 0, {1024, 984}, {81, 158, 0, 0} }},
-	{{ {71, 13, 120}, 0, {82, 380}, {40, 157, 69, 0} }},
+    {{ {71, 13, 120}, 0, {82, 380}, {40, 157, 69, 0} }},
-	{{ {176, 63, 0}, 0, {1466, 550}, {122, 222, 0, 0} }},
+    {{ {176, 63, 0}, 0, {1466, 550}, {122, 222, 0, 0} }},
-	{{ {88, 63, 152}, 0, {290, -208}, {61, 220, 106, 0} }},
+    {{ {88, 63, 152}, 0, {290, -208}, {61, 220, 106, 0} }},
-	{{ {-70, 13, 120}, 0, {-982, 638}, {217, 157, 69, 0} }},
+    {{ {-70, 13, 120}, 0, {-982, 638}, {217, 157, 69, 0} }},
-	{{ {-43, 0, 75}, 0, {-656, 946}, {247, 130, 17, 0} }},
+    {{ {-43, 0, 75}, 0, {-656, 946}, {247, 130, 17, 0} }},
-	{{ {71, 167, -122}, 0, {832, 1186}, {44, 91, 179, 0} }},
+    {{ {71, 167, -122}, 0, {832, 1186}, {44, 91, 179, 0} }},
-	{{ {-38, 201, -66}, 0, {1162, -70}, {234, 119, 216, 0} }},
+    {{ {-38, 201, -66}, 0, {1162, -70}, {234, 119, 216, 0} }},
-	{{ {39, 201, -66}, 0, {654, 498}, {23, 118, 216, 0} }},
+    {{ {39, 201, -66}, 0, {654, 498}, {23, 118, 216, 0} }},
-	{{ {0, 213, 0}, 0, {414, -278}, {0, 127, 0, 0} }},
+    {{ {0, 213, 0}, 0, {414, -278}, {0, 127, 0, 0} }},
-	{{ {79, 201, 0}, 0, {-98, 326}, {47, 118, 0, 0} }},
+    {{ {79, 201, 0}, 0, {-98, 326}, {47, 118, 0, 0} }},
-	{{ {142, 167, 0}, 0, {-524, 874}, {90, 90, 0, 0} }},
+    {{ {142, 167, 0}, 0, {-524, 874}, {90, 90, 0, 0} }},
 };
 
-Gfx toad_cap_Cap_mesh_layer_1_tri_0[] = {
+Gfx toad_cap_mesh_layer_1_tri_0[] = {
-	gsSPVertex(toad_cap_Cap_mesh_layer_1_vtx_0 + 0, 63, 0),
+    gsSPVertex(toad_cap_mesh_layer_1_vtx_0 + 0, 63, 0),
-	gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-	gsSP2Triangles(4, 6, 5, 0, 4, 7, 6, 0),
+    gsSP2Triangles(4, 6, 5, 0, 4, 7, 6, 0),
-	gsSP2Triangles(7, 8, 6, 0, 7, 9, 8, 0),
+    gsSP2Triangles(7, 8, 6, 0, 7, 9, 8, 0),
-	gsSP2Triangles(9, 10, 8, 0, 9, 11, 10, 0),
+    gsSP2Triangles(9, 10, 8, 0, 9, 11, 10, 0),
-	gsSP2Triangles(11, 12, 10, 0, 11, 13, 12, 0),
+    gsSP2Triangles(11, 12, 10, 0, 11, 13, 12, 0),
-	gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0),
-	gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
+    gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0),
-	gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
-	gsSP2Triangles(22, 23, 24, 0, 22, 25, 23, 0),
+    gsSP2Triangles(22, 23, 24, 0, 22, 25, 23, 0),
-	gsSP2Triangles(26, 25, 22, 0, 26, 27, 25, 0),
+    gsSP2Triangles(26, 25, 22, 0, 26, 27, 25, 0),
-	gsSP2Triangles(28, 29, 30, 0, 30, 29, 31, 0),
+    gsSP2Triangles(28, 29, 30, 0, 30, 29, 31, 0),
-	gsSP2Triangles(30, 31, 32, 0, 32, 31, 33, 0),
+    gsSP2Triangles(30, 31, 32, 0, 32, 31, 33, 0),
-	gsSP2Triangles(32, 33, 34, 0, 1, 35, 36, 0),
+    gsSP2Triangles(32, 33, 34, 0, 1, 35, 36, 0),
-	gsSP2Triangles(1, 37, 35, 0, 38, 39, 40, 0),
+    gsSP2Triangles(1, 37, 35, 0, 38, 39, 40, 0),
-	gsSP2Triangles(38, 40, 41, 0, 41, 40, 42, 0),
+    gsSP2Triangles(38, 40, 41, 0, 41, 40, 42, 0),
-	gsSP2Triangles(43, 41, 42, 0, 44, 41, 43, 0),
+    gsSP2Triangles(43, 41, 42, 0, 44, 41, 43, 0),
-	gsSP2Triangles(44, 38, 41, 0, 45, 46, 47, 0),
+    gsSP2Triangles(44, 38, 41, 0, 45, 46, 47, 0),
-	gsSP2Triangles(46, 48, 47, 0, 49, 50, 51, 0),
+    gsSP2Triangles(46, 48, 47, 0, 49, 50, 51, 0),
-	gsSP2Triangles(49, 51, 52, 0, 52, 51, 53, 0),
+    gsSP2Triangles(49, 51, 52, 0, 52, 51, 53, 0),
-	gsSP2Triangles(52, 53, 54, 0, 54, 53, 55, 0),
+    gsSP2Triangles(52, 53, 54, 0, 54, 53, 55, 0),
-	gsSP2Triangles(56, 57, 58, 0, 59, 57, 56, 0),
+    gsSP2Triangles(56, 57, 58, 0, 59, 57, 56, 0),
-	gsSP2Triangles(59, 60, 57, 0, 61, 60, 59, 0),
+    gsSP2Triangles(59, 60, 57, 0, 61, 60, 59, 0),
-	gsSP1Triangle(61, 62, 60, 0),
+    gsSP1Triangle(61, 62, 60, 0),
-	gsSPVertex(toad_cap_Cap_mesh_layer_1_vtx_0 + 63, 31, 0),
+    gsSPVertex(toad_cap_mesh_layer_1_vtx_0 + 63, 31, 0),
-	gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
-	gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
+    gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0),
-	gsSP2Triangles(6, 7, 8, 0, 6, 9, 7, 0),
+    gsSP2Triangles(6, 7, 8, 0, 6, 9, 7, 0),
-	gsSP2Triangles(10, 11, 12, 0, 10, 13, 11, 0),
+    gsSP2Triangles(10, 11, 12, 0, 10, 13, 11, 0),
-	gsSP2Triangles(14, 15, 16, 0, 14, 17, 15, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 17, 15, 0),
-	gsSP2Triangles(18, 19, 20, 0, 20, 19, 21, 0),
+    gsSP2Triangles(18, 19, 20, 0, 20, 19, 21, 0),
-	gsSP2Triangles(20, 21, 22, 0, 23, 20, 22, 0),
+    gsSP2Triangles(20, 21, 22, 0, 23, 20, 22, 0),
-	gsSP2Triangles(24, 20, 23, 0, 24, 18, 20, 0),
+    gsSP2Triangles(24, 20, 23, 0, 24, 18, 20, 0),
-	gsSP2Triangles(25, 26, 27, 0, 27, 26, 28, 0),
+    gsSP2Triangles(25, 26, 27, 0, 27, 26, 28, 0),
-	gsSP2Triangles(29, 27, 28, 0, 30, 27, 29, 0),
+    gsSP2Triangles(29, 27, 28, 0, 30, 27, 29, 0),
-	gsSP1Triangle(30, 25, 27, 0),
+    gsSP1Triangle(30, 25, 27, 0),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
-Vtx toad_cap_Cap_mesh_layer_1_vtx_1[6] = {
+Vtx toad_cap_mesh_layer_1_vtx_1[6] = {
-	{{ {-43, 0, 75}, 0, {-16, -16}, {247, 130, 17, 0} }},
+    {{ {-43, 0, 75}, 0, {-16, -16}, {247, 130, 17, 0} }},
-	{{ {-89, 0, 0}, 0, {-16, -16}, {236, 131, 0, 0} }},
+    {{ {-89, 0, 0}, 0, {-16, -16}, {236, 131, 0, 0} }},
-	{{ {43, 0, 75}, 0, {-16, -16}, {9, 130, 17, 0} }},
+    {{ {43, 0, 75}, 0, {-16, -16}, {9, 130, 17, 0} }},
-	{{ {89, 0, 0}, 0, {-16, -16}, {20, 131, 0, 0} }},
+    {{ {89, 0, 0}, 0, {-16, -16}, {20, 131, 0, 0} }},
-	{{ {-43, 0, -75}, 0, {-16, -16}, {247, 130, 240, 0} }},
+    {{ {-43, 0, -75}, 0, {-16, -16}, {247, 130, 240, 0} }},
-	{{ {43, 0, -75}, 0, {-16, -16}, {9, 130, 240, 0} }},
+    {{ {43, 0, -75}, 0, {-16, -16}, {9, 130, 240, 0} }},
 };
 
-Gfx toad_cap_Cap_mesh_layer_1_tri_1[] = {
+Gfx toad_cap_mesh_layer_1_tri_1[] = {
-	gsSPVertex(toad_cap_Cap_mesh_layer_1_vtx_1 + 0, 6, 0),
+    gsSPVertex(toad_cap_mesh_layer_1_vtx_1 + 0, 6, 0),
-	gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0),
+    gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0),
-	gsSP2Triangles(4, 3, 1, 0, 5, 3, 4, 0),
+    gsSP2Triangles(4, 3, 1, 0, 5, 3, 4, 0),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
-Vtx toad_cap_Cap_mesh_layer_5_vtx_0[100] = {
+Vtx toad_cap_mesh_layer_5_vtx_0[100] = {
-	{{ {-175, 118, 0}, 0, {-418, 482}, {134, 35, 0, 0} }},
+    {{ {-175, 118, 0}, 0, {-418, 482}, {134, 35, 0, 0} }},
-	{{ {-70, 167, 123}, 0, {178, 72}, {212, 90, 78, 0} }},
+    {{ {-70, 167, 123}, 0, {178, 72}, {212, 90, 78, 0} }},
-	{{ {-141, 167, 0}, 0, {-280, 152}, {166, 90, 0, 0} }},
+    {{ {-141, 167, 0}, 0, {-280, 152}, {166, 90, 0, 0} }},
-	{{ {176, 118, 0}, 0, {-16, -16}, {122, 35, 0, 0} }},
+    {{ {176, 118, 0}, 0, {-16, -16}, {122, 35, 0, 0} }},
-	{{ {88, 118, -152}, 0, {-16, -16}, {61, 36, 150, 0} }},
+    {{ {88, 118, -152}, 0, {-16, -16}, {61, 36, 150, 0} }},
-	{{ {71, 167, -122}, 0, {-16, -16}, {44, 91, 179, 0} }},
+    {{ {71, 167, -122}, 0, {-16, -16}, {44, 91, 179, 0} }},
-	{{ {142, 167, 0}, 0, {-16, -16}, {90, 90, 0, 0} }},
+    {{ {142, 167, 0}, 0, {-16, -16}, {90, 90, 0, 0} }},
-	{{ {71, 167, -122}, 0, {-26, 196}, {44, 91, 179, 0} }},
+    {{ {71, 167, -122}, 0, {-26, 196}, {44, 91, 179, 0} }},
-	{{ {-70, 167, -122}, 0, {888, 166}, {212, 91, 179, 0} }},
+    {{ {-70, 167, -122}, 0, {888, 166}, {212, 91, 179, 0} }},
-	{{ {-38, 201, -66}, 0, {646, -188}, {234, 119, 216, 0} }},
+    {{ {-38, 201, -66}, 0, {646, -188}, {234, 119, 216, 0} }},
-	{{ {88, 118, -152}, 0, {-106, 592}, {61, 36, 150, 0} }},
+    {{ {88, 118, -152}, 0, {-106, 592}, {61, 36, 150, 0} }},
-	{{ {-88, 118, -152}, 0, {1032, 556}, {195, 36, 151, 0} }},
+    {{ {-88, 118, -152}, 0, {1032, 556}, {195, 36, 151, 0} }},
-	{{ {88, 63, -153}, 0, {-88, 942}, {61, 222, 150, 0} }},
+    {{ {88, 63, -153}, 0, {-88, 942}, {61, 222, 150, 0} }},
-	{{ {-88, 63, -153}, 0, {1050, 906}, {195, 222, 150, 0} }},
+    {{ {-88, 63, -153}, 0, {1050, 906}, {195, 222, 150, 0} }},
-	{{ {176, 63, 0}, 0, {-196, 438}, {122, 222, 0, 0} }},
+    {{ {176, 63, 0}, 0, {-196, 438}, {122, 222, 0, 0} }},
-	{{ {88, 118, -152}, 0, {1220, 36}, {61, 36, 150, 0} }},
+    {{ {88, 118, -152}, 0, {1220, 36}, {61, 36, 150, 0} }},
-	{{ {176, 118, 0}, 0, {-198, -10}, {122, 35, 0, 0} }},
+    {{ {176, 118, 0}, 0, {-198, -10}, {122, 35, 0, 0} }},
-	{{ {88, 63, -153}, 0, {1222, 482}, {61, 222, 150, 0} }},
+    {{ {88, 63, -153}, 0, {1222, 482}, {61, 222, 150, 0} }},
-	{{ {142, 13, 0}, 0, {-54, 916}, {81, 158, 0, 0} }},
+    {{ {142, 13, 0}, 0, {-54, 916}, {81, 158, 0, 0} }},
-	{{ {71, 13, -123}, 0, {1084, 952}, {40, 158, 186, 0} }},
+    {{ {71, 13, -123}, 0, {1084, 952}, {40, 158, 186, 0} }},
-	{{ {71, 13, -123}, 0, {-16, -16}, {40, 158, 186, 0} }},
+    {{ {71, 13, -123}, 0, {-16, -16}, {40, 158, 186, 0} }},
-	{{ {-70, 13, -123}, 0, {-16, -16}, {216, 158, 186, 0} }},
+    {{ {-70, 13, -123}, 0, {-16, -16}, {216, 158, 186, 0} }},
-	{{ {-88, 63, -153}, 0, {-16, -16}, {195, 222, 150, 0} }},
+    {{ {-88, 63, -153}, 0, {-16, -16}, {195, 222, 150, 0} }},
-	{{ {88, 63, -153}, 0, {-16, -16}, {61, 222, 150, 0} }},
+    {{ {88, 63, -153}, 0, {-16, -16}, {61, 222, 150, 0} }},
-	{{ {-88, 63, -153}, 0, {-198, 414}, {195, 222, 150, 0} }},
+    {{ {-88, 63, -153}, 0, {-198, 414}, {195, 222, 150, 0} }},
-	{{ {-175, 118, 0}, 0, {1372, 98}, {134, 35, 0, 0} }},
+    {{ {-175, 118, 0}, 0, {1372, 98}, {134, 35, 0, 0} }},
-	{{ {-88, 118, -152}, 0, {-146, -82}, {195, 36, 151, 0} }},
+    {{ {-88, 118, -152}, 0, {-146, -82}, {195, 36, 151, 0} }},
-	{{ {-175, 63, 0}, 0, {1320, 596}, {134, 222, 0, 0} }},
+    {{ {-175, 63, 0}, 0, {1320, 596}, {134, 222, 0, 0} }},
-	{{ {-70, 13, -123}, 0, {-96, 882}, {216, 158, 186, 0} }},
+    {{ {-70, 13, -123}, 0, {-96, 882}, {216, 158, 186, 0} }},
-	{{ {-141, 13, 0}, 0, {1122, 1024}, {175, 158, 0, 0} }},
+    {{ {-141, 13, 0}, 0, {1122, 1024}, {175, 158, 0, 0} }},
-	{{ {-88, 118, -152}, 0, {-16, -16}, {195, 36, 151, 0} }},
+    {{ {-88, 118, -152}, 0, {-16, -16}, {195, 36, 151, 0} }},
-	{{ {-175, 118, 0}, 0, {-16, -16}, {134, 35, 0, 0} }},
+    {{ {-175, 118, 0}, 0, {-16, -16}, {134, 35, 0, 0} }},
-	{{ {-141, 167, 0}, 0, {-16, -16}, {166, 90, 0, 0} }},
+    {{ {-141, 167, 0}, 0, {-16, -16}, {166, 90, 0, 0} }},
-	{{ {-70, 167, -122}, 0, {-16, -16}, {212, 91, 179, 0} }},
+    {{ {-70, 167, -122}, 0, {-16, -16}, {212, 91, 179, 0} }},
-	{{ {-141, 167, 0}, 0, {456, 1066}, {166, 90, 0, 0} }},
+    {{ {-141, 167, 0}, 0, {456, 1066}, {166, 90, 0, 0} }},
-	{{ {-70, 167, 123}, 0, {1404, 676}, {212, 90, 78, 0} }},
+    {{ {-70, 167, 123}, 0, {1404, 676}, {212, 90, 78, 0} }},
-	{{ {-38, 201, 69}, 0, {1000, 266}, {233, 118, 40, 0} }},
+    {{ {-38, 201, 69}, 0, {1000, 266}, {233, 118, 40, 0} }},
-	{{ {-78, 201, 0}, 0, {474, 484}, {210, 118, 0, 0} }},
+    {{ {-78, 201, 0}, 0, {474, 484}, {210, 118, 0, 0} }},
-	{{ {0, 213, 0}, 0, {490, -104}, {0, 127, 0, 0} }},
+    {{ {0, 213, 0}, 0, {490, -104}, {0, 127, 0, 0} }},
-	{{ {-38, 201, -66}, 0, {-38, 168}, {234, 119, 216, 0} }},
+    {{ {-38, 201, -66}, 0, {-38, 168}, {234, 119, 216, 0} }},
-	{{ {-70, 167, -122}, 0, {-462, 496}, {212, 91, 179, 0} }},
+    {{ {-70, 167, -122}, 0, {-462, 496}, {212, 91, 179, 0} }},
-	{{ {-175, 118, 0}, 0, {-370, -58}, {134, 35, 0, 0} }},
+    {{ {-175, 118, 0}, 0, {-370, -58}, {134, 35, 0, 0} }},
-	{{ {-88, 118, 152}, 0, {1258, -4}, {195, 35, 106, 0} }},
+    {{ {-88, 118, 152}, 0, {1258, -4}, {195, 35, 106, 0} }},
-	{{ {-70, 167, 123}, 0, {1100, -320}, {212, 90, 78, 0} }},
+    {{ {-70, 167, 123}, 0, {1100, -320}, {212, 90, 78, 0} }},
-	{{ {-175, 63, 0}, 0, {-362, 392}, {134, 222, 0, 0} }},
+    {{ {-175, 63, 0}, 0, {-362, 392}, {134, 222, 0, 0} }},
-	{{ {-88, 63, 152}, 0, {1264, 448}, {195, 220, 106, 0} }},
+    {{ {-88, 63, 152}, 0, {1264, 448}, {195, 220, 106, 0} }},
-	{{ {-141, 13, 0}, 0, {-184, 898}, {175, 158, 0, 0} }},
+    {{ {-141, 13, 0}, 0, {-184, 898}, {175, 158, 0, 0} }},
-	{{ {-70, 13, 120}, 0, {1120, 942}, {217, 157, 69, 0} }},
+    {{ {-70, 13, 120}, 0, {1120, 942}, {217, 157, 69, 0} }},
-	{{ {39, 201, 69}, 0, {-16, -16}, {23, 118, 40, 0} }},
+    {{ {39, 201, 69}, 0, {-16, -16}, {23, 118, 40, 0} }},
-	{{ {79, 201, 0}, 0, {-16, -16}, {47, 118, 0, 0} }},
+    {{ {79, 201, 0}, 0, {-16, -16}, {47, 118, 0, 0} }},
-	{{ {0, 213, 0}, 0, {-16, -16}, {0, 127, 0, 0} }},
+    {{ {0, 213, 0}, 0, {-16, -16}, {0, 127, 0, 0} }},
-	{{ {-38, 201, 69}, 0, {-16, -16}, {233, 118, 40, 0} }},
+    {{ {-38, 201, 69}, 0, {-16, -16}, {233, 118, 40, 0} }},
-	{{ {71, 167, 123}, 0, {2, 250}, {45, 90, 78, 0} }},
+    {{ {71, 167, 123}, 0, {2, 250}, {45, 90, 78, 0} }},
-	{{ {79, 201, 0}, 0, {688, -162}, {47, 118, 0, 0} }},
+    {{ {79, 201, 0}, 0, {688, -162}, {47, 118, 0, 0} }},
-	{{ {39, 201, 69}, 0, {194, -140}, {23, 118, 40, 0} }},
+    {{ {39, 201, 69}, 0, {194, -140}, {23, 118, 40, 0} }},
-	{{ {142, 167, 0}, 0, {892, 212}, {90, 90, 0, 0} }},
+    {{ {142, 167, 0}, 0, {892, 212}, {90, 90, 0, 0} }},
-	{{ {88, 118, 152}, 0, {-98, 640}, {61, 34, 106, 0} }},
+    {{ {88, 118, 152}, 0, {-98, 640}, {61, 34, 106, 0} }},
-	{{ {176, 118, 0}, 0, {1010, 594}, {122, 35, 0, 0} }},
+    {{ {176, 118, 0}, 0, {1010, 594}, {122, 35, 0, 0} }},
-	{{ {88, 63, 152}, 0, {-92, 952}, {61, 220, 106, 0} }},
+    {{ {88, 63, 152}, 0, {-92, 952}, {61, 220, 106, 0} }},
-	{{ {176, 63, 0}, 0, {1016, 906}, {122, 222, 0, 0} }},
+    {{ {176, 63, 0}, 0, {1016, 906}, {122, 222, 0, 0} }},
-	{{ {39, 201, 69}, 0, {780, -272}, {23, 118, 40, 0} }},
+    {{ {39, 201, 69}, 0, {780, -272}, {23, 118, 40, 0} }},
-	{{ {-38, 201, 69}, 0, {304, -170}, {233, 118, 40, 0} }},
+    {{ {-38, 201, 69}, 0, {304, -170}, {233, 118, 40, 0} }},
-	{{ {71, 167, 123}, 0, {1036, -112}, {45, 90, 78, 0} }},
+    {{ {71, 167, 123}, 0, {1036, -112}, {45, 90, 78, 0} }},
-	{{ {43, 0, 75}, 0, {751, 1673}, {9, 130, 17, 0} }},
+    {{ {43, 0, 75}, 0, {751, 1673}, {9, 130, 17, 0} }},
-	{{ {89, 0, 0}, 0, {610, 1852}, {20, 131, 0, 0} }},
+    {{ {89, 0, 0}, 0, {610, 1852}, {20, 131, 0, 0} }},
-	{{ {142, 13, 0}, 0, {624, 1980}, {81, 158, 0, 0} }},
+    {{ {142, 13, 0}, 0, {624, 1980}, {81, 158, 0, 0} }},
-	{{ {71, 13, -123}, 0, {306, 1880}, {40, 158, 186, 0} }},
+    {{ {71, 13, -123}, 0, {306, 1880}, {40, 158, 186, 0} }},
-	{{ {43, 0, -75}, 0, {408, 1776}, {9, 130, 240, 0} }},
+    {{ {43, 0, -75}, 0, {408, 1776}, {9, 130, 240, 0} }},
-	{{ {-70, 13, -123}, 0, {250, 1518}, {216, 158, 186, 0} }},
+    {{ {-70, 13, -123}, 0, {250, 1518}, {216, 158, 186, 0} }},
-	{{ {-43, 0, -75}, 0, {375, 1557}, {247, 130, 240, 0} }},
+    {{ {-43, 0, -75}, 0, {375, 1557}, {247, 130, 240, 0} }},
-	{{ {-141, 13, 0}, 0, {508, 1254}, {175, 158, 0, 0} }},
+    {{ {-141, 13, 0}, 0, {508, 1254}, {175, 158, 0, 0} }},
-	{{ {-89, 0, 0}, 0, {531, 1396}, {236, 131, 0, 0} }},
+    {{ {-89, 0, 0}, 0, {531, 1396}, {236, 131, 0, 0} }},
-	{{ {-70, 13, 120}, 0, {826, 1356}, {217, 157, 69, 0} }},
+    {{ {-70, 13, 120}, 0, {826, 1356}, {217, 157, 69, 0} }},
-	{{ {-43, 0, 75}, 0, {724, 1458}, {247, 130, 17, 0} }},
+    {{ {-43, 0, 75}, 0, {724, 1458}, {247, 130, 17, 0} }},
-	{{ {43, 0, -75}, 0, {-16, -16}, {9, 130, 240, 0} }},
+    {{ {43, 0, -75}, 0, {-16, -16}, {9, 130, 240, 0} }},
-	{{ {89, 0, 0}, 0, {-16, -16}, {20, 131, 0, 0} }},
+    {{ {89, 0, 0}, 0, {-16, -16}, {20, 131, 0, 0} }},
-	{{ {-43, 0, -75}, 0, {-16, -16}, {247, 130, 240, 0} }},
+    {{ {-43, 0, -75}, 0, {-16, -16}, {247, 130, 240, 0} }},
-	{{ {-89, 0, 0}, 0, {-16, -16}, {236, 131, 0, 0} }},
+    {{ {-89, 0, 0}, 0, {-16, -16}, {236, 131, 0, 0} }},
-	{{ {43, 0, 75}, 0, {-16, -16}, {9, 130, 17, 0} }},
+    {{ {43, 0, 75}, 0, {-16, -16}, {9, 130, 17, 0} }},
-	{{ {-43, 0, 75}, 0, {-16, -16}, {247, 130, 17, 0} }},
+    {{ {-43, 0, 75}, 0, {-16, -16}, {247, 130, 17, 0} }},
-	{{ {-70, 13, 120}, 0, {184, 1066}, {217, 157, 69, 0} }},
+    {{ {-70, 13, 120}, 0, {184, 1066}, {217, 157, 69, 0} }},
-	{{ {88, 63, 152}, 0, {1214, 712}, {61, 220, 106, 0} }},
+    {{ {88, 63, 152}, 0, {1214, 712}, {61, 220, 106, 0} }},
-	{{ {-88, 63, 152}, 0, {34, 812}, {195, 220, 106, 0} }},
+    {{ {-88, 63, 152}, 0, {34, 812}, {195, 220, 106, 0} }},
-	{{ {88, 118, 152}, 0, {1186, 352}, {61, 34, 106, 0} }},
+    {{ {88, 118, 152}, 0, {1186, 352}, {61, 34, 106, 0} }},
-	{{ {-88, 118, 152}, 0, {6, 452}, {195, 35, 106, 0} }},
+    {{ {-88, 118, 152}, 0, {6, 452}, {195, 35, 106, 0} }},
-	{{ {71, 167, 123}, 0, {1050, -18}, {45, 90, 78, 0} }},
+    {{ {71, 167, 123}, 0, {1050, -18}, {45, 90, 78, 0} }},
-	{{ {-70, 167, 123}, 0, {104, 62}, {212, 90, 78, 0} }},
+    {{ {-70, 167, 123}, 0, {104, 62}, {212, 90, 78, 0} }},
-	{{ {71, 167, -122}, 0, {832, 1186}, {44, 91, 179, 0} }},
+    {{ {71, 167, -122}, 0, {832, 1186}, {44, 91, 179, 0} }},
-	{{ {-38, 201, -66}, 0, {1162, -70}, {234, 119, 216, 0} }},
+    {{ {-38, 201, -66}, 0, {1162, -70}, {234, 119, 216, 0} }},
-	{{ {39, 201, -66}, 0, {654, 498}, {23, 118, 216, 0} }},
+    {{ {39, 201, -66}, 0, {654, 498}, {23, 118, 216, 0} }},
-	{{ {0, 213, 0}, 0, {414, -278}, {0, 127, 0, 0} }},
+    {{ {0, 213, 0}, 0, {414, -278}, {0, 127, 0, 0} }},
-	{{ {79, 201, 0}, 0, {-98, 326}, {47, 118, 0, 0} }},
+    {{ {79, 201, 0}, 0, {-98, 326}, {47, 118, 0, 0} }},
-	{{ {142, 167, 0}, 0, {-524, 874}, {90, 90, 0, 0} }},
+    {{ {142, 167, 0}, 0, {-524, 874}, {90, 90, 0, 0} }},
-	{{ {71, 13, 120}, 0, {82, 380}, {40, 157, 69, 0} }},
+    {{ {71, 13, 120}, 0, {82, 380}, {40, 157, 69, 0} }},
-	{{ {142, 13, 0}, 0, {1024, 984}, {81, 158, 0, 0} }},
+    {{ {142, 13, 0}, 0, {1024, 984}, {81, 158, 0, 0} }},
-	{{ {176, 63, 0}, 0, {1466, 550}, {122, 222, 0, 0} }},
+    {{ {176, 63, 0}, 0, {1466, 550}, {122, 222, 0, 0} }},
-	{{ {43, 0, 75}, 0, {-11, 790}, {9, 130, 17, 0} }},
+    {{ {43, 0, 75}, 0, {-11, 790}, {9, 130, 17, 0} }},
-	{{ {-43, 0, 75}, 0, {-656, 946}, {247, 130, 17, 0} }},
+    {{ {-43, 0, 75}, 0, {-656, 946}, {247, 130, 17, 0} }},
-	{{ {-70, 13, 120}, 0, {-982, 638}, {217, 157, 69, 0} }},
+    {{ {-70, 13, 120}, 0, {-982, 638}, {217, 157, 69, 0} }},
-	{{ {88, 63, 152}, 0, {290, -208}, {61, 220, 106, 0} }},
+    {{ {88, 63, 152}, 0, {290, -208}, {61, 220, 106, 0} }},
 };
 
-Gfx toad_cap_Cap_mesh_layer_5_tri_0[] = {
+Gfx toad_cap_mesh_layer_5_tri_0[] = {
-	gsSPVertex(toad_cap_Cap_mesh_layer_5_vtx_0 + 0, 63, 0),
+    gsSPVertex(toad_cap_mesh_layer_5_vtx_0 + 0, 63, 0),
-	gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
+    gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
-	gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
+    gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0),
-	gsSP2Triangles(10, 8, 7, 0, 10, 11, 8, 0),
+    gsSP2Triangles(10, 8, 7, 0, 10, 11, 8, 0),
-	gsSP2Triangles(12, 11, 10, 0, 12, 13, 11, 0),
+    gsSP2Triangles(12, 11, 10, 0, 12, 13, 11, 0),
-	gsSP2Triangles(14, 15, 16, 0, 14, 17, 15, 0),
+    gsSP2Triangles(14, 15, 16, 0, 14, 17, 15, 0),
-	gsSP2Triangles(18, 17, 14, 0, 18, 19, 17, 0),
+    gsSP2Triangles(18, 17, 14, 0, 18, 19, 17, 0),
-	gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
+    gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0),
-	gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
+    gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0),
-	gsSP2Triangles(28, 27, 24, 0, 28, 29, 27, 0),
+    gsSP2Triangles(28, 27, 24, 0, 28, 29, 27, 0),
-	gsSP2Triangles(30, 31, 32, 0, 30, 32, 33, 0),
+    gsSP2Triangles(30, 31, 32, 0, 30, 32, 33, 0),
-	gsSP2Triangles(34, 35, 36, 0, 34, 36, 37, 0),
+    gsSP2Triangles(34, 35, 36, 0, 34, 36, 37, 0),
-	gsSP2Triangles(37, 36, 38, 0, 39, 37, 38, 0),
+    gsSP2Triangles(37, 36, 38, 0, 39, 37, 38, 0),
-	gsSP2Triangles(40, 37, 39, 0, 40, 34, 37, 0),
+    gsSP2Triangles(40, 37, 39, 0, 40, 34, 37, 0),
-	gsSP2Triangles(41, 42, 43, 0, 44, 42, 41, 0),
+    gsSP2Triangles(41, 42, 43, 0, 44, 42, 41, 0),
-	gsSP2Triangles(44, 45, 42, 0, 46, 45, 44, 0),
+    gsSP2Triangles(44, 45, 42, 0, 46, 45, 44, 0),
-	gsSP2Triangles(46, 47, 45, 0, 48, 49, 50, 0),
+    gsSP2Triangles(46, 47, 45, 0, 48, 49, 50, 0),
-	gsSP2Triangles(51, 48, 50, 0, 52, 53, 54, 0),
+    gsSP2Triangles(51, 48, 50, 0, 52, 53, 54, 0),
-	gsSP2Triangles(52, 55, 53, 0, 56, 55, 52, 0),
+    gsSP2Triangles(52, 55, 53, 0, 56, 55, 52, 0),
-	gsSP2Triangles(56, 57, 55, 0, 58, 57, 56, 0),
+    gsSP2Triangles(56, 57, 55, 0, 58, 57, 56, 0),
-	gsSP2Triangles(58, 59, 57, 0, 1, 60, 61, 0),
+    gsSP2Triangles(58, 59, 57, 0, 1, 60, 61, 0),
-	gsSP1Triangle(1, 62, 60, 0),
+    gsSP1Triangle(1, 62, 60, 0),
-	gsSPVertex(toad_cap_Cap_mesh_layer_5_vtx_0 + 63, 37, 0),
+    gsSPVertex(toad_cap_mesh_layer_5_vtx_0 + 63, 37, 0),
-	gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-	gsSP2Triangles(1, 4, 3, 0, 4, 5, 3, 0),
+    gsSP2Triangles(1, 4, 3, 0, 4, 5, 3, 0),
-	gsSP2Triangles(4, 6, 5, 0, 6, 7, 5, 0),
+    gsSP2Triangles(4, 6, 5, 0, 6, 7, 5, 0),
-	gsSP2Triangles(6, 8, 7, 0, 8, 9, 7, 0),
+    gsSP2Triangles(6, 8, 7, 0, 8, 9, 7, 0),
-	gsSP2Triangles(8, 10, 9, 0, 11, 12, 13, 0),
+    gsSP2Triangles(8, 10, 9, 0, 11, 12, 13, 0),
-	gsSP2Triangles(13, 12, 14, 0, 12, 15, 14, 0),
+    gsSP2Triangles(13, 12, 14, 0, 12, 15, 14, 0),
-	gsSP2Triangles(16, 14, 15, 0, 17, 18, 19, 0),
+    gsSP2Triangles(16, 14, 15, 0, 17, 18, 19, 0),
-	gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
+    gsSP2Triangles(19, 18, 20, 0, 19, 20, 21, 0),
-	gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0),
+    gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0),
-	gsSP2Triangles(24, 25, 26, 0, 26, 25, 27, 0),
+    gsSP2Triangles(24, 25, 26, 0, 26, 25, 27, 0),
-	gsSP2Triangles(28, 26, 27, 0, 29, 26, 28, 0),
+    gsSP2Triangles(28, 26, 27, 0, 29, 26, 28, 0),
-	gsSP2Triangles(29, 24, 26, 0, 30, 31, 32, 0),
+    gsSP2Triangles(29, 24, 26, 0, 30, 31, 32, 0),
-	gsSP2Triangles(33, 31, 30, 0, 34, 33, 30, 0),
+    gsSP2Triangles(33, 31, 30, 0, 34, 33, 30, 0),
-	gsSP2Triangles(34, 30, 35, 0, 35, 30, 36, 0),
+    gsSP2Triangles(34, 30, 35, 0, 35, 30, 36, 0),
-	gsSP1Triangle(30, 32, 36, 0),
+    gsSP1Triangle(30, 32, 36, 0),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Vtx toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_0[8] = {
-	{{ {-132, 118, -76}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {-132, 118, -76}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-62, 145, -1}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {-62, 145, -1}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-192, 321, -94}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {-192, 321, -94}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-125, 348, -19}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {-125, 348, -19}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {192, 321, -94}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {192, 321, -94}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {62, 145, -1}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {62, 145, -1}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {132, 118, -76}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {132, 118, -76}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {125, 348, -19}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {125, 348, -19}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
 };
 
 Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_0[] = {
-	gsSPVertex(toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_0 + 0, 8, 0),
+    gsSPVertex(toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_0 + 0, 8, 0),
-	gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
-	gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Vtx toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_1[8] = {
-	{{ {-132, 118, -76}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {-132, 118, -76}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-192, 321, -94}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {-192, 321, -94}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-261, 293, -171}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {-261, 293, -171}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-201, 90, -153}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {-201, 90, -153}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {261, 293, -171}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {261, 293, -171}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {192, 321, -94}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {192, 321, -94}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {132, 118, -76}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {132, 118, -76}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {201, 90, -153}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
+    {{ {201, 90, -153}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
 };
 
 Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_1[] = {
-	gsSPVertex(toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_1 + 0, 8, 0),
+    gsSPVertex(toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_1 + 0, 8, 0),
-	gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
+    gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0),
-	gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
+    gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 
 Gfx mat_toad_cap_metal[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
-	gsSPGeometryMode(0, G_TEXTURE_GEN),
+    gsSPGeometryMode(0, G_TEXTURE_GEN),
-	gsSPTexture(4032, 1984, 0, 0, 1),
+    gsSPTexture(4032, 1984, 0, 0, 1),
-	gsSPLight(&toad_cap_black_lights_group.l, 1),
+    gsSPLight(&toad_cap_black_lights_group.l, 1),
-	gsSPCopyLightEXT(2, 17),
+    gsSPCopyLightEXT(2, 17),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_shade),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_shade),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 2047, 128),
+    gsDPLoadBlock(7, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(0, 0, 0, 252, 124),
+    gsDPSetTileSize(0, 0, 0, 252, 124),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_light),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_light),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(6, 0, 0, 2047, 128),
+    gsDPLoadBlock(6, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(1, 0, 0, 252, 124),
+    gsDPSetTileSize(1, 0, 0, 252, 124),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Gfx mat_revert_toad_cap_metal[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsSPGeometryMode(G_TEXTURE_GEN, 0),
+    gsSPGeometryMode(G_TEXTURE_GEN, 0),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
-Gfx mat_toad_cap_cap_base[] = {
+Gfx mat_toad_cap_base[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0),
-	gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-	gsSPCopyLightsPlayerPart(GLOVES),
+    gsSPCopyLightsPlayerPart(CAP),
-	gsSPEndDisplayList(),
+    gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_cap),
+    gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
+    gsSPEndDisplayList(),
 };
 
-Gfx mat_toad_cap_toad_cap_inside[] = {
+Gfx mat_toad_cap_inside[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0),
+    gsDPSetCombineLERP(SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT),
-	gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-	gsSPCopyLightsPlayerPart(GLOVES),
+    gsSPCopyLightsPlayerPart(GLOVES),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_cap_texture_cap_inside),
+    gsDPSetPrimColor(0, 0, 115, 115, 115, 255),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsSPEndDisplayList(),
-	gsDPLoadBlock(7, 0, 0, 63, 1024),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b, 2, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 3, 0, G_TX_CLAMP | G_TX_NOMIRROR, 3, 0),
-	gsDPSetTileSize(0, 0, 0, 28, 28),
-	gsSPEndDisplayList(),
 };
 
-Gfx mat_toad_cap_cap_spots[] = {
+Gfx mat_toad_cap_spots[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0),
-	gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-	gsSPCopyLightsPlayerPart(CAP),
+    gsSPCopyLightsPlayerPart(CAP),
-	gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_spots),
+    gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_spots),
-	gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
-	gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
-	gsDPSetTileSize(0, 0, 0, 124, 124),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Gfx mat_toad_cap_wing[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
+    gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
     gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
-	gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_wings_half_1),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_wings_half_1),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
-	gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Gfx mat_revert_toad_cap_wing[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
     gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Gfx mat_toad_cap_wing_tip[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
+    gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
     gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
-	gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_wings_half_2),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
-	gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Gfx mat_revert_toad_cap_wing_tip[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
     gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Gfx mat_toad_cap_metal_wing[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
-    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
+    gsSPClearGeometryMode(G_CULL_BACK),
-	gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_wings_half_1),
+    gsSPLight(&toad_cap_black_lights_group.l, 1),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsSPCopyLightEXT(2, 17),
-	gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_wings_half_1_shade),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
-	gsSPEndDisplayList(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
+    gsSPEndDisplayList(),
 };
 
 Gfx mat_revert_toad_cap_metal_wing[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
+    gsSPSetGeometryMode(G_CULL_BACK),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Gfx mat_toad_cap_metal_wing_tip[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
-    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
+    gsSPClearGeometryMode(G_CULL_BACK),
-	gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_wings_half_2),
+    gsSPLight(&toad_cap_black_lights_group.l, 1),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsSPCopyLightEXT(2, 17),
-	gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_wings_half_2_shade),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
-	gsSPEndDisplayList(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
+    gsSPEndDisplayList(),
 };
 
 Gfx mat_revert_toad_cap_metal_wing_tip[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
+    gsSPSetGeometryMode(G_CULL_BACK),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
-Gfx toad_cap_Cap_mesh_layer_1[] = {
+Gfx toad_cap_mesh_layer_1[] = {
-	gsSPDisplayList(mat_toad_cap_cap_base),
+    gsSPDisplayList(mat_toad_cap_inside),
-	gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_0),
+    gsSPDisplayList(toad_cap_mesh_layer_1_tri_1),
-	gsSPDisplayList(mat_toad_cap_toad_cap_inside),
+    gsSPEndDisplayList(),
-	gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_1),
-	gsSPEndDisplayList(),
 };
 
-Gfx toad_cap_Cap_mesh_layer_5[] = {
+Gfx toad_cap_mesh_layer_5[] = {
-	gsSPDisplayList(mat_toad_cap_cap_spots),
+    gsSPDisplayList(mat_toad_cap_base),
-	gsSPDisplayList(toad_cap_Cap_mesh_layer_5_tri_0),
+    gsSPDisplayList(toad_cap_mesh_layer_1_tri_0),
-	gsSPEndDisplayList(),
+    gsSPDisplayList(mat_toad_cap_spots),
+    gsSPDisplayList(toad_cap_mesh_layer_5_tri_0),
+    gsSPEndDisplayList(),
 };
 
 Gfx toad_cap_Metal_Cap_mesh_layer_1[] = {
-	gsSPDisplayList(mat_toad_cap_metal),
+    gsSPDisplayList(mat_toad_cap_metal),
-	gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_0),
+    gsSPDisplayList(toad_cap_mesh_layer_1_tri_0),
-	gsSPDisplayList(mat_revert_toad_cap_metal),
+    gsSPDisplayList(mat_revert_toad_cap_metal),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4[] = {
-	gsSPDisplayList(mat_toad_cap_wing),
+    gsSPDisplayList(mat_toad_cap_wing),
-	gsSPDisplayList(toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_0),
+    gsSPDisplayList(toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_0),
-	gsSPDisplayList(mat_revert_toad_cap_wing),
+    gsSPDisplayList(mat_revert_toad_cap_wing),
-	gsSPDisplayList(mat_toad_cap_wing_tip),
+    gsSPDisplayList(mat_toad_cap_wing_tip),
-	gsSPDisplayList(toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_1),
+    gsSPDisplayList(toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_1),
-	gsSPDisplayList(mat_revert_toad_cap_wing_tip),
+    gsSPDisplayList(mat_revert_toad_cap_wing_tip),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Gfx toad_cap_Winged_Metal_Cap_Wings_mesh_layer_4[] = {
-	gsSPDisplayList(mat_toad_cap_metal_wing),
+    gsSPDisplayList(mat_toad_cap_metal_wing),
-	gsSPDisplayList(toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_0),
+    gsSPDisplayList(toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_0),
-	gsSPDisplayList(mat_revert_toad_cap_metal_wing),
+    gsSPDisplayList(mat_revert_toad_cap_metal_wing),
-	gsSPDisplayList(mat_toad_cap_metal_wing_tip),
+    gsSPDisplayList(mat_toad_cap_metal_wing_tip),
-	gsSPDisplayList(toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_1),
+    gsSPDisplayList(toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_1),
-	gsSPDisplayList(mat_revert_toad_cap_metal_wing_tip),
+    gsSPDisplayList(mat_revert_toad_cap_metal_wing_tip),
-	gsSPEndDisplayList(),
+    gsSPEndDisplayList(),
 };
 
 Gfx toad_cap_material_revert_render_settings[] = {

actors/toad_player/geo.inc.c

@@ -42,7 +42,7 @@ const GeoLayout toad_player_toad_player_right_hand_cap[] = {
 	GEO_OPEN_NODE(),
 		GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_right_hand_cap),
 		GEO_OPEN_NODE(),
-			GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_right_hand_cap_decal),
+			GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_right_hand_cap_decal),
 		GEO_CLOSE_NODE(),
 	GEO_CLOSE_NODE(),
 	GEO_RETURN(),
@@ -52,7 +52,7 @@ const GeoLayout toad_player_toad_player_right_hand_wing_cap[] = {
 	GEO_OPEN_NODE(),
 		GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_right_hand_cap),
 		GEO_OPEN_NODE(),
-			GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_right_hand_cap_decal),
+			GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_right_hand_cap_decal),
 			GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4),
 		GEO_CLOSE_NODE(),
 	GEO_CLOSE_NODE(),
@@ -805,8 +805,8 @@ const GeoLayout toad_player_geo[] = {
 													GEO_OPEN_NODE(),
 														GEO_NODE_START(),
 														GEO_OPEN_NODE(),
-															GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_cap_base),
+															GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_cap_base),
-															GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_cap_decal),
+															GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_cap_decal),
 														GEO_CLOSE_NODE(),
 														GEO_BRANCH(1, toad_player_toad_player_head_capless),
 													GEO_CLOSE_NODE(),

actors/waluigi/geo_header.h

@@ -1,399 +1,123 @@
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt1[];
+extern const GeoLayout waluigi_geo_face_and_wings[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt2[];
+extern const GeoLayout waluigi_geo_left_hand[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt3[];
+extern const GeoLayout waluigi_geo_right_hand[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt4[];
+extern const GeoLayout waluigi_geo_body[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt5[];
+extern const GeoLayout waluigi_vanish_geo_face_and_wings[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt6[];
+extern const GeoLayout waluigi_vanish_geo_left_hand[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt7[];
+extern const GeoLayout waluigi_vanish_geo_right_hand[];
-extern const GeoLayout waluigi_Head_Dead_Armature[];
+extern const GeoLayout waluigi_vanish_geo_body[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt1[];
+extern const GeoLayout waluigi_metal_geo_face_and_wings[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt2[];
+extern const GeoLayout waluigi_metal_geo_left_hand[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt3[];
+extern const GeoLayout waluigi_metal_geo_right_hand[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt4[];
+extern const GeoLayout waluigi_metal_geo_body[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt5[];
+extern const GeoLayout waluigi_metal_vanish_geo_face_and_wings[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt6[];
+extern const GeoLayout waluigi_metal_vanish_geo_left_hand[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt7[];
+extern const GeoLayout waluigi_metal_vanish_geo_right_hand[];
-extern const GeoLayout waluigi_Switch_Option_Head_Dead_Capless_Armature[];
+extern const GeoLayout waluigi_metal_vanish_geo_body[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt1[];
+extern const GeoLayout waluigi_geo_load_body[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt2[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt3[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt4[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt5[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt6[];
-extern const GeoLayout waluigi_Head_Capless_Armature[];
-extern const GeoLayout waluigi_Left_Hand_Open_Armature[];
-extern const GeoLayout waluigi_Right_Hand_Open_Armature[];
-extern const GeoLayout waluigi_Right_Hand_Peace_Armature[];
-extern const GeoLayout waluigi_Right_Hand_Cap_Armature[];
-extern const GeoLayout waluigi_Right_Hand_Wing_Cap_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt1[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt2[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt3[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt4[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt5[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt6[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt7_Eye_Material_Switch_Capless_opt7[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_jump_waluigi_Head_Dead_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt1[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt2[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt3[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt4[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt5[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt6[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt7_Eye_Material_Switch_Capless_opt7[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_jump_waluigi_Head_Capless_Armature_jump_waluigi_Switch_Option_Head_Dead_Capless_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt1[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt2[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt3[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt4[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt5[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt1_Eye_Material_Switch_Capless_opt6[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_jump_waluigi_Head_Capless_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_jump_waluigi_Left_Hand_Open_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_jump_waluigi_Right_Hand_Open_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_jump_waluigi_Right_Hand_Peace_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_jump_waluigi_Right_Hand_Cap_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_jump_waluigi_Right_Hand_Wing_Cap_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt1[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt2[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt3[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt4[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt5[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1_Hatless_Switch_opt0_Eye_Material_Switch_opt6[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt1[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt2_jump_waluigi_Head_Dead_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt2_jump_waluigi_Head_Capless_Armature_jump_waluigi_Switch_Option_Head_Dead_Capless_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt2_jump_waluigi_Head_Capless_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt2_jump_waluigi_Left_Hand_Open_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt2_jump_waluigi_Right_Hand_Open_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt2_jump_waluigi_Right_Hand_Peace_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt2_jump_waluigi_Right_Hand_Cap_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt2_jump_waluigi_Right_Hand_Wing_Cap_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt2[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt3_jump_waluigi_Head_Dead_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt3_jump_waluigi_Head_Capless_Armature_jump_waluigi_Switch_Option_Head_Dead_Capless_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt3_jump_waluigi_Head_Capless_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt3_jump_waluigi_Left_Hand_Open_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt3_jump_waluigi_Right_Hand_Open_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt3_jump_waluigi_Right_Hand_Peace_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt3_jump_waluigi_Right_Hand_Cap_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt3_jump_waluigi_Right_Hand_Wing_Cap_Armature[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt3[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt1[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt2[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt3[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt4[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt5[];
-extern const GeoLayout waluigi_2_LoD_Switch_opt0_Cap_Effect_Switch_opt0_Hatless_Switch_opt0_Eye_Material_Switch_opt6[];
 extern const GeoLayout waluigi_geo[];
-extern Lights1 waluigi_body_lights;
+extern const Gfx waluigi_butt_dl[];
-extern Lights1 waluigi_metal_lights;
+extern const Gfx waluigi_butt[];
-extern Lights1 waluigi_shirt_lights;
+extern const Gfx waluigi_metal_butt[];
-extern Lights1 waluigi_cap_lights;
+extern const Gfx waluigi_left_arm_shared_dl[];
-extern Lights1 waluigi_eyes_open_lights;
+extern const Gfx waluigi_left_arm[];
-extern Lights1 waluigi_hair_lights;
+extern const Gfx waluigi_left_forearm_shared_dl[];
-extern Lights1 waluigi_nose_lights;
+extern const Gfx waluigi_left_hand_closed_shared_dl[];
-extern Lights1 waluigi_mouth_closed_lights;
+extern const Gfx waluigi_left_hand_closed[];
-extern Lights1 waluigi_moustache_lights;
+extern const Gfx waluigi_right_arm_shared_dl[];
-extern Lights1 waluigi_sideburns_lights;
+extern const Gfx waluigi_right_arm[];
-extern Lights1 waluigi_emblem_lights;
+extern const Gfx waluigi_right_forearm_shared_dl[];
-extern Lights1 waluigi_emblem_icon_lights;
+extern const Gfx waluigi_right_hand_closed_dl[];
-extern Lights1 waluigi_eyes_half_lights;
+extern const Gfx waluigi_right_hand_closed[];
-extern Lights1 waluigi_eyes_closed_lights;
+extern const Gfx waluigi_metal_right_hand_closed[];
-extern Lights1 waluigi_eyes_left_lights;
+extern const Gfx waluigi_left_thigh_dl[];
-extern Lights1 waluigi_eyes_right_lights;
+extern const Gfx waluigi_left_thigh[];
-extern Lights1 waluigi_eyes_up_lights;
+extern const Gfx waluigi_metal_left_thigh[];
-extern Lights1 waluigi_eyes_down_lights;
+extern const Gfx waluigi_left_leg_shared_dl[];
-extern Lights1 waluigi_waluigi_mouth_open_lights;
+extern const Gfx waluigi_left_foot_shared_dl[];
-extern Lights1 waluigi_eyes_dead_lights;
+extern const Gfx waluigi_left_foot[];
-extern Lights1 waluigi_gloves_lights;
+extern const Gfx waluigi_right_thigh_shared_dl[];
-extern Lights1 waluigi_shoes_lights;
+extern const Gfx waluigi_right_thigh[];
-extern Vtx waluigi_Butt_mesh_layer_1_vtx_0[76];
+extern const Gfx waluigi_right_leg_shared_dl[];
-extern Gfx waluigi_Butt_mesh_layer_1_tri_0[];
+extern const Gfx waluigi_right_foot_dl[];
-extern Vtx waluigi_Torso_mesh_layer_1_vtx_0[107];
+extern const Gfx waluigi_right_foot[];
-extern Gfx waluigi_Torso_mesh_layer_1_tri_0[];
+extern const Gfx waluigi_metal_right_foot[];
-extern Vtx waluigi_Torso_mesh_layer_1_vtx_1[31];
+extern const Gfx waluigi_yellow_button_dl[];
-extern Gfx waluigi_Torso_mesh_layer_1_tri_1[];
+extern const Gfx waluigi_pants_overalls_shared_dl[];
-extern Vtx waluigi_Head_DL_mesh_layer_1_vtx_0[56];
+extern const Gfx waluigi_tshirt_shared_dl[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_tri_0[];
+extern const Gfx waluigi_torso_dl[];
-extern Vtx waluigi_Head_DL_mesh_layer_1_vtx_1[73];
+extern const Gfx waluigi_torso[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_tri_1[];
+extern const Gfx waluigi_metal_torso_shared_dl[];
-extern Vtx waluigi_Head_DL_mesh_layer_1_vtx_2[31];
+extern const Gfx waluigi_r_logo_dl[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_tri_2[];
+extern const Gfx waluigi_eyes_cap_on_dl[];
-extern Vtx waluigi_Head_DL_mesh_layer_1_vtx_3[23];
+extern const Gfx waluigi_hair_sideburn_cap_on_dl[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_tri_3[];
+extern const Gfx waluigi_mouth_cap_on_dl[];
-extern Vtx waluigi_Head_DL_mesh_layer_1_vtx_4[53];
+extern const Gfx waluigi_face_part_cap_on_dl[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_tri_4[];
+extern const Gfx waluigi_face_cap_dl[];
-extern Vtx waluigi_Head_DL_mesh_layer_1_vtx_5[10];
+extern const Gfx waluigi_face_back_hair_cap_on_dl[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_tri_5[];
+extern const Gfx waluigi_nose_cap_on_dl[];
-extern Vtx waluigi_Head_DL_mesh_layer_5_vtx_0[10];
+extern const Gfx waluigi_mustache_cap_on_dl[];
-extern Gfx waluigi_Head_DL_mesh_layer_5_tri_0[];
+extern const Gfx waluigi_mustache_cap_on_dead_dl[];
-extern Vtx waluigi_Head_DL_mesh_layer_5_vtx_1[7];
+extern const Gfx waluigi_hair_sideburn_decal_cap_on[];
-extern Gfx waluigi_Head_DL_mesh_layer_5_tri_1[];
+extern const Gfx waluigi_r_logo_decal[];
-extern Vtx waluigi_Head_DL_mesh_layer_5_vtx_2[7];
+extern const Gfx waluigi_face_cap_on_dl[];
-extern Gfx waluigi_Head_DL_mesh_layer_5_tri_2[];
+extern const Gfx waluigi_cap_on_eyes_front[];
-extern Vtx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_0[66];
+extern const Gfx waluigi_cap_on_eyes_half_closed[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_0[];
+extern const Gfx waluigi_cap_on_eyes_closed[];
-extern Vtx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_1[60];
+extern const Gfx waluigi_cap_on_eyes_right[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_1[];
+extern const Gfx waluigi_cap_on_eyes_left[];
-extern Vtx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_2[10];
+extern const Gfx waluigi_cap_on_eyes_up[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_2[];
+extern const Gfx waluigi_cap_on_eyes_down[];
-extern Vtx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_3[23];
+extern const Gfx waluigi_cap_on_eyes_dead[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_3[];
+extern const Gfx waluigi_metal_cap_on_shared_dl[];
-extern Vtx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_4[53];
+extern const Gfx waluigi_eyes_cap_off_dl[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_4[];
+extern const Gfx waluigi_mouth_cap_off_dl[];
-extern Vtx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_5[31];
+extern const Gfx waluigi_hair_sideburn_cap_off_dl[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_5[];
+extern const Gfx waluigi_face_part_cap_off_dl[];
-extern Vtx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_vtx_0[10];
+extern const Gfx waluigi_face_hair_cap_off_dl[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_tri_0[];
+extern const Gfx waluigi_nose_cap_off_dl[];
-extern Vtx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_vtx_1[7];
+extern const Gfx waluigi_mustache_cap_off_dl[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_tri_1[];
+extern const Gfx waluigi_mustache_cap_off_dead_dl[];
-extern Vtx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_vtx_0[101];
+extern const Gfx waluigi_hair_sideburn_decal_cap_off[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_tri_0[];
+extern const Gfx waluigi_face_cap_off_dl[];
-extern Vtx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_vtx_1[63];
+extern const Gfx waluigi_cap_off_eyes_front[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_tri_1[];
+extern const Gfx waluigi_cap_off_eyes_half_closed[];
-extern Vtx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_vtx_2[10];
+extern const Gfx waluigi_cap_off_eyes_closed[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_tri_2[];
+extern const Gfx waluigi_cap_off_eyes_right[];
-extern Vtx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_vtx_3[23];
+extern const Gfx waluigi_cap_off_eyes_left[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_tri_3[];
+extern const Gfx waluigi_cap_off_eyes_up[];
-extern Vtx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_vtx_4[53];
+extern const Gfx waluigi_cap_off_eyes_down[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_tri_4[];
+extern const Gfx waluigi_cap_off_eyes_dead[];
-extern Vtx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_5_vtx_0[10];
+extern const Gfx waluigi_metal_cap_off_shared_dl[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_5_tri_0[];
+extern const Gfx waluigi_left_hand_open_shared_dl[];
-extern Vtx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_0[101];
+extern const Gfx waluigi_left_hand_open[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_0[];
+extern const Gfx waluigi_right_hand_open_dl[];
-extern Vtx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_1[63];
+extern const Gfx waluigi_right_hand_open[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_1[];
+extern const Gfx waluigi_metal_right_hand_open[];
-extern Vtx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_2[10];
+extern const Gfx waluigi_right_hand_cap_r_logo_dl[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_2[];
+extern const Gfx waluigi_right_hand_cap_top_dl[];
-extern Vtx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_3[23];
+extern const Gfx waluigi_right_hand_cap_hand_position_dl[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_3[];
+extern const Gfx waluigi_right_hand_cap_bottom_dl[];
-extern Vtx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_vtx_4[53];
+extern const Gfx waluigi_right_hand_cap_decal[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_tri_4[];
+extern const Gfx waluigi_right_hand_cap_dl[];
-extern Vtx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_vtx_0[10];
+extern const Gfx waluigi_right_hand_cap_wings_half_1_dl[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_tri_0[];
+extern const Gfx waluigi_right_hand_cap_wings_half_2_dl[];
-extern Vtx waluigi_Left_Wing_DL_mesh_layer_4_vtx_0[4];
+extern const Gfx waluigi_right_hand_cap_wings_intial_dl[];
-extern Gfx waluigi_Left_Wing_DL_mesh_layer_4_tri_0[];
+extern const Gfx waluigi_right_hand_cap_wings_transparent_intial_dl[];
-extern Vtx waluigi_Left_Wing_DL_mesh_layer_4_vtx_1[4];
+extern const Gfx waluigi_right_hand_cap_metal_wings_intial_dl[];
-extern Gfx waluigi_Left_Wing_DL_mesh_layer_4_tri_1[];
+extern const Gfx waluigi_right_hand_cap_wings_end_dl[];
-extern Vtx waluigi_Right_Wing_DL_mesh_layer_4_vtx_0[4];
+extern const Gfx waluigi_right_hand_cap[];
-extern Gfx waluigi_Right_Wing_DL_mesh_layer_4_tri_0[];
+extern const Gfx waluigi_right_hand_cap_wings[];
-extern Vtx waluigi_Right_Wing_DL_mesh_layer_4_vtx_1[4];
+extern const Gfx waluigi_right_hand_cap_wings_transparent[];
-extern Gfx waluigi_Right_Wing_DL_mesh_layer_4_tri_1[];
+extern const Gfx waluigi_metal_right_hand_cap_shared_dl[];
-extern Vtx waluigi_Left_Arm_Color_mesh_layer_1_vtx_0[31];
+extern const Gfx waluigi_metal_right_hand_cap_shared_dl_wings[];
-extern Gfx waluigi_Left_Arm_Color_mesh_layer_1_tri_0[];
+extern const Gfx waluigi_metal_right_hand_cap_shared_dl_wings_transparent[];
-extern Vtx waluigi_Left_Forearm_mesh_layer_1_vtx_0[16];
+extern const Gfx waluigi_right_hand_peace_shared_dl[];
-extern Gfx waluigi_Left_Forearm_mesh_layer_1_tri_0[];
+extern const Gfx waluigi_right_hand_peace[];
-extern Vtx waluigi_Left_Hand_DL_mesh_layer_1_vtx_0[54];
+extern const Gfx waluigi_wings_half_1_dl[];
-extern Gfx waluigi_Left_Hand_DL_mesh_layer_1_tri_0[];
+extern const Gfx waluigi_wings_half_2_dl[];
-extern Vtx waluigi_Left_Hand_DL_mesh_layer_5_vtx_0[9];
+extern const Gfx waluigi_cap_wings[];
-extern Gfx waluigi_Left_Hand_DL_mesh_layer_5_tri_0[];
+extern const Gfx waluigi_cap_wings_transparent[];
-extern Vtx waluigi_Switch_Option_Left_Hand_Open_mesh_layer_1_vtx_0[72];
+extern const Gfx waluigi_metal_cap_wings[];
-extern Gfx waluigi_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0[];
+extern const Gfx waluigi_metal_cap_wings_transparent[];
-extern Vtx waluigi_Switch_Option_Left_Hand_Open_mesh_layer_5_vtx_0[9];
+extern const Gfx waluigi_material_revert_render_settings[];
-extern Gfx waluigi_Switch_Option_Left_Hand_Open_mesh_layer_5_tri_0[];
-extern Vtx waluigi_Right_Arm_Color_mesh_layer_1_vtx_0[28];
-extern Gfx waluigi_Right_Arm_Color_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Right_Forearm_mesh_layer_1_vtx_0[16];
-extern Gfx waluigi_Right_Forearm_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Right_Hand_DL_mesh_layer_1_vtx_0[55];
-extern Gfx waluigi_Right_Hand_DL_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Right_Hand_DL_mesh_layer_5_vtx_0[9];
-extern Gfx waluigi_Right_Hand_DL_mesh_layer_5_tri_0[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Open_mesh_layer_1_vtx_0[73];
-extern Gfx waluigi_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Open_mesh_layer_5_vtx_0[9];
-extern Gfx waluigi_Switch_Option_Right_Hand_Open_mesh_layer_5_tri_0[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Peace_mesh_layer_1_vtx_0[86];
-extern Gfx waluigi_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Peace_mesh_layer_5_vtx_0[9];
-extern Gfx waluigi_Switch_Option_Right_Hand_Peace_mesh_layer_5_tri_0[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_0[59];
-extern Gfx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_1[46];
-extern Gfx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_5_vtx_0[9];
-extern Gfx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_5_tri_0[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_5_vtx_1[5];
-extern Gfx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_5_tri_1[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_0[59];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_1[46];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_1[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_vtx_0[9];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_tri_0[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_vtx_1[5];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_tri_1[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_0[8];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_0[];
-extern Vtx waluigi_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_1[8];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1[];
-extern Vtx waluigi_Left_Thigh_Color_mesh_layer_1_vtx_0[22];
-extern Gfx waluigi_Left_Thigh_Color_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Left_Leg_mesh_layer_1_vtx_0[12];
-extern Gfx waluigi_Left_Leg_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Left_Foot_mesh_layer_1_vtx_0[15];
-extern Gfx waluigi_Left_Foot_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Right_Thigh_Color_mesh_layer_1_vtx_0[22];
-extern Gfx waluigi_Right_Thigh_Color_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Right_Leg_mesh_layer_1_vtx_0[12];
-extern Gfx waluigi_Right_Leg_mesh_layer_1_tri_0[];
-extern Vtx waluigi_Right_Foot_DL_mesh_layer_1_vtx_0[15];
-extern Gfx waluigi_Right_Foot_DL_mesh_layer_1_tri_0[];
-extern Gfx mat_waluigi_body[];
-extern Gfx mat_waluigi_metal[];
-extern Gfx mat_revert_waluigi_metal[];
-extern Gfx mat_waluigi_shirt[];
-extern Gfx mat_waluigi_cap[];
-extern Gfx mat_waluigi_eyes_open[];
-extern Gfx mat_waluigi_hair[];
-extern Gfx mat_waluigi_nose[];
-extern Gfx mat_waluigi_mouth_closed[];
-extern Gfx mat_waluigi_moustache[];
-extern Gfx mat_revert_waluigi_moustache[];
-extern Gfx mat_waluigi_sideburns[];
-extern Gfx mat_waluigi_emblem[];
-extern Gfx mat_revert_waluigi_emblem[];
-extern Gfx mat_waluigi_emblem_icon[];
-extern Gfx mat_revert_waluigi_emblem_icon[];
-extern Gfx mat_waluigi_eyes_half[];
-extern Gfx mat_waluigi_eyes_closed[];
-extern Gfx mat_waluigi_eyes_left[];
-extern Gfx mat_waluigi_eyes_right[];
-extern Gfx mat_waluigi_eyes_up[];
-extern Gfx mat_waluigi_eyes_down[];
-extern Gfx mat_waluigi_waluigi_mouth_open[];
-extern Gfx mat_waluigi_eyes_dead[];
-extern Gfx mat_waluigi_wing_2[];
-extern Gfx mat_revert_waluigi_wing_2[];
-extern Gfx mat_waluigi_wing_1[];
-extern Gfx mat_revert_waluigi_wing_1[];
-extern Gfx mat_waluigi_gloves[];
-extern Gfx mat_waluigi_shoes[];
-extern Gfx waluigi_Butt_mesh_layer_1[];
-extern Gfx waluigi_Butt_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Torso_mesh_layer_1[];
-extern Gfx waluigi_Torso_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Head_DL_mesh_layer_1[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_mat_override_eyes_half_1[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_mat_override_eyes_closed_2[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_mat_override_eyes_left_3[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_mat_override_eyes_right_4[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_mat_override_eyes_up_5[];
-extern Gfx waluigi_Head_DL_mesh_layer_1_mat_override_eyes_down_6[];
-extern Gfx waluigi_Head_DL_mesh_layer_5[];
-extern Gfx waluigi_Head_DL_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Head_DL_mesh_layer_5_mat_override_eyes_half_1[];
-extern Gfx waluigi_Head_DL_mesh_layer_5_mat_override_eyes_closed_2[];
-extern Gfx waluigi_Head_DL_mesh_layer_5_mat_override_eyes_left_3[];
-extern Gfx waluigi_Head_DL_mesh_layer_5_mat_override_eyes_right_4[];
-extern Gfx waluigi_Head_DL_mesh_layer_5_mat_override_eyes_up_5[];
-extern Gfx waluigi_Head_DL_mesh_layer_5_mat_override_eyes_down_6[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_half_1[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_closed_2[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_left_3[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_right_4[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_up_5[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_down_6[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_dead_7[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_half_1[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_closed_2[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_left_3[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_right_4[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_up_5[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_down_6[];
-extern Gfx waluigi_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_dead_7[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_mat_override_eyes_half_1[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_mat_override_eyes_closed_2[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_mat_override_eyes_left_3[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_mat_override_eyes_right_4[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_mat_override_eyes_up_5[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_1_mat_override_eyes_down_6[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_5[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_5_mat_override_eyes_half_1[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_5_mat_override_eyes_closed_2[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_5_mat_override_eyes_left_3[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_5_mat_override_eyes_right_4[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_5_mat_override_eyes_up_5[];
-extern Gfx waluigi_Switch_Option_Head_Capless_DL_mesh_layer_5_mat_override_eyes_down_6[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_half_1[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_closed_2[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_left_3[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_right_4[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_up_5[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_down_6[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_1_mat_override_eyes_dead_7[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_half_1[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_closed_2[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_left_3[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_right_4[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_up_5[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_down_6[];
-extern Gfx waluigi_Switch_Option_Switch_Option_Head_Capless_Dead_DL_mesh_layer_5_mat_override_eyes_dead_7[];
-extern Gfx waluigi_Left_Wing_DL_mesh_layer_4[];
-extern Gfx waluigi_Left_Wing_DL_mesh_layer_4_mat_override_metal_0[];
-extern Gfx waluigi_Right_Wing_DL_mesh_layer_4[];
-extern Gfx waluigi_Right_Wing_DL_mesh_layer_4_mat_override_metal_0[];
-extern Gfx waluigi_Left_Arm_Color_mesh_layer_1[];
-extern Gfx waluigi_Left_Arm_Color_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Left_Forearm_mesh_layer_1[];
-extern Gfx waluigi_Left_Forearm_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Left_Hand_DL_mesh_layer_1[];
-extern Gfx waluigi_Left_Hand_DL_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Left_Hand_DL_mesh_layer_5[];
-extern Gfx waluigi_Left_Hand_DL_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Left_Hand_Open_mesh_layer_1[];
-extern Gfx waluigi_Switch_Option_Left_Hand_Open_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Left_Hand_Open_mesh_layer_5[];
-extern Gfx waluigi_Switch_Option_Left_Hand_Open_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Right_Arm_Color_mesh_layer_1[];
-extern Gfx waluigi_Right_Arm_Color_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Right_Forearm_mesh_layer_1[];
-extern Gfx waluigi_Right_Forearm_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Right_Hand_DL_mesh_layer_1[];
-extern Gfx waluigi_Right_Hand_DL_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Right_Hand_DL_mesh_layer_5[];
-extern Gfx waluigi_Right_Hand_DL_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Open_mesh_layer_1[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Open_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Open_mesh_layer_5[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Open_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Peace_mesh_layer_1[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Peace_mesh_layer_5[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Peace_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_1[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_5[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Cap_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_mat_override_metal_0[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4[];
-extern Gfx waluigi_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_mat_override_metal_0[];
-extern Gfx waluigi_Left_Thigh_Color_mesh_layer_1[];
-extern Gfx waluigi_Left_Thigh_Color_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Left_Leg_mesh_layer_1[];
-extern Gfx waluigi_Left_Leg_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Left_Foot_mesh_layer_1[];
-extern Gfx waluigi_Left_Foot_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Right_Thigh_Color_mesh_layer_1[];
-extern Gfx waluigi_Right_Thigh_Color_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Right_Leg_mesh_layer_1[];
-extern Gfx waluigi_Right_Leg_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_Right_Foot_DL_mesh_layer_1[];
-extern Gfx waluigi_Right_Foot_DL_mesh_layer_1_mat_override_metal_0[];
-extern Gfx waluigi_material_revert_render_settings[];

actors/waluigi/waluigi_externs.h

@@ -0,0 +1,16 @@
+extern ALIGNED8 const Texture waluigi_texture_r_logo[];
+extern ALIGNED8 const Texture waluigi_texture_r_blend[];
+extern ALIGNED8 const Texture waluigi_texture_r_cap[];
+extern ALIGNED8 const Texture waluigi_texture_hair_sideburn[];
+extern ALIGNED8 const Texture waluigi_texture_add_sideburn[];
+extern ALIGNED8 const Texture waluigi_texture_skin_sideburn[];
+extern ALIGNED8 const Texture waluigi_texture_mouth[];
+extern ALIGNED8 const Texture waluigi_texture_mouth_dead[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_front[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_half_closed[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_closed[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_right[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_left[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_up[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_down[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_dead[];

actors/waluigi_cap/geo.inc.c

@@ -1,85 +1,128 @@
+#include "geo_header.h"
 // 0x16000CA4
 const GeoLayout waluigis_cap_geo[] = {
-   GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
+   GEO_NODE_START(),
    GEO_OPEN_NODE(),
-      GEO_SCALE(0x00, 16384),
+      GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
       GEO_OPEN_NODE(),
-         GEO_ASM(1, geo_mario_set_player_colors),
+         GEO_SCALE(0x00, 16384),
-         GEO_ASM(10, geo_update_layer_transparency),
-         GEO_SWITCH_CASE(2, geo_switch_anim_state),
          GEO_OPEN_NODE(),
-            GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_seg3_dl_03022F48),
+            GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
-            GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_seg3_dl_03022F48),
+            GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
+            GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
+            GEO_ASM(10, geo_update_layer_transparency),
+            GEO_SWITCH_CASE(2, geo_switch_anim_state),
+            GEO_OPEN_NODE(),
+               GEO_NODE_START(),
+               GEO_OPEN_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_ALPHA, waluigi_cap_r_logo_decal),
+                  GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_seg3_dl_03022F48),
+               GEO_CLOSE_NODE(),
+               GEO_NODE_START(),
+               GEO_OPEN_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_r_logo_decal),
+                  GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_seg3_dl_03022F48),
+               GEO_CLOSE_NODE(),
+            GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
+      GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, waluigi_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_material_revert_render_settings),
    GEO_CLOSE_NODE(),
    GEO_END(),
 };
 
 // 0x16000CF0
 const GeoLayout waluigis_metal_cap_geo[] = {
-   GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
+   GEO_NODE_START(),
    GEO_OPEN_NODE(),
-      GEO_SCALE(0x00, 16384),
+      GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
       GEO_OPEN_NODE(),
-         GEO_ASM(1, geo_mario_set_player_colors),
+         GEO_SCALE(0x00, 16384),
-         GEO_ASM(10, geo_update_layer_transparency),
-         GEO_SWITCH_CASE(2, geo_switch_anim_state),
          GEO_OPEN_NODE(),
-            GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_seg3_dl_03022FF8),
+            GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
-            GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_seg3_dl_03022FF8),
+            GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
+            GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
+            GEO_ASM(10, geo_update_layer_transparency),
+            GEO_SWITCH_CASE(2, geo_switch_anim_state),
+            GEO_OPEN_NODE(),
+               GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_seg3_dl_03022FF8),
+               GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_seg3_dl_03022FF8),
+            GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
+      GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, waluigi_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_material_revert_render_settings),
    GEO_CLOSE_NODE(),
    GEO_END(),
 };
 
 // 0x16000D3C
 const GeoLayout waluigis_wing_cap_geo[] = {
-   GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
+   GEO_NODE_START(),
    GEO_OPEN_NODE(),
-      GEO_SCALE(0x00, 16384),
+      GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
       GEO_OPEN_NODE(),
-         GEO_ASM(1, geo_mario_set_player_colors),
+         GEO_SCALE(0x00, 16384),
-         GEO_ASM(10, geo_update_layer_transparency),
-         GEO_SWITCH_CASE(2, geo_switch_anim_state),
          GEO_OPEN_NODE(),
-            GEO_NODE_START(),
+            GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
+            GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
+            GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
+            GEO_ASM(10, geo_update_layer_transparency),
+            GEO_SWITCH_CASE(2, geo_switch_anim_state),
             GEO_OPEN_NODE(),
-               GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_seg3_dl_03022F48),
+               GEO_NODE_START(),
-               GEO_DISPLAY_LIST(LAYER_ALPHA, waluigi_cap_seg3_dl_030230B0),
+               GEO_OPEN_NODE(),
-            GEO_CLOSE_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_ALPHA, waluigi_cap_r_logo_decal),
-            GEO_NODE_START(),
+                  GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_seg3_dl_03022F48),
-            GEO_OPEN_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_ALPHA, waluigi_cap_seg3_dl_030230B0),
-               GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_seg3_dl_03023160),
+               GEO_CLOSE_NODE(),
+               GEO_NODE_START(),
+               GEO_OPEN_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_r_logo_decal),
+                  GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_seg3_dl_03023160),
+               GEO_CLOSE_NODE(),
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
+      GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, waluigi_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_material_revert_render_settings),
    GEO_CLOSE_NODE(),
    GEO_END(),
 };
 
 // 0x16000DA8
 const GeoLayout waluigis_winged_metal_cap_geo[] = {
-   GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
+   GEO_NODE_START(),
    GEO_OPEN_NODE(),
-      GEO_SCALE(0x00, 16384),
+      GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
       GEO_OPEN_NODE(),
-         GEO_ASM(1, geo_mario_set_player_colors),
+         GEO_SCALE(0x00, 16384),
-         GEO_ASM(10, geo_update_layer_transparency),
-         GEO_SWITCH_CASE(2, geo_switch_anim_state),
          GEO_OPEN_NODE(),
-            GEO_NODE_START(),
+            GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
+            GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
+            GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
+            GEO_ASM(10, geo_update_layer_transparency),
+            GEO_SWITCH_CASE(2, geo_switch_anim_state),
             GEO_OPEN_NODE(),
-               GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_seg3_dl_03022FF8),
+               GEO_NODE_START(),
-               GEO_DISPLAY_LIST(LAYER_ALPHA, waluigi_cap_seg3_dl_03023108),
+               GEO_OPEN_NODE(),
-            GEO_CLOSE_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_seg3_dl_03022FF8),
-            GEO_NODE_START(),
+                  GEO_DISPLAY_LIST(LAYER_ALPHA, waluigi_cap_seg3_dl_03023108),
-            GEO_OPEN_NODE(),
+               GEO_CLOSE_NODE(),
-               GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_seg3_dl_03023298),
+               GEO_NODE_START(),
+               GEO_OPEN_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_seg3_dl_03023298),
+               GEO_CLOSE_NODE(),
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
+      GEO_DISPLAY_LIST(LAYER_OPAQUE, waluigi_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, waluigi_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, waluigi_cap_material_revert_render_settings),
    GEO_CLOSE_NODE(),
    GEO_END(),
 };

actors/waluigi_cap/geo_header.h

@@ -0,0 +1,21 @@
+extern const GeoLayout waluigis_cap_geo[];
+extern const GeoLayout waluigis_metal_cap_geo[];
+extern const GeoLayout waluigis_wing_cap_geo[];
+extern const GeoLayout waluigis_winged_metal_cap_geo[];
+extern const Gfx waluigi_cap_seg3_dl_03022B30[];
+extern const Gfx waluigi_cap_seg3_dl_03022B68[];
+extern const Gfx waluigi_cap_seg3_dl_03022CC8[];
+extern const Gfx waluigi_cap_seg3_dl_03022D10[];
+extern const Gfx waluigi_cap_seg3_dl_03022E78[];
+extern const Gfx waluigi_cap_seg3_dl_03022EA8[];
+extern const Gfx waluigi_cap_seg3_dl_03022ED8[];
+extern const Gfx waluigi_cap_seg3_dl_03022ED8_metal[];
+extern const Gfx waluigi_cap_seg3_dl_03022F20[];
+extern const Gfx waluigi_cap_r_logo_decal[];
+extern const Gfx waluigi_cap_seg3_dl_03022F48[];
+extern const Gfx waluigi_cap_seg3_dl_03022FF8[];
+extern const Gfx waluigi_cap_seg3_dl_030230B0[];
+extern const Gfx waluigi_cap_seg3_dl_03023108[];
+extern const Gfx waluigi_cap_seg3_dl_03023160[];
+extern const Gfx waluigi_cap_seg3_dl_03023298[];
+extern const Gfx waluigi_cap_material_revert_render_settings[];

actors/waluigi_cap/model.inc.c

@@ -1,35 +1,24 @@
 #include "pc/rom_assets.h"
-// Mario Cap (Normal Cap, Metal, Winged, etc)
+// waluigi Cap (Normal Cap, Metal, Winged, etc)
 
-// 0x0301CF08
+static const Lights1 waluigi_cap_black_lights_group = gdSPDefLights1(
-static const Lights1 waluigi_cap_seg3_lights_0301CF08 = gdSPDefLights1(
+    0x00, 0x00, 0x00,
-    0x39, 0x03, 0x00,
+    0x00, 0x00, 0x00, 0x28, 0x28, 0x28
-    0x73, 0x06, 0x00, 0x28, 0x28, 0x28
 );
 
-// 0x0301CF20
+#include "actors/mario/mario_externs.h"
-static const Lights1 waluigi_cap_seg3_lights_0301CF20 = gdSPDefLights1(
+#include "actors/waluigi/waluigi_externs.h"
-    0x7f, 0x7f, 0x7f,
+#define waluigi_cap_texture_metal_shade              mario_texture_metal_shade
-    0xff, 0xff, 0xff, 0x28, 0x28, 0x28
+#define waluigi_cap_texture_metal_light              mario_texture_metal_light
-);
+#define waluigi_cap_texture_r_logo                   waluigi_texture_r_logo
-
+#define waluigi_cap_texture_r_blend                  waluigi_texture_r_blend
-// 0x0301CF38
+#define waluigi_cap_texture_r_cap                    waluigi_texture_r_cap
-static const Lights1 waluigi_cap_seg3_lights_0301CF38 = gdSPDefLights1(
+#define waluigi_cap_texture_wings_half_1             mario_texture_wings_half_1
-    0x7f, 0x00, 0x00,
+#define waluigi_cap_texture_wings_half_2             mario_texture_wings_half_2
-    0xff, 0x00, 0x00, 0x28, 0x28, 0x28
+#define waluigi_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
-);
+#define waluigi_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
-
+#define waluigi_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
-#include "actors/mario_cap/mario_cap_externs.h"
+#define waluigi_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
-#define waluigi_cap_seg3_texture_0301CF50 mario_cap_seg3_texture_0301CF50
-#define waluigi_cap_seg3_texture_0301E750 mario_cap_seg3_texture_0301E750
-#define waluigi_cap_seg3_texture_0301F750 mario_cap_seg3_texture_0301F750
-#define waluigi_cap_seg3_texture_03020750 mario_cap_seg3_texture_03020750
-#define waluigi_cap_seg3_texture_03021750 mario_cap_seg3_texture_03021750
-
-// 0x0301DF50
-ALIGNED8 const Texture waluigi_cap_seg3_texture_0301DF50[] = {
-#include "actors/waluigi/custom_waluigi_cap.rgba16.inc.c"
-};
 
 // 0x03022750
 ROM_ASSET_LOAD_VTX(waluigi_cap_seg3_vertex_03022750, 0x00114750, 78432, 0x0001bf50, 112);
@@ -96,16 +85,44 @@ const Gfx waluigi_cap_seg3_dl_03022CC8[] = {
 // 0x03022D10 - 0x03022D38
 const Gfx waluigi_cap_seg3_dl_03022D10[] = {
     gsSPDisplayList(waluigi_cap_seg3_dl_03022B68),
-    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&waluigi_cap_seg3_lights_0301CF08.a, 2),
+    gsDPSetCombineLERP(SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsDPSetPrimColor(0, 0, 115, 115, 115, 255),
+    gsSPCopyLightsPlayerPart(CAP),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022CC8),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
     gsSPEndDisplayList(),
 };
 
 // 0x03022D38
-ROM_ASSET_LOAD_VTX(waluigi_cap_seg3_vertex_03022D38, 0x00114750, 78432, 0x0001c538, 192);
+static const Vtx waluigi_cap_seg3_vertex_03022D38[] = {
+    {{{   199,    247,    -55}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   131,    274,     20}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{    69,     71,     38}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   199,    247,    -55}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{    69,     71,     38}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   138,     44,    -37}, 0, {   990,   2012}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{  -137,     44,    -37}, 0, {   990,   2012}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   -68,     71,     38}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{  -198,    247,    -55}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   -68,     71,     38}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{  -130,    274,     20}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{  -198,    247,    -55}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
+};
 
 // 0x03022DF8
-ROM_ASSET_LOAD_VTX(waluigi_cap_seg3_vertex_03022DF8, 0x00114750, 78432, 0x0001c5f8, 128);
+static const Vtx waluigi_cap_seg3_vertex_03022DF8[] = {
+    {{{   268,    219,   -132}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   199,    247,    -55}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   138,     44,    -37}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{   207,     16,   -114}, 0, {   990,   2012}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{  -206,     16,   -114}, 0, {   990,   2012}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{  -137,     44,    -37}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{  -267,    219,   -132}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
+    {{{  -198,    247,    -55}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
+};
 
 // 0x03022E78 - 0x03022EA8
 const Gfx waluigi_cap_seg3_dl_03022E78[] = {
@@ -136,6 +153,16 @@ const Gfx waluigi_cap_seg3_dl_03022ED8[] = {
     gsSPEndDisplayList(),
 };
 
+const Gfx waluigi_cap_seg3_dl_03022ED8_metal[] = {
+    gsDPPipeSync(),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPLight(&waluigi_cap_black_lights_group.l, 1),
+    gsSPCopyLightEXT(2, 17),
+    gsSPEndDisplayList(),
+};
+
 // 0x03022F20 - 0x03022F48
 const Gfx waluigi_cap_seg3_dl_03022F20[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
@@ -145,23 +172,50 @@ const Gfx waluigi_cap_seg3_dl_03022F20[] = {
     gsSPEndDisplayList(),
 };
 
-// 0x03022F48 - 0x03022FF8
+const Gfx waluigi_cap_r_logo_decal[] = {
-const Gfx waluigi_cap_seg3_dl_03022F48[] = {
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_BLENDRGBFADEA, G_CC_BLENDRGBFADEA),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0),
-    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(65535, 65535, 0, 0, 1),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsSPLight(&waluigi_cap_black_lights_group.l, 1),
-    gsDPTileSync(),
+    gsSPCopyLightEXT(2, 17),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_r_logo),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_0301DF50),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
-    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&waluigi_cap_seg3_lights_0301CF38.a, 2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_r_blend),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022B30),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPCopyLightsPlayerPart(CAP),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_r_logo),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_r_cap),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
+    gsSPDisplayList(waluigi_cap_seg3_dl_03022B30),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPEndDisplayList(),
+};
+
+// 0x03022F48 - 0x03022FF8
+const Gfx waluigi_cap_seg3_dl_03022F48[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
+    gsSPCopyLightsPlayerPart(CAP),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022D10),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
@@ -172,12 +226,22 @@ const Gfx waluigi_cap_seg3_dl_03022F48[] = {
 
 // 0x03022FF8 - 0x030230B0
 const Gfx waluigi_cap_seg3_dl_03022FF8[] = {
-    gsDPPipeSync(),
+	gsDPPipeSync(),
-    gsSPSetGeometryMode(G_TEXTURE_GEN),
+	gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
-    gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT),
+	gsSPSetGeometryMode(G_TEXTURE_GEN),
-    gsDPLoadTextureBlock(waluigi_cap_seg3_texture_0301CF50, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
+	gsSPTexture(4032, 1984, 0, 0, 1),
-    gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
+    gsSPLight(&waluigi_cap_black_lights_group.l, 1),
-    gsSPCopyLightsPlayerPart(CAP),
+    gsSPCopyLightEXT(2, 17),
+	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_shade),
+	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+	gsDPLoadBlock(7, 0, 0, 2047, 128),
+	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+	gsDPSetTileSize(0, 0, 0, 252, 124),
+	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_light),
+	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+	gsDPLoadBlock(6, 0, 0, 2047, 128),
+	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+	gsDPSetTileSize(1, 0, 0, 252, 124),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022B30),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022B68),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022CC8),
@@ -193,11 +257,11 @@ const Gfx waluigi_cap_seg3_dl_03022FF8[] = {
 // 0x030230B0 - 0x03023108
 const Gfx waluigi_cap_seg3_dl_030230B0[] = {
     gsSPDisplayList(waluigi_cap_seg3_dl_03022ED8),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_0301E750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_texture_wings_half_1),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_0301F750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_texture_wings_half_2),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022EA8),
@@ -207,14 +271,28 @@ const Gfx waluigi_cap_seg3_dl_030230B0[] = {
 
 // 0x03023108 - 0x03023160
 const Gfx waluigi_cap_seg3_dl_03023108[] = {
-    gsSPDisplayList(waluigi_cap_seg3_dl_03022ED8),
+    gsSPDisplayList(waluigi_cap_seg3_dl_03022ED8_metal),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_03020750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_wings_half_1_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_03021750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022EA8),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022F20),
     gsSPEndDisplayList(),
@@ -222,21 +300,9 @@ const Gfx waluigi_cap_seg3_dl_03023108[] = {
 
 // 0x03023160 - 0x03023298
 const Gfx waluigi_cap_seg3_dl_03023160[] = {
-    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_BLENDRGBFADEA, G_CC_BLENDRGBFADEA),
-    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_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_0301DF50),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
-    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&waluigi_cap_seg3_lights_0301CF38.a, 2),
-    gsSPDisplayList(waluigi_cap_seg3_dl_03022B30),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
+    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&waluigi_cap_seg3_lights_0301CF38.a, 2),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022D10),
     gsDPPipeSync(),
     gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
@@ -245,11 +311,11 @@ const Gfx waluigi_cap_seg3_dl_03023160[] = {
     gsDPTileSync(),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
     gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_0301E750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_texture_wings_half_1),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_0301F750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_texture_wings_half_2),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022EA8),
@@ -265,35 +331,52 @@ const Gfx waluigi_cap_seg3_dl_03023160[] = {
 // 0x03023298 - 0x030233D0
 const Gfx waluigi_cap_seg3_dl_03023298[] = {
     gsDPPipeSync(),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
     gsSPSetGeometryMode(G_TEXTURE_GEN),
-    gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT),
+    gsSPTexture(4032, 1984, 0, 0, 1),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_0301CF50),
+    gsSPLight(&waluigi_cap_black_lights_group.l, 1),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 6, G_TX_NOLOD),
+    gsSPCopyLightEXT(2, 17),
-    gsDPLoadSync(),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_shade),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPPipeSync(),
+    gsDPLoadBlock(7, 0, 0, 2047, 128),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 6, G_TX_NOLOD),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-    gsDPSetTileSize(0, 0, 0, (64 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTileSize(0, 0, 0, 252, 124),
-    gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_light),
-    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&waluigi_cap_seg3_lights_0301CF20.a, 2),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 128),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTileSize(1, 0, 0, 252, 124),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022B30),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022B68),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022CC8),
     gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsSPClearGeometryMode(G_TEXTURE_GEN | G_LIGHTING | G_CULL_BACK),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
-    gsDPSetCombineMode(G_CC_DECALFADEA, G_CC_DECALFADEA),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-    gsDPTileSync(),
+    gsSPLight(&waluigi_cap_black_lights_group.l, 1),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
+    gsSPCopyLightEXT(2, 17),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_wings_half_1_shade),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_03020750),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadSync(),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, waluigi_cap_seg3_texture_03021750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(waluigi_cap_seg3_dl_03022EA8),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -303,3 +386,27 @@ const Gfx waluigi_cap_seg3_dl_03023298[] = {
     gsDPSetEnvColor(255, 255, 255, 255),
     gsSPEndDisplayList(),
 };
+
+const Gfx waluigi_cap_material_revert_render_settings[] = {
+    gsDPPipeSync(),
+    gsSPSetGeometryMode(G_LIGHTING),
+    gsSPClearGeometryMode(G_TEXTURE_GEN),
+    gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
+    gsSPTexture(65535, 65535, 0, 0, 0),
+    gsDPSetEnvColor(255, 255, 255, 255),
+    gsDPSetAlphaCompare(G_AC_NONE),
+
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
+
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
+
+    gsSPEndDisplayList(),
+};

actors/wario/geo.inc.c

@@ -9,6 +9,7 @@ const GeoLayout wario_geo_face_and_wings[] = {
       GEO_OPEN_NODE(),
          GEO_NODE_START(),
          GEO_OPEN_NODE(),
+            GEO_DISPLAY_LIST(LAYER_ALPHA, wario_w_logo_decal),
             GEO_DISPLAY_LIST(LAYER_ALPHA, wario_hair_sideburn_decal_cap_on),
 		    GEO_OPEN_NODE(),
                GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
@@ -99,8 +100,12 @@ const GeoLayout wario_geo_right_hand[] = {
       GEO_CLOSE_NODE(),
       GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_right_hand_peace), // here we go hand
       GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_right_hand_cap),
+      GEO_OPEN_NODE(),
+         GEO_DISPLAY_LIST(LAYER_ALPHA, wario_right_hand_cap_decal),
+      GEO_CLOSE_NODE(),
       GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_right_hand_cap),
       GEO_OPEN_NODE(),
+         GEO_DISPLAY_LIST(LAYER_ALPHA, wario_right_hand_cap_decal),
          GEO_DISPLAY_LIST(LAYER_ALPHA, wario_right_hand_cap_wings),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
@@ -188,6 +193,7 @@ const GeoLayout wario_vanish_geo_face_and_wings[] = {
       GEO_OPEN_NODE(),
          GEO_NODE_START(),
          GEO_OPEN_NODE(),
+            GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_w_logo_decal),
             GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_hair_sideburn_decal_cap_on),
 		    GEO_OPEN_NODE(),
                GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
@@ -279,9 +285,13 @@ const GeoLayout wario_vanish_geo_right_hand[] = {
       GEO_CLOSE_NODE(),
       GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_right_hand_peace), // here we go hand
       GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_right_hand_cap),
+      GEO_OPEN_NODE(),
+         GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_right_hand_cap_decal),
+      GEO_CLOSE_NODE(),
       GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_right_hand_cap),
       GEO_OPEN_NODE(),
-         GEO_DISPLAY_LIST(LAYER_ALPHA, wario_right_hand_cap_wings_transparent),
+         GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_right_hand_cap_wings_transparent),
+         GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_right_hand_cap_decal),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
    GEO_RETURN(),
@@ -575,7 +585,7 @@ const GeoLayout wario_metal_vanish_geo_right_hand[] = {
       GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_metal_right_hand_cap_shared_dl),
       GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_metal_right_hand_cap_shared_dl),
       GEO_OPEN_NODE(),
-         GEO_DISPLAY_LIST(LAYER_ALPHA, wario_metal_right_hand_cap_shared_dl_wings_transparent),
+         GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_metal_right_hand_cap_shared_dl_wings_transparent),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
    GEO_RETURN(),

actors/wario/geo_header.h

@@ -42,7 +42,7 @@ extern const Gfx wario_right_leg_shared_dl[];
 extern const Gfx wario_right_foot_dl[];
 extern const Gfx wario_right_foot[];
 extern const Gfx wario_metal_right_foot[];
-extern const Gfx wario_white_button_dl[];
+extern const Gfx wario_yellow_button_dl[];
 extern const Gfx wario_pants_overalls_shared_dl[];
 extern const Gfx wario_tshirt_shared_dl[];
 extern const Gfx wario_torso_dl[];
@@ -59,6 +59,7 @@ extern const Gfx wario_nose_cap_on_dl[];
 extern const Gfx wario_mustache_cap_on_dl[];
 extern const Gfx wario_mustache_cap_on_dead_dl[];
 extern const Gfx wario_hair_sideburn_decal_cap_on[];
+extern const Gfx wario_w_logo_decal[];
 extern const Gfx wario_face_cap_on_dl[];
 extern const Gfx wario_cap_on_eyes_front[];
 extern const Gfx wario_cap_on_eyes_half_closed[];
@@ -97,11 +98,13 @@ extern const Gfx wario_right_hand_cap_w_logo_dl[];
 extern const Gfx wario_right_hand_cap_top_dl[];
 extern const Gfx wario_right_hand_cap_hand_position_dl[];
 extern const Gfx wario_right_hand_cap_bottom_dl[];
+extern const Gfx wario_right_hand_cap_decal[];
 extern const Gfx wario_right_hand_cap_dl[];
 extern const Gfx wario_right_hand_cap_wings_half_1_dl[];
 extern const Gfx wario_right_hand_cap_wings_half_2_dl[];
 extern const Gfx wario_right_hand_cap_wings_intial_dl[];
 extern const Gfx wario_right_hand_cap_wings_transparent_intial_dl[];
+extern const Gfx wario_right_hand_cap_metal_wings_intial_dl[];
 extern const Gfx wario_right_hand_cap_wings_end_dl[];
 extern const Gfx wario_right_hand_cap[];
 extern const Gfx wario_right_hand_cap_wings[];

actors/wario/wario_externs.h

@@ -1,5 +1,7 @@
 extern ALIGNED8 const Texture wario_texture_white_button[];
 extern ALIGNED8 const Texture wario_texture_w_logo[];
+extern ALIGNED8 const Texture wario_texture_w_blend[];
+extern ALIGNED8 const Texture wario_texture_w_cap[];
 extern ALIGNED8 const Texture wario_texture_hair_sideburn[];
 extern ALIGNED8 const Texture wario_texture_add_sideburn[];
 extern ALIGNED8 const Texture wario_texture_skin_sideburn[];

actors/wario_cap/geo.inc.c

@@ -15,10 +15,12 @@ const GeoLayout warios_cap_geo[] = {
             GEO_OPEN_NODE(),
                GEO_NODE_START(),
                GEO_OPEN_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_w_logo_decal),
                   GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_seg3_dl_03022F48),
                GEO_CLOSE_NODE(),
                GEO_NODE_START(),
                GEO_OPEN_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_w_logo_decal),
                   GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_seg3_dl_03022F48),
                GEO_CLOSE_NODE(),
             GEO_CLOSE_NODE(),
@@ -73,11 +75,13 @@ const GeoLayout warios_wing_cap_geo[] = {
             GEO_OPEN_NODE(),
                GEO_NODE_START(),
                GEO_OPEN_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_w_logo_decal),
                   GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_seg3_dl_03022F48),
                   GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_seg3_dl_030230B0),
                GEO_CLOSE_NODE(),
                GEO_NODE_START(),
                GEO_OPEN_NODE(),
+                  GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_w_logo_decal),
                   GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_seg3_dl_03023160),
                GEO_CLOSE_NODE(),
             GEO_CLOSE_NODE(),

actors/wario_cap/geo_header.h

@@ -9,7 +9,9 @@ extern const Gfx wario_cap_seg3_dl_03022D10[];
 extern const Gfx wario_cap_seg3_dl_03022E78[];
 extern const Gfx wario_cap_seg3_dl_03022EA8[];
 extern const Gfx wario_cap_seg3_dl_03022ED8[];
+extern const Gfx wario_cap_seg3_dl_03022ED8_metal[];
 extern const Gfx wario_cap_seg3_dl_03022F20[];
+extern const Gfx wario_cap_w_logo_decal[];
 extern const Gfx wario_cap_seg3_dl_03022F48[];
 extern const Gfx wario_cap_seg3_dl_03022FF8[];
 extern const Gfx wario_cap_seg3_dl_030230B0[];

actors/wario_cap/model.inc.c

@@ -1,24 +1,6 @@
 #include "pc/rom_assets.h"
 // Wario Cap (Normal Cap, Metal, Winged, etc)
 
-// 0x0301CF08
-static const Lights1 wario_cap_seg3_lights_0301CF08 = gdSPDefLights1(
-    0x39, 0x03, 0x00,
-    0x73, 0x06, 0x00, 0x28, 0x28, 0x28
-);
-
-// 0x0301CF20
-static const Lights1 wario_cap_seg3_lights_0301CF20 = gdSPDefLights1(
-    0x7f, 0x7f, 0x7f,
-    0xff, 0xff, 0xff, 0x28, 0x28, 0x28
-);
-
-// 0x0301CF38
-static const Lights1 wario_cap_seg3_lights_0301CF38 = gdSPDefLights1(
-    0x7f, 0x5e, 0x00,
-    0xff, 0xbd, 0x00, 0x28, 0x28, 0x28
-);
-
 static const Lights1 wario_cap_black_lights_group = gdSPDefLights1(
     0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x28, 0x28, 0x28
@@ -26,14 +8,17 @@ static const Lights1 wario_cap_black_lights_group = gdSPDefLights1(
 
 #include "actors/mario/mario_externs.h"
 #include "actors/wario/wario_externs.h"
-#define wario_cap_texture_metal_shade        mario_texture_metal_shade
+#define wario_cap_texture_metal_shade              mario_texture_metal_shade
-#define wario_cap_texture_metal_light        mario_texture_metal_light
+#define wario_cap_texture_metal_light              mario_texture_metal_light
-#define wario_cap_texture_w_logo             wario_texture_w_logo
+#define wario_cap_texture_w_logo                   wario_texture_w_logo
-#define wario_cap_texture_wings_half_1       mario_texture_wings_half_1
+#define wario_cap_texture_w_blend                  wario_texture_w_blend
-#define wario_cap_texture_wings_half_2       mario_texture_wings_half_2
+#define wario_cap_texture_w_cap                    wario_texture_w_cap
-#define wario_cap_texture_metal_wings_half_1 mario_texture_metal_wings_half_1
+#define wario_cap_texture_wings_half_1             mario_texture_wings_half_1
-#define wario_cap_texture_metal_wings_half_2 mario_texture_metal_wings_half_2
+#define wario_cap_texture_wings_half_2             mario_texture_wings_half_2
-#define wario_cap_texture_cap_inside         mario_texture_cap_inside
+#define wario_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
+#define wario_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
+#define wario_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
+#define wario_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
 
 // 0x03022750
 ROM_ASSET_LOAD_VTX(wario_cap_seg3_vertex_03022750, 0x00114750, 78432, 0x0001bf50, 112);
@@ -100,16 +85,10 @@ const Gfx wario_cap_seg3_dl_03022CC8[] = {
 // 0x03022D10 - 0x03022D38
 const Gfx wario_cap_seg3_dl_03022D10[] = {
     gsSPDisplayList(wario_cap_seg3_dl_03022B68),
-    gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA),
+    gsDPSetCombineLERP(SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT, SHADE, 0, PRIMITIVE, 0, 0, 0, 0, ENVIRONMENT),
-    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(65535, 65535, 0, 0, 1),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPSetPrimColor(0, 0, 115, 115, 115, 255),
-    gsDPTileSync(),
+    gsSPCopyLightsPlayerPart(CAP),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (8 - 1) << G_TEXTURE_IMAGE_FRAC, (8 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_cap_inside),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_16b_BYTES)),
-    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&wario_cap_seg3_lights_0301CF08.a, 2),
     gsSPDisplayList(wario_cap_seg3_dl_03022CC8),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -174,6 +153,16 @@ const Gfx wario_cap_seg3_dl_03022ED8[] = {
     gsSPEndDisplayList(),
 };
 
+const Gfx wario_cap_seg3_dl_03022ED8_metal[] = {
+    gsDPPipeSync(),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPLight(&wario_cap_black_lights_group.l, 1),
+    gsSPCopyLightEXT(2, 17),
+    gsSPEndDisplayList(),
+};
+
 // 0x03022F20 - 0x03022F48
 const Gfx wario_cap_seg3_dl_03022F20[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
@@ -183,23 +172,50 @@ const Gfx wario_cap_seg3_dl_03022F20[] = {
     gsSPEndDisplayList(),
 };
 
-// 0x03022F48 - 0x03022FF8
+const Gfx wario_cap_w_logo_decal[] = {
-const Gfx wario_cap_seg3_dl_03022F48[] = {
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_BLENDRGBFADEA, G_CC_BLENDRGBFADEA),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0),
-    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(65535, 65535, 0, 0, 1),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsSPLight(&wario_cap_black_lights_group.l, 1),
-    gsDPTileSync(),
+    gsSPCopyLightEXT(2, 17),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_w_logo),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_w_logo),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
-    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&wario_cap_seg3_lights_0301CF38.a, 2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_w_blend),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
     gsSPDisplayList(wario_cap_seg3_dl_03022B30),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPCopyLightsPlayerPart(CAP),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_w_logo),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_w_cap),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
+    gsSPDisplayList(wario_cap_seg3_dl_03022B30),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsSPEndDisplayList(),
+};
+
+// 0x03022F48 - 0x03022FF8
+const Gfx wario_cap_seg3_dl_03022F48[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
+    gsSPCopyLightsPlayerPart(CAP),
     gsSPDisplayList(wario_cap_seg3_dl_03022D10),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
@@ -255,14 +271,28 @@ const Gfx wario_cap_seg3_dl_030230B0[] = {
 
 // 0x03023108 - 0x03023160
 const Gfx wario_cap_seg3_dl_03023108[] = {
-    gsSPDisplayList(wario_cap_seg3_dl_03022ED8),
+    gsSPDisplayList(wario_cap_seg3_dl_03022ED8_metal),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_1),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_wings_half_1_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(wario_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(wario_cap_seg3_dl_03022EA8),
     gsSPDisplayList(wario_cap_seg3_dl_03022F20),
     gsSPEndDisplayList(),
@@ -270,21 +300,9 @@ const Gfx wario_cap_seg3_dl_03023108[] = {
 
 // 0x03023160 - 0x03023298
 const Gfx wario_cap_seg3_dl_03023160[] = {
-    gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_BLENDRGBFADEA, G_CC_BLENDRGBFADEA),
-    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_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_w_logo),
-    gsDPLoadSync(),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
-    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&wario_cap_seg3_lights_0301CF38.a, 2),
-    gsSPDisplayList(wario_cap_seg3_dl_03022B30),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
+    gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&wario_cap_seg3_lights_0301CF38.a, 2),
     gsSPDisplayList(wario_cap_seg3_dl_03022D10),
     gsDPPipeSync(),
     gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
@@ -312,40 +330,53 @@ const Gfx wario_cap_seg3_dl_03023160[] = {
 
 // 0x03023298 - 0x030233D0
 const Gfx wario_cap_seg3_dl_03023298[] = {
-	gsDPPipeSync(),
+    gsDPPipeSync(),
-	gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
-	gsSPSetGeometryMode(G_TEXTURE_GEN),
+    gsSPSetGeometryMode(G_TEXTURE_GEN),
-	gsSPTexture(4032, 1984, 0, 0, 1),
+    gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&wario_cap_black_lights_group.l, 1),
     gsSPCopyLightEXT(2, 17),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_shade),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_shade),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 2047, 128),
+    gsDPLoadBlock(7, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(0, 0, 0, 252, 124),
+    gsDPSetTileSize(0, 0, 0, 252, 124),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_light),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_light),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(6, 0, 0, 2047, 128),
+    gsDPLoadBlock(6, 0, 0, 2047, 128),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
-	gsDPSetTileSize(1, 0, 0, 252, 124),
+    gsDPSetTileSize(1, 0, 0, 252, 124),
     gsSPDisplayList(wario_cap_seg3_dl_03022B30),
     gsSPDisplayList(wario_cap_seg3_dl_03022B68),
     gsSPDisplayList(wario_cap_seg3_dl_03022CC8),
     gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsSPClearGeometryMode(G_TEXTURE_GEN | G_LIGHTING | G_CULL_BACK),
+    gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
-    gsDPSetCombineMode(G_CC_DECALFADEA, G_CC_DECALFADEA),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsSPTexture(65535, 65535, 0, 0, 1),
-    gsDPTileSync(),
+    gsSPLight(&wario_cap_black_lights_group.l, 1),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
+    gsSPCopyLightEXT(2, 17),
-    gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_wings_half_1_shade),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_1),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadSync(),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_wings_half_1_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(wario_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_2),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_wings_half_2_shade),
-    gsDPLoadSync(),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
+    gsDPLoadBlock(7, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(0, 0, 0, 124, 252),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_wings_half_2_light),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 2047, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 252),
     gsSPDisplayList(wario_cap_seg3_dl_03022EA8),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),

data/dynos_mgr_builtin_externs.h

@@ -1630,7 +1630,6 @@ extern ALIGNED8 Texture gd_texture_sparkle_3[];
 extern ALIGNED8 Texture gd_texture_sparkle_4[];
 extern ALIGNED8 Texture gd_texture_sparkle_5[];
 
-extern ALIGNED8 const Texture mario_texture_metal[];
 extern ALIGNED8 const Texture mario_texture_metal_shade[];
 extern ALIGNED8 const Texture mario_texture_metal_light[];
 extern ALIGNED8 const Texture mario_texture_yellow_button[];
@@ -1651,9 +1650,10 @@ extern ALIGNED8 const Texture mario_texture_eyes_down[];
 extern ALIGNED8 const Texture mario_texture_eyes_dead[];
 extern ALIGNED8 const Texture mario_texture_wings_half_1[];
 extern ALIGNED8 const Texture mario_texture_wings_half_2[];
-extern ALIGNED8 const Texture mario_texture_metal_wings_half_1[];
+extern ALIGNED8 const Texture mario_texture_metal_wings_half_1_shade[];
-extern ALIGNED8 const Texture mario_texture_metal_wings_half_2[];
+extern ALIGNED8 const Texture mario_texture_metal_wings_half_1_light[];
-extern ALIGNED8 const Texture mario_texture_cap_inside[];
+extern ALIGNED8 const Texture mario_texture_metal_wings_half_2_shade[];
+extern ALIGNED8 const Texture mario_texture_metal_wings_half_2_light[];
 extern ALIGNED8 const Texture mario_cap_seg3_texture_0301CF50[];
 extern ALIGNED8 const Texture mario_cap_seg3_texture_0301DF50[];
 extern ALIGNED8 const Texture mario_cap_seg3_texture_0301E750[];
@@ -1686,6 +1686,8 @@ extern ALIGNED8 const Texture toad_player_texture_eyes_down[];
 extern ALIGNED8 const Texture toad_player_texture_eyes_dead[];
 extern ALIGNED8 const Texture wario_texture_white_button[];
 extern ALIGNED8 const Texture wario_texture_w_logo[];
+extern ALIGNED8 const Texture wario_texture_w_blend[];
+extern ALIGNED8 const Texture wario_texture_w_cap[];
 extern ALIGNED8 const Texture wario_texture_hair_sideburn[];
 extern ALIGNED8 const Texture wario_texture_add_sideburn[];
 extern ALIGNED8 const Texture wario_texture_skin_sideburn[];
@@ -1699,25 +1701,22 @@ extern ALIGNED8 const Texture wario_texture_eyes_left[];
 extern ALIGNED8 const Texture wario_texture_eyes_up[];
 extern ALIGNED8 const Texture wario_texture_eyes_down[];
 extern ALIGNED8 const Texture wario_texture_eyes_dead[];
-
+extern ALIGNED8 const Texture waluigi_texture_r_logo[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_overalls_button_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_r_blend[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_metal_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_r_cap[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_cap_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_hair_sideburn[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_eyes_center_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_add_sideburn[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_mouth_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_skin_sideburn[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_sideburns_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_mouth[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_eyes_half_closed_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_mouth_dead[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_eyes_closed_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_front[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_eyes_left_unused_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_half_closed[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_eyes_right_unused_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_closed[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_eyes_up_unused_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_right[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_eyes_down_unused_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_left[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_mouth_dead_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_up[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_eyes_dead_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_down[];
-extern ALIGNED8 const Texture waluigi_wing_2_rgba16[];
+extern ALIGNED8 const Texture waluigi_texture_eyes_dead[];
-extern ALIGNED8 const Texture waluigi_wing_1_rgba16[];
-extern ALIGNED8 const Texture waluigi_custom_waluigi_glove_rgba16[];
-
 extern ALIGNED8 const Texture water_skybox_texture_00000[];
 extern ALIGNED8 const Texture water_skybox_texture_00001[];
 extern ALIGNED8 const Texture water_skybox_texture_00002[];

data/dynos_mgr_builtin_tex.cpp

@@ -1051,15 +1051,14 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
     define_builtin_tex(wmotr_seg7_texture_07000C00, "levels/wmotr/2.rgba16.png", 32, 32, 16),
     define_builtin_tex(wmotr_seg7_texture_07001400, "levels/wmotr/3.rgba16.png", 32, 8, 16),
     define_builtin_tex(wmotr_seg7_texture_07001600, "levels/wmotr/4.rgba16.png", 8, 32, 16),
-    define_builtin_tex(mario_texture_metal, "actors/mario/mario_metal.rgba16.png", 64, 32, 16),
     define_builtin_tex(mario_texture_metal_shade, "actors/mario/custom_mario_metal_shade.rgba16.png", 64, 32, 16),
     define_builtin_tex(mario_texture_metal_light, "actors/mario/custom_mario_metal_light.rgba16.png", 64, 32, 16),
     define_builtin_tex(mario_texture_yellow_button, "actors/mario/mario_overalls_button.rgba16.png", 32, 32, 16),
     define_builtin_tex(mario_texture_m_logo, "actors/mario/custom_mario_logo.rgba16.png", 32, 32, 16),
     define_builtin_tex(mario_texture_m_blend, "actors/mario/custom_mario_m_blend.rgba16.png", 32, 32, 16),
     define_builtin_tex(mario_texture_m_cap, "actors/mario/custom_mario_cap.rgba16.png", 32, 32, 16),
-    define_builtin_tex(mario_texture_hair_sideburn, "actors/mario/custom_mario_sideburn.rgba32.png", 32, 32, 16),
+    define_builtin_tex(mario_texture_hair_sideburn, "actors/mario/custom_mario_sideburn.rgba16.png", 32, 32, 16),
-    define_builtin_tex(mario_texture_add_sideburn, "actors/mario/custom_mario_sideburn_add.rgba32.png", 32, 32, 16),
+    define_builtin_tex(mario_texture_add_sideburn, "actors/mario/custom_mario_sideburn_add.rgba16.png", 32, 32, 16),
     define_builtin_tex(mario_texture_skin_sideburn, "actors/mario/custom_mario_skin.rgba16.png", 32, 32, 16),
     define_builtin_tex(mario_texture_mustache, "actors/mario/mario_mustache.rgba16.png", 32, 32, 16),
     define_builtin_tex(mario_texture_eyes_front, "actors/mario/mario_eyes_center.rgba16.png", 32, 32, 16),
@@ -1072,9 +1071,10 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
     define_builtin_tex(mario_texture_eyes_dead, "actors/mario/mario_eyes_dead.rgba16.png", 32, 32, 16),
     define_builtin_tex(mario_texture_wings_half_1, "actors/mario/mario_wing.rgba16.png", 32, 64, 16),
     define_builtin_tex(mario_texture_wings_half_2, "actors/mario/mario_wing_tip.rgba16.png", 32, 64, 16),
-    define_builtin_tex(mario_texture_metal_wings_half_1, "actors/mario/mario_metal_wing_unused.rgba16.png", 32, 64, 16),
+    define_builtin_tex(mario_texture_metal_wings_half_1_shade, "actors/mario/custom_mario_metal_wing_shade.rgba16.png", 32, 64, 16),
-    define_builtin_tex(mario_texture_metal_wings_half_2, "actors/mario/mario_metal_wing_tip_unused.rgba16.png", 32, 64, 16),
+    define_builtin_tex(mario_texture_metal_wings_half_1_light, "actors/mario/custom_mario_metal_wing_light.rgba16.png", 32, 64, 16),
-    define_builtin_tex(mario_texture_cap_inside, "actors/mario/custom_mario_cap_inside.rgba32.png", 8, 8, 16),
+    define_builtin_tex(mario_texture_metal_wings_half_2_shade, "actors/mario/custom_mario_metal_wing_tip_shade.rgba16.png", 32, 64, 16),
+    define_builtin_tex(mario_texture_metal_wings_half_2_light, "actors/mario/custom_mario_metal_wing_tip_light.rgba16.png", 32, 64, 16),
     define_builtin_tex(mario_cap_seg3_texture_0301CF50, "actors/mario_cap/mario_cap_metal.rgba16.png", 64, 32, 16),
     define_builtin_tex(mario_cap_seg3_texture_0301DF50, "actors/mario_cap/mario_cap_logo.rgba16.png", 32, 32, 16),
     define_builtin_tex(mario_cap_seg3_texture_0301E750, "actors/mario_cap/mario_cap_wing.rgba16.png", 32, 64, 16),
@@ -1086,10 +1086,10 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
     define_builtin_tex(impact_smoke_seg6_texture_0605EA28, "actors/impact_smoke/impact_smoke_2.ia16.png", 64, 64, 16),
     define_builtin_tex(impact_smoke_seg6_texture_06060A28, "actors/impact_smoke/impact_smoke_3.ia16.png", 64, 64, 16),
     define_builtin_tex(luigi_texture_l_logo, "actors/luigi/custom_luigi_logo.rgba16.png", 32, 32, 16),
-    define_builtin_tex(luigi_texture_l_blend, "actors/luigi/custom_luigi_l_blend.rgba16.png", 32, 32, 16),
+    define_builtin_tex(luigi_texture_l_blend, "actors/luigi/custom_luigi_logo_blend.rgba16.png", 32, 32, 16),
     define_builtin_tex(luigi_texture_l_cap, "actors/luigi/custom_luigi_cap.rgba16.png", 32, 32, 16),
-    define_builtin_tex(luigi_texture_hair_sideburn, "actors/luigi/custom_luigi_sideburn.rgba32.png", 32, 32, 16),
+    define_builtin_tex(luigi_texture_hair_sideburn, "actors/luigi/custom_luigi_sideburn.rgba16.png", 32, 32, 16),
-    define_builtin_tex(luigi_texture_add_sideburn, "actors/luigi/custom_luigi_sideburn_add.rgba32.png", 32, 32, 16),
+    define_builtin_tex(luigi_texture_add_sideburn, "actors/luigi/custom_luigi_sideburn_add.rgba16.png", 32, 32, 16),
     define_builtin_tex(luigi_texture_skin_sideburn, "actors/luigi/custom_luigi_skin.rgba16.png", 32, 32, 16),
     define_builtin_tex(luigi_texture_mustache, "actors/luigi/custom_luigi_mustache.rgba16.png", 32, 32, 16),
     define_builtin_tex(toad_player_texture_cap, "actors/toad_player/custom_toad_cap.ia16.png", 32, 32, 16),
@@ -1107,8 +1107,10 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
     define_builtin_tex(toad_player_texture_eyes_dead, "actors/toad_player/custom_toad_eyes_dead.rgba32.png", 32, 32, 16),
     define_builtin_tex(wario_texture_white_button, "actors/wario/custom_wario_overalls_button.rgba16.png", 32, 32, 16),
     define_builtin_tex(wario_texture_w_logo, "actors/wario/custom_wario_logo.rgba16.png", 32, 32, 16),
-    define_builtin_tex(wario_texture_hair_sideburn, "actors/wario/custom_wario_sideburn.rgba32.png", 32, 32, 16),
+    define_builtin_tex(wario_texture_w_blend, "actors/wario/custom_wario_logo_blend.rgba16.png", 32, 32, 16),
-    define_builtin_tex(wario_texture_add_sideburn, "actors/wario/custom_wario_sideburn_add.rgba32.png", 32, 32, 16),
+    define_builtin_tex(wario_texture_w_cap, "actors/wario/custom_wario_cap.rgba16.png", 32, 32, 16),
+    define_builtin_tex(wario_texture_hair_sideburn, "actors/wario/custom_wario_sideburn.rgba16.png", 32, 32, 16),
+    define_builtin_tex(wario_texture_add_sideburn, "actors/wario/custom_wario_sideburn_add.rgba16.png", 32, 32, 16),
     define_builtin_tex(wario_texture_skin_sideburn, "actors/wario/custom_wario_skin.rgba16.png", 32, 32, 16),
     define_builtin_tex(wario_texture_mouth, "actors/wario/custom_wario_mouth.rgba16.png", 64, 32, 16),
     define_builtin_tex(wario_texture_mouth_dead, "actors/wario/custom_wario_mouth_dead.rgba16.png", 64, 32, 16),
@@ -1120,32 +1122,22 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
     define_builtin_tex(wario_texture_eyes_up, "actors/wario/custom_wario_eyes_up_unused.rgba16.png", 64, 32, 16),
     define_builtin_tex(wario_texture_eyes_down, "actors/wario/custom_wario_eyes_down_unused.rgba16.png", 64, 32, 16),
     define_builtin_tex(wario_texture_eyes_dead, "actors/wario/custom_wario_eyes_dead.rgba16.png", 64, 32, 16),
-    
+    define_builtin_tex(waluigi_texture_r_logo, "actors/waluigi/custom_waluigi_logo.rgba16.png", 32, 32, 16),
-    // Waluigi
+    define_builtin_tex(waluigi_texture_r_blend, "actors/waluigi/custom_waluigi_logo_blend.rgba16.png", 32, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_overalls_button_rgba16, "actors/waluigi/custom_waluigi_overalls_button.rgba16.png", 32, 32, 16),
+    define_builtin_tex(waluigi_texture_r_cap, "actors/waluigi/custom_waluigi_cap.rgba16.png", 32, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_metal_rgba16, "actors/waluigi/custom_waluigi_metal.rgba16.png", 64, 32, 16),
+    define_builtin_tex(waluigi_texture_hair_sideburn, "actors/waluigi/custom_waluigi_sideburn.rgba16.png", 32, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_cap_rgba16, "actors/waluigi/custom_waluigi_cap.rgba16.png", 32, 32, 16),
+    define_builtin_tex(waluigi_texture_add_sideburn, "actors/waluigi/custom_waluigi_sideburn_add.rgba16.png", 32, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_glove_rgba16, "actors/waluigi/custom_waluigi_glove.rgba16.png", 32, 32, 16),
+    define_builtin_tex(waluigi_texture_skin_sideburn, "actors/waluigi/custom_waluigi_skin.rgba16.png", 32, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_sideburns_rgba16, "actors/waluigi/custom_waluigi_sideburns.rgba16.png", 32, 32, 16),
+    define_builtin_tex(waluigi_texture_mouth, "actors/waluigi/custom_waluigi_mouth.rgba16.png", 64, 32, 16),
-
+    define_builtin_tex(waluigi_texture_mouth_dead, "actors/waluigi/custom_waluigi_mouth_dead.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_mouth_rgba16, "actors/waluigi/custom_waluigi_mouth.rgba16.png", 64, 32, 16),
+    define_builtin_tex(waluigi_texture_eyes_front, "actors/waluigi/custom_waluigi_eyes_center.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_mouth_dead_rgba16, "actors/waluigi/custom_waluigi_mouth_dead.rgba16.png", 64, 32, 16),
+    define_builtin_tex(waluigi_texture_eyes_half_closed, "actors/waluigi/custom_waluigi_eyes_half_closed.rgba16.png", 64, 32, 16),
-
+    define_builtin_tex(waluigi_texture_eyes_closed, "actors/waluigi/custom_waluigi_eyes_closed.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_wing_1_rgba16, "actors/waluigi/wing_1.rgba16.png", 32, 64, 16),
+    define_builtin_tex(waluigi_texture_eyes_right, "actors/waluigi/custom_waluigi_eyes_left_unused.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_wing_2_rgba16, "actors/waluigi/wing_2.rgba16.png", 32, 64, 16),
+    define_builtin_tex(waluigi_texture_eyes_left, "actors/waluigi/custom_waluigi_eyes_right_unused.rgba16.png", 64, 32, 16),
-
+    define_builtin_tex(waluigi_texture_eyes_up, "actors/waluigi/custom_waluigi_eyes_up_unused.rgba16.png", 64, 32, 16),
-    // Eyes
+    define_builtin_tex(waluigi_texture_eyes_down, "actors/waluigi/custom_waluigi_eyes_down_unused.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_eyes_center_rgba16, "actors/waluigi/custom_waluigi_eyes_center.rgba16.png", 64, 32, 16),
+    define_builtin_tex(waluigi_texture_eyes_dead, "actors/waluigi/custom_waluigi_eyes_dead.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_eyes_half_closed_rgba16, "actors/waluigi/custom_waluigi_eyes_half_closed.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_eyes_closed_rgba16, "actors/waluigi/custom_waluigi_eyes_closed.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_eyes_dead_rgba16, "actors/waluigi/custom_waluigi_eyes_dead.rgba16.png", 64, 32, 16),
-    
-    // Unused
-    define_builtin_tex(waluigi_custom_waluigi_eyes_left_unused_rgba16, "actors/waluigi/custom_waluigi_eyes_left_unused.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_eyes_right_unused_rgba16, "actors/waluigi/custom_waluigi_eyes_right_unused.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_eyes_up_unused_rgba16, "actors/waluigi/custom_waluigi_eyes_up_unused.rgba16.png", 64, 32, 16),
-    define_builtin_tex(waluigi_custom_waluigi_eyes_down_unused_rgba16, "actors/waluigi/custom_waluigi_eyes_down_unused.rgba16.png", 64, 32, 16),
-
     // Fonts
     define_builtin_tex(texture_font_normal, "textures/custom_font/custom_font_normal.rgba32.png", 256, 128, 32),
     define_builtin_tex(texture_font_aliased, "textures/custom_font/custom_font_aliased.rgba32.png", 512, 256, 32),

palettes/Waluigi.ini

@@ -20,6 +20,6 @@ SKIN_B = 121
 CAP_R = 97
 CAP_G = 38
 CAP_B = 176
-EMBLEM_R = 97
+EMBLEM_R = 255
-EMBLEM_G = 38
+EMBLEM_G = 189
-EMBLEM_B = 176
+EMBLEM_B = 0

palettes/Wario.ini

@@ -2,9 +2,9 @@
 PANTS_R = 127
 PANTS_G = 32
 PANTS_B = 122
-SHIRT_R = 227
+SHIRT_R = 255
-SHIRT_G = 169
+SHIRT_G = 189
-SHIRT_B = 1
+SHIRT_B = 0
 GLOVES_R = 255
 GLOVES_G = 255
 GLOVES_B = 255
@@ -17,9 +17,9 @@ HAIR_B = 0
 SKIN_R = 254
 SKIN_G = 193
 SKIN_B = 121
-CAP_R = 227
+CAP_R = 255
-CAP_G = 169
+CAP_G = 189
-CAP_B = 1
+CAP_B = 0
-EMBLEM_R = 227
+EMBLEM_R = 0
-EMBLEM_G = 169
+EMBLEM_G = 0
-EMBLEM_B = 1
+EMBLEM_B = 255

src/game/characters.c

@@ -17,10 +17,12 @@ extern Gfx mario_cap_seg3_dl_03022F48[];
 extern Gfx mario_cap_m_logo_decal[];
 extern Gfx luigi_cap_seg3_dl_03022F48[];
 extern Gfx luigi_cap_l_logo_decal[];
-extern Gfx toad_cap_Cap_mesh_layer_1[];
+extern Gfx toad_cap_mesh_layer_1[];
-extern Gfx toad_cap_Cap_mesh_layer_5[];
+extern Gfx toad_cap_mesh_layer_5[];
 extern Gfx waluigi_cap_seg3_dl_03022F48[];
+extern Gfx waluigi_cap_r_logo_decal[];
 extern Gfx wario_cap_seg3_dl_03022F48[];
+extern Gfx wario_cap_w_logo_decal[];
 
 extern ALIGNED8 const u8 texture_hud_char_mario_head[];
 extern ALIGNED8 const u8 texture_hud_char_luigi_head[];
@@ -173,8 +175,8 @@ struct Character gCharacters[CT_MAX] = {
         .capWingModelId        = MODEL_TOADS_WING_CAP,
         .capMetalWingModelId   = MODEL_TOADS_WINGED_METAL_CAP,
         .capEnemyLayer         = LAYER_ALPHA,
-        .capEnemyGfx           = toad_cap_Cap_mesh_layer_1,
+        .capEnemyGfx           = toad_cap_mesh_layer_1,
-        .capEnemyDecalGfx      = toad_cap_Cap_mesh_layer_5,
+        .capEnemyDecalGfx      = toad_cap_mesh_layer_5,
         .torsoRotMult          = 1.0f,
         // anim
         .animOffsetEnabled     = false,
@@ -238,19 +240,12 @@ struct Character gCharacters[CT_MAX] = {
         .capMetalModelId       = MODEL_WALUIGIS_METAL_CAP,
         .capWingModelId        = MODEL_WALUIGIS_WING_CAP,
         .capMetalWingModelId   = MODEL_WALUIGIS_WINGED_METAL_CAP,
-        .capEnemyLayer         = LAYER_OPAQUE,
+        .capEnemyLayer         = LAYER_ALPHA,
         .capEnemyGfx           = waluigi_cap_seg3_dl_03022F48,
-        .capEnemyDecalGfx      = NULL,
+        .capEnemyDecalGfx      = waluigi_cap_r_logo_decal,
-        .torsoRotMult          = 0.5f,
+        .torsoRotMult          = 1.0f,
         // anim
-        .animOffsetEnabled     = true,
+        .animOffsetEnabled     = false,
-        .animOffsetLowYPoint   = 11,
-        .animOffsetFeet        = 25,
-        .animOffsetHand        = -10,
-
-        // character anims
-        .animWalking =                          WALUIGI_ANIM_WALKING,
-        .animRunning =                          WALUIGI_ANIM_RUNNING,
 
         // sounds
         .soundFreqScale        = 0.99f,
@@ -311,9 +306,9 @@ struct Character gCharacters[CT_MAX] = {
         .capMetalModelId       = MODEL_WARIOS_METAL_CAP,
         .capWingModelId        = MODEL_WARIOS_WING_CAP,
         .capMetalWingModelId   = MODEL_WARIOS_WINGED_METAL_CAP,
-        .capEnemyLayer         = LAYER_OPAQUE,
+        .capEnemyLayer         = LAYER_ALPHA,
         .capEnemyGfx           = wario_cap_seg3_dl_03022F48,
-        .capEnemyDecalGfx      = NULL,
+        .capEnemyDecalGfx      = wario_cap_w_logo_decal,
         .torsoRotMult          = 1.0f,
         // anim
         .animOffsetEnabled     = false,