Merge branch 'main' of https://github.com/coop-deluxe/sm64coopdx-rebase

actors/luigi_cap/model.inc.c

@@ -368,7 +368,6 @@ const Gfx luigi_cap_seg3_dl_03023160[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&luigi_cap_seg3_lights_0301CF38.a, 2),
-    gsSPDisplayList(luigi_cap_seg3_dl_03022B30),
     gsSPDisplayList(luigi_cap_seg3_dl_03022D10),
     gsDPPipeSync(),
     gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),

actors/mario_cap/model.inc.c

@@ -397,7 +397,6 @@ const Gfx mario_cap_seg3_dl_03023160[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&mario_cap_seg3_lights_0301CF38.a, 2),
-    gsSPDisplayList(mario_cap_seg3_dl_03022B30),
     gsSPDisplayList(mario_cap_seg3_dl_03022D10),
     gsDPPipeSync(),
     gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),

actors/toad_cap/geo.inc.c

@@ -1,3 +1,4 @@
+#include "geo_header.h"
 const GeoLayout toads_cap_geo[] = {
 	GEO_NODE_START(),
 	GEO_OPEN_NODE(),
@@ -5,7 +6,8 @@ const GeoLayout toads_cap_geo[] = {
 		GEO_OPEN_NODE(),
 			GEO_SCALE(LAYER_FORCE, 16384),
 			GEO_OPEN_NODE(),
-				GEO_ASM(0, geo_mario_set_player_colors),
+            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),
@@ -24,6 +26,7 @@ const GeoLayout toads_cap_geo[] = {
 			GEO_CLOSE_NODE(),
 		GEO_CLOSE_NODE(),
 		GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_cap_material_revert_render_settings),
+		GEO_DISPLAY_LIST(LAYER_ALPHA, toad_cap_material_revert_render_settings),
 		GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_material_revert_render_settings),
 	GEO_CLOSE_NODE(),
 	GEO_END(),
@@ -36,7 +39,8 @@ const GeoLayout toads_metal_cap_geo[] = {
 		GEO_OPEN_NODE(),
 			GEO_SCALE(LAYER_FORCE, 16384),
 			GEO_OPEN_NODE(),
-				GEO_ASM(0, geo_mario_set_player_colors),
+            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),
@@ -53,6 +57,7 @@ const GeoLayout toads_metal_cap_geo[] = {
 			GEO_CLOSE_NODE(),
 		GEO_CLOSE_NODE(),
 		GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_cap_material_revert_render_settings),
+		GEO_DISPLAY_LIST(LAYER_ALPHA, toad_cap_material_revert_render_settings),
 		GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_material_revert_render_settings),
 	GEO_CLOSE_NODE(),
 	GEO_END(),
@@ -65,7 +70,8 @@ const GeoLayout toads_wing_cap_geo[] = {
 		GEO_OPEN_NODE(),
 			GEO_SCALE(LAYER_FORCE, 16384),
 			GEO_OPEN_NODE(),
-				GEO_ASM(0, geo_mario_set_player_colors),
+            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),
@@ -105,7 +111,8 @@ const GeoLayout toads_winged_metal_cap_geo[] = {
 		GEO_OPEN_NODE(),
 			GEO_SCALE(LAYER_FORCE, 16384),
 			GEO_OPEN_NODE(),
-				GEO_ASM(0, geo_mario_set_player_colors),
+            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),

actors/toad_cap/model.inc.c

@@ -7,6 +7,7 @@ static const Lights1 toad_cap_black_lights_group = gdSPDefLights1(
 #include "actors/toad_player/toad_player_externs.h"
 #define toad_cap_texture_metal_shade        mario_texture_metal_shade
 #define toad_cap_texture_metal_light        mario_texture_metal_light
+#define toad_cap_texture_cap                toad_player_texture_cap
 #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_2       mario_texture_wings_half_2
@@ -313,14 +314,14 @@ Gfx toad_cap_Cap_mesh_layer_5_tri_0[] = {
 };
 
 Vtx toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_0[8] = {
-	{{ {-132, 118, -76}, 0, {974, 1996}, {167, 238, 89, 255} }},
+	{{ {-132, 118, -76}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-62, 145, -1}, 0, {-16, 1996}, {167, 238, 89, 255} }},
+	{{ {-62, 145, -1}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-192, 321, -94}, 0, {974, -16}, {166, 237, 88, 255} }},
+	{{ {-192, 321, -94}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-125, 348, -19}, 0, {-16, -16}, {166, 236, 88, 255} }},
+	{{ {-125, 348, -19}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {192, 321, -94}, 0, {974, -16}, {90, 237, 88, 255} }},
+	{{ {192, 321, -94}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {62, 145, -1}, 0, {-16, 1996}, {89, 238, 89, 255} }},
+	{{ {62, 145, -1}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {132, 118, -76}, 0, {974, 1996}, {89, 238, 89, 255} }},
+	{{ {132, 118, -76}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {125, 348, -19}, 0, {-16, -16}, {90, 236, 88, 255} }},
+	{{ {125, 348, -19}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
 };
 
 Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_0[] = {
@@ -331,14 +332,14 @@ Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_0[] = {
 };
 
 Vtx toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_1[8] = {
-	{{ {-132, 118, -76}, 0, {-16, 1996}, {167, 238, 89, 255} }},
+	{{ {-132, 118, -76}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-192, 321, -94}, 0, {-16, -16}, {166, 237, 88, 255} }},
+	{{ {-192, 321, -94}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-261, 293, -171}, 0, {974, -16}, {166, 237, 88, 255} }},
+	{{ {-261, 293, -171}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {-201, 90, -153}, 0, {974, 1996}, {166, 237, 88, 255} }},
+	{{ {-201, 90, -153}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {261, 293, -171}, 0, {974, -16}, {90, 237, 88, 255} }},
+	{{ {261, 293, -171}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {192, 321, -94}, 0, {-16, -16}, {90, 237, 88, 255} }},
+	{{ {192, 321, -94}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {132, 118, -76}, 0, {-16, 1996}, {89, 238, 89, 255} }},
+	{{ {132, 118, -76}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
-	{{ {201, 90, -153}, 0, {974, 1996}, {90, 237, 88, 255} }},
+	{{ {201, 90, -153}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
 };
 
 Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_1[] = {
@@ -388,10 +389,10 @@ Gfx mat_toad_cap_toad_cap_inside[] = {
 	gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0),
 	gsSPTexture(65535, 65535, 0, 0, 1),
 	gsSPCopyLightsPlayerPart(GLOVES),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_cap_inside),
+	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_cap_texture_cap_inside),
-	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_32b_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, 63, 1024),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 2, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 3, 0, G_TX_CLAMP | G_TX_NOMIRROR, 3, 0),
+	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(),
 };
@@ -412,7 +413,7 @@ Gfx mat_toad_cap_cap_spots[] = {
 Gfx mat_toad_cap_wing[] = {
 	gsDPPipeSync(),
 	gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
-	gsSPGeometryMode(G_CULL_BACK, 0),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
 	gsSPTexture(65535, 65535, 0, 0, 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),
@@ -424,14 +425,14 @@ Gfx mat_toad_cap_wing[] = {
 
 Gfx mat_revert_toad_cap_wing[] = {
 	gsDPPipeSync(),
-	gsSPGeometryMode(0, G_CULL_BACK),
+    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
 	gsSPEndDisplayList(),
 };
 
 Gfx mat_toad_cap_wing_tip[] = {
 	gsDPPipeSync(),
 	gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
-	gsSPGeometryMode(G_CULL_BACK, 0),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
 	gsSPTexture(65535, 65535, 0, 0, 1),
 	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),
@@ -443,14 +444,14 @@ Gfx mat_toad_cap_wing_tip[] = {
 
 Gfx mat_revert_toad_cap_wing_tip[] = {
 	gsDPPipeSync(),
-	gsSPGeometryMode(0, G_CULL_BACK),
+    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
 	gsSPEndDisplayList(),
 };
 
 Gfx mat_toad_cap_metal_wing[] = {
 	gsDPPipeSync(),
 	gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
-	gsSPGeometryMode(G_CULL_BACK, 0),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
 	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),
 	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),
@@ -462,14 +463,14 @@ Gfx mat_toad_cap_metal_wing[] = {
 
 Gfx mat_revert_toad_cap_metal_wing[] = {
 	gsDPPipeSync(),
-	gsSPGeometryMode(0, G_CULL_BACK),
+    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
 	gsSPEndDisplayList(),
 };
 
 Gfx mat_toad_cap_metal_wing_tip[] = {
 	gsDPPipeSync(),
 	gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
-	gsSPGeometryMode(G_CULL_BACK, 0),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
 	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),
 	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),
@@ -481,7 +482,7 @@ Gfx mat_toad_cap_metal_wing_tip[] = {
 
 Gfx mat_revert_toad_cap_metal_wing_tip[] = {
 	gsDPPipeSync(),
-	gsSPGeometryMode(0, G_CULL_BACK),
+    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
 	gsSPEndDisplayList(),
 };
 
@@ -502,7 +503,6 @@ Gfx toad_cap_Cap_mesh_layer_5[] = {
 Gfx toad_cap_Metal_Cap_mesh_layer_1[] = {
 	gsSPDisplayList(mat_toad_cap_metal),
 	gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_0),
-	gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_1),
 	gsSPDisplayList(mat_revert_toad_cap_metal),
 	gsSPEndDisplayList(),
 };
@@ -535,6 +535,19 @@ Gfx toad_cap_material_revert_render_settings[] = {
     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/toad_player/geo_header.h

@@ -1,196 +1,126 @@
-extern const GeoLayout toad_toad_player_head_capless[];
+extern const GeoLayout toad_player_toad_player_head_capless[];
-extern const GeoLayout toad_toad_player_left_hand_open[];
+extern const GeoLayout toad_player_toad_player_left_hand_closed[];
-extern const GeoLayout toad_toad_player_right_hand_open[];
+extern const GeoLayout toad_player_toad_player_left_hand_open[];
-extern const GeoLayout toad_toad_player_right_hand_peace[];
+extern const GeoLayout toad_player_toad_player_right_hand_open[];
-extern const GeoLayout toad_toad_player_right_hand_cap[];
+extern const GeoLayout toad_player_toad_player_right_hand_peace[];
-extern const GeoLayout toad_toad_player_right_hand_wing_cap[];
+extern const GeoLayout toad_player_toad_player_right_hand_cap[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_head_capless[];
+extern const GeoLayout toad_player_toad_player_right_hand_wing_cap[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_left_hand_open[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_head_capless[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_open[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_left_hand_closed[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_peace[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_left_hand_open[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_cap[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_open[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_wing_cap[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_peace[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt1[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_cap[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt2[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_wing_cap[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt3[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt1[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt4[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt2[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt5[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt3[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt6[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt4[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt7[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt5[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt1[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt6[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_head_capless[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt7[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_left_hand_open[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_open[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_head_capless[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_peace[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_left_hand_closed[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_cap[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_left_hand_open[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_wing_cap[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_open[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt2[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_peace[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_head_capless[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_cap[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_left_hand_open[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_wing_cap[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_open[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_peace[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_head_capless[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_cap[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_left_hand_closed[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_wing_cap[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_left_hand_open[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt3[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_open[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt1[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_peace[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt2[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_cap[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt3[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_wing_cap[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt4[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt5[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt1[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt6[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt2[];
-extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt7[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt3[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt4[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt5[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt6[];
+extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt7[];
 extern const GeoLayout toad_player_geo[];
-extern const Vtx toad_Torso_mesh_layer_1_vtx_0[20];
+extern const Gfx toad_player_Torso_mesh_layer_1_tri_0[];
-extern const Gfx toad_Torso_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Torso_mesh_layer_1_tri_1[];
-extern const Vtx toad_Torso_mesh_layer_1_vtx_1[12];
+extern const Gfx toad_player_Torso_mesh_layer_1_tri_2[];
-extern const Gfx toad_Torso_mesh_layer_1_tri_1[];
+extern const Gfx toad_player_Cap_DL_mesh_layer_4_tri_0[];
-extern const Vtx toad_Torso_mesh_layer_1_vtx_2[20];
+extern const Gfx toad_player_Cap_DL_mesh_layer_4_tri_1[];
-extern const Gfx toad_Torso_mesh_layer_1_tri_2[];
+extern const Gfx toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_tri_0[];
-extern const Vtx toad_Cap_DL_mesh_layer_1_vtx_0[94];
+extern const Gfx toad_player_Head_DL_mesh_layer_1_tri_0[];
-extern const Gfx toad_Cap_DL_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_wings_half_1_dl[];
-extern const Vtx toad_Cap_DL_mesh_layer_5_vtx_0[94];
+extern const Gfx toad_player_wings_half_2_dl[];
-extern const Gfx toad_Cap_DL_mesh_layer_5_tri_0[];
+extern const Gfx toad_player_Left_Arm_Color_mesh_layer_1_tri_0[];
-extern const Vtx toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_vtx_0[12];
+extern const Gfx toad_player_Left_Forearm_mesh_layer_1_tri_0[];
-extern const Gfx toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_tri_0[];
+extern const Gfx toad_player_Left_Hand_DL_mesh_layer_1_tri_0[];
-extern const Vtx toad_Head_DL_mesh_layer_5_vtx_0[60];
+extern const Gfx toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0[];
-extern const Gfx toad_Head_DL_mesh_layer_5_tri_0[];
+extern const Gfx toad_player_Right_Arm_Color_mesh_layer_1_tri_0[];
-extern const Vtx toad_Head_DL_mesh_layer_1_vtx_0[60];
+extern const Gfx toad_player_Right_Forearm_mesh_layer_1_tri_0[];
-extern const Gfx toad_Head_DL_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Right_Hand_DL_mesh_layer_1_tri_0[];
-extern const Vtx toad_Left_Wing_DL_mesh_layer_4_vtx_0[4];
+extern const Gfx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0[];
-extern const Gfx toad_Left_Wing_DL_mesh_layer_4_tri_0[];
+extern const Gfx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0[];
-extern const Vtx toad_Left_Wing_DL_mesh_layer_4_vtx_1[4];
+extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0[];
-extern const Gfx toad_Left_Wing_DL_mesh_layer_4_tri_1[];
+extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1[];
-extern const Vtx toad_Right_Wing_DL_mesh_layer_4_vtx_0[4];
+extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_0[];
-extern const Gfx toad_Right_Wing_DL_mesh_layer_4_tri_0[];
+extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_1[];
-extern const Vtx toad_Right_Wing_DL_mesh_layer_4_vtx_1[4];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_0[];
-extern const Gfx toad_Right_Wing_DL_mesh_layer_4_tri_1[];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_1[];
-extern const Vtx toad_Left_Arm_Color_mesh_layer_1_vtx_0[20];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_tri_0[];
-extern const Gfx toad_Left_Arm_Color_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_tri_1[];
-extern const Vtx toad_Left_Forearm_mesh_layer_1_vtx_0[16];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_0[];
-extern const Gfx toad_Left_Forearm_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1[];
-extern const Vtx toad_Left_Hand_DL_mesh_layer_1_vtx_0[20];
+extern const Gfx toad_player_Left_Shoe_mesh_layer_1_tri_0[];
-extern const Gfx toad_Left_Hand_DL_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Right_Shoe_DL_mesh_layer_1_tri_0[];
-extern const Vtx toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_vtx_0[23];
+extern const Gfx toad_player_Torso_mesh_layer_1[];
-extern const Gfx toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Torso_mesh_layer_1_mat_override_metal_0[];
-extern const Vtx toad_Right_Arm_Color_mesh_layer_1_vtx_0[20];
+extern const Gfx toad_player_cap_base[];
-extern const Gfx toad_Right_Arm_Color_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_cap_decal[];
-extern const Vtx toad_Right_Forearm_mesh_layer_1_vtx_0[16];
+extern const Gfx toad_player_metal_cap[];
-extern const Gfx toad_Right_Forearm_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4[];
-extern const Vtx toad_Right_Hand_DL_mesh_layer_1_vtx_0[20];
+extern const Gfx toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_mat_override_metal_0[];
-extern const Gfx toad_Right_Hand_DL_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Head_DL_mesh_layer_1[];
-extern const Vtx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_vtx_0[23];
+extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_half_closed_1[];
-extern const Vtx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_vtx_0[63];
+extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_closed_2[];
-extern const Gfx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_right_3[];
-extern const Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_0[20];
+extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_left_4[];
-extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_up_5[];
-extern const Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_1[94];
+extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_down_6[];
-extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1[];
+extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_dead_7[];
-extern const Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_2[6];
+extern const Gfx toad_player_cap_wings[];
-extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_2[];
+extern const Gfx toad_player_metal_cap_wings[];
-extern const Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_vtx_0[100];
+extern const Gfx toad_player_Left_Arm_Color_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_tri_0[];
+extern const Gfx toad_player_Left_Arm_Color_mesh_layer_1_mat_override_metal_0[];
-extern const Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_0[20];
+extern const Gfx toad_player_Left_Forearm_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Left_Forearm_mesh_layer_1_mat_override_metal_0[];
-extern const Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_1[94];
+extern const Gfx toad_player_Left_Hand_DL_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_1[];
+extern const Gfx toad_player_Left_Hand_DL_mesh_layer_1_mat_override_metal_0[];
-extern const Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_2[6];
+extern const Gfx toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_2[];
+extern const Gfx toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_mat_override_metal_0[];
-extern const Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_vtx_0[100];
+extern const Gfx toad_player_Right_Arm_Color_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_tri_0[];
+extern const Gfx toad_player_Right_Arm_Color_mesh_layer_1_mat_override_metal_0[];
-extern const Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_0[8];
+extern const Gfx toad_player_Right_Forearm_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_0[];
+extern const Gfx toad_player_Right_Forearm_mesh_layer_1_mat_override_metal_0[];
-extern const Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_1[8];
+extern const Gfx toad_player_Right_Hand_DL_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1[];
+extern const Gfx toad_player_Right_Hand_DL_mesh_layer_1_mat_override_metal_0[];
-extern const Vtx toad_Left_Shoe_mesh_layer_1_vtx_0[20];
+extern const Gfx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1[];
-extern const Gfx toad_Left_Shoe_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_mat_override_metal_0[];
-extern const Vtx toad_Right_Shoe_DL_mesh_layer_1_vtx_0[20];
+extern const Gfx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1[];
-extern const Gfx toad_Right_Shoe_DL_mesh_layer_1_tri_0[];
+extern const Gfx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx mat_toad_white[];
+extern const Gfx toad_player_right_hand_cap[];
-extern const Gfx mat_toad_beige[];
+extern const Gfx toad_player_right_hand_cap_metal[];
-extern const Gfx mat_toad_vest[];
+extern const Gfx toad_player_right_hand_cap_decal[];
-extern const Gfx mat_revert_toad_vest[];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1[];
-extern const Gfx mat_toad_metal[];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx mat_revert_toad_metal[];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4[];
-extern const Gfx mat_toad_cap_base[];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_mat_override_metal_0[];
-extern const Gfx mat_toad_cap_spots[];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4[];
-extern const Gfx mat_toad_hair[];
+extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_mat_override_metal_0[];
-extern const Gfx mat_revert_toad_hair[];
+extern const Gfx toad_player_Left_Shoe_mesh_layer_1[];
-extern const Gfx mat_toad_eyes_center[];
+extern const Gfx toad_player_Left_Shoe_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx mat_toad_face_blush[];
+extern const Gfx toad_player_Right_Shoe_DL_mesh_layer_1[];
-extern const Gfx mat_toad_eyes_half_closed[];
+extern const Gfx toad_player_Right_Shoe_DL_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx mat_toad_eyes_closed[];
+extern const Gfx toad_player_material_revert_render_settings[];
-extern const Gfx mat_toad_eyes_right[];
-extern const Gfx mat_toad_eyes_left[];
-extern const Gfx mat_toad_eyes_up[];
-extern const Gfx mat_toad_eyes_down[];
-extern const Gfx mat_toad_eyes_dead[];
-extern const Gfx mat_toad_wing_tip[];
-extern const Gfx mat_revert_toad_wing_tip[];
-extern const Gfx mat_toad_wing[];
-extern const Gfx mat_revert_toad_wing[];
-extern const Gfx mat_toad_toad_cap_inside[];
-extern const Gfx mat_toad_brown[];
-extern const Gfx toad_Torso_mesh_layer_1[];
-extern const Gfx toad_Torso_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Cap_DL_mesh_layer_1[];
-extern const Gfx toad_Cap_DL_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Cap_DL_mesh_layer_5[];
-extern const Gfx toad_Cap_DL_mesh_layer_5_mat_override_metal_0[];
-extern const Gfx toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4[];
-extern const Gfx toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_mat_override_metal_0[];
-extern const Gfx toad_Head_DL_mesh_layer_5[];
-extern const Gfx toad_Head_DL_mesh_layer_5_mat_override_metal_0[];
-extern const Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_half_closed_1[];
-extern const Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_closed_2[];
-extern const Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_right_3[];
-extern const Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_left_4[];
-extern const Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_up_5[];
-extern const Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_down_6[];
-extern const Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_dead_7[];
-extern const Gfx toad_Head_DL_mesh_layer_1[];
-extern const Gfx toad_Head_DL_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_half_closed_1[];
-extern const Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_closed_2[];
-extern const Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_right_3[];
-extern const Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_left_4[];
-extern const Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_up_5[];
-extern const Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_down_6[];
-extern const Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_dead_7[];
-extern const Gfx toad_Left_Wing_DL_mesh_layer_4[];
-extern const Gfx toad_Left_Wing_DL_mesh_layer_4_mat_override_metal_0[];
-extern const Gfx toad_Right_Wing_DL_mesh_layer_4[];
-extern const Gfx toad_Right_Wing_DL_mesh_layer_4_mat_override_metal_0[];
-extern const Gfx toad_Left_Arm_Color_mesh_layer_1[];
-extern const Gfx toad_Left_Arm_Color_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Left_Forearm_mesh_layer_1[];
-extern const Gfx toad_Left_Forearm_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Left_Hand_DL_mesh_layer_1[];
-extern const Gfx toad_Left_Hand_DL_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1[];
-extern const Gfx toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Right_Arm_Color_mesh_layer_1[];
-extern const Gfx toad_Right_Arm_Color_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Right_Forearm_mesh_layer_1[];
-extern const Gfx toad_Right_Forearm_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Right_Hand_DL_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_DL_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5[];
-extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_mat_override_metal_0[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_mat_override_metal_0[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4[];
-extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_mat_override_metal_0[];
-extern const Gfx toad_Left_Shoe_mesh_layer_1[];
-extern const Gfx toad_Left_Shoe_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_Right_Shoe_DL_mesh_layer_1[];
-extern const Gfx toad_Right_Shoe_DL_mesh_layer_1_mat_override_metal_0[];
-extern const Gfx toad_material_revert_render_settings[];

actors/toad_player/toad_player_externs.h

@@ -1,6 +1,8 @@
+extern ALIGNED8 const Texture toad_player_texture_cap[];
 extern ALIGNED8 const Texture toad_player_texture_spots[];
 extern ALIGNED8 const Texture toad_player_texture_hair[];
-extern ALIGNED8 const Texture toad_player_texture_blush[];
+extern ALIGNED8 const Texture toad_player_texture_face_neutral[];
+extern ALIGNED8 const Texture toad_player_texture_face_dead[];
 extern ALIGNED8 const Texture toad_player_texture_eyes_front[];
 extern ALIGNED8 const Texture toad_player_texture_eyes_half_closed[];
 extern ALIGNED8 const Texture toad_player_texture_eyes_closed[];

actors/wario/geo.inc.c

@@ -1,3 +1,4 @@
+#include "geo_header.h"
 // Normal Mario Geo
 
 const GeoLayout wario_geo_face_and_wings[] = {
@@ -8,9 +9,7 @@ const GeoLayout wario_geo_face_and_wings[] = {
       GEO_OPEN_NODE(),
          GEO_NODE_START(),
          GEO_OPEN_NODE(),
-            GEO_ASM(2, geo_mirror_mario_backface_culling),
+            GEO_DISPLAY_LIST(LAYER_ALPHA, wario_hair_sideburn_decal_cap_on),
-            GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_hair_sideburn_decal_cap_on_dl),
-            GEO_ASM(3, geo_mirror_mario_backface_culling),
 		    GEO_OPEN_NODE(),
                GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
                GEO_OPEN_NODE(),
@@ -27,9 +26,7 @@ const GeoLayout wario_geo_face_and_wings[] = {
 		 GEO_CLOSE_NODE(),
          GEO_NODE_START(),
          GEO_OPEN_NODE(),
-            GEO_ASM(2, geo_mirror_mario_backface_culling),
+            GEO_DISPLAY_LIST(LAYER_ALPHA, wario_hair_sideburn_decal_cap_off),
-            GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_hair_sideburn_decal_cap_off_dl),
-            GEO_ASM(3, geo_mirror_mario_backface_culling),
 		    GEO_OPEN_NODE(),
                GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
                GEO_OPEN_NODE(),
@@ -191,7 +188,7 @@ const GeoLayout wario_vanish_geo_face_and_wings[] = {
       GEO_OPEN_NODE(),
          GEO_NODE_START(),
          GEO_OPEN_NODE(),
-            GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_hair_sideburn_decal_cap_on_dl),
+            GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_hair_sideburn_decal_cap_on),
 		    GEO_OPEN_NODE(),
                GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
                GEO_OPEN_NODE(),
@@ -208,7 +205,7 @@ const GeoLayout wario_vanish_geo_face_and_wings[] = {
 		 GEO_CLOSE_NODE(),
          GEO_NODE_START(),
          GEO_OPEN_NODE(),
-            GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_hair_sideburn_decal_cap_off_dl),
+            GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_hair_sideburn_decal_cap_off),
 		    GEO_OPEN_NODE(),
                GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
                GEO_OPEN_NODE(),
@@ -671,18 +668,26 @@ const GeoLayout wario_geo_load_body[] = {
 // This last geo is used to load all of Mario Geo in the Level Scripts
 
 const GeoLayout wario_geo[] = {
+   GEO_NODE_START(),
+   GEO_OPEN_NODE(),
       GEO_SHADOW(SHADOW_CIRCLE_PLAYER, 0xB4, 100),
          GEO_OPEN_NODE(),
             GEO_SCALE(0x00, 16384),
             GEO_OPEN_NODE(),
-         GEO_ASM(0, geo_mario_set_player_colors),
+               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(0, geo_mirror_mario_backface_culling),
+               GEO_ASM(LAYER_OPAQUE << 2, geo_mirror_mario_backface_culling),
+               GEO_ASM(LAYER_ALPHA << 2, geo_mirror_mario_backface_culling),
+               GEO_ASM(LAYER_TRANSPARENT << 2, geo_mirror_mario_backface_culling),
                GEO_ASM(0, geo_mirror_mario_set_alpha),
                GEO_OPEN_NODE(),
                   GEO_BRANCH(1, wario_geo_load_body),
                GEO_CLOSE_NODE(),
-         GEO_ASM(1, geo_mirror_mario_backface_culling),
+               GEO_ASM((LAYER_OPAQUE << 2) | 1, geo_mirror_mario_backface_culling),
+               GEO_ASM((LAYER_ALPHA << 2) | 1, geo_mirror_mario_backface_culling),
+               GEO_ASM((LAYER_TRANSPARENT << 2) | 1, geo_mirror_mario_backface_culling),
+            GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
          GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_material_revert_render_settings),
          GEO_DISPLAY_LIST(LAYER_ALPHA, wario_material_revert_render_settings),

actors/wario/geo_header.h

@@ -58,7 +58,7 @@ extern const Gfx wario_face_back_hair_cap_on_dl[];
 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_dl[];
+extern const Gfx wario_hair_sideburn_decal_cap_on[];
 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[];
@@ -77,7 +77,7 @@ extern const Gfx wario_face_hair_cap_off_dl[];
 extern const Gfx wario_nose_cap_off_dl[];
 extern const Gfx wario_mustache_cap_off_dl[];
 extern const Gfx wario_mustache_cap_off_dead_dl[];
-extern const Gfx wario_hair_sideburn_decal_cap_off_dl[];
+extern const Gfx wario_hair_sideburn_decal_cap_off[];
 extern const Gfx wario_face_cap_off_dl[];
 extern const Gfx wario_cap_off_eyes_front[];
 extern const Gfx wario_cap_off_eyes_half_closed[];

actors/wario/model.inc.c

@@ -39,7 +39,8 @@ static const Lights1 wario_black_lights_group = gdSPDefLights1(
 );
 
 #include "actors/mario/mario_externs.h"
-#define wario_texture_metal              mario_texture_metal
+#define wario_texture_metal_shade        mario_texture_metal_shade
+#define wario_texture_metal_light        mario_texture_metal_light
 #define wario_texture_wings_half_1       mario_texture_wings_half_1
 #define wario_texture_wings_half_2       mario_texture_wings_half_2
 #define wario_texture_metal_wings_half_1 mario_texture_metal_wings_half_1
@@ -55,7 +56,15 @@ ALIGNED8 const Texture wario_texture_w_logo[] = {
 };
 
 ALIGNED8 const Texture wario_texture_hair_sideburn[] = {
-#include "actors/wario/custom_wario_sideburn.rgba16.inc.c"
+#include "actors/wario/custom_wario_sideburn.rgba32.inc.c"
+};
+
+ALIGNED8 const Texture wario_texture_add_sideburn[] = {
+#include "actors/wario/custom_wario_sideburn_add.rgba32.inc.c"
+};
+
+ALIGNED8 const Texture wario_texture_skin_sideburn[] = {
+#include "actors/wario/custom_wario_skin.rgba16.inc.c"
 };
 
 ALIGNED8 const Texture wario_texture_mouth[] = {
@@ -268,11 +277,21 @@ const Gfx wario_butt[] = {
 
 const Gfx wario_metal_butt[] = {
 	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),
-    gsDPLoadTextureBlock(wario_texture_metal, 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),
+    gsSPLight(&wario_black_lights_group.l, 1),
-    gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
+    gsSPCopyLightEXT(2, 15),
-    gsSPCopyLightsPlayerPart(METAL),
+	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_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, wario_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(wario_butt_dl),
     gsSPEndDisplayList(),
 };
@@ -354,6 +373,8 @@ const Gfx wario_left_arm_shared_dl[] = {
 };
 
 const Gfx wario_left_arm[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(SHIRT), // gsSPLight(&wario_green_lights_group.a, 2),
     gsSPDisplayList(wario_left_arm_shared_dl),
     gsSPEndDisplayList(),
@@ -512,6 +533,8 @@ const Gfx wario_left_hand_closed_shared_dl[] = {
 };
 
 const Gfx wario_left_hand_closed[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(GLOVES), // glove light, set in mario_misc.c
     gsSPDisplayList(wario_left_hand_closed_shared_dl),
     gsSPEndDisplayList(),
@@ -591,6 +614,8 @@ const Gfx wario_right_arm_shared_dl[] = {
 };
 
 const Gfx wario_right_arm[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(SHIRT), // gsSPLight(&wario_green_lights_group.a, 2),
     gsSPDisplayList(wario_right_arm_shared_dl),
     gsSPEndDisplayList(),
@@ -746,6 +771,8 @@ const Gfx wario_right_hand_closed_dl[] = {
 };
 
 const Gfx wario_right_hand_closed[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(GLOVES), // glove light, set in mario_misc.c
     gsSPDisplayList(wario_right_hand_closed_dl),
     gsSPEndDisplayList(),
@@ -831,11 +858,21 @@ const Gfx wario_left_thigh[] = {
 
 const Gfx wario_metal_left_thigh[] = {
 	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),
-    gsDPLoadTextureBlock(wario_texture_metal, 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),
+    gsSPLight(&wario_black_lights_group.l, 1),
-    gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
+    gsSPCopyLightEXT(2, 15),
-    gsSPCopyLightsPlayerPart(METAL),
+	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_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, wario_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(wario_left_thigh_dl),
     gsSPEndDisplayList(),
 };
@@ -962,6 +999,8 @@ const Gfx wario_left_foot_shared_dl[] = {
 };
 
 const Gfx wario_left_foot[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(SHOES),
     gsSPDisplayList(wario_left_foot_shared_dl),
     gsSPEndDisplayList(),
@@ -1029,6 +1068,8 @@ const Gfx wario_right_thigh_shared_dl[] = {
 };
 
 const Gfx wario_right_thigh[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(PANTS), // gsSPLight(&wario_blue_lights_group.a, 2),
     gsSPDisplayList(wario_right_thigh_shared_dl),
     gsSPEndDisplayList(),
@@ -1168,6 +1209,8 @@ const Gfx wario_right_foot_dl[] = {
 };
 
 const Gfx wario_right_foot[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(SHOES),
     gsSPDisplayList(wario_right_foot_dl),
     gsDPPipeSync(),
@@ -2092,7 +2135,26 @@ const Gfx wario_mustache_cap_on_dead_dl[] = {
     gsSPEndDisplayList(),
 };
 
-const Gfx wario_hair_sideburn_decal_cap_on_dl[] = {
+const Gfx wario_hair_sideburn_decal_cap_on[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, COMBINED, 0, 0, 0, COMBINED),
+    gsDPSetCycleType(G_CYC_2CYCLE),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPLight(&wario_black_lights_group.l, 1),
+    gsSPCopyLightEXT(2, 11),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, wario_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),
+    gsDPLoadBlock(7, 0, 0, 1023, 128),
+    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),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, wario_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),
+    gsDPLoadBlock(6, 0, 0, 1023, 128),
+    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),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
+    gsSPDisplayList(wario_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),
     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),
@@ -2100,10 +2162,10 @@ const Gfx wario_hair_sideburn_decal_cap_on_dl[] = {
     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_texture_hair_sideburn),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_texture_skin_sideburn),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
-    gsSPCopyLightsPlayerPart(HAIR),
+    gsSPCopyLightsPlayerPart(SKIN),
     gsSPDisplayList(wario_hair_sideburn_cap_on_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -2112,7 +2174,6 @@ const Gfx wario_hair_sideburn_decal_cap_on_dl[] = {
 };
 
 const Gfx wario_face_cap_on_dl[] = {
-    gsSPDisplayList(wario_hair_sideburn_cap_on_dl),
     gsSPDisplayList(wario_face_part_cap_on_dl),
     gsSPCopyLightsPlayerPart(CAP),
     gsSPDisplayList(wario_face_cap_dl),
@@ -2130,7 +2191,6 @@ const Gfx wario_face_cap_on_dl[] = {
 };
 
 const Gfx wario_face_cap_on_dead_dl[] = {
-    gsSPDisplayList(wario_hair_sideburn_cap_on_dl),
     gsSPDisplayList(wario_face_part_cap_on_dl),
     gsSPCopyLightsPlayerPart(CAP),
     gsSPDisplayList(wario_face_cap_dl),
@@ -3022,7 +3082,26 @@ const Gfx wario_mustache_cap_off_dead_dl[] = {
     gsSPEndDisplayList(),
 };
 
-const Gfx wario_hair_sideburn_decal_cap_off_dl[] = {
+const Gfx wario_hair_sideburn_decal_cap_off[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, COMBINED, 0, 0, 0, COMBINED),
+    gsDPSetCycleType(G_CYC_2CYCLE),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsSPLight(&wario_black_lights_group.l, 1),
+    gsSPCopyLightEXT(2, 11),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, wario_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),
+    gsDPLoadBlock(7, 0, 0, 1023, 128),
+    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),
+    gsDPSetTileSize(0, 0, 0, 124, 124),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, wario_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),
+    gsDPLoadBlock(6, 0, 0, 1023, 128),
+    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),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
+    gsSPDisplayList(wario_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),
     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),
@@ -3030,10 +3109,10 @@ const Gfx wario_hair_sideburn_decal_cap_off_dl[] = {
     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_texture_hair_sideburn),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_texture_skin_sideburn),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
-    gsSPCopyLightsPlayerPart(HAIR),
+    gsSPCopyLightsPlayerPart(SKIN),
     gsSPDisplayList(wario_hair_sideburn_cap_off_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
@@ -3042,7 +3121,6 @@ const Gfx wario_hair_sideburn_decal_cap_off_dl[] = {
 };
 
 const Gfx wario_face_cap_off_dl[] = {
-    gsSPDisplayList(wario_hair_sideburn_cap_off_dl),
     gsSPDisplayList(wario_face_part_cap_off_dl),
     gsSPCopyLightsPlayerPart(HAIR),
     gsSPDisplayList(wario_face_hair_cap_off_dl),
@@ -3058,7 +3136,6 @@ const Gfx wario_face_cap_off_dl[] = {
 };
 
 const Gfx wario_face_cap_off_dead_dl[] = {
-    gsSPDisplayList(wario_hair_sideburn_cap_off_dl),
     gsSPDisplayList(wario_face_part_cap_off_dl),
     gsSPCopyLightsPlayerPart(HAIR),
     gsSPDisplayList(wario_face_hair_cap_off_dl),
@@ -3417,6 +3494,8 @@ const Gfx wario_left_hand_open_shared_dl[] = {
 };
 
 const Gfx wario_left_hand_open[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(GLOVES), // glove light, set in mario_misc.c
     gsSPDisplayList(wario_left_hand_open_shared_dl),
     gsSPEndDisplayList(),
@@ -3559,6 +3638,8 @@ const Gfx wario_right_hand_open_dl[] = {
 };
 
 const Gfx wario_right_hand_open[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(GLOVES), // glove light, set in mario_misc.c
     gsSPDisplayList(wario_right_hand_open_dl),
     gsSPEndDisplayList(),
@@ -3821,6 +3902,7 @@ const Gfx wario_right_hand_cap_bottom_dl[] = {
 };
 
 const Gfx wario_right_hand_cap_dl[] = {
+    gsSPCopyLightsPlayerPart(CAP),
     gsSPDisplayList(wario_right_hand_cap_top_dl),
     gsSPCopyLightsPlayerPart(GLOVES), // glove light, set in wario_misc.c
     gsSPDisplayList(wario_right_hand_cap_hand_position_dl),
@@ -3842,27 +3924,27 @@ const Gfx wario_right_hand_cap_dl[] = {
 };
 
 static const Vtx wario_right_hand_cap_wings_half_1_dl_vertex[10] = {
-    {{{368, 146, 7}, 0, {990, 0}, {0xBE, 0x66, 0xDA, 0xFE}}},
+    {{{368, 146, 7}, 0, {990, 0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{166, 37, 68}, 0, {0, 2012}, {0xBE, 0x66, 0xDA, 0xFE}}},
+    {{{166, 37, 68}, 0, {0, 2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{212, 96, 143}, 0, {990, 2012}, {0xBE, 0x66, 0xDA, 0xFE}}},
+    {{{212, 96, 143}, 0, {990, 2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{368, 146, 7}, 0, {990, 0}, {0xBD, 0x65, 0xD9, 0xFE}}},
+    {{{368, 146, 7}, 0, {990, 0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{322, 87, -67}, 0, {0, 0}, {0xBD, 0x65, 0xD9, 0xFE}}},
+    {{{322, 87, -67}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{166, 37, 68}, 0, {0, 2012}, {0xBD, 0x65, 0xD9, 0xFE}}},
+    {{{166, 37, 68}, 0, {0, 2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{178, -177, 128}, 0, {990, 2012}, {0xA7, 0xB3, 0xCF, 0xFE}}},
+    {{{178, -177, 128}, 0, {990, 2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{149, -100, 60}, 0, {0, 2012}, {0xA7, 0xB3, 0xCF, 0xFE}}},
+    {{{149, -100, 60}, 0, {0, 2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{319, -248, -14}, 0, {990, 0}, {0xA7, 0xB3, 0xCF, 0xFE}}},
+    {{{319, -248, -14}, 0, {990, 0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{290, -171, -81}, 0, {0, 0}, {0xA7, 0xB3, 0xCF, 0xFE}}},
+    {{{290, -171, -81}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
 };
 
 static const Vtx wario_right_hand_cap_wings_half_2_dl_vertex[8] = {
-    {{{414, 206, 82}, 0, {990, 0}, {0xBD, 0x65, 0xD9, 0xFE}}},
+    {{{414, 206, 82}, 0, {990, 0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{212, 96, 143}, 0, {0, 2012}, {0xBD, 0x65, 0xD9, 0xFE}}},
+    {{{212, 96, 143}, 0, {0, 2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{258, 156, 218}, 0, {990, 2012}, {0xBD, 0x65, 0xD9, 0xFE}}},
+    {{{258, 156, 218}, 0, {990, 2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{368, 146, 7}, 0, {0, 0}, {0xBD, 0x65, 0xD9, 0xFE}}},
+    {{{368, 146, 7}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{178, -177, 128}, 0, {0, 2012}, {0xA8, 0xB3, 0xCF, 0xFE}}},
+    {{{178, -177, 128}, 0, {0, 2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{319, -248, -14}, 0, {0, 0}, {0xA8, 0xB3, 0xCF, 0xFE}}},
+    {{{319, -248, -14}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{349, -325, 53}, 0, {990, 0}, {0xA8, 0xB3, 0xCF, 0xFE}}},
+    {{{349, -325, 53}, 0, {990, 0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{207, -253, 195}, 0, {990, 2012}, {0xA8, 0xB3, 0xCF, 0xFE}}},
+    {{{207, -253, 195}, 0, {990, 2012}, {0xff, 0xff, 0xff, 0xff}}},
 };
 
 const Gfx wario_right_hand_cap_wings_half_1_dl[] = {
@@ -3886,7 +3968,7 @@ const Gfx wario_right_hand_cap_wings_half_2_dl[] = {
 const Gfx wario_right_hand_cap_wings_intial_dl[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATERGBA, G_CC_MODULATERGBA),
-    gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
     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),
     gsSPLight(&wario_white_lights_group.l, 1),
@@ -3900,7 +3982,7 @@ const Gfx wario_right_hand_cap_wings_intial_dl[] = {
 const Gfx wario_right_hand_cap_wings_transparent_intial_dl[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_DECALFADEA, G_CC_DECALFADEA),
-    gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
     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),
     gsSPLight(&wario_white_lights_group.l, 1),
@@ -3915,7 +3997,7 @@ const Gfx wario_right_hand_cap_wings_end_dl[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
-    gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
     gsSPEndDisplayList(),
 };
 
@@ -4210,23 +4292,25 @@ const Gfx wario_right_hand_peace_shared_dl[] = {
 };
 
 const Gfx wario_right_hand_peace[] = {
+    gsDPPipeSync(),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
     gsSPCopyLightsPlayerPart(GLOVES), // glove light, set in mario_misc.c
     gsSPDisplayList(wario_right_hand_peace_shared_dl),
     gsSPEndDisplayList(),
 };
 
 static const Vtx wario_wings_half_1_dl_vertex[] = {
-    {{{  -105,    212,      0}, 0, {     0,      0}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{  -105,    212,      0}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -105,      0,      0}, 0, {     0,   2012}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{  -105,      0,      0}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{     0,      0,      0}, 0, {   990,   2012}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{     0,      0,      0}, 0, {   990,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{     0,    212,      0}, 0, {   990,      0}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{     0,    212,      0}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
 };
 
 static const Vtx wario_wings_half_2_dl_vertex[] = {
-    {{{     0,      0,      0}, 0, {     0,   2012}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{     0,      0,      0}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   106,    212,      0}, 0, {   990,      0}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{   106,    212,      0}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{     0,    212,      0}, 0, {     0,      0}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{     0,    212,      0}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   106,      0,      0}, 0, {   990,   2012}, {0x00, 0x00, 0x7f, 0xff}}},
+    {{{   106,      0,      0}, 0, {   990,   2012}, {0xff, 0xff, 0xff, 0xff}}},
 };
 
 const Gfx wario_wings_half_1_dl[] = {
@@ -4245,7 +4329,7 @@ const Gfx wario_wings_half_2_dl[] = {
 const Gfx wario_cap_wings[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATERGBA, G_CC_MODULATERGBA),
-    gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
     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(),
@@ -4264,7 +4348,7 @@ const Gfx wario_cap_wings[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
-    gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
     gsSPEndDisplayList(),
 };
 
@@ -4272,7 +4356,7 @@ const Gfx wario_cap_wings[] = {
 const Gfx wario_cap_wings_transparent[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_DECALFADEA, G_CC_DECALFADEA),
-    gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
     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(),
@@ -4291,7 +4375,7 @@ const Gfx wario_cap_wings_transparent[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
-    gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
     gsSPEndDisplayList(),
 };
 
@@ -4299,7 +4383,7 @@ const Gfx wario_cap_wings_transparent[] = {
 const Gfx wario_metal_cap_wings[] = {
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_MODULATERGBA, G_CC_MODULATERGBA),
-    gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
     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(),
@@ -4318,22 +4402,22 @@ const Gfx wario_metal_cap_wings[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
-    gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
     gsSPEndDisplayList(),
 };
 
 // 0x0401CC28 - 0x0401CD20
 const Gfx wario_metal_cap_wings_transparent[] = {
     gsDPPipeSync(),
-    gsSPClearGeometryMode(G_TEXTURE_GEN),
-    gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
     gsDPSetCombineMode(G_CC_DECALFADEA, G_CC_DECALFADEA),
-    gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
     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, 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),
+    gsSPLight(&wario_white_lights_group.l, 1),
+    gsSPLight(&wario_white_lights_group.a, 2),
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_texture_metal_wings_half_1),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
@@ -4344,10 +4428,8 @@ const Gfx wario_metal_cap_wings_transparent[] = {
     gsSPDisplayList(wario_wings_half_2_dl),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
-    gsSPSetGeometryMode(G_TEXTURE_GEN | G_CULL_BACK | G_SHADING_SMOOTH),
+    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
-    gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE),
+    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
-    gsDPLoadTextureBlock(wario_texture_metal, 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(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
     gsSPEndDisplayList(),
 };
 

actors/wario/wario_externs.h

@@ -0,0 +1,15 @@
+extern ALIGNED8 const Texture wario_texture_white_button[];
+extern ALIGNED8 const Texture wario_texture_w_logo[];
+extern ALIGNED8 const Texture wario_texture_hair_sideburn[];
+extern ALIGNED8 const Texture wario_texture_add_sideburn[];
+extern ALIGNED8 const Texture wario_texture_skin_sideburn[];
+extern ALIGNED8 const Texture wario_texture_mouth[];
+extern ALIGNED8 const Texture wario_texture_mouth_dead[];
+extern ALIGNED8 const Texture wario_texture_eyes_front[];
+extern ALIGNED8 const Texture wario_texture_eyes_half_closed[];
+extern ALIGNED8 const Texture wario_texture_eyes_closed[];
+extern ALIGNED8 const Texture wario_texture_eyes_right[];
+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[];

actors/wario_cap/geo.inc.c

@@ -1,27 +1,47 @@
+#include "geo_header.h"
 // 0x16000CA4
 const GeoLayout warios_cap_geo[] = {
+   GEO_NODE_START(),
+   GEO_OPEN_NODE(),
       GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
       GEO_OPEN_NODE(),
          GEO_SCALE(0x00, 16384),
          GEO_OPEN_NODE(),
-         GEO_ASM(1, geo_mario_set_player_colors),
+            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_NODE_START(),
                GEO_OPEN_NODE(),
                   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_seg3_dl_03022F48),
                GEO_CLOSE_NODE(),
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
+      GEO_CLOSE_NODE(),
+      GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_material_revert_render_settings),
+   GEO_CLOSE_NODE(),
    GEO_END(),
 };
 
 // 0x16000CF0
 const GeoLayout warios_metal_cap_geo[] = {
+   GEO_NODE_START(),
+   GEO_OPEN_NODE(),
       GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
       GEO_OPEN_NODE(),
          GEO_SCALE(0x00, 16384),
          GEO_OPEN_NODE(),
+            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(),
@@ -30,16 +50,24 @@ const GeoLayout warios_metal_cap_geo[] = {
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
+      GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_material_revert_render_settings),
+   GEO_CLOSE_NODE(),
    GEO_END(),
 };
 
 // 0x16000D3C
 const GeoLayout warios_wing_cap_geo[] = {
+   GEO_NODE_START(),
+   GEO_OPEN_NODE(),
       GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
       GEO_OPEN_NODE(),
          GEO_SCALE(0x00, 16384),
          GEO_OPEN_NODE(),
-         GEO_ASM(1, geo_mario_set_player_colors),
+            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(),
@@ -55,16 +83,24 @@ const GeoLayout warios_wing_cap_geo[] = {
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
+      GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_material_revert_render_settings),
+   GEO_CLOSE_NODE(),
    GEO_END(),
 };
 
 // 0x16000DA8
 const GeoLayout warios_winged_metal_cap_geo[] = {
+   GEO_NODE_START(),
+   GEO_OPEN_NODE(),
       GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
       GEO_OPEN_NODE(),
          GEO_SCALE(0x00, 16384),
          GEO_OPEN_NODE(),
-         GEO_ASM(1, geo_mario_set_player_colors),
+            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(),
@@ -80,5 +116,9 @@ const GeoLayout warios_winged_metal_cap_geo[] = {
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
+      GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_material_revert_render_settings),
+      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_material_revert_render_settings),
+   GEO_CLOSE_NODE(),
    GEO_END(),
 };

actors/wario_cap/geo_header.h

@@ -0,0 +1,19 @@
+extern const GeoLayout warios_cap_geo[];
+extern const GeoLayout warios_metal_cap_geo[];
+extern const GeoLayout warios_wing_cap_geo[];
+extern const GeoLayout warios_winged_metal_cap_geo[];
+extern const Gfx wario_cap_seg3_dl_03022B30[];
+extern const Gfx wario_cap_seg3_dl_03022B68[];
+extern const Gfx wario_cap_seg3_dl_03022CC8[];
+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_03022F20[];
+extern const Gfx wario_cap_seg3_dl_03022F48[];
+extern const Gfx wario_cap_seg3_dl_03022FF8[];
+extern const Gfx wario_cap_seg3_dl_030230B0[];
+extern const Gfx wario_cap_seg3_dl_03023108[];
+extern const Gfx wario_cap_seg3_dl_03023160[];
+extern const Gfx wario_cap_seg3_dl_03023298[];
+extern const Gfx wario_cap_material_revert_render_settings[];

actors/wario_cap/model.inc.c

@@ -18,19 +18,21 @@ static const Lights1 wario_cap_seg3_lights_0301CF38 = gdSPDefLights1(
     0xff, 0xbd, 0x00, 0x28, 0x28, 0x28
 );
 
-#include "actors/mario/mario_externs.h"
+static const Lights1 wario_cap_black_lights_group = gdSPDefLights1(
-#include "actors/mario_cap/mario_cap_externs.h"
+    0x00, 0x00, 0x00,
-#define wario_cap_seg3_texture_0301CF50 mario_cap_seg3_texture_0301CF50
+    0x00, 0x00, 0x00, 0x28, 0x28, 0x28
-#define wario_cap_seg3_texture_0301E750 mario_cap_seg3_texture_0301E750
+);
-#define wario_cap_seg3_texture_0301F750 mario_cap_seg3_texture_0301F750
-#define wario_cap_seg3_texture_03020750 mario_cap_seg3_texture_03020750
-#define wario_cap_seg3_texture_03021750 mario_cap_seg3_texture_03021750
-#define wario_cap_texture_cap_inside    mario_texture_cap_inside
 
-// 0x0301DF50
+#include "actors/mario/mario_externs.h"
-ALIGNED8 const Texture wario_cap_seg3_texture_0301DF50[] = {
+#include "actors/wario/wario_externs.h"
-#include "actors/wario_cap/custom_wario_cap_logo.rgba16.inc.c"
+#define wario_cap_texture_metal_shade        mario_texture_metal_shade
-};
+#define wario_cap_texture_metal_light        mario_texture_metal_light
+#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_wings_half_2       mario_texture_wings_half_2
+#define wario_cap_texture_metal_wings_half_1 mario_texture_metal_wings_half_1
+#define wario_cap_texture_metal_wings_half_2 mario_texture_metal_wings_half_2
+#define wario_cap_texture_cap_inside         mario_texture_cap_inside
 
 // 0x03022750
 static const Vtx wario_cap_seg3_vertex_03022750[] = {
@@ -183,30 +185,30 @@ const Gfx wario_cap_seg3_dl_03022D10[] = {
 
 // 0x03022D38
 static const Vtx wario_cap_seg3_vertex_03022D38[] = {
-    {{{   199,    247,    -55}, 0, {   990,      0}, {0x59, 0xed, 0x58, 0xff}}},
+    {{{   199,    247,    -55}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   131,    274,     20}, 0, {     0,      0}, {0x59, 0xed, 0x58, 0xff}}},
+    {{{   131,    274,     20}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{    69,     71,     38}, 0, {     0,   2012}, {0x59, 0xed, 0x58, 0xff}}},
+    {{{    69,     71,     38}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   199,    247,    -55}, 0, {   990,      0}, {0x58, 0xee, 0x58, 0xff}}},
+    {{{   199,    247,    -55}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{    69,     71,     38}, 0, {     0,   2012}, {0x58, 0xee, 0x58, 0xff}}},
+    {{{    69,     71,     38}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   138,     44,    -37}, 0, {   990,   2012}, {0x58, 0xee, 0x58, 0xff}}},
+    {{{   138,     44,    -37}, 0, {   990,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -137,     44,    -37}, 0, {   990,   2012}, {0xa8, 0xee, 0x58, 0xff}}},
+    {{{  -137,     44,    -37}, 0, {   990,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   -68,     71,     38}, 0, {     0,   2012}, {0xa8, 0xee, 0x58, 0xff}}},
+    {{{   -68,     71,     38}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -198,    247,    -55}, 0, {   990,      0}, {0xa8, 0xee, 0x58, 0xff}}},
+    {{{  -198,    247,    -55}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   -68,     71,     38}, 0, {     0,   2012}, {0xa7, 0xed, 0x58, 0xff}}},
+    {{{   -68,     71,     38}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -130,    274,     20}, 0, {     0,      0}, {0xa7, 0xed, 0x58, 0xff}}},
+    {{{  -130,    274,     20}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -198,    247,    -55}, 0, {   990,      0}, {0xa7, 0xed, 0x58, 0xff}}},
+    {{{  -198,    247,    -55}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
 };
 
 // 0x03022DF8
 static const Vtx wario_cap_seg3_vertex_03022DF8[] = {
-    {{{   268,    219,   -132}, 0, {   990,      0}, {0x59, 0xed, 0x57, 0xff}}},
+    {{{   268,    219,   -132}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   199,    247,    -55}, 0, {     0,      0}, {0x59, 0xed, 0x57, 0xff}}},
+    {{{   199,    247,    -55}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   138,     44,    -37}, 0, {     0,   2012}, {0x59, 0xed, 0x57, 0xff}}},
+    {{{   138,     44,    -37}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{   207,     16,   -114}, 0, {   990,   2012}, {0x59, 0xed, 0x57, 0xff}}},
+    {{{   207,     16,   -114}, 0, {   990,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -206,     16,   -114}, 0, {   990,   2012}, {0xa7, 0xed, 0x57, 0xff}}},
+    {{{  -206,     16,   -114}, 0, {   990,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -137,     44,    -37}, 0, {     0,   2012}, {0xa7, 0xed, 0x57, 0xff}}},
+    {{{  -137,     44,    -37}, 0, {     0,   2012}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -267,    219,   -132}, 0, {   990,      0}, {0xa7, 0xed, 0x57, 0xff}}},
+    {{{  -267,    219,   -132}, 0, {   990,      0}, {0xff, 0xff, 0xff, 0xff}}},
-    {{{  -198,    247,    -55}, 0, {     0,      0}, {0xa7, 0xed, 0x57, 0xff}}},
+    {{{  -198,    247,    -55}, 0, {     0,      0}, {0xff, 0xff, 0xff, 0xff}}},
 };
 
 // 0x03022E78 - 0x03022EA8
@@ -256,7 +258,7 @@ const Gfx wario_cap_seg3_dl_03022F48[] = {
     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_seg3_texture_0301DF50),
+    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),
@@ -275,11 +277,21 @@ const Gfx wario_cap_seg3_dl_03022F48[] = {
 // 0x03022FF8 - 0x030230B0
 const Gfx wario_cap_seg3_dl_03022FF8[] = {
 	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),
-    gsDPLoadTextureBlock(wario_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),
+    gsSPLight(&wario_cap_black_lights_group.l, 1),
-    gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
+    gsSPCopyLightEXT(2, 15),
-    gsSPCopyLightsPlayerPart(METAL),
+	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),
+	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, 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),
+	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(wario_cap_seg3_dl_03022B30),
     gsSPDisplayList(wario_cap_seg3_dl_03022B68),
     gsSPDisplayList(wario_cap_seg3_dl_03022CC8),
@@ -295,11 +307,11 @@ const Gfx wario_cap_seg3_dl_03022FF8[] = {
 // 0x030230B0 - 0x03023108
 const Gfx wario_cap_seg3_dl_030230B0[] = {
     gsSPDisplayList(wario_cap_seg3_dl_03022ED8),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_0301E750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_wings_half_1),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(wario_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_0301F750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_wings_half_2),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(wario_cap_seg3_dl_03022EA8),
@@ -310,11 +322,11 @@ const Gfx wario_cap_seg3_dl_030230B0[] = {
 // 0x03023108 - 0x03023160
 const Gfx wario_cap_seg3_dl_03023108[] = {
     gsSPDisplayList(wario_cap_seg3_dl_03022ED8),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_03020750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_1),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(wario_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_03021750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_2),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(wario_cap_seg3_dl_03022EA8),
@@ -331,7 +343,7 @@ const Gfx wario_cap_seg3_dl_03023160[] = {
     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_seg3_texture_0301DF50),
+    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),
@@ -347,11 +359,11 @@ const Gfx wario_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, wario_cap_seg3_texture_0301E750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_wings_half_1),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(wario_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_0301F750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_wings_half_2),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(wario_cap_seg3_dl_03022EA8),
@@ -367,17 +379,21 @@ const Gfx wario_cap_seg3_dl_03023160[] = {
 // 0x03023298 - 0x030233D0
 const Gfx wario_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, wario_cap_seg3_texture_0301CF50),
+    gsSPLight(&wario_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, 15),
-    gsDPLoadSync(),
+	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_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, wario_cap_texture_metal_light),
-    gsSPCopyLightsPlayerPart(METAL),
+	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(wario_cap_seg3_dl_03022B30),
     gsSPDisplayList(wario_cap_seg3_dl_03022B68),
     gsSPDisplayList(wario_cap_seg3_dl_03022CC8),
@@ -389,11 +405,11 @@ const Gfx wario_cap_seg3_dl_03023298[] = {
     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, wario_cap_seg3_texture_03020750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_1),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(wario_cap_seg3_dl_03022E78),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_03021750),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_2),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
     gsSPDisplayList(wario_cap_seg3_dl_03022EA8),
@@ -405,3 +421,27 @@ const Gfx wario_cap_seg3_dl_03023298[] = {
     gsDPSetEnvColor(255, 255, 255, 255),
     gsSPEndDisplayList(),
 };
+
+const Gfx wario_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(),
+};

data/dynos_mgr_builtin_externs.h

@@ -1664,9 +1664,11 @@ extern ALIGNED8 const Texture luigi_texture_hair_sideburn[];
 extern ALIGNED8 const Texture luigi_texture_add_sideburn[];
 extern ALIGNED8 const Texture luigi_texture_skin_sideburn[];
 extern ALIGNED8 const Texture luigi_texture_mustache[];
+extern ALIGNED8 const Texture toad_player_texture_cap[];
 extern ALIGNED8 const Texture toad_player_texture_spots[];
 extern ALIGNED8 const Texture toad_player_texture_hair[];
-extern ALIGNED8 const Texture toad_player_texture_blush[];
+extern ALIGNED8 const Texture toad_player_texture_face_neutral[];
+extern ALIGNED8 const Texture toad_player_texture_face_dead[];
 extern ALIGNED8 const Texture toad_player_texture_eyes_front[];
 extern ALIGNED8 const Texture toad_player_texture_eyes_half_closed[];
 extern ALIGNED8 const Texture toad_player_texture_eyes_closed[];
@@ -1678,6 +1680,8 @@ 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_hair_sideburn[];
+extern ALIGNED8 const Texture wario_texture_add_sideburn[];
+extern ALIGNED8 const Texture wario_texture_skin_sideburn[];
 extern ALIGNED8 const Texture wario_texture_mouth[];
 extern ALIGNED8 const Texture wario_texture_mouth_dead[];
 extern ALIGNED8 const Texture wario_texture_eyes_front[];
@@ -1688,7 +1692,6 @@ 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 wario_cap_seg3_texture_0301DF50[];
 
 extern ALIGNED8 const Texture waluigi_custom_waluigi_overalls_button_rgba16[];
 extern ALIGNED8 const Texture waluigi_custom_waluigi_metal_rgba16[];

data/dynos_mgr_builtin_tex.cpp

@@ -1096,9 +1096,11 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
     define_builtin_tex(luigi_texture_add_sideburn, "actors/luigi/custom_luigi_sideburn_add.rgba32.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_spots, "actors/toad_player/custom_toad_cap.ia16.png", 32, 32, 16),
+    define_builtin_tex(toad_player_texture_cap, "actors/toad_player/custom_toad_cap.ia16.png", 32, 32, 16),
-    define_builtin_tex(toad_player_texture_hair, "actors/toad_player/custom_toad_hair.rgba16.png", 32, 32, 16),
+    define_builtin_tex(toad_player_texture_spots, "actors/toad_player/custom_toad_spots.ia16.png", 32, 32, 16),
-    define_builtin_tex(toad_player_texture_blush, "actors/toad_player/custom_toad_blush.rgba16.png", 32, 32, 16),
+    define_builtin_tex(toad_player_texture_hair, "actors/toad_player/custom_toad_hair.ia16.png", 32, 32, 16),
+    define_builtin_tex(toad_player_texture_face_neutral, "actors/toad_player/custom_toad_face_neutral.rgba32.png", 32, 32, 16),
+    define_builtin_tex(toad_player_texture_face_dead, "actors/toad_player/custom_toad_face_dead.rgba32.png", 32, 32, 16),
     define_builtin_tex(toad_player_texture_eyes_front, "actors/toad_player/custom_toad_eyes_center.rgba32.png", 32, 32, 16),
     define_builtin_tex(toad_player_texture_eyes_half_closed, "actors/toad_player/custom_toad_eyes_half_closed.rgba32.png", 32, 32, 16),
     define_builtin_tex(toad_player_texture_eyes_closed, "actors/toad_player/custom_toad_eyes_closed.rgba32.png", 32, 32, 16),
@@ -1109,7 +1111,9 @@ 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.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_add_sideburn, "actors/wario/custom_wario_sideburn_add.rgba32.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),
     define_builtin_tex(wario_texture_eyes_front, "actors/wario/custom_wario_eyes_center.rgba16.png", 64, 32, 16),
@@ -1120,7 +1124,6 @@ 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(wario_cap_seg3_texture_0301DF50, "actors/wario_cap/custom_wario_cap_logo.rgba16.png", 32, 32, 16),
     
     // Waluigi
     define_builtin_tex(waluigi_custom_waluigi_overalls_button_rgba16, "actors/waluigi/custom_waluigi_overalls_button.rgba16.png", 32, 32, 16),

src/game/characters.c

@@ -595,7 +595,7 @@ struct Character gCharacters[CT_MAX] = {
         .capMetalModelId       = MODEL_TOADS_METAL_CAP,
         .capWingModelId        = MODEL_TOADS_WING_CAP,
         .capMetalWingModelId   = MODEL_TOADS_WINGED_METAL_CAP,
-        .capEnemyLayer         = LAYER_TRANSPARENT,
+        .capEnemyLayer         = LAYER_ALPHA,
         .capEnemyGfx           = toad_cap_Cap_mesh_layer_1,
         .capEnemyDecalGfx      = toad_cap_Cap_mesh_layer_5,
         .torsoRotMult          = 1.0f,
@@ -1157,7 +1157,7 @@ struct Character gCharacters[CT_MAX] = {
         .capEnemyDecalGfx      = NULL,
         .torsoRotMult          = 1.0f,
         // anim
-        .animOffsetEnabled     = true,
+        .animOffsetEnabled     = false,
 
         // character anims
         .animSlowLedgeGrab =                    MARIO_ANIM_SLOW_LEDGE_GRAB,
@@ -1456,7 +1456,7 @@ const struct PlayerPalette gPalettePresets[PALETTE_PRESET_MAX] = {
 {{{ 0xd6, 0x35, 0x4d }, { 0xff, 0x8e, 0xb2 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x8e, 0xb2 }}}, // Bubblegum
 {{{ 0xb2, 0x28, 0x18 }, { 0x47, 0xc5, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x47, 0xc5, 0xff }}}, // Ice Mario
 {{{ 0x00, 0x98, 0x00 }, { 0x47, 0xc5, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x47, 0xc5, 0xff }}}, // Ice Luigi
-{{{ 0xff, 0xff, 0xff }, { 0x4c, 0x2c, 0xd3 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0x00, 0x00 }}}, // Toad
+{{{ 0xff, 0xff, 0xff }, { 0x4c, 0x2c, 0xd3 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x00, 0x00, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0x00, 0x00 }}}, // Toad
 };
 
 enum AnimType {