diff --git a/actors/toad_cap/geo.inc.c b/actors/toad_cap/geo.inc.c index 20627fc3..b95973b1 100644 --- a/actors/toad_cap/geo.inc.c +++ b/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,15 +6,16 @@ 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_TRANSPARENT + 3, 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, toad_cap_Cap_mesh_layer_1), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_Cap_mesh_layer_5), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_cap_Cap_mesh_layer_5), GEO_CLOSE_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), @@ -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,8 +39,9 @@ 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_TRANSPARENT + 3, 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(), @@ -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,8 +70,9 @@ 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_TRANSPARENT + 3, 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(), @@ -75,7 +81,7 @@ const GeoLayout toads_wing_cap_geo[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_cap_Cap_mesh_layer_1), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_Cap_mesh_layer_5), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_cap_Cap_mesh_layer_5), GEO_DISPLAY_LIST(LAYER_ALPHA, toad_cap_Wing_Cap_Wings_mesh_layer_4), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -105,8 +111,9 @@ 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_TRANSPARENT + 3, 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(), diff --git a/actors/toad_cap/model.inc.c b/actors/toad_cap/model.inc.c index 733c1558..25e5fd11 100644 --- a/actors/toad_cap/model.inc.c +++ b/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} }}, - {{ {-62, 145, -1}, 0, {-16, 1996}, {167, 238, 89, 255} }}, - {{ {-192, 321, -94}, 0, {974, -16}, {166, 237, 88, 255} }}, - {{ {-125, 348, -19}, 0, {-16, -16}, {166, 236, 88, 255} }}, - {{ {192, 321, -94}, 0, {974, -16}, {90, 237, 88, 255} }}, - {{ {62, 145, -1}, 0, {-16, 1996}, {89, 238, 89, 255} }}, - {{ {132, 118, -76}, 0, {974, 1996}, {89, 238, 89, 255} }}, - {{ {125, 348, -19}, 0, {-16, -16}, {90, 236, 88, 255} }}, + {{ {-132, 118, -76}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {-62, 145, -1}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {-192, 321, -94}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {-125, 348, -19}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {192, 321, -94}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {62, 145, -1}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {132, 118, -76}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {125, 348, -19}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }}, }; Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_0[] = { @@ -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} }}, - {{ {-192, 321, -94}, 0, {-16, -16}, {166, 237, 88, 255} }}, - {{ {-261, 293, -171}, 0, {974, -16}, {166, 237, 88, 255} }}, - {{ {-201, 90, -153}, 0, {974, 1996}, {166, 237, 88, 255} }}, - {{ {261, 293, -171}, 0, {974, -16}, {90, 237, 88, 255} }}, - {{ {192, 321, -94}, 0, {-16, -16}, {90, 237, 88, 255} }}, - {{ {132, 118, -76}, 0, {-16, 1996}, {89, 238, 89, 255} }}, - {{ {201, 90, -153}, 0, {974, 1996}, {90, 237, 88, 255} }}, + {{ {-132, 118, -76}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {-192, 321, -94}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {-261, 293, -171}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {-201, 90, -153}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {261, 293, -171}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {192, 321, -94}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {132, 118, -76}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {201, 90, -153}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }}, }; Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_1[] = { @@ -377,9 +378,14 @@ Gfx mat_revert_toad_cap_metal[] = { Gfx mat_toad_cap_cap_base[] = { gsDPPipeSync(), - gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPCopyLightsPlayerPart(GLOVES), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_cap), + gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPLoadBlock(7, 0, 0, 1023, 256), + gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), + gsDPSetTileSize(0, 0, 0, 124, 124), gsSPEndDisplayList(), }; @@ -388,10 +394,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), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_cap_texture_cap_inside), + 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 +418,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 +430,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 +449,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 +468,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,19 +487,19 @@ 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(), }; Gfx toad_cap_Cap_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_cap_cap_base), - gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_0), gsSPDisplayList(mat_toad_cap_toad_cap_inside), gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_1), gsSPEndDisplayList(), }; Gfx toad_cap_Cap_mesh_layer_5[] = { + gsSPDisplayList(mat_toad_cap_cap_base), + gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_0), gsSPDisplayList(mat_toad_cap_cap_spots), gsSPDisplayList(toad_cap_Cap_mesh_layer_5_tri_0), gsSPEndDisplayList(), @@ -502,7 +508,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(), }; @@ -528,13 +533,26 @@ Gfx toad_cap_Winged_Metal_Cap_Wings_mesh_layer_4[] = { }; Gfx toad_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), - gsSPEndDisplayList(), + 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(), }; diff --git a/actors/toad_player/custom_toad_blush.rgba16.png b/actors/toad_player/custom_toad_blush.rgba16.png deleted file mode 100644 index b3885a73..00000000 Binary files a/actors/toad_player/custom_toad_blush.rgba16.png and /dev/null differ diff --git a/actors/toad_player/custom_toad_cap.ia16.png b/actors/toad_player/custom_toad_cap.ia16.png index d0980679..16250d58 100644 Binary files a/actors/toad_player/custom_toad_cap.ia16.png and b/actors/toad_player/custom_toad_cap.ia16.png differ diff --git a/actors/toad_player/custom_toad_eyes_center.rgba32.png b/actors/toad_player/custom_toad_eyes_center.rgba32.png index c95924d7..2946ee60 100644 Binary files a/actors/toad_player/custom_toad_eyes_center.rgba32.png and b/actors/toad_player/custom_toad_eyes_center.rgba32.png differ diff --git a/actors/toad_player/custom_toad_eyes_closed.rgba32.png b/actors/toad_player/custom_toad_eyes_closed.rgba32.png index 1ea5da5e..20164b51 100644 Binary files a/actors/toad_player/custom_toad_eyes_closed.rgba32.png and b/actors/toad_player/custom_toad_eyes_closed.rgba32.png differ diff --git a/actors/toad_player/custom_toad_eyes_dead.rgba32.png b/actors/toad_player/custom_toad_eyes_dead.rgba32.png index 656e90f6..30f3152a 100644 Binary files a/actors/toad_player/custom_toad_eyes_dead.rgba32.png and b/actors/toad_player/custom_toad_eyes_dead.rgba32.png differ diff --git a/actors/toad_player/custom_toad_eyes_down.rgba32.png b/actors/toad_player/custom_toad_eyes_down.rgba32.png index 565d2953..a07fa184 100644 Binary files a/actors/toad_player/custom_toad_eyes_down.rgba32.png and b/actors/toad_player/custom_toad_eyes_down.rgba32.png differ diff --git a/actors/toad_player/custom_toad_eyes_half_closed.rgba32.png b/actors/toad_player/custom_toad_eyes_half_closed.rgba32.png index 9dd2589f..a9e528f5 100644 Binary files a/actors/toad_player/custom_toad_eyes_half_closed.rgba32.png and b/actors/toad_player/custom_toad_eyes_half_closed.rgba32.png differ diff --git a/actors/toad_player/custom_toad_eyes_left.rgba32.png b/actors/toad_player/custom_toad_eyes_left.rgba32.png index 05de1187..106b8f8a 100644 Binary files a/actors/toad_player/custom_toad_eyes_left.rgba32.png and b/actors/toad_player/custom_toad_eyes_left.rgba32.png differ diff --git a/actors/toad_player/custom_toad_eyes_right.rgba32.png b/actors/toad_player/custom_toad_eyes_right.rgba32.png index a8160c17..e85e19e9 100644 Binary files a/actors/toad_player/custom_toad_eyes_right.rgba32.png and b/actors/toad_player/custom_toad_eyes_right.rgba32.png differ diff --git a/actors/toad_player/custom_toad_eyes_up.rgba32.png b/actors/toad_player/custom_toad_eyes_up.rgba32.png index 40426b27..251d31a9 100644 Binary files a/actors/toad_player/custom_toad_eyes_up.rgba32.png and b/actors/toad_player/custom_toad_eyes_up.rgba32.png differ diff --git a/actors/toad_player/custom_toad_face_dead.rgba32.png b/actors/toad_player/custom_toad_face_dead.rgba32.png new file mode 100644 index 00000000..44e7dcb7 Binary files /dev/null and b/actors/toad_player/custom_toad_face_dead.rgba32.png differ diff --git a/actors/toad_player/custom_toad_face_neutral.rgba32.png b/actors/toad_player/custom_toad_face_neutral.rgba32.png new file mode 100644 index 00000000..9fad387a Binary files /dev/null and b/actors/toad_player/custom_toad_face_neutral.rgba32.png differ diff --git a/actors/toad_player/custom_toad_hair.ia16.png b/actors/toad_player/custom_toad_hair.ia16.png new file mode 100644 index 00000000..b93cf7eb Binary files /dev/null and b/actors/toad_player/custom_toad_hair.ia16.png differ diff --git a/actors/toad_player/custom_toad_hair.rgba16.png b/actors/toad_player/custom_toad_hair.rgba16.png deleted file mode 100644 index 77ab8354..00000000 Binary files a/actors/toad_player/custom_toad_hair.rgba16.png and /dev/null differ diff --git a/actors/toad_player/custom_toad_spots.ia16.png b/actors/toad_player/custom_toad_spots.ia16.png new file mode 100644 index 00000000..f5d1310b Binary files /dev/null and b/actors/toad_player/custom_toad_spots.ia16.png differ diff --git a/actors/toad_player/geo.inc.c b/actors/toad_player/geo.inc.c index 018ed6d7..7ff56780 100644 --- a/actors/toad_player/geo.inc.c +++ b/actors/toad_player/geo.inc.c @@ -1,168 +1,172 @@ -const GeoLayout toad_toad_player_head_capless[] = { +#include "geo_header.h" +const GeoLayout toad_player_toad_player_head_capless[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_toad_player_left_hand_open[] = { +const GeoLayout toad_player_toad_player_left_hand_closed[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Left_Hand_DL_mesh_layer_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_toad_player_right_hand_open[] = { +const GeoLayout toad_player_toad_player_left_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout toad_player_toad_player_right_hand_open[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1), GEO_OPEN_NODE(), GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_toad_player_right_hand_peace[] = { +const GeoLayout toad_player_toad_player_right_hand_peace[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_toad_player_right_hand_cap[] = { +const GeoLayout toad_player_toad_player_right_hand_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1), GEO_OPEN_NODE(), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5), - GEO_ASM(3, geo_mirror_mario_backface_culling), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_toad_player_right_hand_wing_cap[] = { +const GeoLayout toad_player_toad_player_right_hand_wing_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1), GEO_OPEN_NODE(), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5), - GEO_ASM(3, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_ALPHA, toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_head_capless[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_head_capless[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_left_hand_open[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_left_hand_closed[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Left_Hand_DL_mesh_layer_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_open[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_left_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_open[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1), GEO_OPEN_NODE(), GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_peace[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_peace[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_cap[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_wing_cap[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_wing_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt1[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt1[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_half_closed_1), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_1_mat_override_eyes_half_closed_1), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_half_closed_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt2[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt2[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_closed_2), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_1_mat_override_eyes_closed_2), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_closed_2), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt3[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt3[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_right_3), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_1_mat_override_eyes_right_3), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_right_3), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt4[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt4[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_left_4), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_1_mat_override_eyes_left_4), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_left_4), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt5[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt5[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_up_5), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_1_mat_override_eyes_up_5), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_up_5), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt6[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt6[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_down_6), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_1_mat_override_eyes_down_6), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_down_6), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt7[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt7[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_dead_7), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_1_mat_override_eyes_dead_7), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_dead_7), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt1[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt1[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 40, 0, NULL), @@ -175,7 +179,7 @@ const GeoLayout toad_Cap_Effect_Switch_opt1[] = { GEO_ASM(0, geo_mario_tilt_torso), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_Torso_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_player_Torso_mesh_layer_1), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 83, 0, 0, NULL), GEO_OPEN_NODE(), @@ -186,49 +190,47 @@ const GeoLayout toad_Cap_Effect_Switch_opt1[] = { GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Cap_DL_mesh_layer_1), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Cap_DL_mesh_layer_5), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Cap_DL_mesh_layer_4), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_head_capless), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_head_capless), GEO_CLOSE_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_eyes), GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_1), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_DL_mesh_layer_1), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_Eye_Switch_opt1), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_Eye_Switch_opt2), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_Eye_Switch_opt3), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_Eye_Switch_opt4), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_Eye_Switch_opt5), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_Eye_Switch_opt6), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_Eye_Switch_opt7), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt1), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt2), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt3), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt4), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt5), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt6), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt7), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, 132, -15, 33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, 132, -22, 40, -135), GEO_OPEN_NODE(), GEO_ASM(1, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Left_Wing_DL_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, -132, 15, -33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, -132, 22, -40, -135), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Wing_DL_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 65, -3, 52, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_Left_Arm_Color_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_player_Left_Arm_Color_mesh_layer_1), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 20, 0, 0, toad_Left_Forearm_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 20, 0, 0, toad_player_Left_Forearm_mesh_layer_1), GEO_OPEN_NODE(), GEO_SWITCH_CASE(1, geo_switch_mario_hand), GEO_OPEN_NODE(), @@ -239,20 +241,23 @@ const GeoLayout toad_Cap_Effect_Switch_opt1[] = { GEO_ASM(1, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Left_Hand_DL_mesh_layer_1), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Left_Hand_DL_mesh_layer_1), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_left_hand_open), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_left_hand_open), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_left_hand_closed), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_left_hand_closed), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_left_hand_closed), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 65, -3, -52, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_Right_Arm_Color_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_player_Right_Arm_Color_mesh_layer_1), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 20, 0, 0, toad_Right_Forearm_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 20, 0, 0, toad_player_Right_Forearm_mesh_layer_1), GEO_OPEN_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_hand), GEO_OPEN_NODE(), @@ -263,15 +268,15 @@ const GeoLayout toad_Cap_Effect_Switch_opt1[] = { GEO_ASM(0, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Hand_DL_mesh_layer_1), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Hand_DL_mesh_layer_1), GEO_CLOSE_NODE(), GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_open), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_peace), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_cap), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_wing_cap), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_open), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_peace), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_cap), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_wing_cap), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -284,7 +289,7 @@ const GeoLayout toad_Cap_Effect_Switch_opt1[] = { GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 21, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 16, 0, 0, toad_Left_Shoe_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 16, 0, 0, toad_player_Left_Shoe_mesh_layer_1), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -299,7 +304,7 @@ const GeoLayout toad_Cap_Effect_Switch_opt1[] = { GEO_ASM(2, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Shoe_DL_mesh_layer_1), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Shoe_DL_mesh_layer_1), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -311,55 +316,66 @@ const GeoLayout toad_Cap_Effect_Switch_opt1[] = { GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_head_capless[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_head_capless[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_left_hand_open[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_left_hand_closed[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Left_Hand_DL_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_open[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_left_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_mat_override_metal_0), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_open[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_peace[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_peace[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_cap[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0), - GEO_CLOSE_NODE(), - GEO_RETURN(), -}; -const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_wing_cap[] = { - GEO_NODE_START(), - GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt2[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_wing_cap[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_mat_override_metal_0), + GEO_CLOSE_NODE(), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout toad_player_2_Cap_Effect_Switch_opt2[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 40, 0, NULL), @@ -372,7 +388,7 @@ const GeoLayout toad_Cap_Effect_Switch_opt2[] = { GEO_ASM(0, geo_mario_tilt_torso), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_Torso_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_player_Torso_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 83, 0, 0, NULL), GEO_OPEN_NODE(), @@ -383,40 +399,40 @@ const GeoLayout toad_Cap_Effect_Switch_opt2[] = { GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Cap_DL_mesh_layer_1_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Cap_DL_mesh_layer_4_mat_override_metal_0), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_head_capless), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_head_capless), GEO_CLOSE_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_eyes), GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Head_DL_mesh_layer_1_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Head_DL_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, 132, -15, 33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, 132, -22, 40, -135), GEO_OPEN_NODE(), GEO_ASM(1, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, toad_Left_Wing_DL_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_metal_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, -132, 15, -33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, -132, 22, -40, -135), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, toad_Right_Wing_DL_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_metal_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 65, -3, 52, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_Left_Arm_Color_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_player_Left_Arm_Color_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 20, 0, 0, toad_Left_Forearm_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 20, 0, 0, toad_player_Left_Forearm_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), GEO_SWITCH_CASE(1, geo_switch_mario_hand), GEO_OPEN_NODE(), @@ -427,20 +443,23 @@ const GeoLayout toad_Cap_Effect_Switch_opt2[] = { GEO_ASM(1, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Left_Hand_DL_mesh_layer_1_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Left_Hand_DL_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_left_hand_open), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_left_hand_open), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_left_hand_closed), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_left_hand_closed), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_left_hand_closed), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 65, -3, -52, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_Right_Arm_Color_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_player_Right_Arm_Color_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 20, 0, 0, toad_Right_Forearm_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 20, 0, 0, toad_player_Right_Forearm_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_hand), GEO_OPEN_NODE(), @@ -451,15 +470,15 @@ const GeoLayout toad_Cap_Effect_Switch_opt2[] = { GEO_ASM(0, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Right_Hand_DL_mesh_layer_1_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Right_Hand_DL_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_open), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_peace), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_cap), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_wing_cap), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_open), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_peace), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_cap), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_wing_cap), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -472,7 +491,7 @@ const GeoLayout toad_Cap_Effect_Switch_opt2[] = { GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 21, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 16, 0, 0, toad_Left_Shoe_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 16, 0, 0, toad_player_Left_Shoe_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -487,7 +506,7 @@ const GeoLayout toad_Cap_Effect_Switch_opt2[] = { GEO_ASM(2, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Right_Shoe_DL_mesh_layer_1_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Right_Shoe_DL_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -499,55 +518,66 @@ const GeoLayout toad_Cap_Effect_Switch_opt2[] = { GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_head_capless[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_head_capless[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_left_hand_open[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_left_hand_closed[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Left_Hand_DL_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_open[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_left_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_mat_override_metal_0), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_open[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_peace[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_peace[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_cap[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0), - GEO_CLOSE_NODE(), - GEO_RETURN(), -}; -const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_wing_cap[] = { - GEO_NODE_START(), - GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt3[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_wing_cap[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_mat_override_metal_0), + GEO_CLOSE_NODE(), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout toad_player_2_Cap_Effect_Switch_opt3[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 40, 0, NULL), @@ -560,7 +590,7 @@ const GeoLayout toad_Cap_Effect_Switch_opt3[] = { GEO_ASM(0, geo_mario_tilt_torso), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_Torso_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_player_Torso_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 83, 0, 0, NULL), GEO_OPEN_NODE(), @@ -571,40 +601,40 @@ const GeoLayout toad_Cap_Effect_Switch_opt3[] = { GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Cap_DL_mesh_layer_1_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Cap_DL_mesh_layer_4_mat_override_metal_0), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_head_capless), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_head_capless), GEO_CLOSE_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_eyes), GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_1_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Head_DL_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, 132, -15, 33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, 132, -22, 40, -135), GEO_OPEN_NODE(), GEO_ASM(1, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Left_Wing_DL_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, -132, 15, -33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, -132, 22, -40, -135), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Wing_DL_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 65, -3, 52, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_Left_Arm_Color_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_player_Left_Arm_Color_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 20, 0, 0, toad_Left_Forearm_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 20, 0, 0, toad_player_Left_Forearm_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), GEO_SWITCH_CASE(1, geo_switch_mario_hand), GEO_OPEN_NODE(), @@ -615,20 +645,23 @@ const GeoLayout toad_Cap_Effect_Switch_opt3[] = { GEO_ASM(1, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Left_Hand_DL_mesh_layer_1_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Left_Hand_DL_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_left_hand_open), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_left_hand_open), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_left_hand_closed), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_left_hand_closed), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_left_hand_closed), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 65, -3, -52, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_Right_Arm_Color_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, toad_player_Right_Arm_Color_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 20, 0, 0, toad_Right_Forearm_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 20, 0, 0, toad_player_Right_Forearm_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_hand), GEO_OPEN_NODE(), @@ -639,15 +672,15 @@ const GeoLayout toad_Cap_Effect_Switch_opt3[] = { GEO_ASM(0, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Hand_DL_mesh_layer_1_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Hand_DL_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_open), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_peace), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_cap), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_wing_cap), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_open), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_peace), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_cap), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_wing_cap), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -660,7 +693,7 @@ const GeoLayout toad_Cap_Effect_Switch_opt3[] = { GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 21, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 16, 0, 0, toad_Left_Shoe_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 16, 0, 0, toad_player_Left_Shoe_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -675,7 +708,7 @@ const GeoLayout toad_Cap_Effect_Switch_opt3[] = { GEO_ASM(2, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Right_Shoe_DL_mesh_layer_1_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Shoe_DL_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -687,73 +720,52 @@ const GeoLayout toad_Cap_Effect_Switch_opt3[] = { GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt1[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt1[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_half_closed_1), - GEO_ASM(3, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Head_DL_mesh_layer_1_mat_override_eyes_half_closed_1), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_half_closed_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt2[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt2[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_closed_2), - GEO_ASM(3, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Head_DL_mesh_layer_1_mat_override_eyes_closed_2), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_closed_2), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt3[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt3[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_right_3), - GEO_ASM(3, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Head_DL_mesh_layer_1_mat_override_eyes_right_3), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_right_3), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt4[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt4[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_left_4), - GEO_ASM(3, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Head_DL_mesh_layer_1_mat_override_eyes_left_4), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_left_4), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt5[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt5[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_up_5), - GEO_ASM(3, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Head_DL_mesh_layer_1_mat_override_eyes_up_5), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_up_5), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt6[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt6[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_down_6), - GEO_ASM(3, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Head_DL_mesh_layer_1_mat_override_eyes_down_6), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_down_6), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt7[] = { +const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt7[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5_mat_override_eyes_dead_7), - GEO_ASM(3, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Head_DL_mesh_layer_1_mat_override_eyes_dead_7), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Head_DL_mesh_layer_1_mat_override_eyes_dead_7), GEO_CLOSE_NODE(), GEO_RETURN(), }; @@ -764,9 +776,12 @@ const GeoLayout toad_player_geo[] = { GEO_OPEN_NODE(), GEO_SCALE(LAYER_FORCE, 4096), 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_SWITCH_CASE(0, geo_switch_mario_cap_effect), GEO_OPEN_NODE(), @@ -782,7 +797,7 @@ const GeoLayout toad_player_geo[] = { GEO_ASM(0, geo_mario_tilt_torso), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_Torso_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_player_Torso_mesh_layer_1), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 83, 0, 0, NULL), GEO_OPEN_NODE(), @@ -793,53 +808,47 @@ const GeoLayout toad_player_geo[] = { GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Cap_DL_mesh_layer_1), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Cap_DL_mesh_layer_5), - GEO_ASM(3, geo_mirror_mario_backface_culling), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Cap_DL_mesh_layer_4), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_toad_player_head_capless), + GEO_BRANCH(1, toad_player_toad_player_head_capless), GEO_CLOSE_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_eyes), GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ASM(2, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_Head_DL_mesh_layer_5), - GEO_ASM(3, geo_mirror_mario_backface_culling), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Head_DL_mesh_layer_1), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Head_DL_mesh_layer_1), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt0_Eye_Switch_opt1), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt0_Eye_Switch_opt2), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt0_Eye_Switch_opt3), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt0_Eye_Switch_opt4), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt0_Eye_Switch_opt5), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt0_Eye_Switch_opt6), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt0_Eye_Switch_opt7), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt1), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt2), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt3), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt4), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt5), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt6), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt7), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, 132, -15, 33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, 132, -22, 40, -135), GEO_OPEN_NODE(), GEO_ASM(1, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, toad_Left_Wing_DL_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, -132, 15, -33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 138, -117, -132, 22, -40, -135), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, toad_Right_Wing_DL_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 65, -3, 52, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_Left_Arm_Color_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_player_Left_Arm_Color_mesh_layer_1), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 20, 0, 0, toad_Left_Forearm_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 20, 0, 0, toad_player_Left_Forearm_mesh_layer_1), GEO_OPEN_NODE(), GEO_SWITCH_CASE(1, geo_switch_mario_hand), GEO_OPEN_NODE(), @@ -850,20 +859,23 @@ const GeoLayout toad_player_geo[] = { GEO_ASM(1, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Left_Hand_DL_mesh_layer_1), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Left_Hand_DL_mesh_layer_1), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_toad_player_left_hand_open), + GEO_BRANCH(1, toad_player_toad_player_left_hand_open), + GEO_BRANCH(1, toad_player_toad_player_left_hand_closed), + GEO_BRANCH(1, toad_player_toad_player_left_hand_closed), + GEO_BRANCH(1, toad_player_toad_player_left_hand_closed), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 65, -3, -52, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_Right_Arm_Color_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, toad_player_Right_Arm_Color_mesh_layer_1), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 20, 0, 0, toad_Right_Forearm_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 20, 0, 0, toad_player_Right_Forearm_mesh_layer_1), GEO_OPEN_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_hand), GEO_OPEN_NODE(), @@ -874,15 +886,15 @@ const GeoLayout toad_player_geo[] = { GEO_ASM(0, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Right_Hand_DL_mesh_layer_1), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Right_Hand_DL_mesh_layer_1), GEO_CLOSE_NODE(), GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_toad_player_right_hand_open), - GEO_BRANCH(1, toad_toad_player_right_hand_peace), - GEO_BRANCH(1, toad_toad_player_right_hand_cap), - GEO_BRANCH(1, toad_toad_player_right_hand_wing_cap), + GEO_BRANCH(1, toad_player_toad_player_right_hand_open), + GEO_BRANCH(1, toad_player_toad_player_right_hand_peace), + GEO_BRANCH(1, toad_player_toad_player_right_hand_cap), + GEO_BRANCH(1, toad_player_toad_player_right_hand_wing_cap), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -895,7 +907,7 @@ const GeoLayout toad_player_geo[] = { GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 21, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 16, 0, 0, toad_Left_Shoe_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 16, 0, 0, toad_player_Left_Shoe_mesh_layer_1), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -910,7 +922,7 @@ const GeoLayout toad_player_geo[] = { GEO_ASM(2, geo_mario_hand_foot_scaler), GEO_SCALE(LAYER_FORCE, 65536), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_Right_Shoe_DL_mesh_layer_1), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_Right_Shoe_DL_mesh_layer_1), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -920,16 +932,18 @@ const GeoLayout toad_player_geo[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt1), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt2), - GEO_BRANCH(1, toad_Cap_Effect_Switch_opt3), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2), + GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3), 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, toad_material_revert_render_settings), - GEO_DISPLAY_LIST(LAYER_ALPHA, toad_material_revert_render_settings), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_material_revert_render_settings), GEO_CLOSE_NODE(), GEO_END(), }; diff --git a/actors/toad_player/geo_header.h b/actors/toad_player/geo_header.h index 6f79b761..45e779d6 100644 --- a/actors/toad_player/geo_header.h +++ b/actors/toad_player/geo_header.h @@ -1,196 +1,126 @@ -extern const GeoLayout toad_toad_player_head_capless[]; -extern const GeoLayout toad_toad_player_left_hand_open[]; -extern const GeoLayout toad_toad_player_right_hand_open[]; -extern const GeoLayout toad_toad_player_right_hand_peace[]; -extern const GeoLayout toad_toad_player_right_hand_cap[]; -extern const GeoLayout toad_toad_player_right_hand_wing_cap[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_head_capless[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_left_hand_open[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_open[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_peace[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_cap[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_jump_toad_toad_player_right_hand_wing_cap[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt1[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt2[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt3[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt4[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt5[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt6[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1_Eye_Switch_opt7[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt1[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_head_capless[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_left_hand_open[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_open[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_peace[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_cap[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt2_jump_toad_toad_player_right_hand_wing_cap[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt2[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_head_capless[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_left_hand_open[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_open[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_peace[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_cap[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt3_jump_toad_toad_player_right_hand_wing_cap[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt3[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt1[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt2[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt3[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt4[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt5[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt6[]; -extern const GeoLayout toad_Cap_Effect_Switch_opt0_Eye_Switch_opt7[]; +extern const GeoLayout toad_player_toad_player_head_capless[]; +extern const GeoLayout toad_player_toad_player_left_hand_closed[]; +extern const GeoLayout toad_player_toad_player_left_hand_open[]; +extern const GeoLayout toad_player_toad_player_right_hand_open[]; +extern const GeoLayout toad_player_toad_player_right_hand_peace[]; +extern const GeoLayout toad_player_toad_player_right_hand_cap[]; +extern const GeoLayout toad_player_toad_player_right_hand_wing_cap[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_head_capless[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_left_hand_closed[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_left_hand_open[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_open[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_peace[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_cap[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_right_hand_wing_cap[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt1[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt2[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt3[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt4[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt5[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt6[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_Eye_Switch_opt7[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt1[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_head_capless[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_left_hand_closed[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_left_hand_open[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_open[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_peace[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_cap[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_wing_cap[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt2[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_head_capless[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_left_hand_closed[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_left_hand_open[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_open[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_peace[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_cap[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_wing_cap[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt3[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt1[]; +extern const GeoLayout toad_player_2_Cap_Effect_Switch_opt0_Eye_Switch_opt2[]; +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_Torso_mesh_layer_1_tri_0[]; -extern const Vtx toad_Torso_mesh_layer_1_vtx_1[12]; -extern const Gfx toad_Torso_mesh_layer_1_tri_1[]; -extern const Vtx toad_Torso_mesh_layer_1_vtx_2[20]; -extern const Gfx toad_Torso_mesh_layer_1_tri_2[]; -extern const Vtx toad_Cap_DL_mesh_layer_1_vtx_0[94]; -extern const Gfx toad_Cap_DL_mesh_layer_1_tri_0[]; -extern const Vtx toad_Cap_DL_mesh_layer_5_vtx_0[94]; -extern const Gfx toad_Cap_DL_mesh_layer_5_tri_0[]; -extern const Vtx toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_vtx_0[12]; -extern const Gfx toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_tri_0[]; -extern const Vtx toad_Head_DL_mesh_layer_5_vtx_0[60]; -extern const Gfx toad_Head_DL_mesh_layer_5_tri_0[]; -extern const Vtx toad_Head_DL_mesh_layer_1_vtx_0[60]; -extern const Gfx toad_Head_DL_mesh_layer_1_tri_0[]; -extern const Vtx toad_Left_Wing_DL_mesh_layer_4_vtx_0[4]; -extern const Gfx toad_Left_Wing_DL_mesh_layer_4_tri_0[]; -extern const Vtx toad_Left_Wing_DL_mesh_layer_4_vtx_1[4]; -extern const Gfx toad_Left_Wing_DL_mesh_layer_4_tri_1[]; -extern const Vtx toad_Right_Wing_DL_mesh_layer_4_vtx_0[4]; -extern const Gfx toad_Right_Wing_DL_mesh_layer_4_tri_0[]; -extern const Vtx toad_Right_Wing_DL_mesh_layer_4_vtx_1[4]; -extern const Gfx toad_Right_Wing_DL_mesh_layer_4_tri_1[]; -extern const Vtx toad_Left_Arm_Color_mesh_layer_1_vtx_0[20]; -extern const Gfx toad_Left_Arm_Color_mesh_layer_1_tri_0[]; -extern const Vtx toad_Left_Forearm_mesh_layer_1_vtx_0[16]; -extern const Gfx toad_Left_Forearm_mesh_layer_1_tri_0[]; -extern const Vtx toad_Left_Hand_DL_mesh_layer_1_vtx_0[20]; -extern const Gfx toad_Left_Hand_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_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0[]; -extern const Vtx toad_Right_Arm_Color_mesh_layer_1_vtx_0[20]; -extern const Gfx toad_Right_Arm_Color_mesh_layer_1_tri_0[]; -extern const Vtx toad_Right_Forearm_mesh_layer_1_vtx_0[16]; -extern const Gfx toad_Right_Forearm_mesh_layer_1_tri_0[]; -extern const Vtx toad_Right_Hand_DL_mesh_layer_1_vtx_0[20]; -extern const Gfx toad_Right_Hand_DL_mesh_layer_1_tri_0[]; -extern const Vtx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_vtx_0[23]; -extern const Gfx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0[]; -extern const Vtx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_vtx_0[63]; -extern const Gfx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0[]; -extern const Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_0[20]; -extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0[]; -extern const Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_1[94]; -extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1[]; -extern const Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_2[6]; -extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_2[]; -extern const Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_vtx_0[100]; -extern const Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_tri_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_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_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_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_1[]; -extern const Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_2[6]; -extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_2[]; -extern const Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_vtx_0[100]; -extern const Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_tri_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_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_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_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1[]; -extern const Vtx toad_Left_Shoe_mesh_layer_1_vtx_0[20]; -extern const Gfx toad_Left_Shoe_mesh_layer_1_tri_0[]; -extern const Vtx toad_Right_Shoe_DL_mesh_layer_1_vtx_0[20]; -extern const Gfx toad_Right_Shoe_DL_mesh_layer_1_tri_0[]; -extern const Gfx mat_toad_white[]; -extern const Gfx mat_toad_beige[]; -extern const Gfx mat_toad_vest[]; -extern const Gfx mat_revert_toad_vest[]; -extern const Gfx mat_toad_metal[]; -extern const Gfx mat_revert_toad_metal[]; -extern const Gfx mat_toad_cap_base[]; -extern const Gfx mat_toad_cap_spots[]; -extern const Gfx mat_toad_hair[]; -extern const Gfx mat_revert_toad_hair[]; -extern const Gfx mat_toad_eyes_center[]; -extern const Gfx mat_toad_face_blush[]; -extern const Gfx mat_toad_eyes_half_closed[]; -extern const Gfx mat_toad_eyes_closed[]; -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[]; +extern const Gfx toad_player_Torso_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Torso_mesh_layer_1_tri_1[]; +extern const Gfx toad_player_Torso_mesh_layer_1_tri_2[]; +extern const Gfx toad_player_Cap_DL_mesh_layer_4_tri_0[]; +extern const Gfx toad_player_Cap_DL_mesh_layer_4_tri_1[]; +extern const Gfx toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_tri_0[]; +extern const Gfx toad_player_Head_DL_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_wings_half_1_dl[]; +extern const Gfx toad_player_wings_half_2_dl[]; +extern const Gfx toad_player_Left_Arm_Color_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Left_Forearm_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Left_Hand_DL_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Right_Arm_Color_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Right_Forearm_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Right_Hand_DL_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1[]; +extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_0[]; +extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_1[]; +extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_1[]; +extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_tri_0[]; +extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_tri_1[]; +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_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1[]; +extern const Gfx toad_player_Left_Shoe_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Right_Shoe_DL_mesh_layer_1_tri_0[]; +extern const Gfx toad_player_Torso_mesh_layer_1[]; +extern const Gfx toad_player_Torso_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Cap_DL_mesh_layer_4[]; +extern const Gfx toad_player_Cap_DL_mesh_layer_4_mat_override_metal_0[]; +extern const Gfx toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4[]; +extern const Gfx toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_mat_override_metal_0[]; +extern const Gfx toad_player_Head_DL_mesh_layer_1[]; +extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_half_closed_1[]; +extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_closed_2[]; +extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_right_3[]; +extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_left_4[]; +extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_up_5[]; +extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_down_6[]; +extern const Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_dead_7[]; +extern const Gfx toad_player_cap_wings[]; +extern const Gfx toad_player_metal_cap_wings[]; +extern const Gfx toad_player_Left_Arm_Color_mesh_layer_1[]; +extern const Gfx toad_player_Left_Arm_Color_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Left_Forearm_mesh_layer_1[]; +extern const Gfx toad_player_Left_Forearm_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Left_Hand_DL_mesh_layer_1[]; +extern const Gfx toad_player_Left_Hand_DL_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1[]; +extern const Gfx toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Right_Arm_Color_mesh_layer_1[]; +extern const Gfx toad_player_Right_Arm_Color_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Right_Forearm_mesh_layer_1[]; +extern const Gfx toad_player_Right_Forearm_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Right_Hand_DL_mesh_layer_1[]; +extern const Gfx toad_player_Right_Hand_DL_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1[]; +extern const Gfx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1[]; +extern const Gfx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1[]; +extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4[]; +extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_mat_override_metal_0[]; +extern const Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1[]; +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 toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4[]; +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 toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4[]; +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 toad_player_Left_Shoe_mesh_layer_1[]; +extern const Gfx toad_player_Left_Shoe_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_Right_Shoe_DL_mesh_layer_1[]; +extern const Gfx toad_player_Right_Shoe_DL_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx toad_player_material_revert_render_settings[]; diff --git a/actors/toad_player/model.inc.c b/actors/toad_player/model.inc.c index 251dd070..55468585 100644 --- a/actors/toad_player/model.inc.c +++ b/actors/toad_player/model.inc.c @@ -1,12 +1,34 @@ static const Lights1 toad_player_white_lights_group = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); + 0x7F, 0x7F, 0x7F, + 0xFF, 0xFF, 0xFF, 0x28, 0x28, 0x28); + +static const Lights1 toad_player_beige_lights_group = gdSPDefLights1( + 0x7F, 0x69, 0x4E, + 0xFE, 0xD5, 0xA1, 0x28, 0x28, 0x28); + +static const Lights1 toad_player_vest_lights_group = gdSPDefLights1( + 0x1C, 0xE, 0x59, + 0x42, 0x27, 0xB5, 0x28, 0x28, 0x28); + +static const Lights1 toad_player_cap_base_lights_group = gdSPDefLights1( + 0x7F, 0x7F, 0x7F, + 0xFF, 0xFF, 0xFF, 0x28, 0x28, 0x28); + +static const Lights1 toad_player_cap_spots_lights_group = gdSPDefLights1( + 0x7F, 0x0, 0x0, + 0xFF, 0x0, 0x0, 0x28, 0x28, 0x28); + +static const Lights1 toad_player_hair_lights_group = gdSPDefLights1( + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x28, 0x28); + +static const Lights1 toad_player_brown_lights_group = gdSPDefLights1( + 0x30, 0x1B, 0x8, + 0x68, 0x40, 0x1B, 0x28, 0x28, 0x28); static const Lights1 toad_player_black_lights_group = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x28, 0x28); #include "actors/mario/mario_externs.h" #define toad_player_texture_metal_shade mario_texture_metal_shade @@ -17,75 +39,83 @@ static const Lights1 toad_player_black_lights_group = gdSPDefLights1( #define toad_player_texture_metal_wings_half_2 mario_texture_metal_wings_half_2 #define toad_player_texture_cap_inside mario_texture_cap_inside +ALIGNED8 const Texture toad_player_texture_cap[] = { + #include "actors/toad_player/custom_toad_cap.ia16.inc.c" +}; + ALIGNED8 const Texture toad_player_texture_spots[] = { -#include "actors/toad_player/custom_toad_cap.ia16.inc.c" + #include "actors/toad_player/custom_toad_spots.ia16.inc.c" }; ALIGNED8 const Texture toad_player_texture_hair[] = { -#include "actors/toad_player/custom_toad_hair.rgba16.inc.c" + #include "actors/toad_player/custom_toad_hair.ia16.inc.c" }; -ALIGNED8 const Texture toad_player_texture_blush[] = { -#include "actors/toad_player/custom_toad_blush.rgba16.inc.c" +ALIGNED8 const Texture toad_player_texture_face_neutral[] = { + #include "actors/toad_player/custom_toad_face_neutral.rgba32.inc.c" +}; + +ALIGNED8 const Texture toad_player_texture_face_dead[] = { + #include "actors/toad_player/custom_toad_face_dead.rgba32.inc.c" }; ALIGNED8 const Texture toad_player_texture_eyes_front[] = { -#include "actors/toad_player/custom_toad_eyes_center.rgba32.inc.c" + #include "actors/toad_player/custom_toad_eyes_center.rgba32.inc.c" }; ALIGNED8 const Texture toad_player_texture_eyes_half_closed[] = { -#include "actors/toad_player/custom_toad_eyes_half_closed.rgba32.inc.c" + #include "actors/toad_player/custom_toad_eyes_half_closed.rgba32.inc.c" }; ALIGNED8 const Texture toad_player_texture_eyes_closed[] = { -#include "actors/toad_player/custom_toad_eyes_closed.rgba32.inc.c" + #include "actors/toad_player/custom_toad_eyes_closed.rgba32.inc.c" }; ALIGNED8 const Texture toad_player_texture_eyes_right[] = { -#include "actors/toad_player/custom_toad_eyes_left.rgba32.inc.c" + #include "actors/toad_player/custom_toad_eyes_left.rgba32.inc.c" }; ALIGNED8 const Texture toad_player_texture_eyes_left[] = { -#include "actors/toad_player/custom_toad_eyes_right.rgba32.inc.c" + #include "actors/toad_player/custom_toad_eyes_right.rgba32.inc.c" }; ALIGNED8 const Texture toad_player_texture_eyes_up[] = { -#include "actors/toad_player/custom_toad_eyes_up.rgba32.inc.c" + #include "actors/toad_player/custom_toad_eyes_up.rgba32.inc.c" }; ALIGNED8 const Texture toad_player_texture_eyes_down[] = { -#include "actors/toad_player/custom_toad_eyes_down.rgba32.inc.c" + #include "actors/toad_player/custom_toad_eyes_down.rgba32.inc.c" }; ALIGNED8 const Texture toad_player_texture_eyes_dead[] = { -#include "actors/toad_player/custom_toad_eyes_dead.rgba32.inc.c" + #include "actors/toad_player/custom_toad_eyes_dead.rgba32.inc.c" }; -Vtx toad_Torso_mesh_layer_1_vtx_0[20] = { +Vtx toad_player_Torso_mesh_layer_1_vtx_0[20] = { {{ {-4, -21, -71}, 0, {-16, -16}, {234, 211, 139, 0} }}, - {{ {43, 30, -57}, 0, {-16, -16}, {58, 43, 151, 0} }}, + {{ {43, 30, -57}, 0, {-16, -16}, {58, 43, 152, 0} }}, {{ {43, -18, -57}, 0, {-16, -16}, {54, 211, 150, 0} }}, - {{ {1, 33, -71}, 0, {-16, -16}, {243, 42, 137, 0} }}, + {{ {1, 33, -71}, 0, {-16, -16}, {243, 43, 137, 0} }}, {{ {-35, -25, -44}, 0, {-16, -16}, {148, 213, 205, 0} }}, - {{ {-11, -52, -35}, 0, {-16, -16}, {222, 140, 217, 0} }}, + {{ {-11, -52, -35}, 0, {-16, -16}, {221, 140, 216, 0} }}, {{ {43, -43, -29}, 0, {-16, -16}, {42, 143, 215, 0} }}, {{ {-11, -52, 35}, 0, {-16, -16}, {222, 140, 40, 0} }}, {{ {-35, -25, 44}, 0, {-16, -16}, {148, 212, 50, 0} }}, {{ {-4, -21, 71}, 0, {-16, -16}, {236, 209, 116, 0} }}, - {{ {43, -18, 57}, 0, {-16, -16}, {53, 209, 106, 0} }}, + {{ {43, -18, 57}, 0, {-16, -16}, {53, 209, 105, 0} }}, {{ {43, -43, 29}, 0, {-16, -16}, {41, 143, 42, 0} }}, - {{ {1, 33, 71}, 0, {-16, -16}, {244, 44, 119, 0} }}, - {{ {-35, 42, 44}, 0, {-16, -16}, {153, 54, 52, 0} }}, + {{ {1, 33, 71}, 0, {-16, -16}, {244, 44, 118, 0} }}, + {{ {-35, 42, 44}, 0, {-16, -16}, {154, 54, 52, 0} }}, {{ {1, 69, 35}, 0, {-16, -16}, {241, 118, 44, 0} }}, - {{ {43, 57, 29}, 0, {-16, -16}, {57, 106, 41, 0} }}, + {{ {43, 57, 29}, 0, {-16, -16}, {57, 106, 42, 0} }}, {{ {43, 30, 57}, 0, {-16, -16}, {58, 44, 104, 0} }}, {{ {1, 69, -35}, 0, {-16, -16}, {241, 118, 212, 0} }}, - {{ {-35, 42, -44}, 0, {-16, -16}, {153, 53, 203, 0} }}, + {{ {-35, 42, -44}, 0, {-16, -16}, {154, 53, 203, 0} }}, {{ {43, 57, -29}, 0, {-16, -16}, {57, 106, 215, 0} }}, }; -Gfx toad_Torso_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Torso_mesh_layer_1_vtx_0 + 0, 20, 0), +Gfx toad_player_Torso_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Torso_mesh_layer_1_vtx_0 + 0, 20, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(4, 3, 0, 0, 0, 5, 4, 0), gsSP2Triangles(6, 5, 0, 0, 6, 0, 2, 0), @@ -104,23 +134,23 @@ Gfx toad_Torso_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Torso_mesh_layer_1_vtx_1[12] = { - {{ {89, 22, -21}, 0, {-16, -16}, {109, 47, 210, 0} }}, +Vtx toad_player_Torso_mesh_layer_1_vtx_1[12] = { + {{ {89, 22, -21}, 0, {-16, -16}, {108, 47, 209, 0} }}, {{ {43, -18, -57}, 0, {-16, -16}, {54, 211, 150, 0} }}, - {{ {43, 30, -57}, 0, {-16, -16}, {58, 43, 151, 0} }}, - {{ {89, -20, -21}, 0, {-16, -16}, {104, 199, 210, 0} }}, - {{ {89, 22, 20}, 0, {-16, -16}, {109, 47, 46, 0} }}, + {{ {43, 30, -57}, 0, {-16, -16}, {58, 43, 152, 0} }}, + {{ {89, -20, -21}, 0, {-16, -16}, {103, 198, 209, 0} }}, + {{ {89, 22, 20}, 0, {-16, -16}, {108, 47, 47, 0} }}, {{ {43, 57, -29}, 0, {-16, -16}, {57, 106, 215, 0} }}, - {{ {43, 57, 29}, 0, {-16, -16}, {57, 106, 41, 0} }}, + {{ {43, 57, 29}, 0, {-16, -16}, {57, 106, 42, 0} }}, {{ {43, 30, 57}, 0, {-16, -16}, {58, 44, 104, 0} }}, - {{ {89, -20, 20}, 0, {-16, -16}, {104, 199, 46, 0} }}, - {{ {43, -18, 57}, 0, {-16, -16}, {53, 209, 106, 0} }}, + {{ {89, -20, 20}, 0, {-16, -16}, {103, 198, 47, 0} }}, + {{ {43, -18, 57}, 0, {-16, -16}, {53, 209, 105, 0} }}, {{ {43, -43, 29}, 0, {-16, -16}, {41, 143, 42, 0} }}, {{ {43, -43, -29}, 0, {-16, -16}, {42, 143, 215, 0} }}, }; -Gfx toad_Torso_mesh_layer_1_tri_1[] = { - gsSPVertex(toad_Torso_mesh_layer_1_vtx_1 + 0, 12, 0), +Gfx toad_player_Torso_mesh_layer_1_tri_1[] = { + gsSPVertex(toad_player_Torso_mesh_layer_1_vtx_1 + 0, 12, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(3, 0, 4, 0, 4, 0, 5, 0), gsSP2Triangles(2, 5, 0, 0, 4, 5, 6, 0), @@ -131,31 +161,31 @@ Gfx toad_Torso_mesh_layer_1_tri_1[] = { gsSPEndDisplayList(), }; -Vtx toad_Torso_mesh_layer_1_vtx_2[20] = { - {{ {2, 38, 81}, 0, {-16, -16}, {47, 44, 110, 0} }}, - {{ {54, 58, 26}, 0, {-16, -16}, {52, 93, 68, 0} }}, - {{ {7, 73, 40}, 0, {-16, -16}, {51, 86, 79, 0} }}, +Vtx toad_player_Torso_mesh_layer_1_vtx_2[20] = { + {{ {2, 38, 81}, 0, {-16, -16}, {48, 44, 109, 0} }}, + {{ {54, 58, 26}, 0, {-16, -16}, {53, 93, 68, 0} }}, + {{ {7, 73, 40}, 0, {-16, -16}, {51, 85, 79, 0} }}, {{ {51, 36, 62}, 0, {-16, -16}, {57, 57, 98, 0} }}, - {{ {51, -19, 62}, 0, {-16, -16}, {50, 215, 109, 0} }}, - {{ {-2, -16, 81}, 0, {-16, -16}, {38, 216, 115, 0} }}, - {{ {-5, -68, 40}, 0, {-16, -16}, {37, 145, 50, 0} }}, + {{ {51, -19, 62}, 0, {-16, -16}, {50, 214, 109, 0} }}, + {{ {-2, -16, 81}, 0, {-16, -16}, {39, 216, 114, 0} }}, + {{ {-5, -68, 40}, 0, {-16, -16}, {37, 146, 50, 0} }}, {{ {51, -52, 31}, 0, {-16, -16}, {49, 147, 43, 0} }}, {{ {51, -52, -31}, 0, {-16, -16}, {48, 147, 212, 0} }}, {{ {-5, -68, -40}, 0, {-16, -16}, {39, 147, 204, 0} }}, - {{ {-2, -16, -81}, 0, {-16, -16}, {41, 216, 143, 0} }}, - {{ {51, -19, -62}, 0, {-16, -16}, {50, 215, 147, 0} }}, + {{ {-2, -16, -81}, 0, {-16, -16}, {41, 215, 143, 0} }}, + {{ {51, -19, -62}, 0, {-16, -16}, {50, 214, 147, 0} }}, {{ {51, 36, -62}, 0, {-16, -16}, {61, 51, 157, 0} }}, {{ {2, 38, -81}, 0, {-16, -16}, {45, 41, 144, 0} }}, {{ {7, 73, -40}, 0, {-16, -16}, {42, 94, 182, 0} }}, - {{ {54, 58, -26}, 0, {-16, -16}, {57, 95, 194, 0} }}, - {{ {85, 28, -36}, 0, {-16, -16}, {76, 36, 161, 0} }}, + {{ {54, 58, -26}, 0, {-16, -16}, {58, 94, 194, 0} }}, + {{ {85, 28, -36}, 0, {-16, -16}, {76, 37, 161, 0} }}, {{ {93, -26, -36}, 0, {-16, -16}, {74, 183, 183, 0} }}, - {{ {93, -26, 36}, 0, {-16, -16}, {75, 181, 71, 0} }}, + {{ {93, -26, 36}, 0, {-16, -16}, {75, 182, 71, 0} }}, {{ {85, 28, 36}, 0, {-16, -16}, {79, 41, 91, 0} }}, }; -Gfx toad_Torso_mesh_layer_1_tri_2[] = { - gsSPVertex(toad_Torso_mesh_layer_1_vtx_2 + 0, 20, 0), +Gfx toad_player_Torso_mesh_layer_1_tri_2[] = { + gsSPVertex(toad_player_Torso_mesh_layer_1_vtx_2 + 0, 20, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(0, 4, 3, 0, 0, 5, 4, 0), gsSP2Triangles(6, 4, 5, 0, 6, 7, 4, 0), @@ -171,105 +201,105 @@ Gfx toad_Torso_mesh_layer_1_tri_2[] = { gsSPEndDisplayList(), }; -Vtx toad_Cap_DL_mesh_layer_1_vtx_0[94] = { - {{ {174, -49, -176}, 0, {-418, 482}, {30, 240, 134, 0} }}, +Vtx toad_player_Cap_DL_mesh_layer_4_vtx_0[94] = { + {{ {174, -49, -176}, 0, {-418, 482}, {31, 240, 134, 0} }}, {{ {275, 35, -71}, 0, {178, 72}, {116, 26, 211, 0} }}, {{ {217, -73, -142}, 0, {-280, 152}, {79, 214, 166, 0} }}, - {{ {98, 60, 34}, 0, {718, 1666}, {157, 79, 12, 0} }}, - {{ {67, 9, 71}, 0, {606, 1810}, {149, 62, 31, 0} }}, - {{ {82, -1, 142}, 0, {624, 1980}, {170, 46, 81, 0} }}, - {{ {24, -108, 71}, 0, {306, 1880}, {136, 241, 40, 0} }}, - {{ {38, -42, 34}, 0, {442, 1742}, {135, 34, 16, 0} }}, - {{ {24, -108, -71}, 0, {250, 1518}, {136, 241, 216, 0} }}, - {{ {38, -42, -34}, 0, {416, 1570}, {135, 34, 241, 0} }}, - {{ {82, 0, -142}, 0, {508, 1254}, {170, 46, 174, 0} }}, + {{ {98, 60, 34}, 0, {718, 1666}, {157, 78, 13, 0} }}, + {{ {67, 9, 71}, 0, {606, 1810}, {150, 62, 31, 0} }}, + {{ {82, -1, 142}, 0, {624, 1980}, {170, 47, 81, 0} }}, + {{ {24, -108, 71}, 0, {306, 1880}, {137, 240, 40, 0} }}, + {{ {38, -42, 34}, 0, {442, 1742}, {135, 35, 16, 0} }}, + {{ {24, -108, -71}, 0, {250, 1518}, {137, 240, 215, 0} }}, + {{ {38, -42, -34}, 0, {416, 1570}, {135, 35, 241, 0} }}, + {{ {82, 0, -142}, 0, {508, 1254}, {170, 46, 175, 0} }}, {{ {67, 9, -71}, 0, {538, 1444}, {147, 59, 227, 0} }}, - {{ {139, 108, -71}, 0, {826, 1356}, {201, 108, 217, 0} }}, + {{ {139, 108, -71}, 0, {826, 1356}, {200, 107, 217, 0} }}, {{ {98, 60, -34}, 0, {690, 1492}, {157, 79, 248, 0} }}, - {{ {197, 111, 88}, 0, {-92, 952}, {18, 110, 61, 0} }}, + {{ {197, 111, 88}, 0, {-92, 952}, {19, 110, 61, 0} }}, {{ {126, -24, 176}, 0, {1016, 906}, {226, 16, 122, 0} }}, - {{ {174, -49, 176}, 0, {1010, 594}, {30, 240, 122, 0} }}, + {{ {174, -49, 176}, 0, {1010, 594}, {31, 240, 122, 0} }}, {{ {245, 85, 88}, 0, {-98, 640}, {81, 77, 61, 0} }}, {{ {217, -73, 142}, 0, {892, 212}, {79, 214, 90, 0} }}, {{ {275, 35, 71}, 0, {2, 250}, {116, 26, 45, 0} }}, - {{ {248, -89, 79}, 0, {688, -162}, {104, 201, 47, 0} }}, + {{ {248, -89, 79}, 0, {688, -162}, {104, 201, 48, 0} }}, {{ {280, -29, 39}, 0, {194, -140}, {123, 237, 23, 0} }}, {{ {126, -24, 176}, 0, {-196, 438}, {226, 16, 122, 0} }}, {{ {103, -184, 88}, 0, {1220, 36}, {238, 146, 61, 0} }}, - {{ {174, -49, 176}, 0, {-198, -10}, {30, 240, 122, 0} }}, + {{ {174, -49, 176}, 0, {-198, -10}, {31, 240, 122, 0} }}, {{ {54, -158, 88}, 0, {1222, 482}, {175, 179, 61, 0} }}, - {{ {82, -1, 142}, 0, {-54, 916}, {170, 46, 81, 0} }}, - {{ {24, -108, 71}, 0, {1084, 952}, {136, 241, 40, 0} }}, - {{ {139, 108, -71}, 0, {184, 1066}, {201, 108, 217, 0} }}, - {{ {197, 111, 88}, 0, {1214, 712}, {18, 110, 61, 0} }}, + {{ {82, -1, 142}, 0, {-54, 916}, {170, 47, 81, 0} }}, + {{ {24, -108, 71}, 0, {1084, 952}, {137, 240, 40, 0} }}, + {{ {139, 108, -71}, 0, {184, 1066}, {200, 107, 217, 0} }}, + {{ {197, 111, 88}, 0, {1214, 712}, {19, 110, 61, 0} }}, {{ {197, 111, -88}, 0, {34, 812}, {19, 110, 195, 0} }}, {{ {245, 85, 88}, 0, {1186, 352}, {81, 77, 61, 0} }}, {{ {245, 85, -88}, 0, {6, 452}, {81, 77, 195, 0} }}, {{ {275, 35, 71}, 0, {1050, -18}, {116, 26, 45, 0} }}, {{ {275, 35, -71}, 0, {104, 62}, {116, 26, 211, 0} }}, {{ {280, -29, 39}, 0, {780, -272}, {123, 237, 23, 0} }}, - {{ {280, -29, -39}, 0, {304, -170}, {123, 237, 233, 0} }}, + {{ {280, -29, -39}, 0, {304, -170}, {123, 237, 232, 0} }}, {{ {275, 35, 71}, 0, {1036, -112}, {116, 26, 45, 0} }}, {{ {217, -73, -142}, 0, {456, 1066}, {79, 214, 166, 0} }}, {{ {275, 35, -71}, 0, {1404, 676}, {116, 26, 211, 0} }}, - {{ {280, -29, -39}, 0, {1000, 266}, {123, 237, 233, 0} }}, - {{ {248, -89, -79}, 0, {474, 484}, {104, 201, 209, 0} }}, + {{ {280, -29, -39}, 0, {1000, 266}, {123, 237, 232, 0} }}, + {{ {248, -89, -79}, 0, {474, 484}, {104, 201, 208, 0} }}, {{ {259, -94, 0}, 0, {490, -104}, {112, 196, 0, 0} }}, {{ {216, -149, -39}, 0, {-38, 168}, {85, 164, 233, 0} }}, - {{ {160, -181, -71}, 0, {-462, 496}, {43, 145, 212, 0} }}, - {{ {280, -29, -39}, 0, {-16, -16}, {123, 237, 233, 0} }}, + {{ {160, -181, -71}, 0, {-462, 496}, {43, 145, 211, 0} }}, + {{ {280, -29, -39}, 0, {-16, -16}, {123, 237, 232, 0} }}, {{ {280, -29, 39}, 0, {-16, -16}, {123, 237, 23, 0} }}, {{ {259, -94, 0}, 0, {-16, -16}, {112, 196, 0, 0} }}, - {{ {248, -89, 79}, 0, {-16, -16}, {104, 201, 47, 0} }}, - {{ {82, 0, -142}, 0, {-184, 898}, {170, 46, 174, 0} }}, - {{ {139, 108, -71}, 0, {1120, 942}, {201, 108, 217, 0} }}, + {{ {248, -89, 79}, 0, {-16, -16}, {104, 201, 48, 0} }}, + {{ {82, 0, -142}, 0, {-184, 898}, {170, 46, 175, 0} }}, + {{ {139, 108, -71}, 0, {1120, 942}, {200, 107, 217, 0} }}, {{ {197, 111, -88}, 0, {1264, 448}, {19, 110, 195, 0} }}, {{ {126, -24, -176}, 0, {-362, 392}, {226, 16, 134, 0} }}, {{ {245, 85, -88}, 0, {1258, -4}, {81, 77, 195, 0} }}, - {{ {174, -49, -176}, 0, {-370, -58}, {30, 240, 134, 0} }}, + {{ {174, -49, -176}, 0, {-370, -58}, {31, 240, 134, 0} }}, {{ {275, 35, -71}, 0, {1100, -320}, {116, 26, 211, 0} }}, {{ {160, -181, 71}, 0, {-26, 196}, {43, 145, 45, 0} }}, - {{ {160, -181, -71}, 0, {888, 166}, {43, 145, 212, 0} }}, + {{ {160, -181, -71}, 0, {888, 166}, {43, 145, 211, 0} }}, {{ {216, -149, -39}, 0, {646, -188}, {85, 164, 233, 0} }}, {{ {103, -184, 88}, 0, {-106, 592}, {238, 146, 61, 0} }}, - {{ {103, -184, -88}, 0, {1032, 556}, {238, 146, 195, 0} }}, + {{ {103, -184, -88}, 0, {1032, 556}, {237, 146, 195, 0} }}, {{ {54, -158, 88}, 0, {-88, 942}, {175, 179, 61, 0} }}, {{ {54, -158, -88}, 0, {1050, 906}, {175, 179, 195, 0} }}, - {{ {24, -108, -71}, 0, {-96, 882}, {136, 241, 216, 0} }}, - {{ {82, 0, -142}, 0, {1122, 1024}, {170, 46, 174, 0} }}, + {{ {24, -108, -71}, 0, {-96, 882}, {137, 240, 215, 0} }}, + {{ {82, 0, -142}, 0, {1122, 1024}, {170, 46, 175, 0} }}, {{ {126, -24, -176}, 0, {1320, 596}, {226, 16, 134, 0} }}, {{ {54, -158, -88}, 0, {-198, 414}, {175, 179, 195, 0} }}, - {{ {174, -49, -176}, 0, {1372, 98}, {30, 240, 134, 0} }}, - {{ {103, -184, -88}, 0, {-146, -82}, {238, 146, 195, 0} }}, - {{ {174, -49, 176}, 0, {-16, -16}, {30, 240, 122, 0} }}, + {{ {174, -49, -176}, 0, {1372, 98}, {31, 240, 134, 0} }}, + {{ {103, -184, -88}, 0, {-146, -82}, {237, 146, 195, 0} }}, + {{ {174, -49, 176}, 0, {-16, -16}, {31, 240, 122, 0} }}, {{ {160, -181, 71}, 0, {-16, -16}, {43, 145, 45, 0} }}, {{ {217, -73, 142}, 0, {-16, -16}, {79, 214, 90, 0} }}, {{ {103, -184, 88}, 0, {-16, -16}, {238, 146, 61, 0} }}, - {{ {24, -108, 71}, 0, {-16, -16}, {136, 241, 40, 0} }}, + {{ {24, -108, 71}, 0, {-16, -16}, {137, 240, 40, 0} }}, {{ {54, -158, -88}, 0, {-16, -16}, {175, 179, 195, 0} }}, {{ {54, -158, 88}, 0, {-16, -16}, {175, 179, 61, 0} }}, - {{ {24, -108, -71}, 0, {-16, -16}, {136, 241, 216, 0} }}, - {{ {103, -184, -88}, 0, {-16, -16}, {238, 146, 195, 0} }}, + {{ {24, -108, -71}, 0, {-16, -16}, {137, 240, 215, 0} }}, + {{ {103, -184, -88}, 0, {-16, -16}, {237, 146, 195, 0} }}, {{ {217, -73, -142}, 0, {-16, -16}, {79, 214, 166, 0} }}, - {{ {160, -181, -71}, 0, {-16, -16}, {43, 145, 212, 0} }}, - {{ {174, -49, -176}, 0, {-16, -16}, {30, 240, 134, 0} }}, - {{ {98, 60, 34}, 0, {-42, 926}, {157, 79, 12, 0} }}, - {{ {82, -1, 142}, 0, {1024, 984}, {170, 46, 81, 0} }}, - {{ {139, 108, 71}, 0, {82, 380}, {200, 107, 39, 0} }}, + {{ {160, -181, -71}, 0, {-16, -16}, {43, 145, 211, 0} }}, + {{ {174, -49, -176}, 0, {-16, -16}, {31, 240, 134, 0} }}, + {{ {98, 60, 34}, 0, {-42, 926}, {157, 78, 13, 0} }}, + {{ {82, -1, 142}, 0, {1024, 984}, {170, 47, 81, 0} }}, + {{ {139, 108, 71}, 0, {82, 380}, {200, 107, 40, 0} }}, {{ {126, -24, 176}, 0, {1466, 550}, {226, 16, 122, 0} }}, - {{ {197, 111, 88}, 0, {290, -208}, {18, 110, 61, 0} }}, - {{ {139, 108, -71}, 0, {-982, 638}, {201, 108, 217, 0} }}, + {{ {197, 111, 88}, 0, {290, -208}, {19, 110, 61, 0} }}, + {{ {139, 108, -71}, 0, {-982, 638}, {200, 107, 217, 0} }}, {{ {98, 60, -34}, 0, {-548, 1048}, {157, 79, 248, 0} }}, {{ {160, -181, 71}, 0, {832, 1186}, {43, 145, 45, 0} }}, {{ {216, -149, -39}, 0, {1162, -70}, {85, 164, 233, 0} }}, {{ {216, -149, 39}, 0, {654, 498}, {85, 164, 23, 0} }}, {{ {259, -94, 0}, 0, {414, -278}, {112, 196, 0, 0} }}, - {{ {248, -89, 79}, 0, {-98, 326}, {104, 201, 47, 0} }}, + {{ {248, -89, 79}, 0, {-98, 326}, {104, 201, 48, 0} }}, {{ {217, -73, 142}, 0, {-524, 874}, {79, 214, 90, 0} }}, }; -Gfx toad_Cap_DL_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Cap_DL_mesh_layer_1_vtx_0 + 0, 63, 0), +Gfx toad_player_Cap_DL_mesh_layer_4_tri_0[] = { + gsSPVertex(toad_player_Cap_DL_mesh_layer_4_vtx_0 + 0, 63, 0), gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), gsSP2Triangles(4, 6, 5, 0, 4, 7, 6, 0), gsSP2Triangles(7, 8, 6, 0, 7, 9, 8, 0), @@ -293,7 +323,7 @@ Gfx toad_Cap_DL_mesh_layer_1_tri_0[] = { gsSP2Triangles(56, 57, 58, 0, 59, 57, 56, 0), gsSP2Triangles(59, 60, 57, 0, 61, 60, 59, 0), gsSP1Triangle(61, 62, 60, 0), - gsSPVertex(toad_Cap_DL_mesh_layer_1_vtx_0 + 63, 31, 0), + gsSPVertex(toad_player_Cap_DL_mesh_layer_4_vtx_0 + 63, 31, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), gsSP2Triangles(6, 7, 8, 0, 6, 9, 7, 0), @@ -308,105 +338,105 @@ Gfx toad_Cap_DL_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Cap_DL_mesh_layer_5_vtx_0[94] = { - {{ {174, -49, -176}, 0, {-418, 482}, {30, 240, 134, 0} }}, +Vtx toad_player_Cap_DL_mesh_layer_4_vtx_1[94] = { + {{ {174, -49, -176}, 0, {-418, 482}, {31, 240, 134, 0} }}, {{ {275, 35, -71}, 0, {178, 72}, {116, 26, 211, 0} }}, {{ {217, -73, -142}, 0, {-280, 152}, {79, 214, 166, 0} }}, - {{ {98, 60, 34}, 0, {718, 1666}, {157, 79, 12, 0} }}, - {{ {67, 9, 71}, 0, {606, 1810}, {149, 62, 31, 0} }}, - {{ {82, -1, 142}, 0, {624, 1980}, {170, 46, 81, 0} }}, - {{ {24, -108, 71}, 0, {306, 1880}, {136, 241, 40, 0} }}, - {{ {38, -42, 34}, 0, {442, 1742}, {135, 34, 16, 0} }}, - {{ {24, -108, -71}, 0, {250, 1518}, {136, 241, 216, 0} }}, - {{ {38, -42, -34}, 0, {416, 1570}, {135, 34, 241, 0} }}, - {{ {82, 0, -142}, 0, {508, 1254}, {170, 46, 174, 0} }}, + {{ {98, 60, 34}, 0, {718, 1666}, {157, 78, 13, 0} }}, + {{ {67, 9, 71}, 0, {606, 1810}, {150, 62, 31, 0} }}, + {{ {82, 0, 142}, 0, {624, 1980}, {170, 47, 81, 0} }}, + {{ {24, -108, 71}, 0, {306, 1880}, {137, 240, 40, 0} }}, + {{ {38, -42, 34}, 0, {442, 1742}, {135, 35, 16, 0} }}, + {{ {24, -108, -71}, 0, {250, 1518}, {137, 240, 215, 0} }}, + {{ {38, -42, -34}, 0, {416, 1570}, {135, 35, 241, 0} }}, + {{ {82, 0, -142}, 0, {508, 1254}, {170, 46, 175, 0} }}, {{ {67, 9, -71}, 0, {538, 1444}, {147, 59, 227, 0} }}, - {{ {139, 108, -71}, 0, {826, 1356}, {201, 108, 217, 0} }}, + {{ {139, 108, -71}, 0, {826, 1356}, {200, 107, 217, 0} }}, {{ {98, 60, -34}, 0, {690, 1492}, {157, 79, 248, 0} }}, - {{ {197, 111, 88}, 0, {-92, 952}, {18, 110, 61, 0} }}, + {{ {197, 111, 88}, 0, {-92, 952}, {19, 110, 61, 0} }}, {{ {126, -24, 176}, 0, {1016, 906}, {226, 16, 122, 0} }}, - {{ {174, -49, 176}, 0, {1010, 594}, {30, 240, 122, 0} }}, + {{ {174, -49, 176}, 0, {1010, 594}, {31, 240, 122, 0} }}, {{ {245, 85, 88}, 0, {-98, 640}, {81, 77, 61, 0} }}, {{ {217, -73, 142}, 0, {892, 212}, {79, 214, 90, 0} }}, {{ {275, 35, 71}, 0, {2, 250}, {116, 26, 45, 0} }}, - {{ {248, -89, 79}, 0, {688, -162}, {104, 201, 47, 0} }}, - {{ {280, -29, 39}, 0, {194, -140}, {123, 237, 23, 0} }}, + {{ {248, -89, 79}, 0, {688, -162}, {104, 201, 48, 0} }}, + {{ {280, -30, 39}, 0, {194, -140}, {123, 237, 23, 0} }}, {{ {126, -24, 176}, 0, {-196, 438}, {226, 16, 122, 0} }}, - {{ {103, -184, 88}, 0, {1220, 36}, {238, 146, 61, 0} }}, - {{ {174, -49, 176}, 0, {-198, -10}, {30, 240, 122, 0} }}, + {{ {102, -184, 88}, 0, {1220, 36}, {238, 146, 61, 0} }}, + {{ {174, -49, 176}, 0, {-198, -10}, {31, 240, 122, 0} }}, {{ {54, -158, 88}, 0, {1222, 482}, {175, 179, 61, 0} }}, - {{ {82, -1, 142}, 0, {-54, 916}, {170, 46, 81, 0} }}, - {{ {24, -108, 71}, 0, {1084, 952}, {136, 241, 40, 0} }}, - {{ {139, 108, -71}, 0, {184, 1066}, {201, 108, 217, 0} }}, - {{ {197, 111, 88}, 0, {1214, 712}, {18, 110, 61, 0} }}, + {{ {82, 0, 142}, 0, {-54, 916}, {170, 47, 81, 0} }}, + {{ {24, -108, 71}, 0, {1084, 952}, {137, 240, 40, 0} }}, + {{ {139, 108, -71}, 0, {184, 1066}, {200, 107, 217, 0} }}, + {{ {197, 111, 88}, 0, {1214, 712}, {19, 110, 61, 0} }}, {{ {197, 111, -88}, 0, {34, 812}, {19, 110, 195, 0} }}, {{ {245, 85, 88}, 0, {1186, 352}, {81, 77, 61, 0} }}, {{ {245, 85, -88}, 0, {6, 452}, {81, 77, 195, 0} }}, {{ {275, 35, 71}, 0, {1050, -18}, {116, 26, 45, 0} }}, {{ {275, 35, -71}, 0, {104, 62}, {116, 26, 211, 0} }}, - {{ {280, -29, 39}, 0, {780, -272}, {123, 237, 23, 0} }}, - {{ {280, -29, -39}, 0, {304, -170}, {123, 237, 233, 0} }}, + {{ {280, -30, 39}, 0, {780, -272}, {123, 237, 23, 0} }}, + {{ {280, -30, -39}, 0, {304, -170}, {123, 237, 232, 0} }}, {{ {275, 35, 71}, 0, {1036, -112}, {116, 26, 45, 0} }}, {{ {217, -73, -142}, 0, {456, 1066}, {79, 214, 166, 0} }}, {{ {275, 35, -71}, 0, {1404, 676}, {116, 26, 211, 0} }}, - {{ {280, -29, -39}, 0, {1000, 266}, {123, 237, 233, 0} }}, - {{ {248, -89, -79}, 0, {474, 484}, {104, 201, 209, 0} }}, + {{ {280, -30, -39}, 0, {1000, 266}, {123, 237, 232, 0} }}, + {{ {248, -89, -79}, 0, {474, 484}, {104, 201, 208, 0} }}, {{ {259, -94, 0}, 0, {490, -104}, {112, 196, 0, 0} }}, {{ {216, -149, -39}, 0, {-38, 168}, {85, 164, 233, 0} }}, - {{ {160, -181, -71}, 0, {-462, 496}, {43, 145, 212, 0} }}, - {{ {280, -29, -39}, 0, {-16, -16}, {123, 237, 233, 0} }}, - {{ {280, -29, 39}, 0, {-16, -16}, {123, 237, 23, 0} }}, + {{ {160, -181, -71}, 0, {-462, 496}, {43, 145, 211, 0} }}, + {{ {280, -30, -39}, 0, {-16, -16}, {123, 237, 232, 0} }}, + {{ {280, -30, 39}, 0, {-16, -16}, {123, 237, 23, 0} }}, {{ {259, -94, 0}, 0, {-16, -16}, {112, 196, 0, 0} }}, - {{ {248, -89, 79}, 0, {-16, -16}, {104, 201, 47, 0} }}, - {{ {82, 0, -142}, 0, {-184, 898}, {170, 46, 174, 0} }}, - {{ {139, 108, -71}, 0, {1120, 942}, {201, 108, 217, 0} }}, + {{ {248, -89, 79}, 0, {-16, -16}, {104, 201, 48, 0} }}, + {{ {82, 0, -142}, 0, {-184, 898}, {170, 46, 175, 0} }}, + {{ {139, 108, -71}, 0, {1120, 942}, {200, 107, 217, 0} }}, {{ {197, 111, -88}, 0, {1264, 448}, {19, 110, 195, 0} }}, {{ {126, -24, -176}, 0, {-362, 392}, {226, 16, 134, 0} }}, {{ {245, 85, -88}, 0, {1258, -4}, {81, 77, 195, 0} }}, - {{ {174, -49, -176}, 0, {-370, -58}, {30, 240, 134, 0} }}, + {{ {174, -49, -176}, 0, {-370, -58}, {31, 240, 134, 0} }}, {{ {275, 35, -71}, 0, {1100, -320}, {116, 26, 211, 0} }}, {{ {160, -181, 71}, 0, {-26, 196}, {43, 145, 45, 0} }}, - {{ {160, -181, -71}, 0, {888, 166}, {43, 145, 212, 0} }}, + {{ {160, -181, -71}, 0, {888, 166}, {43, 145, 211, 0} }}, {{ {216, -149, -39}, 0, {646, -188}, {85, 164, 233, 0} }}, - {{ {103, -184, 88}, 0, {-106, 592}, {238, 146, 61, 0} }}, - {{ {103, -184, -88}, 0, {1032, 556}, {238, 146, 195, 0} }}, + {{ {102, -184, 88}, 0, {-106, 592}, {238, 146, 61, 0} }}, + {{ {102, -184, -88}, 0, {1032, 556}, {237, 146, 195, 0} }}, {{ {54, -158, 88}, 0, {-88, 942}, {175, 179, 61, 0} }}, {{ {54, -158, -88}, 0, {1050, 906}, {175, 179, 195, 0} }}, - {{ {24, -108, -71}, 0, {-96, 882}, {136, 241, 216, 0} }}, - {{ {82, 0, -142}, 0, {1122, 1024}, {170, 46, 174, 0} }}, + {{ {24, -108, -71}, 0, {-96, 882}, {137, 240, 215, 0} }}, + {{ {82, 0, -142}, 0, {1122, 1024}, {170, 46, 175, 0} }}, {{ {126, -24, -176}, 0, {1320, 596}, {226, 16, 134, 0} }}, {{ {54, -158, -88}, 0, {-198, 414}, {175, 179, 195, 0} }}, - {{ {174, -49, -176}, 0, {1372, 98}, {30, 240, 134, 0} }}, - {{ {103, -184, -88}, 0, {-146, -82}, {238, 146, 195, 0} }}, - {{ {174, -49, 176}, 0, {-16, -16}, {30, 240, 122, 0} }}, + {{ {174, -49, -176}, 0, {1372, 98}, {31, 240, 134, 0} }}, + {{ {102, -184, -88}, 0, {-146, -82}, {237, 146, 195, 0} }}, + {{ {174, -49, 176}, 0, {-16, -16}, {31, 240, 122, 0} }}, {{ {160, -181, 71}, 0, {-16, -16}, {43, 145, 45, 0} }}, {{ {217, -73, 142}, 0, {-16, -16}, {79, 214, 90, 0} }}, - {{ {103, -184, 88}, 0, {-16, -16}, {238, 146, 61, 0} }}, - {{ {24, -108, 71}, 0, {-16, -16}, {136, 241, 40, 0} }}, + {{ {102, -184, 88}, 0, {-16, -16}, {238, 146, 61, 0} }}, + {{ {24, -108, 71}, 0, {-16, -16}, {137, 240, 40, 0} }}, {{ {54, -158, -88}, 0, {-16, -16}, {175, 179, 195, 0} }}, {{ {54, -158, 88}, 0, {-16, -16}, {175, 179, 61, 0} }}, - {{ {24, -108, -71}, 0, {-16, -16}, {136, 241, 216, 0} }}, - {{ {103, -184, -88}, 0, {-16, -16}, {238, 146, 195, 0} }}, + {{ {24, -108, -71}, 0, {-16, -16}, {137, 240, 215, 0} }}, + {{ {102, -184, -88}, 0, {-16, -16}, {237, 146, 195, 0} }}, {{ {217, -73, -142}, 0, {-16, -16}, {79, 214, 166, 0} }}, - {{ {160, -181, -71}, 0, {-16, -16}, {43, 145, 212, 0} }}, - {{ {174, -49, -176}, 0, {-16, -16}, {30, 240, 134, 0} }}, - {{ {98, 60, 34}, 0, {-42, 926}, {157, 79, 12, 0} }}, - {{ {82, -1, 142}, 0, {1024, 984}, {170, 46, 81, 0} }}, - {{ {139, 108, 71}, 0, {82, 380}, {200, 107, 39, 0} }}, + {{ {160, -181, -71}, 0, {-16, -16}, {43, 145, 211, 0} }}, + {{ {174, -49, -176}, 0, {-16, -16}, {31, 240, 134, 0} }}, + {{ {98, 60, 34}, 0, {-42, 926}, {157, 78, 13, 0} }}, + {{ {82, 0, 142}, 0, {1024, 984}, {170, 47, 81, 0} }}, + {{ {139, 108, 71}, 0, {82, 380}, {200, 107, 40, 0} }}, {{ {126, -24, 176}, 0, {1466, 550}, {226, 16, 122, 0} }}, - {{ {197, 111, 88}, 0, {290, -208}, {18, 110, 61, 0} }}, - {{ {139, 108, -71}, 0, {-982, 638}, {201, 108, 217, 0} }}, + {{ {197, 111, 88}, 0, {290, -208}, {19, 110, 61, 0} }}, + {{ {139, 108, -71}, 0, {-982, 638}, {200, 107, 217, 0} }}, {{ {98, 60, -34}, 0, {-548, 1048}, {157, 79, 248, 0} }}, {{ {160, -181, 71}, 0, {832, 1186}, {43, 145, 45, 0} }}, {{ {216, -149, -39}, 0, {1162, -70}, {85, 164, 233, 0} }}, {{ {216, -149, 39}, 0, {654, 498}, {85, 164, 23, 0} }}, {{ {259, -94, 0}, 0, {414, -278}, {112, 196, 0, 0} }}, - {{ {248, -89, 79}, 0, {-98, 326}, {104, 201, 47, 0} }}, + {{ {248, -89, 79}, 0, {-98, 326}, {104, 201, 48, 0} }}, {{ {217, -73, 142}, 0, {-524, 874}, {79, 214, 90, 0} }}, }; -Gfx toad_Cap_DL_mesh_layer_5_tri_0[] = { - gsSPVertex(toad_Cap_DL_mesh_layer_5_vtx_0 + 0, 63, 0), +Gfx toad_player_Cap_DL_mesh_layer_4_tri_1[] = { + gsSPVertex(toad_player_Cap_DL_mesh_layer_4_vtx_1 + 0, 63, 0), gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), gsSP2Triangles(4, 6, 5, 0, 4, 7, 6, 0), gsSP2Triangles(7, 8, 6, 0, 7, 9, 8, 0), @@ -430,7 +460,7 @@ Gfx toad_Cap_DL_mesh_layer_5_tri_0[] = { gsSP2Triangles(56, 57, 58, 0, 59, 57, 56, 0), gsSP2Triangles(59, 60, 57, 0, 61, 60, 59, 0), gsSP1Triangle(61, 62, 60, 0), - gsSPVertex(toad_Cap_DL_mesh_layer_5_vtx_0 + 63, 31, 0), + gsSPVertex(toad_player_Cap_DL_mesh_layer_4_vtx_1 + 63, 31, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), gsSP2Triangles(6, 7, 8, 0, 6, 9, 7, 0), @@ -445,79 +475,73 @@ Gfx toad_Cap_DL_mesh_layer_5_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_vtx_0[12] = { +Vtx toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_vtx_0[6] = { {{ {192, -52, -28}, 0, {-16, -16}, {45, 100, 192, 0} }}, - {{ {144, -28, -24}, 0, {-16, 1008}, {45, 100, 192, 0} }}, - {{ {196, -36, 0}, 0, {496, -16}, {45, 100, 192, 0} }}, - {{ {144, -28, -24}, 0, {-16, 1008}, {37, 113, 212, 0} }}, - {{ {148, -20, 0}, 0, {496, 1008}, {37, 113, 212, 0} }}, - {{ {196, -36, 0}, 0, {496, -16}, {37, 113, 212, 0} }}, - {{ {144, -28, 24}, 0, {1008, 1008}, {45, 100, 64, 0} }}, + {{ {144, -28, -24}, 0, {-16, 1008}, {40, 109, 205, 0} }}, + {{ {196, -36, 0}, 0, {496, -16}, {48, 117, 0, 0} }}, + {{ {148, -20, 0}, 0, {496, 1008}, {40, 120, 0, 0} }}, + {{ {144, -28, 24}, 0, {1008, 1008}, {40, 109, 51, 0} }}, {{ {192, -52, 28}, 0, {1008, -16}, {45, 100, 64, 0} }}, - {{ {196, -36, 0}, 0, {496, -16}, {45, 100, 64, 0} }}, - {{ {148, -20, 0}, 0, {496, 1008}, {37, 113, 44, 0} }}, - {{ {144, -28, 24}, 0, {1008, 1008}, {37, 113, 44, 0} }}, - {{ {196, -36, 0}, 0, {496, -16}, {37, 113, 44, 0} }}, }; -Gfx toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_tri_0[] = { - gsSPVertex(toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_vtx_0 + 0, 12, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0), +Gfx toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_tri_0[] = { + gsSPVertex(toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_vtx_0 + 0, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), + gsSP2Triangles(3, 4, 2, 0, 4, 5, 2, 0), gsSPEndDisplayList(), }; -Vtx toad_Head_DL_mesh_layer_5_vtx_0[60] = { +Vtx toad_player_Head_DL_mesh_layer_1_vtx_0[60] = { {{ {-9, 60, 0}, 0, {496, 1028}, {146, 64, 0, 0} }}, - {{ {24, 69, -44}, 0, {49, 748}, {204, 90, 183, 0} }}, - {{ {-2, 32, -43}, 0, {56, 969}, {152, 29, 188, 0} }}, - {{ {27, 87, 0}, 0, {496, 706}, {216, 121, 0, 0} }}, - {{ {24, 69, 44}, 0, {943, 748}, {204, 90, 73, 0} }}, - {{ {-2, 32, 43}, 0, {936, 969}, {152, 29, 68, 0} }}, - {{ {30, 13, 77}, 0, {1290, 679}, {204, 15, 115, 0} }}, + {{ {24, 69, -44}, 0, {49, 748}, {203, 90, 183, 0} }}, + {{ {-2, 32, -43}, 0, {56, 969}, {153, 29, 188, 0} }}, + {{ {27, 87, 0}, 0, {496, 668}, {216, 120, 0, 0} }}, + {{ {24, 69, 44}, 0, {943, 748}, {203, 90, 73, 0} }}, + {{ {-2, 32, 43}, 0, {936, 969}, {153, 29, 68, 0} }}, + {{ {30, 13, 77}, 0, {1290, 679}, {203, 15, 115, 0} }}, {{ {58, 66, 57}, 0, {1080, 426}, {247, 89, 90, 0} }}, - {{ {74, -5, 87}, 0, {1388, 289}, {255, 254, 127, 0} }}, - {{ {106, 64, 57}, 0, {1080, -6}, {31, 86, 88, 0} }}, - {{ {97, 88, 0}, 0, {496, 76}, {23, 125, 0, 0} }}, + {{ {74, -5, 87}, 0, {1388, 289}, {254, 253, 127, 0} }}, + {{ {106, 64, 57}, 0, {1080, -6}, {32, 86, 88, 0} }}, + {{ {97, 88, 0}, 0, {496, 76}, {24, 125, 0, 0} }}, {{ {130, 76, 0}, 0, {496, -224}, {74, 103, 0, 0} }}, - {{ {106, 64, -57}, 0, {-88, -6}, {31, 86, 168, 0} }}, + {{ {106, 64, -57}, 0, {-88, -6}, {32, 86, 168, 0} }}, {{ {58, 66, -57}, 0, {-88, 426}, {247, 89, 166, 0} }}, - {{ {74, -5, -87}, 0, {-396, 289}, {255, 254, 129, 0} }}, - {{ {30, 13, -77}, 0, {-298, 679}, {204, 15, 141, 0} }}, - {{ {71, 90, 0}, 0, {496, 316}, {1, 127, 0, 0} }}, - {{ {30, 13, -77}, 0, {-16, -16}, {204, 15, 141, 0} }}, + {{ {74, -5, -87}, 0, {-396, 289}, {254, 253, 129, 0} }}, + {{ {30, 13, -77}, 0, {-298, 679}, {203, 15, 141, 0} }}, + {{ {71, 90, 0}, 0, {496, 316}, {2, 127, 0, 0} }}, + {{ {30, 13, -77}, 0, {-16, -16}, {203, 15, 141, 0} }}, {{ {13, -30, -57}, 0, {-16, -16}, {174, 210, 171, 0} }}, - {{ {-2, 32, -43}, 0, {-16, -16}, {152, 29, 188, 0} }}, + {{ {-2, 32, -43}, 0, {-16, -16}, {153, 29, 188, 0} }}, {{ {46, -55, -62}, 0, {-16, -16}, {217, 175, 166, 0} }}, - {{ {74, -5, -87}, 0, {-16, -16}, {255, 254, 129, 0} }}, - {{ {79, -63, -60}, 0, {-16, -16}, {5, 161, 172, 0} }}, - {{ {104, -14, -81}, 0, {-16, -16}, {40, 241, 136, 0} }}, - {{ {106, 64, -57}, 0, {-16, -16}, {31, 86, 168, 0} }}, + {{ {74, -5, -87}, 0, {-16, -16}, {254, 253, 129, 0} }}, + {{ {79, -63, -60}, 0, {-16, -16}, {6, 161, 172, 0} }}, + {{ {104, -14, -81}, 0, {-16, -16}, {40, 240, 136, 0} }}, + {{ {106, 64, -57}, 0, {-16, -16}, {32, 86, 168, 0} }}, {{ {130, 50, -53}, 0, {-16, -16}, {77, 59, 174, 0} }}, {{ {130, 76, 0}, 0, {-16, -16}, {74, 103, 0, 0} }}, {{ {150, 50, 0}, 0, {-16, -16}, {113, 58, 0, 0} }}, {{ {130, 50, 53}, 0, {-16, -16}, {77, 59, 82, 0} }}, - {{ {106, 64, 57}, 0, {-16, -16}, {31, 86, 88, 0} }}, - {{ {104, -14, 81}, 0, {-16, -16}, {40, 241, 120, 0} }}, - {{ {74, -5, 87}, 0, {-16, -16}, {255, 254, 127, 0} }}, - {{ {79, -63, 60}, 0, {-16, -16}, {5, 161, 84, 0} }}, + {{ {106, 64, 57}, 0, {-16, -16}, {32, 86, 88, 0} }}, + {{ {104, -14, 81}, 0, {-16, -16}, {40, 240, 120, 0} }}, + {{ {74, -5, 87}, 0, {-16, -16}, {254, 253, 127, 0} }}, + {{ {79, -63, 60}, 0, {-16, -16}, {6, 161, 84, 0} }}, {{ {46, -55, 62}, 0, {-16, -16}, {217, 175, 90, 0} }}, - {{ {30, 13, 77}, 0, {-16, -16}, {204, 15, 115, 0} }}, + {{ {30, 13, 77}, 0, {-16, -16}, {203, 15, 115, 0} }}, {{ {13, -30, 57}, 0, {-16, -16}, {174, 210, 85, 0} }}, - {{ {-2, 32, 43}, 0, {-16, -16}, {152, 29, 68, 0} }}, - {{ {-9, -3, 30}, 0, {-16, -16}, {139, 250, 50, 0} }}, + {{ {-2, 32, 43}, 0, {-16, -16}, {153, 29, 68, 0} }}, + {{ {-9, -3, 30}, 0, {-16, -16}, {140, 250, 50, 0} }}, {{ {-9, 60, 0}, 0, {-16, -16}, {146, 64, 0, 0} }}, {{ {-17, -29, 0}, 0, {-16, -16}, {134, 220, 0, 0} }}, - {{ {-9, -3, -30}, 0, {-16, -16}, {139, 250, 206, 0} }}, + {{ {-9, -3, -30}, 0, {-16, -16}, {140, 250, 206, 0} }}, {{ {2, -60, 0}, 0, {-16, -16}, {165, 167, 0, 0} }}, - {{ {32, -80, 0}, 0, {-16, -16}, {208, 138, 0, 0} }}, - {{ {64, -86, 0}, 0, {-16, -16}, {252, 129, 0, 0} }}, + {{ {32, -80, 0}, 0, {-16, -16}, {207, 139, 0, 0} }}, + {{ {64, -86, 0}, 0, {-16, -16}, {251, 129, 0, 0} }}, {{ {110, -60, -52}, 0, {-16, -16}, {52, 164, 186, 0} }}, - {{ {129, -20, -66}, 0, {-16, -16}, {81, 229, 162, 0} }}, - {{ {145, 30, -43}, 0, {-16, -16}, {107, 28, 194, 0} }}, + {{ {129, -20, -66}, 0, {-16, -16}, {81, 228, 162, 0} }}, + {{ {145, 30, -43}, 0, {-16, -16}, {107, 29, 194, 0} }}, {{ {158, 18, 0}, 0, {-16, -16}, {127, 11, 0, 0} }}, - {{ {145, 30, 43}, 0, {-16, -16}, {107, 28, 62, 0} }}, - {{ {129, -20, 66}, 0, {-16, -16}, {81, 229, 94, 0} }}, + {{ {145, 30, 43}, 0, {-16, -16}, {107, 29, 62, 0} }}, + {{ {129, -20, 66}, 0, {-16, -16}, {81, 228, 94, 0} }}, {{ {110, -60, 52}, 0, {-16, -16}, {52, 164, 70, 0} }}, {{ {96, -81, 0}, 0, {-16, -16}, {36, 134, 0, 0} }}, {{ {127, -64, 0}, 0, {-16, -16}, {83, 160, 0, 0} }}, @@ -530,8 +554,8 @@ Vtx toad_Head_DL_mesh_layer_5_vtx_0[60] = { {{ {132, -52, 33}, 0, {-16, -16}, {92, 178, 39, 0} }}, }; -Gfx toad_Head_DL_mesh_layer_5_tri_0[] = { - gsSPVertex(toad_Head_DL_mesh_layer_5_vtx_0 + 0, 60, 0), +Gfx toad_player_Head_DL_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Head_DL_mesh_layer_1_vtx_0 + 0, 60, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(0, 4, 3, 0, 0, 5, 4, 0), gsSP2Triangles(4, 5, 6, 0, 6, 7, 4, 0), @@ -583,199 +607,57 @@ Gfx toad_Head_DL_mesh_layer_5_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Head_DL_mesh_layer_1_vtx_0[60] = { - {{ {-9, 60, 0}, 0, {496, 1028}, {146, 64, 0, 0} }}, - {{ {24, 69, -44}, 0, {49, 748}, {204, 90, 183, 0} }}, - {{ {-2, 32, -43}, 0, {56, 969}, {152, 29, 188, 0} }}, - {{ {27, 87, 0}, 0, {496, 706}, {216, 121, 0, 0} }}, - {{ {24, 69, 44}, 0, {943, 748}, {204, 90, 73, 0} }}, - {{ {-2, 32, 43}, 0, {936, 969}, {152, 29, 68, 0} }}, - {{ {30, 13, 77}, 0, {1290, 679}, {204, 15, 115, 0} }}, - {{ {58, 66, 57}, 0, {1080, 426}, {247, 89, 90, 0} }}, - {{ {74, -5, 87}, 0, {1388, 289}, {255, 254, 127, 0} }}, - {{ {106, 64, 57}, 0, {1080, -6}, {31, 86, 88, 0} }}, - {{ {97, 88, 0}, 0, {496, 76}, {23, 125, 0, 0} }}, - {{ {130, 76, 0}, 0, {496, -224}, {74, 103, 0, 0} }}, - {{ {106, 64, -57}, 0, {-88, -6}, {31, 86, 168, 0} }}, - {{ {58, 66, -57}, 0, {-88, 426}, {247, 89, 166, 0} }}, - {{ {74, -5, -87}, 0, {-396, 289}, {255, 254, 129, 0} }}, - {{ {30, 13, -77}, 0, {-298, 679}, {204, 15, 141, 0} }}, - {{ {71, 90, 0}, 0, {496, 316}, {1, 127, 0, 0} }}, - {{ {30, 13, -77}, 0, {-16, -16}, {204, 15, 141, 0} }}, - {{ {13, -30, -57}, 0, {-16, -16}, {174, 210, 171, 0} }}, - {{ {-2, 32, -43}, 0, {-16, -16}, {152, 29, 188, 0} }}, - {{ {46, -55, -62}, 0, {-16, -16}, {217, 175, 166, 0} }}, - {{ {74, -5, -87}, 0, {-16, -16}, {255, 254, 129, 0} }}, - {{ {79, -63, -60}, 0, {-16, -16}, {5, 161, 172, 0} }}, - {{ {104, -14, -81}, 0, {-16, -16}, {40, 241, 136, 0} }}, - {{ {106, 64, -57}, 0, {-16, -16}, {31, 86, 168, 0} }}, - {{ {130, 50, -53}, 0, {-16, -16}, {77, 59, 174, 0} }}, - {{ {130, 76, 0}, 0, {-16, -16}, {74, 103, 0, 0} }}, - {{ {150, 50, 0}, 0, {-16, -16}, {113, 58, 0, 0} }}, - {{ {130, 50, 53}, 0, {-16, -16}, {77, 59, 82, 0} }}, - {{ {106, 64, 57}, 0, {-16, -16}, {31, 86, 88, 0} }}, - {{ {104, -14, 81}, 0, {-16, -16}, {40, 241, 120, 0} }}, - {{ {74, -5, 87}, 0, {-16, -16}, {255, 254, 127, 0} }}, - {{ {79, -63, 60}, 0, {-16, -16}, {5, 161, 84, 0} }}, - {{ {46, -55, 62}, 0, {-16, -16}, {217, 175, 90, 0} }}, - {{ {30, 13, 77}, 0, {-16, -16}, {204, 15, 115, 0} }}, - {{ {13, -30, 57}, 0, {-16, -16}, {174, 210, 85, 0} }}, - {{ {-2, 32, 43}, 0, {-16, -16}, {152, 29, 68, 0} }}, - {{ {-9, -3, 30}, 0, {-16, -16}, {139, 250, 50, 0} }}, - {{ {-9, 60, 0}, 0, {-16, -16}, {146, 64, 0, 0} }}, - {{ {-17, -29, 0}, 0, {-16, -16}, {134, 220, 0, 0} }}, - {{ {-9, -3, -30}, 0, {-16, -16}, {139, 250, 206, 0} }}, - {{ {2, -60, 0}, 0, {-16, -16}, {165, 167, 0, 0} }}, - {{ {32, -80, 0}, 0, {-16, -16}, {208, 138, 0, 0} }}, - {{ {64, -86, 0}, 0, {-16, -16}, {252, 129, 0, 0} }}, - {{ {110, -60, -52}, 0, {-16, -16}, {52, 164, 186, 0} }}, - {{ {129, -20, -66}, 0, {-16, -16}, {81, 229, 162, 0} }}, - {{ {145, 30, -43}, 0, {-16, -16}, {107, 28, 194, 0} }}, - {{ {158, 18, 0}, 0, {-16, -16}, {127, 11, 0, 0} }}, - {{ {145, 30, 43}, 0, {-16, -16}, {107, 28, 62, 0} }}, - {{ {129, -20, 66}, 0, {-16, -16}, {81, 229, 94, 0} }}, - {{ {110, -60, 52}, 0, {-16, -16}, {52, 164, 70, 0} }}, - {{ {96, -81, 0}, 0, {-16, -16}, {36, 134, 0, 0} }}, - {{ {127, -64, 0}, 0, {-16, -16}, {83, 160, 0, 0} }}, - {{ {132, -52, -33}, 0, {-16, -16}, {92, 178, 217, 0} }}, - {{ {143, -22, -45}, 0, {-16, -16}, {109, 220, 202, 0} }}, - {{ {153, 5, -31}, 0, {-16, -16}, {120, 252, 215, 0} }}, - {{ {152, -23, 0}, 0, {-16, -16}, {120, 214, 0, 0} }}, - {{ {153, 5, 31}, 0, {-16, -16}, {120, 252, 41, 0} }}, - {{ {143, -22, 45}, 0, {-16, -16}, {109, 220, 54, 0} }}, - {{ {132, -52, 33}, 0, {-16, -16}, {92, 178, 39, 0} }}, +static const Vtx toad_player_wings_half_1_dl_vertex[] = { + {{{ -105, 212, 0}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -105, 0, 0}, 0, { 0, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 0, 0, 0}, 0, { 990, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 0, 212, 0}, 0, { 990, 0}, {0xff, 0xff, 0xff, 0xff}}}, }; -Gfx toad_Head_DL_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Head_DL_mesh_layer_1_vtx_0 + 0, 60, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), - gsSP2Triangles(0, 4, 3, 0, 0, 5, 4, 0), - gsSP2Triangles(4, 5, 6, 0, 6, 7, 4, 0), - gsSP2Triangles(7, 6, 8, 0, 8, 9, 7, 0), - gsSP2Triangles(7, 9, 10, 0, 9, 11, 10, 0), - gsSP2Triangles(12, 10, 11, 0, 10, 12, 13, 0), - gsSP2Triangles(13, 12, 14, 0, 14, 15, 13, 0), - gsSP2Triangles(1, 13, 15, 0, 15, 2, 1, 0), - gsSP2Triangles(16, 13, 1, 0, 13, 16, 10, 0), - gsSP2Triangles(10, 16, 7, 0, 4, 7, 16, 0), - gsSP2Triangles(16, 3, 4, 0, 1, 3, 16, 0), - gsSP2Triangles(17, 18, 19, 0, 20, 18, 17, 0), - gsSP2Triangles(21, 20, 17, 0, 21, 22, 20, 0), - gsSP2Triangles(21, 23, 22, 0, 24, 23, 21, 0), - gsSP2Triangles(24, 25, 23, 0, 24, 26, 25, 0), - gsSP2Triangles(25, 26, 27, 0, 28, 27, 26, 0), - gsSP2Triangles(29, 28, 26, 0, 29, 30, 28, 0), - gsSP2Triangles(29, 31, 30, 0, 31, 32, 30, 0), - gsSP2Triangles(31, 33, 32, 0, 34, 33, 31, 0), - gsSP2Triangles(34, 35, 33, 0, 36, 35, 34, 0), - gsSP2Triangles(36, 37, 35, 0, 38, 37, 36, 0), - gsSP2Triangles(38, 39, 37, 0, 38, 40, 39, 0), - gsSP2Triangles(38, 19, 40, 0, 18, 40, 19, 0), - gsSP2Triangles(39, 40, 18, 0, 39, 18, 41, 0), - gsSP2Triangles(18, 20, 41, 0, 20, 42, 41, 0), - gsSP2Triangles(20, 43, 42, 0, 20, 22, 43, 0), - gsSP2Triangles(43, 22, 44, 0, 23, 44, 22, 0), - gsSP2Triangles(23, 45, 44, 0, 45, 23, 25, 0), - gsSP2Triangles(46, 45, 25, 0, 25, 27, 46, 0), - gsSP2Triangles(46, 27, 47, 0, 48, 47, 27, 0), - gsSP2Triangles(28, 48, 27, 0, 48, 28, 49, 0), - gsSP2Triangles(28, 30, 49, 0, 30, 50, 49, 0), - gsSP2Triangles(30, 32, 50, 0, 50, 32, 43, 0), - gsSP2Triangles(33, 43, 32, 0, 33, 42, 43, 0), - gsSP2Triangles(42, 33, 41, 0, 33, 35, 41, 0), - gsSP2Triangles(41, 35, 39, 0, 35, 37, 39, 0), - gsSP2Triangles(51, 50, 43, 0, 50, 51, 52, 0), - gsSP2Triangles(44, 52, 51, 0, 51, 43, 44, 0), - gsSP2Triangles(44, 53, 52, 0, 53, 44, 54, 0), - gsSP2Triangles(44, 45, 54, 0, 54, 45, 46, 0), - gsSP2Triangles(55, 54, 46, 0, 46, 47, 55, 0), - gsSP2Triangles(55, 47, 56, 0, 47, 57, 56, 0), - gsSP2Triangles(48, 57, 47, 0, 57, 48, 58, 0), - gsSP2Triangles(48, 49, 58, 0, 58, 49, 50, 0), - gsSP2Triangles(59, 58, 50, 0, 50, 52, 59, 0), - gsSP2Triangles(59, 52, 56, 0, 52, 53, 56, 0), - gsSP2Triangles(53, 54, 56, 0, 54, 55, 56, 0), - gsSP2Triangles(58, 59, 56, 0, 57, 58, 56, 0), - gsSPEndDisplayList(), +const Gfx toad_player_wings_half_1_dl[] = { + gsSPVertex(toad_player_wings_half_1_dl_vertex, 4, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSPEndDisplayList(), }; -Vtx toad_Left_Wing_DL_mesh_layer_4_vtx_0[4] = { - {{ {0, 0, 0}, 0, {-16, 1978}, {233, 0, 125, 255} }}, - {{ {104, 0, 19}, 0, {974, 1978}, {233, 0, 125, 255} }}, - {{ {104, 212, 19}, 0, {974, -34}, {233, 0, 125, 255} }}, - {{ {0, 212, 0}, 0, {-16, -34}, {234, 0, 125, 255} }}, +static const Vtx toad_player_wings_half_2_dl_vertex[] = { + {{{ 0, 0, 0}, 0, { 0, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 106, 212, 0}, 0, { 990, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 0, 212, 0}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 106, 0, 0}, 0, { 990, 2012}, {0xff, 0xff, 0xff, 0xff}}}, }; -Gfx toad_Left_Wing_DL_mesh_layer_4_tri_0[] = { - gsSPVertex(toad_Left_Wing_DL_mesh_layer_4_vtx_0 + 0, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), +const Gfx toad_player_wings_half_2_dl[] = { + gsSPVertex(toad_player_wings_half_2_dl_vertex, 4, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSPEndDisplayList(), }; -Vtx toad_Left_Wing_DL_mesh_layer_4_vtx_1[4] = { - {{ {-103, 212, -18}, 0, {-16, -34}, {234, 0, 125, 255} }}, - {{ {0, 0, 0}, 0, {974, 1978}, {233, 0, 125, 255} }}, - {{ {0, 212, 0}, 0, {974, -34}, {234, 0, 125, 255} }}, - {{ {-103, 0, -19}, 0, {-16, 1978}, {234, 0, 125, 255} }}, -}; - -Gfx toad_Left_Wing_DL_mesh_layer_4_tri_1[] = { - gsSPVertex(toad_Left_Wing_DL_mesh_layer_4_vtx_1 + 0, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), - gsSPEndDisplayList(), -}; - -Vtx toad_Right_Wing_DL_mesh_layer_4_vtx_0[4] = { - {{ {0, 0, 0}, 0, {-16, 1978}, {233, 0, 131, 255} }}, - {{ {104, 212, -19}, 0, {974, -34}, {233, 0, 131, 255} }}, - {{ {104, 0, -19}, 0, {974, 1978}, {233, 0, 131, 255} }}, - {{ {0, 212, 0}, 0, {-16, -34}, {234, 0, 131, 255} }}, -}; - -Gfx toad_Right_Wing_DL_mesh_layer_4_tri_0[] = { - gsSPVertex(toad_Right_Wing_DL_mesh_layer_4_vtx_0 + 0, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), - gsSPEndDisplayList(), -}; - -Vtx toad_Right_Wing_DL_mesh_layer_4_vtx_1[4] = { - {{ {-103, 212, 18}, 0, {-16, -34}, {234, 0, 131, 255} }}, - {{ {0, 212, 0}, 0, {974, -34}, {234, 0, 131, 255} }}, - {{ {0, 0, 0}, 0, {974, 1978}, {233, 0, 131, 255} }}, - {{ {-103, 0, 19}, 0, {-16, 1978}, {234, 0, 131, 255} }}, -}; - -Gfx toad_Right_Wing_DL_mesh_layer_4_tri_1[] = { - gsSPVertex(toad_Right_Wing_DL_mesh_layer_4_vtx_1 + 0, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), -}; - -Vtx toad_Left_Arm_Color_mesh_layer_1_vtx_0[20] = { +Vtx toad_player_Left_Arm_Color_mesh_layer_1_vtx_0[20] = { {{ {-5, -10, 2}, 0, {-16, -16}, {200, 147, 34, 0} }}, - {{ {-10, -6, 0}, 0, {-16, -16}, {148, 190, 14, 0} }}, - {{ {-10, -4, -6}, 0, {-16, -16}, {151, 214, 197, 0} }}, + {{ {-10, -6, 0}, 0, {-16, -16}, {148, 190, 15, 0} }}, + {{ {-10, -4, -6}, 0, {-16, -16}, {152, 214, 197, 0} }}, {{ {-5, 0, 10}, 0, {-16, -16}, {199, 254, 114, 0} }}, - {{ {19, 0, 15}, 0, {-16, -16}, {20, 0, 125, 0} }}, + {{ {19, 0, 15}, 0, {-16, -16}, {20, 255, 125, 0} }}, {{ {19, -17, 4}, 0, {-16, -16}, {23, 137, 38, 0} }}, {{ {-5, -6, -9}, 0, {-16, -16}, {206, 191, 159, 0} }}, {{ {-10, 4, -6}, 0, {-16, -16}, {152, 43, 197, 0} }}, {{ {-10, 6, 0}, 0, {-16, -16}, {148, 66, 13, 0} }}, - {{ {-10, 0, 5}, 0, {-16, -16}, {146, 0, 64, 0} }}, + {{ {-10, 0, 5}, 0, {-16, -16}, {146, 255, 64, 0} }}, {{ {-5, 10, 2}, 0, {-16, -16}, {199, 109, 31, 0} }}, - {{ {19, 17, 4}, 0, {-16, -16}, {24, 119, 36, 0} }}, - {{ {26, 11, 2}, 0, {-16, -16}, {108, 65, 19, 0} }}, + {{ {19, 17, 4}, 0, {-16, -16}, {25, 119, 36, 0} }}, + {{ {26, 11, 2}, 0, {-16, -16}, {107, 65, 19, 0} }}, {{ {26, 0, 11}, 0, {-16, -16}, {99, 0, 80, 0} }}, - {{ {26, -11, 2}, 0, {-16, -16}, {108, 192, 21, 0} }}, + {{ {26, -11, 2}, 0, {-16, -16}, {108, 192, 22, 0} }}, {{ {26, -7, -10}, 0, {-16, -16}, {101, 216, 190, 0} }}, {{ {19, -10, -13}, 0, {-16, -16}, {17, 184, 153, 0} }}, - {{ {-5, 6, -9}, 0, {-16, -16}, {207, 66, 159, 0} }}, - {{ {19, 10, -13}, 0, {-16, -16}, {18, 73, 153, 0} }}, + {{ {-5, 6, -9}, 0, {-16, -16}, {206, 66, 160, 0} }}, + {{ {19, 10, -13}, 0, {-16, -16}, {18, 73, 154, 0} }}, {{ {26, 7, -10}, 0, {-16, -16}, {100, 43, 191, 0} }}, }; -Gfx toad_Left_Arm_Color_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Left_Arm_Color_mesh_layer_1_vtx_0 + 0, 20, 0), +Gfx toad_player_Left_Arm_Color_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Left_Arm_Color_mesh_layer_1_vtx_0 + 0, 20, 0), gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0), gsSP2Triangles(3, 0, 4, 0, 0, 5, 4, 0), gsSP2Triangles(0, 6, 5, 0, 0, 2, 6, 0), @@ -797,27 +679,27 @@ Gfx toad_Left_Arm_Color_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Left_Forearm_mesh_layer_1_vtx_0[16] = { - {{ {1, -10, -13}, 0, {-16, -16}, {208, 190, 158, 0} }}, +Vtx toad_player_Left_Forearm_mesh_layer_1_vtx_0[16] = { + {{ {1, -10, -13}, 0, {-16, -16}, {208, 190, 159, 0} }}, {{ {-6, -7, -10}, 0, {-16, -16}, {155, 216, 190, 0} }}, {{ {-6, 7, -10}, 0, {-16, -16}, {156, 43, 191, 0} }}, - {{ {1, -17, 4}, 0, {-16, -16}, {199, 148, 34, 0} }}, + {{ {1, -17, 4}, 0, {-16, -16}, {198, 148, 34, 0} }}, {{ {25, -24, 6}, 0, {-16, -16}, {37, 140, 36, 0} }}, {{ {25, -15, -18}, 0, {-16, -16}, {37, 185, 157, 0} }}, - {{ {1, 10, -13}, 0, {-16, -16}, {206, 66, 159, 0} }}, + {{ {1, 10, -13}, 0, {-16, -16}, {206, 65, 159, 0} }}, {{ {-6, 11, 2}, 0, {-16, -16}, {148, 65, 15, 0} }}, - {{ {-6, 0, 11}, 0, {-16, -16}, {156, 252, 79, 0} }}, - {{ {-6, -11, 2}, 0, {-16, -16}, {148, 192, 21, 0} }}, + {{ {-6, 0, 11}, 0, {-16, -16}, {156, 251, 79, 0} }}, + {{ {-6, -11, 2}, 0, {-16, -16}, {148, 192, 22, 0} }}, {{ {1, 0, 15}, 0, {-16, -16}, {207, 255, 117, 0} }}, - {{ {25, 0, 22}, 0, {-16, -16}, {37, 0, 122, 0} }}, + {{ {25, 0, 22}, 0, {-16, -16}, {37, 0, 121, 0} }}, {{ {40, 0, -1}, 0, {-16, -16}, {127, 0, 254, 0} }}, {{ {25, 15, -18}, 0, {-16, -16}, {37, 71, 157, 0} }}, {{ {1, 17, 4}, 0, {-16, -16}, {199, 108, 34, 0} }}, - {{ {25, 24, 6}, 0, {-16, -16}, {37, 116, 37, 0} }}, + {{ {25, 24, 6}, 0, {-16, -16}, {38, 116, 37, 0} }}, }; -Gfx toad_Left_Forearm_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Left_Forearm_mesh_layer_1_vtx_0 + 0, 16, 0), +Gfx toad_player_Left_Forearm_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Left_Forearm_mesh_layer_1_vtx_0 + 0, 16, 0), gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0), gsSP2Triangles(3, 0, 4, 0, 0, 5, 4, 0), gsSP2Triangles(0, 6, 5, 0, 0, 2, 6, 0), @@ -835,31 +717,31 @@ Gfx toad_Left_Forearm_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Left_Hand_DL_mesh_layer_1_vtx_0[20] = { +Vtx toad_player_Left_Hand_DL_mesh_layer_1_vtx_0[20] = { {{ {7, -14, -18}, 0, {0, 0}, {191, 181, 177, 255} }}, {{ {-5, 14, -18}, 0, {0, 0}, {171, 23, 164, 255} }}, - {{ {11, 5, -21}, 0, {0, 0}, {213, 4, 137, 255} }}, - {{ {-9, -4, 1}, 0, {0, 0}, {138, 209, 3, 255} }}, - {{ {10, -22, 6}, 0, {0, 0}, {205, 143, 29, 255} }}, - {{ {37, -16, -30}, 0, {0, 0}, {31, 182, 157, 255} }}, - {{ {26, 7, -30}, 0, {0, 0}, {243, 20, 131, 255} }}, + {{ {11, 5, -21}, 0, {0, 0}, {213, 5, 137, 255} }}, + {{ {-9, -4, 1}, 0, {0, 0}, {138, 208, 4, 255} }}, + {{ {10, -22, 6}, 0, {0, 0}, {205, 144, 30, 255} }}, + {{ {37, -16, -30}, 0, {0, 0}, {31, 182, 158, 255} }}, + {{ {26, 7, -30}, 0, {0, 0}, {243, 21, 131, 255} }}, {{ {10, 36, -12}, 0, {0, 0}, {209, 93, 184, 255} }}, {{ {-8, 23, 6}, 0, {0, 0}, {141, 46, 28, 255} }}, - {{ {1, 0, 22}, 0, {0, 0}, {183, 227, 100, 255} }}, + {{ {1, 0, 22}, 0, {0, 0}, {184, 227, 100, 255} }}, {{ {26, -24, 9}, 0, {0, 0}, {13, 142, 54, 255} }}, - {{ {52, -14, 6}, 0, {0, 0}, {102, 192, 40, 255} }}, - {{ {48, -2, -22}, 0, {0, 0}, {105, 253, 185, 255} }}, + {{ {52, -14, 6}, 0, {0, 0}, {102, 192, 41, 255} }}, + {{ {48, -2, -22}, 0, {0, 0}, {105, 252, 185, 255} }}, {{ {43, 11, -22}, 0, {0, 0}, {73, 48, 164, 255} }}, {{ {24, 32, -17}, 0, {0, 0}, {22, 85, 164, 255} }}, - {{ {25, 47, 9}, 0, {0, 0}, {19, 121, 34, 255} }}, + {{ {25, 47, 9}, 0, {0, 0}, {20, 121, 35, 255} }}, {{ {2, 35, 9}, 0, {0, 0}, {180, 89, 50, 255} }}, - {{ {14, 6, 27}, 0, {0, 0}, {239, 247, 126, 255} }}, + {{ {14, 6, 27}, 0, {0, 0}, {238, 247, 125, 255} }}, {{ {40, 17, 27}, 0, {0, 0}, {64, 24, 107, 255} }}, - {{ {48, 24, -5}, 0, {0, 0}, {108, 64, 236, 255} }}, + {{ {48, 24, -5}, 0, {0, 0}, {108, 64, 235, 255} }}, }; -Gfx toad_Left_Hand_DL_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Left_Hand_DL_mesh_layer_1_vtx_0 + 0, 20, 0), +Gfx toad_player_Left_Hand_DL_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Left_Hand_DL_mesh_layer_1_vtx_0 + 0, 20, 0), gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0), gsSP2Triangles(3, 0, 4, 0, 0, 5, 4, 0), gsSP2Triangles(0, 2, 5, 0, 2, 6, 5, 0), @@ -881,34 +763,34 @@ Gfx toad_Left_Hand_DL_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_vtx_0[23] = { +Vtx toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_vtx_0[23] = { {{ {49, 29, 0}, 0, {-16, -16}, {85, 79, 51, 0} }}, - {{ {29, 40, -1}, 0, {-16, -16}, {6, 127, 4, 0} }}, + {{ {29, 40, -1}, 0, {-16, -16}, {7, 127, 5, 0} }}, {{ {31, 17, 23}, 0, {-16, -16}, {37, 43, 114, 0} }}, {{ {52, 30, -15}, 0, {-16, -16}, {69, 66, 172, 0} }}, {{ {55, 7, 5}, 0, {-16, -16}, {112, 246, 59, 0} }}, {{ {36, -18, 15}, 0, {-16, -16}, {65, 183, 81, 0} }}, - {{ {13, 5, 27}, 0, {-16, -16}, {239, 2, 126, 0} }}, + {{ {13, 5, 27}, 0, {-16, -16}, {239, 3, 126, 0} }}, {{ {4, 33, 7}, 0, {-16, -16}, {202, 109, 37, 0} }}, - {{ {6, 22, -18}, 0, {-16, -16}, {235, 65, 149, 0} }}, - {{ {31, 31, -11}, 0, {-16, -16}, {254, 57, 142, 0} }}, - {{ {58, 7, -14}, 0, {-16, -16}, {96, 231, 176, 0} }}, + {{ {6, 22, -18}, 0, {-16, -16}, {234, 65, 149, 0} }}, + {{ {31, 31, -11}, 0, {-16, -16}, {253, 57, 142, 0} }}, + {{ {58, 7, -14}, 0, {-16, -16}, {95, 230, 176, 0} }}, {{ {39, -11, -8}, 0, {-16, -16}, {106, 230, 191, 0} }}, {{ {37, -28, -15}, 0, {-16, -16}, {73, 166, 204, 0} }}, {{ {21, -25, 10}, 0, {-16, -16}, {244, 146, 63, 0} }}, - {{ {1, 0, 22}, 0, {-16, -16}, {181, 231, 100, 0} }}, + {{ {1, 0, 22}, 0, {-16, -16}, {181, 231, 99, 0} }}, {{ {-8, 23, 6}, 0, {-16, -16}, {149, 61, 31, 0} }}, {{ {-5, 14, -18}, 0, {-16, -16}, {174, 27, 163, 0} }}, {{ {7, -14, -18}, 0, {-16, -16}, {193, 198, 162, 0} }}, {{ {33, -18, -20}, 0, {-16, -16}, {54, 254, 141, 0} }}, - {{ {28, 0, -12}, 0, {-16, -16}, {66, 31, 152, 0} }}, + {{ {28, 0, -12}, 0, {-16, -16}, {66, 32, 152, 0} }}, {{ {20, -25, -15}, 0, {-16, -16}, {218, 153, 192, 0} }}, {{ {10, -22, 6}, 0, {-16, -16}, {188, 153, 31, 0} }}, - {{ {-9, -4, 1}, 0, {-16, -16}, {138, 209, 3, 0} }}, + {{ {-9, -4, 1}, 0, {-16, -16}, {138, 208, 4, 0} }}, }; -Gfx toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_vtx_0 + 0, 23, 0), +Gfx toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_vtx_0 + 0, 23, 0), gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0), gsSP2Triangles(0, 4, 3, 0, 4, 0, 2, 0), gsSP2Triangles(5, 4, 2, 0, 5, 2, 6, 0), @@ -933,31 +815,31 @@ Gfx toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Right_Arm_Color_mesh_layer_1_vtx_0[20] = { +Vtx toad_player_Right_Arm_Color_mesh_layer_1_vtx_0[20] = { {{ {-5, 10, -2}, 0, {-16, -16}, {199, 109, 225, 0} }}, - {{ {19, 17, -4}, 0, {-16, -16}, {24, 119, 220, 0} }}, + {{ {19, 17, -4}, 0, {-16, -16}, {25, 119, 220, 0} }}, {{ {-5, 0, -10}, 0, {-16, -16}, {199, 254, 142, 0} }}, - {{ {19, 10, 13}, 0, {-16, -16}, {18, 73, 103, 0} }}, - {{ {-5, 6, 9}, 0, {-16, -16}, {207, 66, 97, 0} }}, + {{ {19, 10, 13}, 0, {-16, -16}, {18, 73, 102, 0} }}, + {{ {-5, 6, 9}, 0, {-16, -16}, {206, 66, 96, 0} }}, {{ {-10, 6, 0}, 0, {-16, -16}, {148, 66, 243, 0} }}, - {{ {-10, 0, -5}, 0, {-16, -16}, {146, 0, 192, 0} }}, - {{ {-10, -6, 0}, 0, {-16, -16}, {148, 190, 242, 0} }}, + {{ {-10, 0, -5}, 0, {-16, -16}, {146, 255, 192, 0} }}, + {{ {-10, -6, 0}, 0, {-16, -16}, {148, 190, 241, 0} }}, {{ {-5, -10, -2}, 0, {-16, -16}, {200, 147, 222, 0} }}, - {{ {19, 0, -15}, 0, {-16, -16}, {20, 0, 131, 0} }}, - {{ {26, 11, -2}, 0, {-16, -16}, {108, 65, 237, 0} }}, + {{ {19, 0, -15}, 0, {-16, -16}, {20, 255, 131, 0} }}, + {{ {26, 11, -2}, 0, {-16, -16}, {107, 65, 237, 0} }}, {{ {26, 7, 10}, 0, {-16, -16}, {100, 43, 65, 0} }}, {{ {26, -7, 10}, 0, {-16, -16}, {101, 216, 66, 0} }}, {{ {19, -10, 13}, 0, {-16, -16}, {17, 184, 103, 0} }}, {{ {-5, -6, 9}, 0, {-16, -16}, {206, 191, 97, 0} }}, {{ {-10, 4, 6}, 0, {-16, -16}, {152, 43, 59, 0} }}, - {{ {-10, -4, 6}, 0, {-16, -16}, {151, 214, 59, 0} }}, + {{ {-10, -4, 6}, 0, {-16, -16}, {152, 214, 59, 0} }}, {{ {19, -17, -4}, 0, {-16, -16}, {23, 137, 218, 0} }}, - {{ {26, -11, -2}, 0, {-16, -16}, {108, 192, 235, 0} }}, + {{ {26, -11, -2}, 0, {-16, -16}, {108, 192, 234, 0} }}, {{ {26, 0, -11}, 0, {-16, -16}, {99, 0, 176, 0} }}, }; -Gfx toad_Right_Arm_Color_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Right_Arm_Color_mesh_layer_1_vtx_0 + 0, 20, 0), +Gfx toad_player_Right_Arm_Color_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Right_Arm_Color_mesh_layer_1_vtx_0 + 0, 20, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(4, 3, 0, 0, 4, 0, 5, 0), gsSP2Triangles(0, 6, 5, 0, 0, 2, 6, 0), @@ -979,27 +861,27 @@ Gfx toad_Right_Arm_Color_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Right_Forearm_mesh_layer_1_vtx_0[16] = { - {{ {1, 10, 13}, 0, {-16, -16}, {206, 66, 97, 0} }}, +Vtx toad_player_Right_Forearm_mesh_layer_1_vtx_0[16] = { + {{ {1, 10, 13}, 0, {-16, -16}, {206, 65, 97, 0} }}, {{ {-6, 11, -2}, 0, {-16, -16}, {148, 65, 241, 0} }}, {{ {-6, 7, 10}, 0, {-16, -16}, {156, 43, 65, 0} }}, {{ {1, 17, -4}, 0, {-16, -16}, {199, 108, 222, 0} }}, {{ {25, 15, 18}, 0, {-16, -16}, {37, 71, 99, 0} }}, {{ {25, -15, 18}, 0, {-16, -16}, {37, 185, 99, 0} }}, - {{ {1, -10, 13}, 0, {-16, -16}, {208, 190, 98, 0} }}, + {{ {1, -10, 13}, 0, {-16, -16}, {208, 190, 97, 0} }}, {{ {-6, -7, 10}, 0, {-16, -16}, {155, 216, 66, 0} }}, - {{ {-6, 0, -11}, 0, {-16, -16}, {156, 252, 177, 0} }}, + {{ {-6, 0, -11}, 0, {-16, -16}, {156, 251, 177, 0} }}, {{ {1, 0, -15}, 0, {-16, -16}, {207, 255, 139, 0} }}, - {{ {25, 24, -6}, 0, {-16, -16}, {37, 116, 219, 0} }}, + {{ {25, 24, -6}, 0, {-16, -16}, {38, 116, 219, 0} }}, {{ {40, 0, 1}, 0, {-16, -16}, {127, 0, 2, 0} }}, {{ {25, -24, -6}, 0, {-16, -16}, {37, 140, 220, 0} }}, - {{ {1, -17, -4}, 0, {-16, -16}, {199, 148, 222, 0} }}, - {{ {-6, -11, -2}, 0, {-16, -16}, {148, 192, 235, 0} }}, - {{ {25, 0, -22}, 0, {-16, -16}, {37, 0, 134, 0} }}, + {{ {1, -17, -4}, 0, {-16, -16}, {198, 148, 222, 0} }}, + {{ {-6, -11, -2}, 0, {-16, -16}, {148, 192, 234, 0} }}, + {{ {25, 0, -22}, 0, {-16, -16}, {37, 0, 135, 0} }}, }; -Gfx toad_Right_Forearm_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Right_Forearm_mesh_layer_1_vtx_0 + 0, 16, 0), +Gfx toad_player_Right_Forearm_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Right_Forearm_mesh_layer_1_vtx_0 + 0, 16, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(0, 4, 3, 0, 0, 5, 4, 0), gsSP2Triangles(6, 5, 0, 0, 6, 0, 2, 0), @@ -1017,31 +899,31 @@ Gfx toad_Right_Forearm_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_DL_mesh_layer_1_vtx_0[20] = { +Vtx toad_player_Right_Hand_DL_mesh_layer_1_vtx_0[20] = { {{ {7, -14, 18}, 0, {0, 0}, {191, 181, 79, 255} }}, - {{ {11, 5, 21}, 0, {0, 0}, {213, 4, 119, 255} }}, + {{ {11, 5, 21}, 0, {0, 0}, {213, 5, 119, 255} }}, {{ {-5, 14, 18}, 0, {0, 0}, {171, 23, 92, 255} }}, - {{ {37, -16, 30}, 0, {0, 0}, {31, 182, 99, 255} }}, - {{ {10, -22, -6}, 0, {0, 0}, {205, 143, 227, 255} }}, - {{ {-9, -4, -1}, 0, {0, 0}, {138, 209, 253, 255} }}, + {{ {37, -16, 30}, 0, {0, 0}, {31, 182, 98, 255} }}, + {{ {10, -22, -6}, 0, {0, 0}, {205, 144, 226, 255} }}, + {{ {-9, -4, -1}, 0, {0, 0}, {138, 208, 252, 255} }}, {{ {-8, 23, -6}, 0, {0, 0}, {141, 46, 228, 255} }}, {{ {10, 36, 12}, 0, {0, 0}, {209, 93, 72, 255} }}, - {{ {26, 7, 30}, 0, {0, 0}, {243, 20, 125, 255} }}, - {{ {48, -2, 22}, 0, {0, 0}, {105, 253, 71, 255} }}, - {{ {52, -14, -6}, 0, {0, 0}, {102, 192, 216, 255} }}, + {{ {26, 7, 30}, 0, {0, 0}, {243, 21, 125, 255} }}, + {{ {48, -2, 22}, 0, {0, 0}, {105, 252, 71, 255} }}, + {{ {52, -14, -6}, 0, {0, 0}, {102, 192, 215, 255} }}, {{ {26, -24, -9}, 0, {0, 0}, {13, 142, 202, 255} }}, - {{ {1, 0, -22}, 0, {0, 0}, {183, 227, 156, 255} }}, + {{ {1, 0, -22}, 0, {0, 0}, {184, 227, 156, 255} }}, {{ {2, 35, -9}, 0, {0, 0}, {180, 89, 206, 255} }}, - {{ {25, 47, -9}, 0, {0, 0}, {19, 121, 222, 255} }}, + {{ {25, 47, -9}, 0, {0, 0}, {20, 121, 221, 255} }}, {{ {24, 32, 17}, 0, {0, 0}, {22, 85, 92, 255} }}, {{ {43, 11, 22}, 0, {0, 0}, {73, 48, 92, 255} }}, - {{ {48, 24, 5}, 0, {0, 0}, {108, 64, 20, 255} }}, + {{ {48, 24, 5}, 0, {0, 0}, {108, 64, 21, 255} }}, {{ {40, 17, -27}, 0, {0, 0}, {64, 24, 149, 255} }}, - {{ {14, 6, -27}, 0, {0, 0}, {239, 247, 130, 255} }}, + {{ {14, 6, -27}, 0, {0, 0}, {238, 247, 131, 255} }}, }; -Gfx toad_Right_Hand_DL_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Right_Hand_DL_mesh_layer_1_vtx_0 + 0, 20, 0), +Gfx toad_player_Right_Hand_DL_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Right_Hand_DL_mesh_layer_1_vtx_0 + 0, 20, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(0, 4, 3, 0, 5, 4, 0, 0), gsSP2Triangles(5, 0, 2, 0, 6, 5, 2, 0), @@ -1063,34 +945,34 @@ Gfx toad_Right_Hand_DL_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_vtx_0[23] = { +Vtx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_vtx_0[23] = { {{ {49, 29, 0}, 0, {-16, -16}, {85, 79, 205, 0} }}, {{ {31, 17, -23}, 0, {-16, -16}, {37, 43, 142, 0} }}, - {{ {29, 40, 1}, 0, {-16, -16}, {6, 127, 252, 0} }}, + {{ {29, 40, 1}, 0, {-16, -16}, {7, 127, 251, 0} }}, {{ {55, 7, -5}, 0, {-16, -16}, {112, 246, 197, 0} }}, {{ {52, 30, 15}, 0, {-16, -16}, {69, 66, 84, 0} }}, - {{ {31, 31, 11}, 0, {-16, -16}, {254, 57, 114, 0} }}, - {{ {6, 22, 18}, 0, {-16, -16}, {235, 65, 107, 0} }}, + {{ {31, 31, 11}, 0, {-16, -16}, {253, 57, 114, 0} }}, + {{ {6, 22, 18}, 0, {-16, -16}, {234, 65, 107, 0} }}, {{ {4, 33, -7}, 0, {-16, -16}, {202, 109, 219, 0} }}, - {{ {13, 5, -27}, 0, {-16, -16}, {239, 2, 130, 0} }}, + {{ {13, 5, -27}, 0, {-16, -16}, {239, 3, 130, 0} }}, {{ {36, -18, -15}, 0, {-16, -16}, {65, 183, 175, 0} }}, - {{ {58, 7, 14}, 0, {-16, -16}, {96, 231, 80, 0} }}, + {{ {58, 7, 14}, 0, {-16, -16}, {95, 230, 80, 0} }}, {{ {39, -11, 8}, 0, {-16, -16}, {106, 230, 65, 0} }}, - {{ {28, 0, 12}, 0, {-16, -16}, {66, 31, 104, 0} }}, + {{ {28, 0, 12}, 0, {-16, -16}, {66, 32, 104, 0} }}, {{ {33, -18, 20}, 0, {-16, -16}, {54, 254, 115, 0} }}, {{ {7, -14, 18}, 0, {-16, -16}, {193, 198, 94, 0} }}, {{ {-5, 14, 18}, 0, {-16, -16}, {174, 27, 93, 0} }}, {{ {-8, 23, -6}, 0, {-16, -16}, {149, 61, 225, 0} }}, - {{ {1, 0, -22}, 0, {-16, -16}, {181, 231, 156, 0} }}, + {{ {1, 0, -22}, 0, {-16, -16}, {181, 231, 157, 0} }}, {{ {21, -25, -10}, 0, {-16, -16}, {244, 146, 193, 0} }}, {{ {37, -28, 15}, 0, {-16, -16}, {73, 166, 52, 0} }}, {{ {20, -25, 15}, 0, {-16, -16}, {218, 153, 64, 0} }}, {{ {10, -22, -6}, 0, {-16, -16}, {188, 153, 225, 0} }}, - {{ {-9, -4, -1}, 0, {-16, -16}, {138, 209, 253, 0} }}, + {{ {-9, -4, -1}, 0, {-16, -16}, {138, 208, 252, 0} }}, }; -Gfx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_vtx_0 + 0, 23, 0), +Gfx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_vtx_0 + 0, 23, 0), gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0), gsSP2Triangles(0, 4, 3, 0, 2, 4, 0, 0), gsSP2Triangles(4, 2, 5, 0, 2, 6, 5, 0), @@ -1115,74 +997,74 @@ Gfx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_vtx_0[63] = { +Vtx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_vtx_0[63] = { {{ {23, 42, -9}, 0, {-16, -16}, {7, 117, 49, 255} }}, - {{ {37, 26, 8}, 0, {-16, -16}, {50, 69, 95, 255} }}, - {{ {37, 31, -7}, 0, {-16, -16}, {70, 100, 35, 255} }}, - {{ {21, 28, 19}, 0, {-16, -16}, {16, 82, 96, 255} }}, - {{ {5, 22, 21}, 0, {-16, -16}, {213, 65, 101, 255} }}, - {{ {2, 32, -9}, 0, {-16, -16}, {201, 108, 39, 255} }}, + {{ {37, 26, 8}, 0, {-16, -16}, {50, 69, 94, 255} }}, + {{ {37, 31, -7}, 0, {-16, -16}, {70, 100, 36, 255} }}, + {{ {21, 28, 19}, 0, {-16, -16}, {17, 82, 95, 255} }}, + {{ {5, 22, 21}, 0, {-16, -16}, {213, 65, 100, 255} }}, + {{ {2, 32, -9}, 0, {-16, -16}, {201, 107, 40, 255} }}, {{ {-9, 24, -6}, 0, {-16, -16}, {160, 73, 39, 255} }}, - {{ {-5, 14, 18}, 0, {-16, -16}, {161, 18, 83, 255} }}, - {{ {-9, -4, -1}, 0, {-16, -16}, {144, 211, 41, 255} }}, + {{ {-5, 14, 18}, 0, {-16, -16}, {162, 18, 83, 255} }}, + {{ {-9, -4, -1}, 0, {-16, -16}, {145, 211, 41, 255} }}, {{ {7, -14, 18}, 0, {-16, -16}, {189, 179, 75, 255} }}, - {{ {10, -23, -6}, 0, {-16, -16}, {220, 137, 27, 255} }}, + {{ {10, -23, -6}, 0, {-16, -16}, {219, 137, 27, 255} }}, {{ {24, -16, 25}, 0, {-16, -16}, {3, 182, 103, 255} }}, - {{ {29, -23, -9}, 0, {-16, -16}, {40, 136, 5, 255} }}, + {{ {29, -23, -9}, 0, {-16, -16}, {40, 136, 6, 255} }}, {{ {37, -16, 16}, 0, {-16, -16}, {67, 164, 57, 255} }}, - {{ {45, -13, 4}, 0, {-16, -16}, {78, 155, 255, 255} }}, - {{ {41, -9, -13}, 0, {-16, -16}, {56, 146, 225, 255} }}, - {{ {72, -7, 7}, 0, {-16, -16}, {19, 131, 244, 255} }}, - {{ {78, -5, -12}, 0, {-16, -16}, {13, 130, 252, 255} }}, - {{ {40, 0, 22}, 0, {-16, -16}, {79, 4, 99, 255} }}, - {{ {44, 7, 11}, 0, {-16, -16}, {94, 27, 82, 255} }}, - {{ {65, 27, 9}, 0, {-16, -16}, {251, 19, 125, 255} }}, - {{ {56, 37, 7}, 0, {-16, -16}, {251, 21, 125, 255} }}, - {{ {47, 10, -2}, 0, {-16, -16}, {11, 126, 15, 255} }}, + {{ {45, -13, 4}, 0, {-16, -16}, {78, 156, 255, 255} }}, + {{ {41, -9, -13}, 0, {-16, -16}, {56, 147, 224, 255} }}, + {{ {72, -7, 7}, 0, {-16, -16}, {19, 131, 243, 255} }}, + {{ {78, -5, -12}, 0, {-16, -16}, {14, 130, 251, 255} }}, + {{ {40, 0, 22}, 0, {-16, -16}, {79, 5, 99, 255} }}, + {{ {44, 7, 11}, 0, {-16, -16}, {94, 27, 81, 255} }}, + {{ {65, 27, 9}, 0, {-16, -16}, {250, 20, 125, 255} }}, + {{ {56, 37, 7}, 0, {-16, -16}, {250, 21, 125, 255} }}, + {{ {47, 10, -2}, 0, {-16, -16}, {11, 126, 16, 255} }}, {{ {44, 7, 11}, 0, {-16, -16}, {11, 122, 34, 255} }}, - {{ {71, 5, 8}, 0, {-16, -16}, {14, 123, 27, 255} }}, - {{ {76, 8, -9}, 0, {-16, -16}, {13, 125, 15, 255} }}, - {{ {39, 10, -21}, 0, {-16, -16}, {9, 127, 254, 255} }}, - {{ {78, -5, -12}, 0, {-16, -16}, {122, 7, 34, 255} }}, - {{ {76, 8, -9}, 0, {-16, -16}, {122, 12, 32, 255} }}, + {{ {71, 5, 8}, 0, {-16, -16}, {15, 123, 27, 255} }}, + {{ {76, 8, -9}, 0, {-16, -16}, {14, 125, 15, 255} }}, + {{ {39, 10, -21}, 0, {-16, -16}, {9, 127, 253, 255} }}, + {{ {78, -5, -12}, 0, {-16, -16}, {122, 8, 35, 255} }}, + {{ {76, 8, -9}, 0, {-16, -16}, {122, 12, 33, 255} }}, {{ {71, 5, 8}, 0, {-16, -16}, {122, 5, 36, 255} }}, {{ {72, -7, 7}, 0, {-16, -16}, {121, 1, 38, 255} }}, - {{ {45, -13, 4}, 0, {-16, -16}, {4, 223, 123, 255} }}, + {{ {45, -13, 4}, 0, {-16, -16}, {5, 222, 122, 255} }}, {{ {71, 5, 8}, 0, {-16, -16}, {254, 232, 125, 255} }}, {{ {44, 7, 11}, 0, {-16, -16}, {10, 215, 120, 255} }}, - {{ {72, -7, 7}, 0, {-16, -16}, {245, 245, 126, 255} }}, - {{ {39, 10, -21}, 0, {-16, -16}, {24, 9, 132, 255} }}, + {{ {72, -7, 7}, 0, {-16, -16}, {244, 245, 126, 255} }}, + {{ {39, 10, -21}, 0, {-16, -16}, {25, 9, 132, 255} }}, {{ {76, 8, -9}, 0, {-16, -16}, {40, 33, 140, 255} }}, - {{ {78, -5, -12}, 0, {-16, -16}, {31, 7, 133, 255} }}, + {{ {78, -5, -12}, 0, {-16, -16}, {32, 8, 133, 255} }}, {{ {41, -9, -13}, 0, {-16, -16}, {20, 206, 141, 255} }}, {{ {15, 7, -27}, 0, {-16, -16}, {248, 1, 129, 255} }}, - {{ {29, -23, -9}, 0, {-16, -16}, {3, 191, 147, 255} }}, - {{ {1, 1, -22}, 0, {-16, -16}, {186, 230, 153, 255} }}, + {{ {29, -23, -9}, 0, {-16, -16}, {4, 191, 147, 255} }}, + {{ {1, 1, -22}, 0, {-16, -16}, {186, 230, 154, 255} }}, {{ {10, -23, -6}, 0, {-16, -16}, {215, 178, 164, 255} }}, {{ {-9, -4, -1}, 0, {-16, -16}, {152, 213, 197, 255} }}, - {{ {-9, 24, -6}, 0, {-16, -16}, {173, 29, 164, 255} }}, + {{ {-9, 24, -6}, 0, {-16, -16}, {173, 29, 165, 255} }}, {{ {2, 32, -9}, 0, {-16, -16}, {212, 55, 150, 255} }}, {{ {23, 42, -9}, 0, {-16, -16}, {11, 64, 147, 255} }}, {{ {37, 31, -7}, 0, {-16, -16}, {20, 71, 153, 255} }}, - {{ {58, 43, -5}, 0, {-16, -16}, {4, 54, 141, 255} }}, - {{ {67, 31, -8}, 0, {-16, -16}, {21, 44, 139, 255} }}, - {{ {37, 31, -7}, 0, {-16, -16}, {194, 105, 37, 255} }}, - {{ {37, 26, 8}, 0, {-16, -16}, {196, 105, 40, 255} }}, - {{ {58, 43, -5}, 0, {-16, -16}, {197, 105, 41, 255} }}, - {{ {56, 37, 7}, 0, {-16, -16}, {199, 105, 44, 255} }}, - {{ {67, 31, -8}, 0, {-16, -16}, {86, 163, 243, 255} }}, - {{ {47, 10, -2}, 0, {-16, -16}, {86, 163, 240, 255} }}, - {{ {39, 10, -21}, 0, {-16, -16}, {81, 163, 223, 255} }}, - {{ {65, 27, 9}, 0, {-16, -16}, {88, 164, 254, 255} }}, + {{ {58, 43, -5}, 0, {-16, -16}, {5, 54, 141, 255} }}, + {{ {67, 31, -8}, 0, {-16, -16}, {22, 45, 139, 255} }}, + {{ {37, 31, -7}, 0, {-16, -16}, {194, 104, 38, 255} }}, + {{ {37, 26, 8}, 0, {-16, -16}, {196, 104, 40, 255} }}, + {{ {58, 43, -5}, 0, {-16, -16}, {197, 104, 42, 255} }}, + {{ {56, 37, 7}, 0, {-16, -16}, {199, 104, 45, 255} }}, + {{ {67, 31, -8}, 0, {-16, -16}, {86, 164, 243, 255} }}, + {{ {47, 10, -2}, 0, {-16, -16}, {85, 163, 240, 255} }}, + {{ {39, 10, -21}, 0, {-16, -16}, {80, 163, 223, 255} }}, + {{ {65, 27, 9}, 0, {-16, -16}, {88, 165, 253, 255} }}, {{ {44, 7, 11}, 0, {-16, -16}, {88, 165, 253, 255} }}, {{ {67, 31, -8}, 0, {-16, -16}, {96, 73, 40, 255} }}, - {{ {58, 43, -5}, 0, {-16, -16}, {100, 63, 47, 255} }}, - {{ {56, 37, 7}, 0, {-16, -16}, {95, 75, 39, 255} }}, - {{ {65, 27, 9}, 0, {-16, -16}, {90, 84, 32, 255} }}, + {{ {58, 43, -5}, 0, {-16, -16}, {99, 63, 48, 255} }}, + {{ {56, 37, 7}, 0, {-16, -16}, {95, 75, 40, 255} }}, + {{ {65, 27, 9}, 0, {-16, -16}, {90, 83, 32, 255} }}, }; -Gfx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_vtx_0 + 0, 63, 0), +Gfx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_vtx_0 + 0, 63, 0), gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0), gsSP2Triangles(4, 3, 0, 0, 5, 4, 0, 0), gsSP2Triangles(5, 6, 4, 0, 6, 7, 4, 0), @@ -1214,31 +1096,31 @@ Gfx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0[] = gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_0[20] = { +Vtx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_0[20] = { {{ {7, -14, 18}, 0, {0, 0}, {193, 179, 79, 255} }}, - {{ {11, 5, 21}, 0, {0, 0}, {213, 3, 120, 255} }}, + {{ {11, 5, 21}, 0, {0, 0}, {212, 4, 119, 255} }}, {{ {-5, 14, 18}, 0, {0, 0}, {171, 22, 91, 255} }}, {{ {37, -16, 30}, 0, {0, 0}, {32, 183, 99, 255} }}, - {{ {10, -22, -6}, 0, {0, 0}, {206, 143, 227, 255} }}, - {{ {-9, -4, -1}, 0, {0, 0}, {138, 208, 253, 255} }}, - {{ {-8, 23, -6}, 0, {0, 0}, {142, 47, 227, 255} }}, - {{ {10, 36, 12}, 0, {0, 0}, {208, 93, 73, 255} }}, - {{ {26, 7, 30}, 0, {0, 0}, {242, 19, 125, 255} }}, + {{ {10, -22, -6}, 0, {0, 0}, {205, 143, 227, 255} }}, + {{ {-9, -4, -1}, 0, {0, 0}, {139, 208, 252, 255} }}, + {{ {-8, 23, -6}, 0, {0, 0}, {142, 48, 227, 255} }}, + {{ {10, 36, 12}, 0, {0, 0}, {208, 92, 73, 255} }}, + {{ {26, 7, 30}, 0, {0, 0}, {242, 20, 125, 255} }}, {{ {48, -2, 22}, 0, {0, 0}, {105, 253, 72, 255} }}, {{ {52, -14, -6}, 0, {0, 0}, {101, 190, 216, 255} }}, {{ {26, -24, -9}, 0, {0, 0}, {13, 142, 202, 255} }}, {{ {1, 0, -22}, 0, {0, 0}, {184, 226, 156, 255} }}, {{ {2, 35, -9}, 0, {0, 0}, {180, 89, 206, 255} }}, - {{ {25, 47, -9}, 0, {0, 0}, {17, 121, 222, 255} }}, + {{ {25, 47, -9}, 0, {0, 0}, {18, 121, 221, 255} }}, {{ {24, 32, 17}, 0, {0, 0}, {21, 85, 92, 255} }}, - {{ {43, 11, 22}, 0, {0, 0}, {72, 47, 94, 255} }}, + {{ {43, 11, 22}, 0, {0, 0}, {72, 47, 93, 255} }}, {{ {48, 24, 5}, 0, {0, 0}, {108, 64, 20, 255} }}, - {{ {40, 17, -27}, 0, {0, 0}, {63, 22, 148, 255} }}, + {{ {40, 17, -27}, 0, {0, 0}, {63, 23, 148, 255} }}, {{ {14, 6, -27}, 0, {0, 0}, {238, 248, 131, 255} }}, }; -Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_0 + 0, 20, 0), +Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_0 + 0, 20, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(0, 4, 3, 0, 5, 4, 0, 0), gsSP2Triangles(5, 0, 2, 0, 6, 5, 2, 0), @@ -1260,35 +1142,51 @@ Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_1[94] = { - {{ {141, -176, 106}, 0, {-418, 482}, {29, 133, 239, 0} }}, +Vtx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_1[6] = { + {{ {1, -43, 100}, 0, {-16, -16}, {139, 247, 47, 0} }}, + {{ {38, -89, 165}, 0, {-16, -16}, {148, 236, 63, 0} }}, + {{ {1, 43, 100}, 0, {-16, -16}, {139, 10, 47, 0} }}, + {{ {38, 89, 165}, 0, {-16, -16}, {147, 20, 62, 0} }}, + {{ {76, -43, 230}, 0, {-16, -16}, {156, 246, 77, 0} }}, + {{ {76, 43, 230}, 0, {-16, -16}, {156, 9, 77, 0} }}, +}; + +Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1[] = { + gsSPVertex(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_1 + 0, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0), + gsSP2Triangles(4, 3, 1, 0, 5, 3, 4, 0), + gsSPEndDisplayList(), +}; + +Vtx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_vtx_0[94] = { + {{ {141, -176, 106}, 0, {-418, 482}, {29, 134, 239, 0} }}, {{ {122, -71, -25}, 0, {178, 72}, {39, 211, 144, 0} }}, - {{ {183, -142, 81}, 0, {-280, 152}, {78, 166, 211, 0} }}, - {{ {1, 43, 100}, 0, {751, 1673}, {138, 9, 47, 0} }}, + {{ {183, -142, 81}, 0, {-280, 152}, {78, 167, 211, 0} }}, + {{ {1, 43, 100}, 0, {751, 1673}, {139, 10, 47, 0} }}, {{ {38, 89, 165}, 0, {610, 1852}, {147, 20, 62, 0} }}, - {{ {50, 142, 158}, 0, {624, 1980}, {171, 82, 48, 0} }}, - {{ {111, 71, 265}, 0, {306, 1880}, {206, 40, 110, 0} }}, - {{ {76, 43, 230}, 0, {408, 1776}, {155, 9, 77, 0} }}, - {{ {111, -71, 265}, 0, {250, 1518}, {206, 216, 110, 0} }}, - {{ {76, -43, 230}, 0, {375, 1557}, {155, 247, 77, 0} }}, + {{ {50, 142, 158}, 0, {624, 1980}, {172, 82, 48, 0} }}, + {{ {111, 71, 265}, 0, {306, 1880}, {206, 40, 109, 0} }}, + {{ {76, 43, 230}, 0, {408, 1776}, {156, 9, 77, 0} }}, + {{ {111, -71, 265}, 0, {250, 1518}, {206, 215, 109, 0} }}, + {{ {76, -43, 230}, 0, {375, 1557}, {156, 246, 77, 0} }}, {{ {50, -142, 158}, 0, {508, 1254}, {172, 174, 49, 0} }}, - {{ {38, -89, 165}, 0, {531, 1396}, {147, 236, 63, 0} }}, + {{ {38, -89, 165}, 0, {531, 1396}, {148, 236, 63, 0} }}, {{ {-10, -71, 55}, 0, {826, 1356}, {136, 216, 246, 0} }}, - {{ {1, -43, 100}, 0, {724, 1458}, {138, 247, 47, 0} }}, + {{ {1, -43, 100}, 0, {724, 1458}, {139, 247, 47, 0} }}, {{ {17, 88, 2}, 0, {-92, 952}, {172, 61, 183, 0} }}, {{ {93, 175, 133}, 0, {1016, 906}, {226, 122, 17, 0} }}, - {{ {141, 176, 106}, 0, {1010, 594}, {29, 123, 240, 0} }}, + {{ {141, 176, 106}, 0, {1010, 594}, {29, 122, 239, 0} }}, {{ {65, 88, -26}, 0, {-98, 640}, {233, 61, 147, 0} }}, - {{ {183, 142, 81}, 0, {892, 212}, {78, 90, 211, 0} }}, + {{ {183, 142, 81}, 0, {892, 212}, {78, 89, 211, 0} }}, {{ {122, 71, -25}, 0, {2, 250}, {39, 45, 144, 0} }}, {{ {213, 79, 64}, 0, {688, -162}, {103, 47, 198, 0} }}, - {{ {178, 38, 5}, 0, {194, -140}, {82, 22, 161, 0} }}, + {{ {178, 38, 5}, 0, {194, -140}, {82, 22, 162, 0} }}, {{ {93, 175, 133}, 0, {-196, 438}, {226, 122, 17, 0} }}, {{ {217, 88, 238}, 0, {1220, 36}, {84, 61, 73, 0} }}, - {{ {141, 176, 106}, 0, {-198, -10}, {29, 123, 240, 0} }}, + {{ {141, 176, 106}, 0, {-198, -10}, {29, 122, 239, 0} }}, {{ {170, 88, 266}, 0, {1222, 482}, {24, 61, 109, 0} }}, - {{ {50, 142, 158}, 0, {-54, 916}, {171, 82, 48, 0} }}, - {{ {111, 71, 265}, 0, {1084, 952}, {206, 40, 110, 0} }}, + {{ {50, 142, 158}, 0, {-54, 916}, {172, 82, 48, 0} }}, + {{ {111, 71, 265}, 0, {1084, 952}, {206, 40, 109, 0} }}, {{ {-10, -71, 55}, 0, {184, 1066}, {136, 216, 246, 0} }}, {{ {17, 88, 2}, 0, {1214, 712}, {172, 61, 183, 0} }}, {{ {17, -88, 2}, 0, {34, 812}, {172, 195, 182, 0} }}, @@ -1296,18 +1194,18 @@ Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_1[94] = { {{ {65, -88, -26}, 0, {6, 452}, {233, 195, 147, 0} }}, {{ {122, 71, -25}, 0, {1050, -18}, {39, 45, 144, 0} }}, {{ {122, -71, -25}, 0, {104, 62}, {39, 211, 144, 0} }}, - {{ {178, 38, 5}, 0, {780, -272}, {82, 22, 161, 0} }}, - {{ {178, -38, 5}, 0, {304, -170}, {82, 234, 162, 0} }}, + {{ {178, 38, 5}, 0, {780, -272}, {82, 22, 162, 0} }}, + {{ {178, -38, 5}, 0, {304, -170}, {82, 233, 162, 0} }}, {{ {122, 71, -25}, 0, {1036, -112}, {39, 45, 144, 0} }}, - {{ {183, -142, 81}, 0, {456, 1066}, {78, 166, 211, 0} }}, + {{ {183, -142, 81}, 0, {456, 1066}, {78, 167, 211, 0} }}, {{ {122, -71, -25}, 0, {1404, 676}, {39, 211, 144, 0} }}, - {{ {178, -38, 5}, 0, {1000, 266}, {82, 234, 162, 0} }}, - {{ {213, -79, 64}, 0, {474, 484}, {103, 210, 197, 0} }}, + {{ {178, -38, 5}, 0, {1000, 266}, {82, 233, 162, 0} }}, + {{ {213, -79, 64}, 0, {474, 484}, {102, 210, 197, 0} }}, {{ {223, 0, 58}, 0, {490, -104}, {110, 0, 193, 0} }}, - {{ {246, -38, 122}, 0, {-38, 168}, {123, 235, 232, 0} }}, + {{ {246, -38, 122}, 0, {-38, 168}, {123, 234, 231, 0} }}, {{ {244, -71, 187}, 0, {-462, 496}, {117, 212, 21, 0} }}, - {{ {178, -38, 5}, 0, {-16, -16}, {82, 234, 162, 0} }}, - {{ {178, 38, 5}, 0, {-16, -16}, {82, 22, 161, 0} }}, + {{ {178, -38, 5}, 0, {-16, -16}, {82, 233, 162, 0} }}, + {{ {178, 38, 5}, 0, {-16, -16}, {82, 22, 162, 0} }}, {{ {223, 0, 58}, 0, {-16, -16}, {110, 0, 193, 0} }}, {{ {213, 79, 64}, 0, {-16, -16}, {103, 47, 198, 0} }}, {{ {50, -142, 158}, 0, {-184, 898}, {172, 174, 49, 0} }}, @@ -1315,50 +1213,50 @@ Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_1[94] = { {{ {17, -88, 2}, 0, {1264, 448}, {172, 195, 182, 0} }}, {{ {93, -175, 133}, 0, {-362, 392}, {226, 134, 17, 0} }}, {{ {65, -88, -26}, 0, {1258, -4}, {233, 195, 147, 0} }}, - {{ {141, -176, 106}, 0, {-370, -58}, {29, 133, 239, 0} }}, + {{ {141, -176, 106}, 0, {-370, -58}, {29, 134, 239, 0} }}, {{ {122, -71, -25}, 0, {1100, -320}, {39, 211, 144, 0} }}, {{ {244, 71, 187}, 0, {-26, 196}, {117, 44, 21, 0} }}, {{ {244, -71, 187}, 0, {888, 166}, {117, 212, 21, 0} }}, - {{ {246, -38, 122}, 0, {646, -188}, {123, 235, 232, 0} }}, + {{ {246, -38, 122}, 0, {646, -188}, {123, 234, 231, 0} }}, {{ {217, 88, 238}, 0, {-106, 592}, {84, 61, 73, 0} }}, {{ {217, -88, 238}, 0, {1032, 556}, {84, 195, 73, 0} }}, {{ {170, 88, 266}, 0, {-88, 942}, {24, 61, 109, 0} }}, - {{ {170, -88, 266}, 0, {1050, 906}, {23, 195, 109, 0} }}, - {{ {111, -71, 265}, 0, {-96, 882}, {206, 216, 110, 0} }}, + {{ {170, -88, 266}, 0, {1050, 906}, {24, 195, 109, 0} }}, + {{ {111, -71, 265}, 0, {-96, 882}, {206, 215, 109, 0} }}, {{ {50, -142, 158}, 0, {1122, 1024}, {172, 174, 49, 0} }}, {{ {93, -175, 133}, 0, {1320, 596}, {226, 134, 17, 0} }}, - {{ {170, -88, 266}, 0, {-198, 414}, {23, 195, 109, 0} }}, - {{ {141, -176, 106}, 0, {1372, 98}, {29, 133, 239, 0} }}, + {{ {170, -88, 266}, 0, {-198, 414}, {24, 195, 109, 0} }}, + {{ {141, -176, 106}, 0, {1372, 98}, {29, 134, 239, 0} }}, {{ {217, -88, 238}, 0, {-146, -82}, {84, 195, 73, 0} }}, - {{ {141, 176, 106}, 0, {-16, -16}, {29, 123, 240, 0} }}, + {{ {141, 176, 106}, 0, {-16, -16}, {29, 122, 239, 0} }}, {{ {244, 71, 187}, 0, {-16, -16}, {117, 44, 21, 0} }}, - {{ {183, 142, 81}, 0, {-16, -16}, {78, 90, 211, 0} }}, + {{ {183, 142, 81}, 0, {-16, -16}, {78, 89, 211, 0} }}, {{ {217, 88, 238}, 0, {-16, -16}, {84, 61, 73, 0} }}, - {{ {111, 71, 265}, 0, {-16, -16}, {206, 40, 110, 0} }}, - {{ {170, -88, 266}, 0, {-16, -16}, {23, 195, 109, 0} }}, + {{ {111, 71, 265}, 0, {-16, -16}, {206, 40, 109, 0} }}, + {{ {170, -88, 266}, 0, {-16, -16}, {24, 195, 109, 0} }}, {{ {170, 88, 266}, 0, {-16, -16}, {24, 61, 109, 0} }}, - {{ {111, -71, 265}, 0, {-16, -16}, {206, 216, 110, 0} }}, + {{ {111, -71, 265}, 0, {-16, -16}, {206, 215, 109, 0} }}, {{ {217, -88, 238}, 0, {-16, -16}, {84, 195, 73, 0} }}, - {{ {183, -142, 81}, 0, {-16, -16}, {78, 166, 211, 0} }}, + {{ {183, -142, 81}, 0, {-16, -16}, {78, 167, 211, 0} }}, {{ {244, -71, 187}, 0, {-16, -16}, {117, 212, 21, 0} }}, - {{ {141, -176, 106}, 0, {-16, -16}, {29, 133, 239, 0} }}, - {{ {1, 43, 100}, 0, {-11, 790}, {138, 9, 47, 0} }}, - {{ {50, 142, 158}, 0, {1024, 984}, {171, 82, 48, 0} }}, + {{ {141, -176, 106}, 0, {-16, -16}, {29, 134, 239, 0} }}, + {{ {1, 43, 100}, 0, {-11, 790}, {139, 10, 47, 0} }}, + {{ {50, 142, 158}, 0, {1024, 984}, {172, 82, 48, 0} }}, {{ {-10, 71, 55}, 0, {82, 380}, {136, 40, 246, 0} }}, {{ {93, 175, 133}, 0, {1466, 550}, {226, 122, 17, 0} }}, {{ {17, 88, 2}, 0, {290, -208}, {172, 61, 183, 0} }}, {{ {-10, -71, 55}, 0, {-982, 638}, {136, 216, 246, 0} }}, - {{ {1, -43, 100}, 0, {-656, 946}, {138, 247, 47, 0} }}, + {{ {1, -43, 100}, 0, {-656, 946}, {139, 247, 47, 0} }}, {{ {244, 71, 187}, 0, {832, 1186}, {117, 44, 21, 0} }}, - {{ {246, -38, 122}, 0, {1162, -70}, {123, 235, 232, 0} }}, - {{ {246, 38, 122}, 0, {654, 498}, {123, 22, 232, 0} }}, + {{ {246, -38, 122}, 0, {1162, -70}, {123, 234, 231, 0} }}, + {{ {246, 38, 122}, 0, {654, 498}, {123, 22, 231, 0} }}, {{ {223, 0, 58}, 0, {414, -278}, {110, 0, 193, 0} }}, {{ {213, 79, 64}, 0, {-98, 326}, {103, 47, 198, 0} }}, - {{ {183, 142, 81}, 0, {-524, 874}, {78, 90, 211, 0} }}, + {{ {183, 142, 81}, 0, {-524, 874}, {78, 89, 211, 0} }}, }; -Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1[] = { - gsSPVertex(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_1 + 0, 63, 0), +Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_0[] = { + gsSPVertex(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_vtx_0 + 0, 63, 0), gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), gsSP2Triangles(4, 6, 5, 0, 4, 7, 6, 0), gsSP2Triangles(7, 8, 6, 0, 7, 9, 8, 0), @@ -1382,7 +1280,7 @@ Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1[] = { gsSP2Triangles(56, 57, 58, 0, 59, 57, 56, 0), gsSP2Triangles(59, 60, 57, 0, 61, 60, 59, 0), gsSP1Triangle(61, 62, 60, 0), - gsSPVertex(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_1 + 63, 31, 0), + gsSPVertex(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_vtx_0 + 63, 31, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), gsSP2Triangles(6, 7, 8, 0, 6, 9, 7, 0), @@ -1397,103 +1295,87 @@ Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1[] = { gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_2[6] = { - {{ {1, -43, 100}, 0, {-16, -16}, {138, 247, 47, 0} }}, - {{ {38, -89, 165}, 0, {-16, -16}, {147, 236, 63, 0} }}, - {{ {1, 43, 100}, 0, {-16, -16}, {138, 9, 47, 0} }}, - {{ {38, 89, 165}, 0, {-16, -16}, {147, 20, 62, 0} }}, - {{ {76, -43, 230}, 0, {-16, -16}, {155, 247, 77, 0} }}, - {{ {76, 43, 230}, 0, {-16, -16}, {155, 9, 77, 0} }}, -}; - -Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_2[] = { - gsSPVertex(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_vtx_2 + 0, 6, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0), - gsSP2Triangles(4, 3, 1, 0, 5, 3, 4, 0), - gsSPEndDisplayList(), -}; - -Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_vtx_0[100] = { - {{ {141, -176, 106}, 0, {-418, 482}, {29, 133, 239, 0} }}, +Vtx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_vtx_1[100] = { + {{ {141, -176, 106}, 0, {-418, 482}, {29, 134, 239, 0} }}, {{ {122, -71, -25}, 0, {178, 72}, {39, 211, 144, 0} }}, - {{ {183, -142, 81}, 0, {-280, 152}, {78, 166, 211, 0} }}, - {{ {141, 176, 106}, 0, {-16, -16}, {29, 123, 240, 0} }}, + {{ {183, -142, 81}, 0, {-280, 152}, {78, 167, 211, 0} }}, + {{ {141, 176, 106}, 0, {-16, -16}, {29, 122, 239, 0} }}, {{ {217, 88, 238}, 0, {-16, -16}, {84, 61, 73, 0} }}, {{ {244, 71, 187}, 0, {-16, -16}, {117, 44, 21, 0} }}, - {{ {183, 142, 81}, 0, {-16, -16}, {78, 90, 211, 0} }}, + {{ {183, 142, 81}, 0, {-16, -16}, {78, 89, 211, 0} }}, {{ {244, 71, 187}, 0, {-26, 196}, {117, 44, 21, 0} }}, {{ {244, -71, 187}, 0, {888, 166}, {117, 212, 21, 0} }}, - {{ {246, -38, 122}, 0, {646, -188}, {123, 235, 232, 0} }}, + {{ {246, -38, 122}, 0, {646, -188}, {123, 234, 231, 0} }}, {{ {217, 88, 238}, 0, {-106, 592}, {84, 61, 73, 0} }}, {{ {217, -88, 238}, 0, {1032, 556}, {84, 195, 73, 0} }}, {{ {170, 88, 266}, 0, {-88, 942}, {24, 61, 109, 0} }}, - {{ {170, -88, 266}, 0, {1050, 906}, {23, 195, 109, 0} }}, + {{ {170, -88, 266}, 0, {1050, 906}, {24, 195, 109, 0} }}, {{ {93, 175, 133}, 0, {-196, 438}, {226, 122, 17, 0} }}, {{ {217, 88, 238}, 0, {1220, 36}, {84, 61, 73, 0} }}, - {{ {141, 176, 106}, 0, {-198, -10}, {29, 123, 240, 0} }}, + {{ {141, 176, 106}, 0, {-198, -10}, {29, 122, 239, 0} }}, {{ {170, 88, 266}, 0, {1222, 482}, {24, 61, 109, 0} }}, - {{ {50, 142, 158}, 0, {-54, 916}, {171, 82, 48, 0} }}, - {{ {111, 71, 265}, 0, {1084, 952}, {206, 40, 110, 0} }}, - {{ {111, 71, 265}, 0, {-16, -16}, {206, 40, 110, 0} }}, - {{ {111, -71, 265}, 0, {-16, -16}, {206, 216, 110, 0} }}, - {{ {170, -88, 266}, 0, {-16, -16}, {23, 195, 109, 0} }}, + {{ {50, 142, 158}, 0, {-54, 916}, {172, 82, 48, 0} }}, + {{ {111, 71, 265}, 0, {1084, 952}, {206, 40, 109, 0} }}, + {{ {111, 71, 265}, 0, {-16, -16}, {206, 40, 109, 0} }}, + {{ {111, -71, 265}, 0, {-16, -16}, {206, 215, 109, 0} }}, + {{ {170, -88, 266}, 0, {-16, -16}, {24, 195, 109, 0} }}, {{ {170, 88, 266}, 0, {-16, -16}, {24, 61, 109, 0} }}, - {{ {170, -88, 266}, 0, {-198, 414}, {23, 195, 109, 0} }}, - {{ {141, -176, 106}, 0, {1372, 98}, {29, 133, 239, 0} }}, + {{ {170, -88, 266}, 0, {-198, 414}, {24, 195, 109, 0} }}, + {{ {141, -176, 106}, 0, {1372, 98}, {29, 134, 239, 0} }}, {{ {217, -88, 238}, 0, {-146, -82}, {84, 195, 73, 0} }}, {{ {93, -175, 133}, 0, {1320, 596}, {226, 134, 17, 0} }}, - {{ {111, -71, 265}, 0, {-96, 882}, {206, 216, 110, 0} }}, + {{ {111, -71, 265}, 0, {-96, 882}, {206, 215, 109, 0} }}, {{ {50, -142, 158}, 0, {1122, 1024}, {172, 174, 49, 0} }}, {{ {217, -88, 238}, 0, {-16, -16}, {84, 195, 73, 0} }}, - {{ {141, -176, 106}, 0, {-16, -16}, {29, 133, 239, 0} }}, - {{ {183, -142, 81}, 0, {-16, -16}, {78, 166, 211, 0} }}, + {{ {141, -176, 106}, 0, {-16, -16}, {29, 134, 239, 0} }}, + {{ {183, -142, 81}, 0, {-16, -16}, {78, 167, 211, 0} }}, {{ {244, -71, 187}, 0, {-16, -16}, {117, 212, 21, 0} }}, - {{ {183, -142, 81}, 0, {456, 1066}, {78, 166, 211, 0} }}, + {{ {183, -142, 81}, 0, {456, 1066}, {78, 167, 211, 0} }}, {{ {122, -71, -25}, 0, {1404, 676}, {39, 211, 144, 0} }}, - {{ {178, -38, 5}, 0, {1000, 266}, {82, 234, 162, 0} }}, - {{ {213, -79, 64}, 0, {474, 484}, {103, 210, 197, 0} }}, + {{ {178, -38, 5}, 0, {1000, 266}, {82, 233, 162, 0} }}, + {{ {213, -79, 64}, 0, {474, 484}, {102, 210, 197, 0} }}, {{ {223, 0, 58}, 0, {490, -104}, {110, 0, 193, 0} }}, - {{ {246, -38, 122}, 0, {-38, 168}, {123, 235, 232, 0} }}, + {{ {246, -38, 122}, 0, {-38, 168}, {123, 234, 231, 0} }}, {{ {244, -71, 187}, 0, {-462, 496}, {117, 212, 21, 0} }}, - {{ {141, -176, 106}, 0, {-370, -58}, {29, 133, 239, 0} }}, + {{ {141, -176, 106}, 0, {-370, -58}, {29, 134, 239, 0} }}, {{ {65, -88, -26}, 0, {1258, -4}, {233, 195, 147, 0} }}, {{ {122, -71, -25}, 0, {1100, -320}, {39, 211, 144, 0} }}, {{ {93, -175, 133}, 0, {-362, 392}, {226, 134, 17, 0} }}, {{ {17, -88, 2}, 0, {1264, 448}, {172, 195, 182, 0} }}, {{ {50, -142, 158}, 0, {-184, 898}, {172, 174, 49, 0} }}, {{ {-10, -71, 55}, 0, {1120, 942}, {136, 216, 246, 0} }}, - {{ {178, 38, 5}, 0, {-16, -16}, {82, 22, 161, 0} }}, + {{ {178, 38, 5}, 0, {-16, -16}, {82, 22, 162, 0} }}, {{ {213, 79, 64}, 0, {-16, -16}, {103, 47, 198, 0} }}, {{ {223, 0, 58}, 0, {-16, -16}, {110, 0, 193, 0} }}, - {{ {178, -38, 5}, 0, {-16, -16}, {82, 234, 162, 0} }}, + {{ {178, -38, 5}, 0, {-16, -16}, {82, 233, 162, 0} }}, {{ {122, 71, -25}, 0, {2, 250}, {39, 45, 144, 0} }}, {{ {213, 79, 64}, 0, {688, -162}, {103, 47, 198, 0} }}, - {{ {178, 38, 5}, 0, {194, -140}, {82, 22, 161, 0} }}, - {{ {183, 142, 81}, 0, {892, 212}, {78, 90, 211, 0} }}, + {{ {178, 38, 5}, 0, {194, -140}, {82, 22, 162, 0} }}, + {{ {183, 142, 81}, 0, {892, 212}, {78, 89, 211, 0} }}, {{ {65, 88, -26}, 0, {-98, 640}, {233, 61, 147, 0} }}, - {{ {141, 176, 106}, 0, {1010, 594}, {29, 123, 240, 0} }}, + {{ {141, 176, 106}, 0, {1010, 594}, {29, 122, 239, 0} }}, {{ {17, 88, 2}, 0, {-92, 952}, {172, 61, 183, 0} }}, {{ {93, 175, 133}, 0, {1016, 906}, {226, 122, 17, 0} }}, - {{ {178, 38, 5}, 0, {780, -272}, {82, 22, 161, 0} }}, - {{ {178, -38, 5}, 0, {304, -170}, {82, 234, 162, 0} }}, + {{ {178, 38, 5}, 0, {780, -272}, {82, 22, 162, 0} }}, + {{ {178, -38, 5}, 0, {304, -170}, {82, 233, 162, 0} }}, {{ {122, 71, -25}, 0, {1036, -112}, {39, 45, 144, 0} }}, - {{ {1, 43, 100}, 0, {751, 1673}, {138, 9, 47, 0} }}, + {{ {1, 43, 100}, 0, {751, 1673}, {139, 10, 47, 0} }}, {{ {38, 89, 165}, 0, {610, 1852}, {147, 20, 62, 0} }}, - {{ {50, 142, 158}, 0, {624, 1980}, {171, 82, 48, 0} }}, - {{ {111, 71, 265}, 0, {306, 1880}, {206, 40, 110, 0} }}, - {{ {76, 43, 230}, 0, {408, 1776}, {155, 9, 77, 0} }}, - {{ {111, -71, 265}, 0, {250, 1518}, {206, 216, 110, 0} }}, - {{ {76, -43, 230}, 0, {375, 1557}, {155, 247, 77, 0} }}, + {{ {50, 142, 158}, 0, {624, 1980}, {172, 82, 48, 0} }}, + {{ {111, 71, 265}, 0, {306, 1880}, {206, 40, 109, 0} }}, + {{ {76, 43, 230}, 0, {408, 1776}, {156, 9, 77, 0} }}, + {{ {111, -71, 265}, 0, {250, 1518}, {206, 215, 109, 0} }}, + {{ {76, -43, 230}, 0, {375, 1557}, {156, 246, 77, 0} }}, {{ {50, -142, 158}, 0, {508, 1254}, {172, 174, 49, 0} }}, - {{ {38, -89, 165}, 0, {531, 1396}, {147, 236, 63, 0} }}, + {{ {38, -89, 165}, 0, {531, 1396}, {148, 236, 63, 0} }}, {{ {-10, -71, 55}, 0, {826, 1356}, {136, 216, 246, 0} }}, - {{ {1, -43, 100}, 0, {724, 1458}, {138, 247, 47, 0} }}, - {{ {76, 43, 230}, 0, {-16, -16}, {155, 9, 77, 0} }}, + {{ {1, -43, 100}, 0, {724, 1458}, {139, 247, 47, 0} }}, + {{ {76, 43, 230}, 0, {-16, -16}, {156, 9, 77, 0} }}, {{ {38, 89, 165}, 0, {-16, -16}, {147, 20, 62, 0} }}, - {{ {76, -43, 230}, 0, {-16, -16}, {155, 247, 77, 0} }}, - {{ {38, -89, 165}, 0, {-16, -16}, {147, 236, 63, 0} }}, - {{ {1, 43, 100}, 0, {-16, -16}, {138, 9, 47, 0} }}, - {{ {1, -43, 100}, 0, {-16, -16}, {138, 247, 47, 0} }}, + {{ {76, -43, 230}, 0, {-16, -16}, {156, 246, 77, 0} }}, + {{ {38, -89, 165}, 0, {-16, -16}, {148, 236, 63, 0} }}, + {{ {1, 43, 100}, 0, {-16, -16}, {139, 10, 47, 0} }}, + {{ {1, -43, 100}, 0, {-16, -16}, {139, 247, 47, 0} }}, {{ {-10, -71, 55}, 0, {184, 1066}, {136, 216, 246, 0} }}, {{ {17, 88, 2}, 0, {1214, 712}, {172, 61, 183, 0} }}, {{ {17, -88, 2}, 0, {34, 812}, {172, 195, 182, 0} }}, @@ -1502,22 +1384,22 @@ Vtx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_vtx_0[100] = { {{ {122, 71, -25}, 0, {1050, -18}, {39, 45, 144, 0} }}, {{ {122, -71, -25}, 0, {104, 62}, {39, 211, 144, 0} }}, {{ {244, 71, 187}, 0, {832, 1186}, {117, 44, 21, 0} }}, - {{ {246, -38, 122}, 0, {1162, -70}, {123, 235, 232, 0} }}, - {{ {246, 38, 122}, 0, {654, 498}, {123, 22, 232, 0} }}, + {{ {246, -38, 122}, 0, {1162, -70}, {123, 234, 231, 0} }}, + {{ {246, 38, 122}, 0, {654, 498}, {123, 22, 231, 0} }}, {{ {223, 0, 58}, 0, {414, -278}, {110, 0, 193, 0} }}, {{ {213, 79, 64}, 0, {-98, 326}, {103, 47, 198, 0} }}, - {{ {183, 142, 81}, 0, {-524, 874}, {78, 90, 211, 0} }}, + {{ {183, 142, 81}, 0, {-524, 874}, {78, 89, 211, 0} }}, {{ {-10, 71, 55}, 0, {82, 380}, {136, 40, 246, 0} }}, - {{ {50, 142, 158}, 0, {1024, 984}, {171, 82, 48, 0} }}, + {{ {50, 142, 158}, 0, {1024, 984}, {172, 82, 48, 0} }}, {{ {93, 175, 133}, 0, {1466, 550}, {226, 122, 17, 0} }}, - {{ {1, 43, 100}, 0, {-11, 790}, {138, 9, 47, 0} }}, - {{ {1, -43, 100}, 0, {-656, 946}, {138, 247, 47, 0} }}, + {{ {1, 43, 100}, 0, {-11, 790}, {139, 10, 47, 0} }}, + {{ {1, -43, 100}, 0, {-656, 946}, {139, 247, 47, 0} }}, {{ {-10, -71, 55}, 0, {-982, 638}, {136, 216, 246, 0} }}, {{ {17, 88, 2}, 0, {290, -208}, {172, 61, 183, 0} }}, }; -Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_tri_0[] = { - gsSPVertex(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_vtx_0 + 0, 63, 0), +Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_1[] = { + gsSPVertex(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_vtx_1 + 0, 63, 0), gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), gsSP2Triangles(10, 8, 7, 0, 10, 11, 8, 0), @@ -1539,7 +1421,7 @@ Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_tri_0[] = { gsSP2Triangles(56, 57, 55, 0, 58, 57, 56, 0), gsSP2Triangles(58, 59, 57, 0, 1, 60, 61, 0), gsSP1Triangle(1, 62, 60, 0), - gsSPVertex(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_vtx_0 + 63, 37, 0), + gsSPVertex(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_vtx_1 + 63, 37, 0), gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), gsSP2Triangles(1, 4, 3, 0, 4, 5, 3, 0), gsSP2Triangles(4, 6, 5, 0, 6, 7, 5, 0), @@ -1558,31 +1440,31 @@ Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_0[20] = { +Vtx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_0[20] = { {{ {7, -14, 18}, 0, {0, 0}, {193, 179, 79, 255} }}, - {{ {11, 5, 21}, 0, {0, 0}, {213, 3, 120, 255} }}, + {{ {11, 5, 21}, 0, {0, 0}, {212, 4, 119, 255} }}, {{ {-5, 14, 18}, 0, {0, 0}, {171, 22, 91, 255} }}, {{ {37, -16, 30}, 0, {0, 0}, {32, 183, 99, 255} }}, - {{ {10, -22, -6}, 0, {0, 0}, {206, 143, 227, 255} }}, - {{ {-9, -4, -1}, 0, {0, 0}, {138, 208, 253, 255} }}, - {{ {-8, 23, -6}, 0, {0, 0}, {142, 47, 227, 255} }}, - {{ {10, 36, 12}, 0, {0, 0}, {208, 93, 73, 255} }}, - {{ {26, 7, 30}, 0, {0, 0}, {242, 19, 125, 255} }}, + {{ {10, -22, -6}, 0, {0, 0}, {205, 143, 227, 255} }}, + {{ {-9, -4, -1}, 0, {0, 0}, {139, 208, 252, 255} }}, + {{ {-8, 23, -6}, 0, {0, 0}, {142, 48, 227, 255} }}, + {{ {10, 36, 12}, 0, {0, 0}, {208, 92, 73, 255} }}, + {{ {26, 7, 30}, 0, {0, 0}, {242, 20, 125, 255} }}, {{ {48, -2, 22}, 0, {0, 0}, {105, 253, 72, 255} }}, {{ {52, -14, -6}, 0, {0, 0}, {101, 190, 216, 255} }}, {{ {26, -24, -9}, 0, {0, 0}, {13, 142, 202, 255} }}, {{ {1, 0, -22}, 0, {0, 0}, {184, 226, 156, 255} }}, {{ {2, 35, -9}, 0, {0, 0}, {180, 89, 206, 255} }}, - {{ {25, 47, -9}, 0, {0, 0}, {17, 121, 222, 255} }}, + {{ {25, 47, -9}, 0, {0, 0}, {18, 121, 221, 255} }}, {{ {24, 32, 17}, 0, {0, 0}, {21, 85, 92, 255} }}, - {{ {43, 11, 22}, 0, {0, 0}, {72, 47, 94, 255} }}, + {{ {43, 11, 22}, 0, {0, 0}, {72, 47, 93, 255} }}, {{ {48, 24, 5}, 0, {0, 0}, {108, 64, 20, 255} }}, - {{ {40, 17, -27}, 0, {0, 0}, {63, 22, 148, 255} }}, + {{ {40, 17, -27}, 0, {0, 0}, {63, 23, 148, 255} }}, {{ {14, 6, -27}, 0, {0, 0}, {238, 248, 131, 255} }}, }; -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_0 + 0, 20, 0), +Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_0 + 0, 20, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(0, 4, 3, 0, 5, 4, 0, 0), gsSP2Triangles(5, 0, 2, 0, 6, 5, 2, 0), @@ -1604,35 +1486,51 @@ Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_ gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_1[94] = { - {{ {141, -176, 106}, 0, {-418, 482}, {29, 133, 239, 0} }}, +Vtx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_1[6] = { + {{ {1, -43, 100}, 0, {-16, -16}, {139, 247, 47, 0} }}, + {{ {38, -89, 165}, 0, {-16, -16}, {148, 236, 63, 0} }}, + {{ {1, 43, 100}, 0, {-16, -16}, {139, 10, 47, 0} }}, + {{ {38, 89, 165}, 0, {-16, -16}, {147, 20, 62, 0} }}, + {{ {76, -43, 230}, 0, {-16, -16}, {156, 246, 77, 0} }}, + {{ {76, 43, 230}, 0, {-16, -16}, {156, 9, 77, 0} }}, +}; + +Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_1[] = { + gsSPVertex(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_1 + 0, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0), + gsSP2Triangles(4, 3, 1, 0, 5, 3, 4, 0), + gsSPEndDisplayList(), +}; + +Vtx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_vtx_0[94] = { + {{ {141, -176, 106}, 0, {-418, 482}, {29, 134, 239, 0} }}, {{ {122, -71, -25}, 0, {178, 72}, {39, 211, 144, 0} }}, - {{ {183, -142, 81}, 0, {-280, 152}, {78, 166, 211, 0} }}, - {{ {1, 43, 100}, 0, {751, 1673}, {138, 9, 47, 0} }}, + {{ {183, -142, 81}, 0, {-280, 152}, {78, 167, 211, 0} }}, + {{ {1, 43, 100}, 0, {751, 1673}, {139, 10, 47, 0} }}, {{ {38, 89, 165}, 0, {610, 1852}, {147, 20, 62, 0} }}, - {{ {50, 142, 158}, 0, {624, 1980}, {171, 82, 48, 0} }}, - {{ {111, 71, 265}, 0, {306, 1880}, {206, 40, 110, 0} }}, - {{ {76, 43, 230}, 0, {408, 1776}, {155, 9, 77, 0} }}, - {{ {111, -71, 265}, 0, {250, 1518}, {206, 216, 110, 0} }}, - {{ {76, -43, 230}, 0, {375, 1557}, {155, 247, 77, 0} }}, + {{ {50, 142, 158}, 0, {624, 1980}, {172, 82, 48, 0} }}, + {{ {111, 71, 265}, 0, {306, 1880}, {206, 40, 109, 0} }}, + {{ {76, 43, 230}, 0, {408, 1776}, {156, 9, 77, 0} }}, + {{ {111, -71, 265}, 0, {250, 1518}, {206, 215, 109, 0} }}, + {{ {76, -43, 230}, 0, {375, 1557}, {156, 246, 77, 0} }}, {{ {50, -142, 158}, 0, {508, 1254}, {172, 174, 49, 0} }}, - {{ {38, -89, 165}, 0, {531, 1396}, {147, 236, 63, 0} }}, + {{ {38, -89, 165}, 0, {531, 1396}, {148, 236, 63, 0} }}, {{ {-10, -71, 55}, 0, {826, 1356}, {136, 216, 246, 0} }}, - {{ {1, -43, 100}, 0, {724, 1458}, {138, 247, 47, 0} }}, + {{ {1, -43, 100}, 0, {724, 1458}, {139, 247, 47, 0} }}, {{ {17, 88, 2}, 0, {-92, 952}, {172, 61, 183, 0} }}, {{ {93, 175, 133}, 0, {1016, 906}, {226, 122, 17, 0} }}, - {{ {141, 176, 106}, 0, {1010, 594}, {29, 123, 240, 0} }}, + {{ {141, 176, 106}, 0, {1010, 594}, {29, 122, 239, 0} }}, {{ {65, 88, -26}, 0, {-98, 640}, {233, 61, 147, 0} }}, - {{ {183, 142, 81}, 0, {892, 212}, {78, 90, 211, 0} }}, + {{ {183, 142, 81}, 0, {892, 212}, {78, 89, 211, 0} }}, {{ {122, 71, -25}, 0, {2, 250}, {39, 45, 144, 0} }}, {{ {213, 79, 64}, 0, {688, -162}, {103, 47, 198, 0} }}, - {{ {178, 38, 5}, 0, {194, -140}, {82, 22, 161, 0} }}, + {{ {178, 38, 5}, 0, {194, -140}, {82, 22, 162, 0} }}, {{ {93, 175, 133}, 0, {-196, 438}, {226, 122, 17, 0} }}, {{ {217, 88, 238}, 0, {1220, 36}, {84, 61, 73, 0} }}, - {{ {141, 176, 106}, 0, {-198, -10}, {29, 123, 240, 0} }}, + {{ {141, 176, 106}, 0, {-198, -10}, {29, 122, 239, 0} }}, {{ {170, 88, 266}, 0, {1222, 482}, {24, 61, 109, 0} }}, - {{ {50, 142, 158}, 0, {-54, 916}, {171, 82, 48, 0} }}, - {{ {111, 71, 265}, 0, {1084, 952}, {206, 40, 110, 0} }}, + {{ {50, 142, 158}, 0, {-54, 916}, {172, 82, 48, 0} }}, + {{ {111, 71, 265}, 0, {1084, 952}, {206, 40, 109, 0} }}, {{ {-10, -71, 55}, 0, {184, 1066}, {136, 216, 246, 0} }}, {{ {17, 88, 2}, 0, {1214, 712}, {172, 61, 183, 0} }}, {{ {17, -88, 2}, 0, {34, 812}, {172, 195, 182, 0} }}, @@ -1640,18 +1538,18 @@ Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_ {{ {65, -88, -26}, 0, {6, 452}, {233, 195, 147, 0} }}, {{ {122, 71, -25}, 0, {1050, -18}, {39, 45, 144, 0} }}, {{ {122, -71, -25}, 0, {104, 62}, {39, 211, 144, 0} }}, - {{ {178, 38, 5}, 0, {780, -272}, {82, 22, 161, 0} }}, - {{ {178, -38, 5}, 0, {304, -170}, {82, 234, 162, 0} }}, + {{ {178, 38, 5}, 0, {780, -272}, {82, 22, 162, 0} }}, + {{ {178, -38, 5}, 0, {304, -170}, {82, 233, 162, 0} }}, {{ {122, 71, -25}, 0, {1036, -112}, {39, 45, 144, 0} }}, - {{ {183, -142, 81}, 0, {456, 1066}, {78, 166, 211, 0} }}, + {{ {183, -142, 81}, 0, {456, 1066}, {78, 167, 211, 0} }}, {{ {122, -71, -25}, 0, {1404, 676}, {39, 211, 144, 0} }}, - {{ {178, -38, 5}, 0, {1000, 266}, {82, 234, 162, 0} }}, - {{ {213, -79, 64}, 0, {474, 484}, {103, 210, 197, 0} }}, + {{ {178, -38, 5}, 0, {1000, 266}, {82, 233, 162, 0} }}, + {{ {213, -79, 64}, 0, {474, 484}, {102, 210, 197, 0} }}, {{ {223, 0, 58}, 0, {490, -104}, {110, 0, 193, 0} }}, - {{ {246, -38, 122}, 0, {-38, 168}, {123, 235, 232, 0} }}, + {{ {246, -38, 122}, 0, {-38, 168}, {123, 234, 231, 0} }}, {{ {244, -71, 187}, 0, {-462, 496}, {117, 212, 21, 0} }}, - {{ {178, -38, 5}, 0, {-16, -16}, {82, 234, 162, 0} }}, - {{ {178, 38, 5}, 0, {-16, -16}, {82, 22, 161, 0} }}, + {{ {178, -38, 5}, 0, {-16, -16}, {82, 233, 162, 0} }}, + {{ {178, 38, 5}, 0, {-16, -16}, {82, 22, 162, 0} }}, {{ {223, 0, 58}, 0, {-16, -16}, {110, 0, 193, 0} }}, {{ {213, 79, 64}, 0, {-16, -16}, {103, 47, 198, 0} }}, {{ {50, -142, 158}, 0, {-184, 898}, {172, 174, 49, 0} }}, @@ -1659,50 +1557,50 @@ Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_ {{ {17, -88, 2}, 0, {1264, 448}, {172, 195, 182, 0} }}, {{ {93, -175, 133}, 0, {-362, 392}, {226, 134, 17, 0} }}, {{ {65, -88, -26}, 0, {1258, -4}, {233, 195, 147, 0} }}, - {{ {141, -176, 106}, 0, {-370, -58}, {29, 133, 239, 0} }}, + {{ {141, -176, 106}, 0, {-370, -58}, {29, 134, 239, 0} }}, {{ {122, -71, -25}, 0, {1100, -320}, {39, 211, 144, 0} }}, {{ {244, 71, 187}, 0, {-26, 196}, {117, 44, 21, 0} }}, {{ {244, -71, 187}, 0, {888, 166}, {117, 212, 21, 0} }}, - {{ {246, -38, 122}, 0, {646, -188}, {123, 235, 232, 0} }}, + {{ {246, -38, 122}, 0, {646, -188}, {123, 234, 231, 0} }}, {{ {217, 88, 238}, 0, {-106, 592}, {84, 61, 73, 0} }}, {{ {217, -88, 238}, 0, {1032, 556}, {84, 195, 73, 0} }}, {{ {170, 88, 266}, 0, {-88, 942}, {24, 61, 109, 0} }}, - {{ {170, -88, 266}, 0, {1050, 906}, {23, 195, 109, 0} }}, - {{ {111, -71, 265}, 0, {-96, 882}, {206, 216, 110, 0} }}, + {{ {170, -88, 266}, 0, {1050, 906}, {24, 195, 109, 0} }}, + {{ {111, -71, 265}, 0, {-96, 882}, {206, 215, 109, 0} }}, {{ {50, -142, 158}, 0, {1122, 1024}, {172, 174, 49, 0} }}, {{ {93, -175, 133}, 0, {1320, 596}, {226, 134, 17, 0} }}, - {{ {170, -88, 266}, 0, {-198, 414}, {23, 195, 109, 0} }}, - {{ {141, -176, 106}, 0, {1372, 98}, {29, 133, 239, 0} }}, + {{ {170, -88, 266}, 0, {-198, 414}, {24, 195, 109, 0} }}, + {{ {141, -176, 106}, 0, {1372, 98}, {29, 134, 239, 0} }}, {{ {217, -88, 238}, 0, {-146, -82}, {84, 195, 73, 0} }}, - {{ {141, 176, 106}, 0, {-16, -16}, {29, 123, 240, 0} }}, + {{ {141, 176, 106}, 0, {-16, -16}, {29, 122, 239, 0} }}, {{ {244, 71, 187}, 0, {-16, -16}, {117, 44, 21, 0} }}, - {{ {183, 142, 81}, 0, {-16, -16}, {78, 90, 211, 0} }}, + {{ {183, 142, 81}, 0, {-16, -16}, {78, 89, 211, 0} }}, {{ {217, 88, 238}, 0, {-16, -16}, {84, 61, 73, 0} }}, - {{ {111, 71, 265}, 0, {-16, -16}, {206, 40, 110, 0} }}, - {{ {170, -88, 266}, 0, {-16, -16}, {23, 195, 109, 0} }}, + {{ {111, 71, 265}, 0, {-16, -16}, {206, 40, 109, 0} }}, + {{ {170, -88, 266}, 0, {-16, -16}, {24, 195, 109, 0} }}, {{ {170, 88, 266}, 0, {-16, -16}, {24, 61, 109, 0} }}, - {{ {111, -71, 265}, 0, {-16, -16}, {206, 216, 110, 0} }}, + {{ {111, -71, 265}, 0, {-16, -16}, {206, 215, 109, 0} }}, {{ {217, -88, 238}, 0, {-16, -16}, {84, 195, 73, 0} }}, - {{ {183, -142, 81}, 0, {-16, -16}, {78, 166, 211, 0} }}, + {{ {183, -142, 81}, 0, {-16, -16}, {78, 167, 211, 0} }}, {{ {244, -71, 187}, 0, {-16, -16}, {117, 212, 21, 0} }}, - {{ {141, -176, 106}, 0, {-16, -16}, {29, 133, 239, 0} }}, - {{ {1, 43, 100}, 0, {-11, 790}, {138, 9, 47, 0} }}, - {{ {50, 142, 158}, 0, {1024, 984}, {171, 82, 48, 0} }}, + {{ {141, -176, 106}, 0, {-16, -16}, {29, 134, 239, 0} }}, + {{ {1, 43, 100}, 0, {-11, 790}, {139, 10, 47, 0} }}, + {{ {50, 142, 158}, 0, {1024, 984}, {172, 82, 48, 0} }}, {{ {-10, 71, 55}, 0, {82, 380}, {136, 40, 246, 0} }}, {{ {93, 175, 133}, 0, {1466, 550}, {226, 122, 17, 0} }}, {{ {17, 88, 2}, 0, {290, -208}, {172, 61, 183, 0} }}, {{ {-10, -71, 55}, 0, {-982, 638}, {136, 216, 246, 0} }}, - {{ {1, -43, 100}, 0, {-656, 946}, {138, 247, 47, 0} }}, + {{ {1, -43, 100}, 0, {-656, 946}, {139, 247, 47, 0} }}, {{ {244, 71, 187}, 0, {832, 1186}, {117, 44, 21, 0} }}, - {{ {246, -38, 122}, 0, {1162, -70}, {123, 235, 232, 0} }}, - {{ {246, 38, 122}, 0, {654, 498}, {123, 22, 232, 0} }}, + {{ {246, -38, 122}, 0, {1162, -70}, {123, 234, 231, 0} }}, + {{ {246, 38, 122}, 0, {654, 498}, {123, 22, 231, 0} }}, {{ {223, 0, 58}, 0, {414, -278}, {110, 0, 193, 0} }}, {{ {213, 79, 64}, 0, {-98, 326}, {103, 47, 198, 0} }}, - {{ {183, 142, 81}, 0, {-524, 874}, {78, 90, 211, 0} }}, + {{ {183, 142, 81}, 0, {-524, 874}, {78, 89, 211, 0} }}, }; -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_1[] = { - gsSPVertex(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_1 + 0, 63, 0), +Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_tri_0[] = { + gsSPVertex(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_vtx_0 + 0, 63, 0), gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), gsSP2Triangles(4, 6, 5, 0, 4, 7, 6, 0), gsSP2Triangles(7, 8, 6, 0, 7, 9, 8, 0), @@ -1726,7 +1624,7 @@ Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_ gsSP2Triangles(56, 57, 58, 0, 59, 57, 56, 0), gsSP2Triangles(59, 60, 57, 0, 61, 60, 59, 0), gsSP1Triangle(61, 62, 60, 0), - gsSPVertex(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_1 + 63, 31, 0), + gsSPVertex(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_vtx_0 + 63, 31, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), gsSP2Triangles(6, 7, 8, 0, 6, 9, 7, 0), @@ -1741,103 +1639,87 @@ Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_ gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_2[6] = { - {{ {1, -43, 100}, 0, {-16, -16}, {138, 247, 47, 0} }}, - {{ {38, -89, 165}, 0, {-16, -16}, {147, 236, 63, 0} }}, - {{ {1, 43, 100}, 0, {-16, -16}, {138, 9, 47, 0} }}, - {{ {38, 89, 165}, 0, {-16, -16}, {147, 20, 62, 0} }}, - {{ {76, -43, 230}, 0, {-16, -16}, {155, 247, 77, 0} }}, - {{ {76, 43, 230}, 0, {-16, -16}, {155, 9, 77, 0} }}, -}; - -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_2[] = { - gsSPVertex(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_vtx_2 + 0, 6, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 2, 1, 0), - gsSP2Triangles(4, 3, 1, 0, 5, 3, 4, 0), - gsSPEndDisplayList(), -}; - -Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_vtx_0[100] = { - {{ {141, -176, 106}, 0, {-418, 482}, {29, 133, 239, 0} }}, +Vtx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_vtx_1[100] = { + {{ {141, -176, 106}, 0, {-418, 482}, {29, 134, 239, 0} }}, {{ {122, -71, -25}, 0, {178, 72}, {39, 211, 144, 0} }}, - {{ {183, -142, 81}, 0, {-280, 152}, {78, 166, 211, 0} }}, - {{ {141, 176, 106}, 0, {-16, -16}, {29, 123, 240, 0} }}, + {{ {183, -142, 81}, 0, {-280, 152}, {78, 167, 211, 0} }}, + {{ {141, 176, 106}, 0, {-16, -16}, {29, 122, 239, 0} }}, {{ {217, 88, 238}, 0, {-16, -16}, {84, 61, 73, 0} }}, {{ {244, 71, 187}, 0, {-16, -16}, {117, 44, 21, 0} }}, - {{ {183, 142, 81}, 0, {-16, -16}, {78, 90, 211, 0} }}, + {{ {183, 142, 81}, 0, {-16, -16}, {78, 89, 211, 0} }}, {{ {244, 71, 187}, 0, {-26, 196}, {117, 44, 21, 0} }}, {{ {244, -71, 187}, 0, {888, 166}, {117, 212, 21, 0} }}, - {{ {246, -38, 122}, 0, {646, -188}, {123, 235, 232, 0} }}, + {{ {246, -38, 122}, 0, {646, -188}, {123, 234, 231, 0} }}, {{ {217, 88, 238}, 0, {-106, 592}, {84, 61, 73, 0} }}, {{ {217, -88, 238}, 0, {1032, 556}, {84, 195, 73, 0} }}, {{ {170, 88, 266}, 0, {-88, 942}, {24, 61, 109, 0} }}, - {{ {170, -88, 266}, 0, {1050, 906}, {23, 195, 109, 0} }}, + {{ {170, -88, 266}, 0, {1050, 906}, {24, 195, 109, 0} }}, {{ {93, 175, 133}, 0, {-196, 438}, {226, 122, 17, 0} }}, {{ {217, 88, 238}, 0, {1220, 36}, {84, 61, 73, 0} }}, - {{ {141, 176, 106}, 0, {-198, -10}, {29, 123, 240, 0} }}, + {{ {141, 176, 106}, 0, {-198, -10}, {29, 122, 239, 0} }}, {{ {170, 88, 266}, 0, {1222, 482}, {24, 61, 109, 0} }}, - {{ {50, 142, 158}, 0, {-54, 916}, {171, 82, 48, 0} }}, - {{ {111, 71, 265}, 0, {1084, 952}, {206, 40, 110, 0} }}, - {{ {111, 71, 265}, 0, {-16, -16}, {206, 40, 110, 0} }}, - {{ {111, -71, 265}, 0, {-16, -16}, {206, 216, 110, 0} }}, - {{ {170, -88, 266}, 0, {-16, -16}, {23, 195, 109, 0} }}, + {{ {50, 142, 158}, 0, {-54, 916}, {172, 82, 48, 0} }}, + {{ {111, 71, 265}, 0, {1084, 952}, {206, 40, 109, 0} }}, + {{ {111, 71, 265}, 0, {-16, -16}, {206, 40, 109, 0} }}, + {{ {111, -71, 265}, 0, {-16, -16}, {206, 215, 109, 0} }}, + {{ {170, -88, 266}, 0, {-16, -16}, {24, 195, 109, 0} }}, {{ {170, 88, 266}, 0, {-16, -16}, {24, 61, 109, 0} }}, - {{ {170, -88, 266}, 0, {-198, 414}, {23, 195, 109, 0} }}, - {{ {141, -176, 106}, 0, {1372, 98}, {29, 133, 239, 0} }}, + {{ {170, -88, 266}, 0, {-198, 414}, {24, 195, 109, 0} }}, + {{ {141, -176, 106}, 0, {1372, 98}, {29, 134, 239, 0} }}, {{ {217, -88, 238}, 0, {-146, -82}, {84, 195, 73, 0} }}, {{ {93, -175, 133}, 0, {1320, 596}, {226, 134, 17, 0} }}, - {{ {111, -71, 265}, 0, {-96, 882}, {206, 216, 110, 0} }}, + {{ {111, -71, 265}, 0, {-96, 882}, {206, 215, 109, 0} }}, {{ {50, -142, 158}, 0, {1122, 1024}, {172, 174, 49, 0} }}, {{ {217, -88, 238}, 0, {-16, -16}, {84, 195, 73, 0} }}, - {{ {141, -176, 106}, 0, {-16, -16}, {29, 133, 239, 0} }}, - {{ {183, -142, 81}, 0, {-16, -16}, {78, 166, 211, 0} }}, + {{ {141, -176, 106}, 0, {-16, -16}, {29, 134, 239, 0} }}, + {{ {183, -142, 81}, 0, {-16, -16}, {78, 167, 211, 0} }}, {{ {244, -71, 187}, 0, {-16, -16}, {117, 212, 21, 0} }}, - {{ {183, -142, 81}, 0, {456, 1066}, {78, 166, 211, 0} }}, + {{ {183, -142, 81}, 0, {456, 1066}, {78, 167, 211, 0} }}, {{ {122, -71, -25}, 0, {1404, 676}, {39, 211, 144, 0} }}, - {{ {178, -38, 5}, 0, {1000, 266}, {82, 234, 162, 0} }}, - {{ {213, -79, 64}, 0, {474, 484}, {103, 210, 197, 0} }}, + {{ {178, -38, 5}, 0, {1000, 266}, {82, 233, 162, 0} }}, + {{ {213, -79, 64}, 0, {474, 484}, {102, 210, 197, 0} }}, {{ {223, 0, 58}, 0, {490, -104}, {110, 0, 193, 0} }}, - {{ {246, -38, 122}, 0, {-38, 168}, {123, 235, 232, 0} }}, + {{ {246, -38, 122}, 0, {-38, 168}, {123, 234, 231, 0} }}, {{ {244, -71, 187}, 0, {-462, 496}, {117, 212, 21, 0} }}, - {{ {141, -176, 106}, 0, {-370, -58}, {29, 133, 239, 0} }}, + {{ {141, -176, 106}, 0, {-370, -58}, {29, 134, 239, 0} }}, {{ {65, -88, -26}, 0, {1258, -4}, {233, 195, 147, 0} }}, {{ {122, -71, -25}, 0, {1100, -320}, {39, 211, 144, 0} }}, {{ {93, -175, 133}, 0, {-362, 392}, {226, 134, 17, 0} }}, {{ {17, -88, 2}, 0, {1264, 448}, {172, 195, 182, 0} }}, {{ {50, -142, 158}, 0, {-184, 898}, {172, 174, 49, 0} }}, {{ {-10, -71, 55}, 0, {1120, 942}, {136, 216, 246, 0} }}, - {{ {178, 38, 5}, 0, {-16, -16}, {82, 22, 161, 0} }}, + {{ {178, 38, 5}, 0, {-16, -16}, {82, 22, 162, 0} }}, {{ {213, 79, 64}, 0, {-16, -16}, {103, 47, 198, 0} }}, {{ {223, 0, 58}, 0, {-16, -16}, {110, 0, 193, 0} }}, - {{ {178, -38, 5}, 0, {-16, -16}, {82, 234, 162, 0} }}, + {{ {178, -38, 5}, 0, {-16, -16}, {82, 233, 162, 0} }}, {{ {122, 71, -25}, 0, {2, 250}, {39, 45, 144, 0} }}, {{ {213, 79, 64}, 0, {688, -162}, {103, 47, 198, 0} }}, - {{ {178, 38, 5}, 0, {194, -140}, {82, 22, 161, 0} }}, - {{ {183, 142, 81}, 0, {892, 212}, {78, 90, 211, 0} }}, + {{ {178, 38, 5}, 0, {194, -140}, {82, 22, 162, 0} }}, + {{ {183, 142, 81}, 0, {892, 212}, {78, 89, 211, 0} }}, {{ {65, 88, -26}, 0, {-98, 640}, {233, 61, 147, 0} }}, - {{ {141, 176, 106}, 0, {1010, 594}, {29, 123, 240, 0} }}, + {{ {141, 176, 106}, 0, {1010, 594}, {29, 122, 239, 0} }}, {{ {17, 88, 2}, 0, {-92, 952}, {172, 61, 183, 0} }}, {{ {93, 175, 133}, 0, {1016, 906}, {226, 122, 17, 0} }}, - {{ {178, 38, 5}, 0, {780, -272}, {82, 22, 161, 0} }}, - {{ {178, -38, 5}, 0, {304, -170}, {82, 234, 162, 0} }}, + {{ {178, 38, 5}, 0, {780, -272}, {82, 22, 162, 0} }}, + {{ {178, -38, 5}, 0, {304, -170}, {82, 233, 162, 0} }}, {{ {122, 71, -25}, 0, {1036, -112}, {39, 45, 144, 0} }}, - {{ {1, 43, 100}, 0, {751, 1673}, {138, 9, 47, 0} }}, + {{ {1, 43, 100}, 0, {751, 1673}, {139, 10, 47, 0} }}, {{ {38, 89, 165}, 0, {610, 1852}, {147, 20, 62, 0} }}, - {{ {50, 142, 158}, 0, {624, 1980}, {171, 82, 48, 0} }}, - {{ {111, 71, 265}, 0, {306, 1880}, {206, 40, 110, 0} }}, - {{ {76, 43, 230}, 0, {408, 1776}, {155, 9, 77, 0} }}, - {{ {111, -71, 265}, 0, {250, 1518}, {206, 216, 110, 0} }}, - {{ {76, -43, 230}, 0, {375, 1557}, {155, 247, 77, 0} }}, + {{ {50, 142, 158}, 0, {624, 1980}, {172, 82, 48, 0} }}, + {{ {111, 71, 265}, 0, {306, 1880}, {206, 40, 109, 0} }}, + {{ {76, 43, 230}, 0, {408, 1776}, {156, 9, 77, 0} }}, + {{ {111, -71, 265}, 0, {250, 1518}, {206, 215, 109, 0} }}, + {{ {76, -43, 230}, 0, {375, 1557}, {156, 246, 77, 0} }}, {{ {50, -142, 158}, 0, {508, 1254}, {172, 174, 49, 0} }}, - {{ {38, -89, 165}, 0, {531, 1396}, {147, 236, 63, 0} }}, + {{ {38, -89, 165}, 0, {531, 1396}, {148, 236, 63, 0} }}, {{ {-10, -71, 55}, 0, {826, 1356}, {136, 216, 246, 0} }}, - {{ {1, -43, 100}, 0, {724, 1458}, {138, 247, 47, 0} }}, - {{ {76, 43, 230}, 0, {-16, -16}, {155, 9, 77, 0} }}, + {{ {1, -43, 100}, 0, {724, 1458}, {139, 247, 47, 0} }}, + {{ {76, 43, 230}, 0, {-16, -16}, {156, 9, 77, 0} }}, {{ {38, 89, 165}, 0, {-16, -16}, {147, 20, 62, 0} }}, - {{ {76, -43, 230}, 0, {-16, -16}, {155, 247, 77, 0} }}, - {{ {38, -89, 165}, 0, {-16, -16}, {147, 236, 63, 0} }}, - {{ {1, 43, 100}, 0, {-16, -16}, {138, 9, 47, 0} }}, - {{ {1, -43, 100}, 0, {-16, -16}, {138, 247, 47, 0} }}, + {{ {76, -43, 230}, 0, {-16, -16}, {156, 246, 77, 0} }}, + {{ {38, -89, 165}, 0, {-16, -16}, {148, 236, 63, 0} }}, + {{ {1, 43, 100}, 0, {-16, -16}, {139, 10, 47, 0} }}, + {{ {1, -43, 100}, 0, {-16, -16}, {139, 247, 47, 0} }}, {{ {-10, -71, 55}, 0, {184, 1066}, {136, 216, 246, 0} }}, {{ {17, 88, 2}, 0, {1214, 712}, {172, 61, 183, 0} }}, {{ {17, -88, 2}, 0, {34, 812}, {172, 195, 182, 0} }}, @@ -1846,22 +1728,22 @@ Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_vtx_ {{ {122, 71, -25}, 0, {1050, -18}, {39, 45, 144, 0} }}, {{ {122, -71, -25}, 0, {104, 62}, {39, 211, 144, 0} }}, {{ {244, 71, 187}, 0, {832, 1186}, {117, 44, 21, 0} }}, - {{ {246, -38, 122}, 0, {1162, -70}, {123, 235, 232, 0} }}, - {{ {246, 38, 122}, 0, {654, 498}, {123, 22, 232, 0} }}, + {{ {246, -38, 122}, 0, {1162, -70}, {123, 234, 231, 0} }}, + {{ {246, 38, 122}, 0, {654, 498}, {123, 22, 231, 0} }}, {{ {223, 0, 58}, 0, {414, -278}, {110, 0, 193, 0} }}, {{ {213, 79, 64}, 0, {-98, 326}, {103, 47, 198, 0} }}, - {{ {183, 142, 81}, 0, {-524, 874}, {78, 90, 211, 0} }}, + {{ {183, 142, 81}, 0, {-524, 874}, {78, 89, 211, 0} }}, {{ {-10, 71, 55}, 0, {82, 380}, {136, 40, 246, 0} }}, - {{ {50, 142, 158}, 0, {1024, 984}, {171, 82, 48, 0} }}, + {{ {50, 142, 158}, 0, {1024, 984}, {172, 82, 48, 0} }}, {{ {93, 175, 133}, 0, {1466, 550}, {226, 122, 17, 0} }}, - {{ {1, 43, 100}, 0, {-11, 790}, {138, 9, 47, 0} }}, - {{ {1, -43, 100}, 0, {-656, 946}, {138, 247, 47, 0} }}, + {{ {1, 43, 100}, 0, {-11, 790}, {139, 10, 47, 0} }}, + {{ {1, -43, 100}, 0, {-656, 946}, {139, 247, 47, 0} }}, {{ {-10, -71, 55}, 0, {-982, 638}, {136, 216, 246, 0} }}, {{ {17, 88, 2}, 0, {290, -208}, {172, 61, 183, 0} }}, }; -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_tri_0[] = { - gsSPVertex(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_vtx_0 + 0, 63, 0), +Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_tri_1[] = { + gsSPVertex(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_vtx_1 + 0, 63, 0), gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), gsSP2Triangles(10, 8, 7, 0, 10, 11, 8, 0), @@ -1883,7 +1765,7 @@ Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_tri_ gsSP2Triangles(56, 57, 55, 0, 58, 57, 56, 0), gsSP2Triangles(58, 59, 57, 0, 1, 60, 61, 0), gsSP1Triangle(1, 62, 60, 0), - gsSPVertex(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_vtx_0 + 63, 37, 0), + gsSPVertex(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_4_vtx_1 + 63, 37, 0), gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), gsSP2Triangles(1, 4, 3, 0, 4, 5, 3, 0), gsSP2Triangles(4, 6, 5, 0, 6, 7, 5, 0), @@ -1902,67 +1784,67 @@ Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_tri_ gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_0[8] = { - {{ {179, -132, 172}, 0, {974, 1996}, {196, 167, 189, 255} }}, - {{ {165, -62, 93}, 0, {-16, 1996}, {195, 167, 189, 255} }}, - {{ {363, -192, 86}, 0, {974, -16}, {195, 166, 190, 255} }}, - {{ {349, -125, 7}, 0, {-16, -16}, {195, 166, 190, 255} }}, - {{ {363, 192, 86}, 0, {974, -16}, {195, 90, 190, 255} }}, - {{ {165, 62, 93}, 0, {-16, 1996}, {195, 89, 189, 255} }}, - {{ {179, 132, 172}, 0, {974, 1996}, {196, 89, 189, 255} }}, - {{ {349, 125, 7}, 0, {-16, -16}, {195, 90, 190, 255} }}, +Vtx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_0[8] = { + {{ {179, -132, 172}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {165, -62, 93}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {363, -192, 86}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {349, -125, 7}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {363, 192, 86}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {165, 62, 93}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {179, 132, 172}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {349, 125, 7}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }}, }; -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_0[] = { - gsSPVertex(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_0 + 0, 8, 0), +Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_0[] = { + gsSPVertex(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_0 + 0, 8, 0), gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0), gsSPEndDisplayList(), }; -Vtx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_1[8] = { - {{ {179, -132, 172}, 0, {-16, 1996}, {196, 167, 189, 255} }}, - {{ {363, -192, 86}, 0, {-16, -16}, {195, 166, 190, 255} }}, - {{ {378, -261, 167}, 0, {974, -16}, {196, 166, 190, 255} }}, - {{ {193, -201, 252}, 0, {974, 1996}, {196, 166, 190, 255} }}, - {{ {378, 261, 167}, 0, {974, -16}, {196, 90, 190, 255} }}, - {{ {363, 192, 86}, 0, {-16, -16}, {195, 90, 190, 255} }}, - {{ {179, 132, 172}, 0, {-16, 1996}, {196, 89, 189, 255} }}, - {{ {193, 201, 252}, 0, {974, 1996}, {196, 90, 190, 255} }}, +Vtx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_1[8] = { + {{ {179, -132, 172}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {363, -192, 86}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {378, -261, 167}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {193, -201, 252}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {378, 261, 167}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {363, 192, 86}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {179, 132, 172}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }}, + {{ {193, 201, 252}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }}, }; -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1[] = { - gsSPVertex(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_1 + 0, 8, 0), +Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1[] = { + gsSPVertex(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_vtx_1 + 0, 8, 0), gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0), gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), gsSPEndDisplayList(), }; -Vtx toad_Left_Shoe_mesh_layer_1_vtx_0[20] = { - {{ {56, 5, 48}, 0, {-16, -16}, {47, 50, 107, 0} }}, - {{ {40, -23, 38}, 0, {-16, -16}, {250, 188, 107, 0} }}, - {{ {64, -32, 20}, 0, {-16, -16}, {69, 158, 43, 0} }}, +Vtx toad_player_Left_Shoe_mesh_layer_1_vtx_0[20] = { + {{ {56, 5, 48}, 0, {-16, -16}, {47, 51, 107, 0} }}, + {{ {40, -23, 38}, 0, {-16, -16}, {249, 188, 107, 0} }}, + {{ {64, -32, 20}, 0, {-16, -16}, {69, 159, 43, 0} }}, {{ {-1, -2, 29}, 0, {-16, -16}, {189, 212, 99, 0} }}, - {{ {8, 23, 36}, 0, {-16, -16}, {244, 83, 96, 0} }}, - {{ {8, 23, -31}, 0, {-16, -16}, {244, 83, 160, 0} }}, - {{ {56, 5, -43}, 0, {-16, -16}, {48, 48, 149, 0} }}, - {{ {80, -4, 25}, 0, {-16, -16}, {115, 31, 45, 0} }}, + {{ {8, 23, 36}, 0, {-16, -16}, {244, 82, 96, 0} }}, + {{ {8, 23, -31}, 0, {-16, -16}, {243, 82, 160, 0} }}, + {{ {56, 5, -43}, 0, {-16, -16}, {49, 49, 149, 0} }}, + {{ {80, -4, 25}, 0, {-16, -16}, {114, 31, 46, 0} }}, {{ {80, -4, -20}, 0, {-16, -16}, {114, 30, 208, 0} }}, - {{ {64, -32, -15}, 0, {-16, -16}, {69, 160, 211, 0} }}, - {{ {30, -39, 20}, 0, {-16, -16}, {225, 141, 45, 0} }}, - {{ {-5, -11, 16}, 0, {-16, -16}, {169, 171, 38, 0} }}, + {{ {64, -32, -15}, 0, {-16, -16}, {69, 160, 210, 0} }}, + {{ {30, -39, 20}, 0, {-16, -16}, {225, 142, 46, 0} }}, + {{ {-5, -11, 16}, 0, {-16, -16}, {170, 171, 38, 0} }}, {{ {-20, 9, 16}, 0, {-16, -16}, {141, 228, 47, 0} }}, - {{ {-17, 32, 19}, 0, {-16, -16}, {189, 95, 52, 0} }}, + {{ {-17, 32, 19}, 0, {-16, -16}, {189, 94, 52, 0} }}, {{ {-17, 32, -14}, 0, {-16, -16}, {189, 94, 204, 0} }}, - {{ {-20, 9, -11}, 0, {-16, -16}, {141, 228, 209, 0} }}, - {{ {-1, -2, -24}, 0, {-16, -16}, {188, 215, 157, 0} }}, - {{ {40, -23, -33}, 0, {-16, -16}, {254, 189, 148, 0} }}, + {{ {-20, 9, -11}, 0, {-16, -16}, {142, 228, 209, 0} }}, + {{ {-1, -2, -24}, 0, {-16, -16}, {188, 214, 157, 0} }}, + {{ {40, -23, -33}, 0, {-16, -16}, {253, 189, 148, 0} }}, {{ {30, -39, -15}, 0, {-16, -16}, {226, 141, 212, 0} }}, {{ {-5, -11, -11}, 0, {-16, -16}, {168, 172, 220, 0} }}, }; -Gfx toad_Left_Shoe_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Left_Shoe_mesh_layer_1_vtx_0 + 0, 20, 0), +Gfx toad_player_Left_Shoe_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Left_Shoe_mesh_layer_1_vtx_0 + 0, 20, 0), gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0), gsSP2Triangles(3, 0, 4, 0, 4, 0, 5, 0), gsSP2Triangles(0, 6, 5, 0, 6, 0, 7, 0), @@ -1984,31 +1866,31 @@ Gfx toad_Left_Shoe_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx toad_Right_Shoe_DL_mesh_layer_1_vtx_0[20] = { - {{ {56, 5, 43}, 0, {-16, -16}, {47, 50, 107, 0} }}, +Vtx toad_player_Right_Shoe_DL_mesh_layer_1_vtx_0[20] = { + {{ {56, 5, 43}, 0, {-16, -16}, {47, 51, 107, 0} }}, {{ {-1, -2, 24}, 0, {-16, -16}, {189, 212, 99, 0} }}, - {{ {40, -23, 33}, 0, {-16, -16}, {250, 188, 107, 0} }}, - {{ {8, 23, 31}, 0, {-16, -16}, {244, 83, 96, 0} }}, - {{ {56, 5, -48}, 0, {-16, -16}, {48, 48, 149, 0} }}, + {{ {40, -23, 33}, 0, {-16, -16}, {249, 188, 107, 0} }}, + {{ {8, 23, 31}, 0, {-16, -16}, {244, 82, 96, 0} }}, + {{ {56, 5, -48}, 0, {-16, -16}, {49, 49, 149, 0} }}, {{ {80, -4, -25}, 0, {-16, -16}, {114, 30, 208, 0} }}, - {{ {80, -4, 20}, 0, {-16, -16}, {115, 31, 45, 0} }}, - {{ {64, -32, 15}, 0, {-16, -16}, {69, 158, 43, 0} }}, - {{ {30, -39, 15}, 0, {-16, -16}, {225, 141, 45, 0} }}, - {{ {-5, -11, 11}, 0, {-16, -16}, {169, 171, 38, 0} }}, + {{ {80, -4, 20}, 0, {-16, -16}, {114, 31, 46, 0} }}, + {{ {64, -32, 15}, 0, {-16, -16}, {69, 159, 43, 0} }}, + {{ {30, -39, 15}, 0, {-16, -16}, {225, 142, 46, 0} }}, + {{ {-5, -11, 11}, 0, {-16, -16}, {170, 171, 38, 0} }}, {{ {-20, 9, 11}, 0, {-16, -16}, {141, 228, 47, 0} }}, - {{ {-17, 32, 14}, 0, {-16, -16}, {189, 95, 52, 0} }}, - {{ {8, 23, -36}, 0, {-16, -16}, {244, 83, 160, 0} }}, - {{ {40, -23, -38}, 0, {-16, -16}, {254, 189, 148, 0} }}, - {{ {64, -32, -20}, 0, {-16, -16}, {69, 160, 211, 0} }}, + {{ {-17, 32, 14}, 0, {-16, -16}, {189, 94, 52, 0} }}, + {{ {8, 23, -36}, 0, {-16, -16}, {243, 82, 160, 0} }}, + {{ {40, -23, -38}, 0, {-16, -16}, {253, 189, 148, 0} }}, + {{ {64, -32, -20}, 0, {-16, -16}, {69, 160, 210, 0} }}, {{ {30, -39, -20}, 0, {-16, -16}, {226, 141, 212, 0} }}, {{ {-5, -11, -16}, 0, {-16, -16}, {168, 172, 220, 0} }}, - {{ {-20, 9, -16}, 0, {-16, -16}, {141, 228, 209, 0} }}, + {{ {-20, 9, -16}, 0, {-16, -16}, {142, 228, 209, 0} }}, {{ {-17, 32, -19}, 0, {-16, -16}, {189, 94, 204, 0} }}, - {{ {-1, -2, -29}, 0, {-16, -16}, {188, 215, 157, 0} }}, + {{ {-1, -2, -29}, 0, {-16, -16}, {188, 214, 157, 0} }}, }; -Gfx toad_Right_Shoe_DL_mesh_layer_1_tri_0[] = { - gsSPVertex(toad_Right_Shoe_DL_mesh_layer_1_vtx_0 + 0, 20, 0), +Gfx toad_player_Right_Shoe_DL_mesh_layer_1_tri_0[] = { + gsSPVertex(toad_player_Right_Shoe_DL_mesh_layer_1_vtx_0 + 0, 20, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(4, 3, 0, 0, 5, 4, 0, 0), gsSP2Triangles(5, 0, 6, 0, 0, 7, 6, 0), @@ -2031,7 +1913,7 @@ Gfx toad_Right_Shoe_DL_mesh_layer_1_tri_0[] = { }; -Gfx mat_toad_white[] = { +Gfx mat_toad_player_white[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), @@ -2039,7 +1921,7 @@ Gfx mat_toad_white[] = { gsSPEndDisplayList(), }; -Gfx mat_toad_beige[] = { +Gfx mat_toad_player_beige[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), @@ -2047,7 +1929,7 @@ Gfx mat_toad_beige[] = { gsSPEndDisplayList(), }; -Gfx mat_toad_vest[] = { +Gfx mat_toad_player_vest[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPGeometryMode(G_CULL_BACK, 0), @@ -2056,19 +1938,19 @@ Gfx mat_toad_vest[] = { gsSPEndDisplayList(), }; -Gfx mat_revert_toad_vest[] = { +Gfx mat_revert_toad_player_vest[] = { gsDPPipeSync(), gsSPGeometryMode(0, G_CULL_BACK), gsSPEndDisplayList(), }; -Gfx mat_toad_metal[] = { +Gfx mat_toad_player_metal[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT), gsSPGeometryMode(0, G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), - gsSPLight(&toad_player_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 15), + gsSPLight(&toad_player_black_lights_group.l, 1), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_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), @@ -2082,20 +1964,20 @@ Gfx mat_toad_metal[] = { gsSPEndDisplayList(), }; -Gfx mat_revert_toad_metal[] = { +Gfx mat_revert_toad_player_metal[] = { gsDPPipeSync(), gsSPGeometryMode(G_TEXTURE_GEN, 0), gsSPEndDisplayList(), }; -Gfx mat_toad_metal_vest[] = { +Gfx mat_toad_player_metal_vest[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT), gsSPGeometryMode(0, G_TEXTURE_GEN), gsSPGeometryMode(G_CULL_BACK, 0), gsSPTexture(4032, 1984, 0, 0, 1), - gsSPLight(&toad_player_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 15), + gsSPLight(&toad_player_black_lights_group.l, 1), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_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), @@ -2109,22 +1991,27 @@ Gfx mat_toad_metal_vest[] = { gsSPEndDisplayList(), }; -Gfx mat_revert_toad_metal_vest[] = { +Gfx mat_revert_toad_player_metal_vest[] = { gsDPPipeSync(), gsSPGeometryMode(G_TEXTURE_GEN, 0), gsSPGeometryMode(0, G_CULL_BACK), gsSPEndDisplayList(), }; -Gfx mat_toad_cap_base[] = { +Gfx mat_toad_player_cap_base[] = { gsDPPipeSync(), - gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPCopyLightsPlayerPart(GLOVES), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_texture_cap), + gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPLoadBlock(7, 0, 0, 1023, 256), + gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), + gsDPSetTileSize(0, 0, 0, 124, 124), gsSPEndDisplayList(), }; -Gfx mat_toad_cap_spots[] = { +Gfx mat_toad_player_cap_spots[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), @@ -2137,147 +2024,230 @@ Gfx mat_toad_cap_spots[] = { gsSPEndDisplayList(), }; -Gfx mat_toad_hair[] = { +Gfx mat_toad_player_hair[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), gsSPGeometryMode(G_CULL_BACK, 0), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(toad_player_white_lights_group), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_texture_hair), - 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), + gsSPCopyLightsPlayerPart(HAIR), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_texture_hair), + gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 1023, 256), - gsDPSetTile(G_IM_FMT_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), + gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), gsDPSetTileSize(0, 0, 0, 124, 124), gsSPEndDisplayList(), }; -Gfx mat_revert_toad_hair[] = { +Gfx mat_revert_toad_player_hair[] = { gsDPPipeSync(), gsSPGeometryMode(0, G_CULL_BACK), gsSPEndDisplayList(), }; -Gfx mat_toad_eyes_center[] = { +Gfx mat_toad_player_eyes_center[] = { gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, COMBINED, 0, TEXEL0, 0, 0, 0, 0, ENVIRONMENT), + gsDPSetCycleType(G_CYC_2CYCLE), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(toad_player_white_lights_group), + gsSPCopyLightsPlayerPart(SKIN), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_player_texture_eyes_front), 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, toad_player_texture_face_neutral), + 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), gsSPEndDisplayList(), }; -Gfx mat_toad_face_blush[] = { +Gfx mat_revert_toad_player_eyes_center[] = { gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPEndDisplayList(), +}; + +Gfx mat_toad_player_eyes_half_closed[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, COMBINED, 0, TEXEL0, 0, 0, 0, 0, ENVIRONMENT), + gsDPSetCycleType(G_CYC_2CYCLE), gsSPTexture(65535, 65535, 0, 0, 1), gsSPCopyLightsPlayerPart(SKIN), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_texture_blush), - 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), - gsSPEndDisplayList(), -}; - -Gfx mat_toad_eyes_half_closed[] = { - gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), - gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(toad_player_white_lights_group), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_player_texture_eyes_half_closed), 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, toad_player_texture_face_neutral), + 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), gsSPEndDisplayList(), }; -Gfx mat_toad_eyes_closed[] = { +Gfx mat_revert_toad_player_eyes_half_closed[] = { gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPEndDisplayList(), +}; + +Gfx mat_toad_player_eyes_closed[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, COMBINED, 0, TEXEL0, 0, 0, 0, 0, ENVIRONMENT), + gsDPSetCycleType(G_CYC_2CYCLE), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(toad_player_white_lights_group), + gsSPCopyLightsPlayerPart(SKIN), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_player_texture_eyes_closed), 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, toad_player_texture_face_neutral), + 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), gsSPEndDisplayList(), }; -Gfx mat_toad_eyes_right[] = { +Gfx mat_revert_toad_player_eyes_closed[] = { gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPEndDisplayList(), +}; + +Gfx mat_toad_player_eyes_right[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, COMBINED, 0, TEXEL0, 0, 0, 0, 0, ENVIRONMENT), + gsDPSetCycleType(G_CYC_2CYCLE), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(toad_player_white_lights_group), + gsSPCopyLightsPlayerPart(SKIN), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_player_texture_eyes_right), 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, toad_player_texture_face_neutral), + 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), gsSPEndDisplayList(), }; -Gfx mat_toad_eyes_left[] = { +Gfx mat_revert_toad_player_eyes_right[] = { gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPEndDisplayList(), +}; + +Gfx mat_toad_player_eyes_left[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, COMBINED, 0, TEXEL0, 0, 0, 0, 0, ENVIRONMENT), + gsDPSetCycleType(G_CYC_2CYCLE), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(toad_player_white_lights_group), + gsSPCopyLightsPlayerPart(SKIN), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_player_texture_eyes_left), 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, toad_player_texture_face_neutral), + 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), gsSPEndDisplayList(), }; -Gfx mat_toad_eyes_up[] = { +Gfx mat_revert_toad_player_eyes_left[] = { gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPEndDisplayList(), +}; + +Gfx mat_toad_player_eyes_up[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, COMBINED, 0, TEXEL0, 0, 0, 0, 0, ENVIRONMENT), + gsDPSetCycleType(G_CYC_2CYCLE), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(toad_player_white_lights_group), + gsSPCopyLightsPlayerPart(SKIN), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_player_texture_eyes_up), 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, toad_player_texture_face_neutral), + 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), gsSPEndDisplayList(), }; -Gfx mat_toad_eyes_down[] = { +Gfx mat_revert_toad_player_eyes_up[] = { gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPEndDisplayList(), +}; + +Gfx mat_toad_player_eyes_down[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, COMBINED, 0, TEXEL0, 0, 0, 0, 0, ENVIRONMENT), + gsDPSetCycleType(G_CYC_2CYCLE), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(toad_player_white_lights_group), + gsSPCopyLightsPlayerPart(SKIN), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_player_texture_eyes_down), 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, toad_player_texture_face_neutral), + 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), gsSPEndDisplayList(), }; -Gfx mat_toad_eyes_dead[] = { +Gfx mat_revert_toad_player_eyes_down[] = { gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPEndDisplayList(), +}; + +Gfx mat_toad_player_eyes_dead[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, COMBINED, 0, TEXEL0, 0, 0, 0, 0, ENVIRONMENT), + gsDPSetCycleType(G_CYC_2CYCLE), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(toad_player_white_lights_group), + gsSPCopyLightsPlayerPart(SKIN), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_player_texture_eyes_dead), 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, toad_player_texture_face_dead), + 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), gsSPEndDisplayList(), }; -Gfx mat_toad_wing_tip[] = { +Gfx mat_revert_toad_player_eyes_dead[] = { gsDPPipeSync(), - gsDPSetCombineMode(G_CC_MODULATERGBA, G_CC_MODULATERGBA), - gsSPGeometryMode(G_CULL_BACK, 0), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPEndDisplayList(), +}; + +Gfx mat_toad_player_wing[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0), + gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_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), @@ -2287,16 +2257,16 @@ Gfx mat_toad_wing_tip[] = { gsSPEndDisplayList(), }; -Gfx mat_revert_toad_wing_tip[] = { +Gfx mat_revert_toad_player_wing[] = { gsDPPipeSync(), - gsSPGeometryMode(0, G_CULL_BACK), + gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK), gsSPEndDisplayList(), }; -Gfx mat_toad_wing[] = { +Gfx mat_toad_player_wing_tip[] = { gsDPPipeSync(), - gsDPSetCombineMode(G_CC_MODULATERGBA, G_CC_MODULATERGBA), - gsSPGeometryMode(G_CULL_BACK, 0), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0), + gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_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), @@ -2306,16 +2276,16 @@ Gfx mat_toad_wing[] = { gsSPEndDisplayList(), }; -Gfx mat_revert_toad_wing[] = { +Gfx mat_revert_toad_player_wing_tip[] = { gsDPPipeSync(), - gsSPGeometryMode(0, G_CULL_BACK), + gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK), gsSPEndDisplayList(), }; -Gfx mat_toad_metal_wing_tip[] = { +Gfx mat_toad_player_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_player_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), @@ -2325,16 +2295,16 @@ Gfx mat_toad_metal_wing_tip[] = { gsSPEndDisplayList(), }; -Gfx mat_revert_toad_metal_wing_tip[] = { +Gfx mat_revert_toad_player_metal_wing[] = { gsDPPipeSync(), - gsSPGeometryMode(0, G_CULL_BACK), + gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK), gsSPEndDisplayList(), }; -Gfx mat_toad_metal_wing[] = { +Gfx mat_toad_player_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_player_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), @@ -2344,26 +2314,26 @@ Gfx mat_toad_metal_wing[] = { gsSPEndDisplayList(), }; -Gfx mat_revert_toad_metal_wing[] = { +Gfx mat_revert_toad_player_metal_wing_tip[] = { gsDPPipeSync(), - gsSPGeometryMode(0, G_CULL_BACK), + gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK), gsSPEndDisplayList(), }; -Gfx mat_toad_toad_cap_inside[] = { +Gfx mat_toad_player_toad_cap_inside[] = { gsDPPipeSync(), 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_player_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), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_player_texture_cap_inside), + 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(), }; -Gfx mat_toad_brown[] = { +Gfx mat_toad_player_brown[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), @@ -2371,431 +2341,328 @@ Gfx mat_toad_brown[] = { gsSPEndDisplayList(), }; -Gfx toad_Torso_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_white), - gsSPDisplayList(toad_Torso_mesh_layer_1_tri_0), - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Torso_mesh_layer_1_tri_1), - gsSPDisplayList(mat_toad_vest), - gsSPDisplayList(toad_Torso_mesh_layer_1_tri_2), - gsSPDisplayList(mat_revert_toad_vest), +Gfx toad_player_Torso_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_white), + gsSPDisplayList(toad_player_Torso_mesh_layer_1_tri_0), + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Torso_mesh_layer_1_tri_1), + gsSPDisplayList(mat_toad_player_vest), + gsSPDisplayList(toad_player_Torso_mesh_layer_1_tri_2), + gsSPDisplayList(mat_revert_toad_player_vest), gsSPEndDisplayList(), }; -Gfx toad_Torso_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Torso_mesh_layer_1_tri_0), - gsSPDisplayList(toad_Torso_mesh_layer_1_tri_1), - gsSPDisplayList(mat_revert_toad_metal), - gsSPDisplayList(mat_toad_metal_vest), - gsSPDisplayList(toad_Torso_mesh_layer_1_tri_2), - gsSPDisplayList(mat_revert_toad_metal_vest), +Gfx toad_player_Torso_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Torso_mesh_layer_1_tri_0), + gsSPDisplayList(toad_player_Torso_mesh_layer_1_tri_1), + gsSPDisplayList(mat_revert_toad_player_metal), + gsSPDisplayList(mat_toad_player_metal_vest), + gsSPDisplayList(toad_player_Torso_mesh_layer_1_tri_2), + gsSPDisplayList(mat_revert_toad_player_metal_vest), gsSPEndDisplayList(), }; -Gfx toad_Cap_DL_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_cap_base), - gsSPDisplayList(toad_Cap_DL_mesh_layer_1_tri_0), +Gfx toad_player_Cap_DL_mesh_layer_4[] = { + gsSPDisplayList(mat_toad_player_cap_base), + gsSPDisplayList(toad_player_Cap_DL_mesh_layer_4_tri_0), + gsSPDisplayList(mat_toad_player_cap_spots), + gsSPDisplayList(toad_player_Cap_DL_mesh_layer_4_tri_1), gsSPEndDisplayList(), }; -Gfx toad_Cap_DL_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Cap_DL_mesh_layer_1_tri_0), +Gfx toad_player_Cap_DL_mesh_layer_4_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Cap_DL_mesh_layer_4_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Cap_DL_mesh_layer_5[] = { - gsSPDisplayList(mat_toad_cap_spots), - gsSPDisplayList(toad_Cap_DL_mesh_layer_5_tri_0), +Gfx toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4[] = { + gsSPDisplayList(mat_toad_player_hair), + gsSPDisplayList(toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_tri_0), + gsSPDisplayList(mat_revert_toad_player_hair), gsSPEndDisplayList(), }; -Gfx toad_Cap_DL_mesh_layer_5_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Cap_DL_mesh_layer_5_tri_0), - gsSPDisplayList(mat_revert_toad_metal), +Gfx toad_player_Head_DL_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_eyes_center), + gsSPDisplayList(toad_player_Head_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_eyes_center), gsSPEndDisplayList(), }; -Gfx toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4[] = { - gsSPDisplayList(mat_toad_hair), - gsSPDisplayList(toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_toad_hair), +Gfx toad_player_Head_DL_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Head_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_hair), - gsSPDisplayList(toad_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_toad_hair), +Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_half_closed_1[] = { + gsSPDisplayList(mat_toad_player_eyes_half_closed), + gsSPDisplayList(toad_player_Head_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_eyes_half_closed), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_5[] = { - gsSPDisplayList(mat_toad_eyes_center), - gsSPDisplayList(toad_Head_DL_mesh_layer_5_tri_0), +Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_closed_2[] = { + gsSPDisplayList(mat_toad_player_eyes_closed), + gsSPDisplayList(toad_player_Head_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_eyes_closed), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_5_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Head_DL_mesh_layer_5_tri_0), - gsSPDisplayList(mat_revert_toad_metal), +Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_right_3[] = { + gsSPDisplayList(mat_toad_player_eyes_right), + gsSPDisplayList(toad_player_Head_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_eyes_right), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_half_closed_1[] = { - gsSPDisplayList(mat_toad_eyes_half_closed), - gsSPDisplayList(toad_Head_DL_mesh_layer_5_tri_0), +Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_left_4[] = { + gsSPDisplayList(mat_toad_player_eyes_left), + gsSPDisplayList(toad_player_Head_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_eyes_left), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_closed_2[] = { - gsSPDisplayList(mat_toad_eyes_closed), - gsSPDisplayList(toad_Head_DL_mesh_layer_5_tri_0), +Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_up_5[] = { + gsSPDisplayList(mat_toad_player_eyes_up), + gsSPDisplayList(toad_player_Head_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_eyes_up), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_right_3[] = { - gsSPDisplayList(mat_toad_eyes_right), - gsSPDisplayList(toad_Head_DL_mesh_layer_5_tri_0), +Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_down_6[] = { + gsSPDisplayList(mat_toad_player_eyes_down), + gsSPDisplayList(toad_player_Head_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_eyes_down), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_left_4[] = { - gsSPDisplayList(mat_toad_eyes_left), - gsSPDisplayList(toad_Head_DL_mesh_layer_5_tri_0), +Gfx toad_player_Head_DL_mesh_layer_1_mat_override_eyes_dead_7[] = { + gsSPDisplayList(mat_toad_player_eyes_dead), + gsSPDisplayList(toad_player_Head_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_eyes_dead), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_up_5[] = { - gsSPDisplayList(mat_toad_eyes_up), - gsSPDisplayList(toad_Head_DL_mesh_layer_5_tri_0), +const Gfx toad_player_cap_wings[] = { + gsSPDisplayList(mat_toad_player_wing_tip), + gsSPDisplayList(toad_player_wings_half_2_dl), + gsSPDisplayList(mat_revert_toad_player_wing_tip), + gsSPDisplayList(mat_toad_player_wing), + gsSPDisplayList(toad_player_wings_half_1_dl), + gsSPDisplayList(mat_revert_toad_player_wing), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_down_6[] = { - gsSPDisplayList(mat_toad_eyes_down), - gsSPDisplayList(toad_Head_DL_mesh_layer_5_tri_0), +const Gfx toad_player_metal_cap_wings[] = { + gsSPDisplayList(mat_toad_player_metal_wing_tip), + gsSPDisplayList(toad_player_wings_half_2_dl), + gsSPDisplayList(mat_revert_toad_player_metal_wing_tip), + gsSPDisplayList(mat_toad_player_metal_wing), + gsSPDisplayList(toad_player_wings_half_1_dl), + gsSPDisplayList(mat_revert_toad_player_metal_wing), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_5_mat_override_eyes_dead_7[] = { - gsSPDisplayList(mat_toad_eyes_dead), - gsSPDisplayList(toad_Head_DL_mesh_layer_5_tri_0), +Gfx toad_player_Left_Arm_Color_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Left_Arm_Color_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_face_blush), - gsSPDisplayList(toad_Head_DL_mesh_layer_1_tri_0), +Gfx toad_player_Left_Arm_Color_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Left_Arm_Color_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Head_DL_mesh_layer_1_tri_0), +Gfx toad_player_Left_Forearm_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Left_Forearm_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_half_closed_1[] = { - gsSPDisplayList(mat_toad_face_blush), - gsSPDisplayList(toad_Head_DL_mesh_layer_1_tri_0), +Gfx toad_player_Left_Forearm_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Left_Forearm_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_closed_2[] = { - gsSPDisplayList(mat_toad_face_blush), - gsSPDisplayList(toad_Head_DL_mesh_layer_1_tri_0), +Gfx toad_player_Left_Hand_DL_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Left_Hand_DL_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_right_3[] = { - gsSPDisplayList(mat_toad_face_blush), - gsSPDisplayList(toad_Head_DL_mesh_layer_1_tri_0), +Gfx toad_player_Left_Hand_DL_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Left_Hand_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_left_4[] = { - gsSPDisplayList(mat_toad_face_blush), - gsSPDisplayList(toad_Head_DL_mesh_layer_1_tri_0), +Gfx toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_up_5[] = { - gsSPDisplayList(mat_toad_face_blush), - gsSPDisplayList(toad_Head_DL_mesh_layer_1_tri_0), +Gfx toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_down_6[] = { - gsSPDisplayList(mat_toad_face_blush), - gsSPDisplayList(toad_Head_DL_mesh_layer_1_tri_0), +Gfx toad_player_Right_Arm_Color_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Right_Arm_Color_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Head_DL_mesh_layer_1_mat_override_eyes_dead_7[] = { - gsSPDisplayList(mat_toad_face_blush), - gsSPDisplayList(toad_Head_DL_mesh_layer_1_tri_0), +Gfx toad_player_Right_Arm_Color_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Right_Arm_Color_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Left_Wing_DL_mesh_layer_4[] = { - gsSPDisplayList(mat_toad_wing_tip), - gsSPDisplayList(toad_Left_Wing_DL_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_toad_wing_tip), - gsSPDisplayList(mat_toad_wing), - gsSPDisplayList(toad_Left_Wing_DL_mesh_layer_4_tri_1), - gsSPDisplayList(mat_revert_toad_wing), +Gfx toad_player_Right_Forearm_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Right_Forearm_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Left_Wing_DL_mesh_layer_4_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal_wing_tip), - gsSPDisplayList(toad_Left_Wing_DL_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_toad_metal_wing_tip), - gsSPDisplayList(mat_toad_metal_wing), - gsSPDisplayList(toad_Left_Wing_DL_mesh_layer_4_tri_1), - gsSPDisplayList(mat_revert_toad_metal_wing), +Gfx toad_player_Right_Forearm_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Right_Forearm_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Right_Wing_DL_mesh_layer_4[] = { - gsSPDisplayList(mat_toad_wing_tip), - gsSPDisplayList(toad_Right_Wing_DL_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_toad_wing_tip), - gsSPDisplayList(mat_toad_wing), - gsSPDisplayList(toad_Right_Wing_DL_mesh_layer_4_tri_1), - gsSPDisplayList(mat_revert_toad_wing), +Gfx toad_player_Right_Hand_DL_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Right_Hand_DL_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Right_Wing_DL_mesh_layer_4_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal_wing_tip), - gsSPDisplayList(toad_Right_Wing_DL_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_toad_metal_wing_tip), - gsSPDisplayList(mat_toad_metal_wing), - gsSPDisplayList(toad_Right_Wing_DL_mesh_layer_4_tri_1), - gsSPDisplayList(mat_revert_toad_metal_wing), +Gfx toad_player_Right_Hand_DL_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Right_Hand_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Left_Arm_Color_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Left_Arm_Color_mesh_layer_1_tri_0), +Gfx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Left_Arm_Color_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Left_Arm_Color_mesh_layer_1_tri_0), +Gfx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Left_Forearm_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Left_Forearm_mesh_layer_1_tri_0), +Gfx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Left_Forearm_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Left_Forearm_mesh_layer_1_tri_0), +Gfx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Left_Hand_DL_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Left_Hand_DL_mesh_layer_1_tri_0), +Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_beige), + gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0), + gsSPDisplayList(mat_toad_player_toad_cap_inside), + gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1), gsSPEndDisplayList(), }; -Gfx toad_Left_Hand_DL_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Left_Hand_DL_mesh_layer_1_tri_0), +Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0), + gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0), +Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4[] = { + gsSPDisplayList(mat_toad_player_cap_base), + gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_0), + gsSPDisplayList(mat_toad_player_cap_spots), + gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_1), gsSPEndDisplayList(), }; -Gfx toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Left_Hand_Open_Switch_Option_Left_Hand_Open_mesh_layer_1_tri_0), +Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Right_Arm_Color_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Right_Arm_Color_mesh_layer_1_tri_0), +Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4[] = { + gsSPDisplayList(mat_toad_player_wing), + gsSPDisplayList(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_0), + gsSPDisplayList(mat_revert_toad_player_wing), + gsSPDisplayList(mat_toad_player_wing_tip), + gsSPDisplayList(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1), + gsSPDisplayList(mat_revert_toad_player_wing_tip), gsSPEndDisplayList(), }; -Gfx toad_Right_Arm_Color_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Right_Arm_Color_mesh_layer_1_tri_0), +Gfx toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal_wing), + gsSPDisplayList(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal_wing), + gsSPDisplayList(mat_toad_player_metal_wing_tip), + gsSPDisplayList(toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1), + gsSPDisplayList(mat_revert_toad_player_metal_wing_tip), gsSPEndDisplayList(), }; -Gfx toad_Right_Forearm_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Right_Forearm_mesh_layer_1_tri_0), +Gfx toad_player_Left_Shoe_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_brown), + gsSPDisplayList(toad_player_Left_Shoe_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Right_Forearm_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Right_Forearm_mesh_layer_1_tri_0), +Gfx toad_player_Left_Shoe_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Left_Shoe_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Right_Hand_DL_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Right_Hand_DL_mesh_layer_1_tri_0), +Gfx toad_player_Right_Shoe_DL_mesh_layer_1[] = { + gsSPDisplayList(mat_toad_player_brown), + gsSPDisplayList(toad_player_Right_Shoe_DL_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; -Gfx toad_Right_Hand_DL_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Right_Hand_DL_mesh_layer_1_tri_0), +Gfx toad_player_Right_Shoe_DL_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_toad_player_metal), + gsSPDisplayList(toad_player_Right_Shoe_DL_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_toad_player_metal), gsSPEndDisplayList(), }; -Gfx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_layer_1_tri_0), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_tri_0), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0), - gsSPDisplayList(mat_toad_cap_base), - gsSPDisplayList(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1), - gsSPDisplayList(mat_toad_toad_cap_inside), - gsSPDisplayList(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_2), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_0), - gsSPDisplayList(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1), - gsSPDisplayList(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_2), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5[] = { - gsSPDisplayList(mat_toad_cap_spots), - gsSPDisplayList(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_tri_0), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_5_tri_0), - gsSPDisplayList(mat_revert_toad_metal), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_beige), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_0), - gsSPDisplayList(mat_toad_cap_base), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_1), - gsSPDisplayList(mat_toad_toad_cap_inside), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_2), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_0), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_1), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_1_tri_2), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5[] = { - gsSPDisplayList(mat_toad_cap_spots), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_tri_0), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_mesh_layer_5_tri_0), - gsSPDisplayList(mat_revert_toad_metal), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4[] = { - gsSPDisplayList(mat_toad_wing), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_toad_wing), - gsSPDisplayList(mat_toad_wing_tip), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1), - gsSPDisplayList(mat_revert_toad_wing_tip), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal_wing), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_toad_metal_wing), - gsSPDisplayList(mat_toad_metal_wing_tip), - gsSPDisplayList(toad_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4_tri_1), - gsSPDisplayList(mat_revert_toad_metal_wing_tip), - gsSPEndDisplayList(), -}; - -Gfx toad_Left_Shoe_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_brown), - gsSPDisplayList(toad_Left_Shoe_mesh_layer_1_tri_0), - gsSPEndDisplayList(), -}; - -Gfx toad_Left_Shoe_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Left_Shoe_mesh_layer_1_tri_0), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Shoe_DL_mesh_layer_1[] = { - gsSPDisplayList(mat_toad_brown), - gsSPDisplayList(toad_Right_Shoe_DL_mesh_layer_1_tri_0), - gsSPEndDisplayList(), -}; - -Gfx toad_Right_Shoe_DL_mesh_layer_1_mat_override_metal_0[] = { - gsSPDisplayList(mat_toad_metal), - gsSPDisplayList(toad_Right_Shoe_DL_mesh_layer_1_tri_0), - gsSPEndDisplayList(), -}; - -Gfx toad_material_revert_render_settings[] = { +Gfx toad_player_material_revert_render_settings[] = { gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_TEXTURE_GEN), diff --git a/actors/toad_player/toad_player_externs.h b/actors/toad_player/toad_player_externs.h index ccfd800a..f92de71d 100644 --- a/actors/toad_player/toad_player_externs.h +++ b/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[]; diff --git a/data/dynos_mgr_builtin_externs.h b/data/dynos_mgr_builtin_externs.h index 3fcbd8f4..9c56057a 100644 --- a/data/dynos_mgr_builtin_externs.h +++ b/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[]; diff --git a/data/dynos_mgr_builtin_tex.cpp b/data/dynos_mgr_builtin_tex.cpp index e3114f32..17dc3850 100644 --- a/data/dynos_mgr_builtin_tex.cpp +++ b/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_hair, "actors/toad_player/custom_toad_hair.rgba16.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_cap, "actors/toad_player/custom_toad_cap.ia16.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_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), diff --git a/src/game/characters.c b/src/game/characters.c index 4f559a69..9a52b440 100644 --- a/src/game/characters.c +++ b/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,