etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-21 19:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Toad

Browse source
This commit is contained in:
FluffaMario 2023-12-08 23:20:54 -06:00
parent aed5353e61
commit 4337aeca0e
24 changed files with 1527 additions and 1685 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
actors/toad_cap/geo.inc.c
View file

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

96
actors/toad_cap/model.inc.c
View file

@ -7,6 +7,7 @@ static const Lights1 toad_cap_black_lights_group = gdSPDefLights1(
#include "actors/toad_player/toad_player_externs.h" #include "actors/toad_player/toad_player_externs.h"
#define toad_cap_texture_metal_shade mario_texture_metal_shade #define toad_cap_texture_metal_shade mario_texture_metal_shade
#define toad_cap_texture_metal_light mario_texture_metal_light #define toad_cap_texture_metal_light mario_texture_metal_light
#define toad_cap_texture_cap toad_player_texture_cap
#define toad_cap_texture_spots toad_player_texture_spots #define toad_cap_texture_spots toad_player_texture_spots
#define toad_cap_texture_wings_half_1 mario_texture_wings_half_1 #define toad_cap_texture_wings_half_1 mario_texture_wings_half_1
#define toad_cap_texture_wings_half_2 mario_texture_wings_half_2 #define toad_cap_texture_wings_half_2 mario_texture_wings_half_2
@ -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] = { Vtx toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_0[8] = {
{{ {-132, 118, -76}, 0, {974, 1996}, {167, 238, 89, 255} }}, {{ {-132, 118, -76}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
{{ {-62, 145, -1}, 0, {-16, 1996}, {167, 238, 89, 255} }}, {{ {-62, 145, -1}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
{{ {-192, 321, -94}, 0, {974, -16}, {166, 237, 88, 255} }}, {{ {-192, 321, -94}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
{{ {-125, 348, -19}, 0, {-16, -16}, {166, 236, 88, 255} }}, {{ {-125, 348, -19}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
{{ {192, 321, -94}, 0, {974, -16}, {90, 237, 88, 255} }}, {{ {192, 321, -94}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
{{ {62, 145, -1}, 0, {-16, 1996}, {89, 238, 89, 255} }}, {{ {62, 145, -1}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
{{ {132, 118, -76}, 0, {974, 1996}, {89, 238, 89, 255} }}, {{ {132, 118, -76}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
{{ {125, 348, -19}, 0, {-16, -16}, {90, 236, 88, 255} }}, {{ {125, 348, -19}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
}; };
Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_0[] = { 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] = { Vtx toad_cap_Wing_Cap_Wings_mesh_layer_4_vtx_1[8] = {
{{ {-132, 118, -76}, 0, {-16, 1996}, {167, 238, 89, 255} }}, {{ {-132, 118, -76}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
{{ {-192, 321, -94}, 0, {-16, -16}, {166, 237, 88, 255} }}, {{ {-192, 321, -94}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
{{ {-261, 293, -171}, 0, {974, -16}, {166, 237, 88, 255} }}, {{ {-261, 293, -171}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
{{ {-201, 90, -153}, 0, {974, 1996}, {166, 237, 88, 255} }}, {{ {-201, 90, -153}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
{{ {261, 293, -171}, 0, {974, -16}, {90, 237, 88, 255} }}, {{ {261, 293, -171}, 0, {974, -16}, {0xff, 0xff, 0xff, 0xff} }},
{{ {192, 321, -94}, 0, {-16, -16}, {90, 237, 88, 255} }}, {{ {192, 321, -94}, 0, {-16, -16}, {0xff, 0xff, 0xff, 0xff} }},
{{ {132, 118, -76}, 0, {-16, 1996}, {89, 238, 89, 255} }}, {{ {132, 118, -76}, 0, {-16, 1996}, {0xff, 0xff, 0xff, 0xff} }},
{{ {201, 90, -153}, 0, {974, 1996}, {90, 237, 88, 255} }}, {{ {201, 90, -153}, 0, {974, 1996}, {0xff, 0xff, 0xff, 0xff} }},
}; };
Gfx toad_cap_Wing_Cap_Wings_mesh_layer_4_tri_1[] = { 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[] = { Gfx mat_toad_cap_cap_base[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0),
gsSPTexture(65535, 65535, 0, 0, 1), gsSPTexture(65535, 65535, 0, 0, 1),
gsSPCopyLightsPlayerPart(GLOVES), gsSPCopyLightsPlayerPart(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(), 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), gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0),
gsSPTexture(65535, 65535, 0, 0, 1), gsSPTexture(65535, 65535, 0, 0, 1),
gsSPCopyLightsPlayerPart(GLOVES), gsSPCopyLightsPlayerPart(GLOVES),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_cap_inside), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 1, toad_cap_texture_cap_inside),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_32b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 63, 1024), 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), gsDPSetTileSize(0, 0, 0, 28, 28),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
@ -412,7 +418,7 @@ Gfx mat_toad_cap_cap_spots[] = {
Gfx mat_toad_cap_wing[] = { Gfx mat_toad_cap_wing[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0), gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
gsSPGeometryMode(G_CULL_BACK, 0), gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPTexture(65535, 65535, 0, 0, 1), gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_wings_half_1), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_wings_half_1),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
@ -424,14 +430,14 @@ Gfx mat_toad_cap_wing[] = {
Gfx mat_revert_toad_cap_wing[] = { Gfx mat_revert_toad_cap_wing[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsSPGeometryMode(0, G_CULL_BACK), gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
Gfx mat_toad_cap_wing_tip[] = { Gfx mat_toad_cap_wing_tip[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0), gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0),
gsSPGeometryMode(G_CULL_BACK, 0), gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPTexture(65535, 65535, 0, 0, 1), gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_wings_half_2), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_wings_half_2),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
@ -443,14 +449,14 @@ Gfx mat_toad_cap_wing_tip[] = {
Gfx mat_revert_toad_cap_wing_tip[] = { Gfx mat_revert_toad_cap_wing_tip[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsSPGeometryMode(0, G_CULL_BACK), gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
Gfx mat_toad_cap_metal_wing[] = { Gfx mat_toad_cap_metal_wing[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0), gsDPSetCombineLERP(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), 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), 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), 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[] = { Gfx mat_revert_toad_cap_metal_wing[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsSPGeometryMode(0, G_CULL_BACK), gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
Gfx mat_toad_cap_metal_wing_tip[] = { Gfx mat_toad_cap_metal_wing_tip[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0), gsDPSetCombineLERP(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), 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), 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), 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[] = { Gfx mat_revert_toad_cap_metal_wing_tip[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsSPGeometryMode(0, G_CULL_BACK), gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
Gfx toad_cap_Cap_mesh_layer_1[] = { 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(mat_toad_cap_toad_cap_inside),
gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_1), gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_1),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
Gfx toad_cap_Cap_mesh_layer_5[] = { 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(mat_toad_cap_cap_spots),
gsSPDisplayList(toad_cap_Cap_mesh_layer_5_tri_0), gsSPDisplayList(toad_cap_Cap_mesh_layer_5_tri_0),
gsSPEndDisplayList(), gsSPEndDisplayList(),
@ -502,7 +508,6 @@ Gfx toad_cap_Cap_mesh_layer_5[] = {
Gfx toad_cap_Metal_Cap_mesh_layer_1[] = { Gfx toad_cap_Metal_Cap_mesh_layer_1[] = {
gsSPDisplayList(mat_toad_cap_metal), gsSPDisplayList(mat_toad_cap_metal),
gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_0), gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_0),
gsSPDisplayList(toad_cap_Cap_mesh_layer_1_tri_1),
gsSPDisplayList(mat_revert_toad_cap_metal), gsSPDisplayList(mat_revert_toad_cap_metal),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
@ -528,13 +533,26 @@ Gfx toad_cap_Winged_Metal_Cap_Wings_mesh_layer_4[] = {
}; };
Gfx toad_cap_material_revert_render_settings[] = { Gfx toad_cap_material_revert_render_settings[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsSPSetGeometryMode(G_LIGHTING), gsSPSetGeometryMode(G_LIGHTING),
gsSPClearGeometryMode(G_TEXTURE_GEN), gsSPClearGeometryMode(G_TEXTURE_GEN),
gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
gsSPTexture(65535, 65535, 0, 0, 0), gsSPTexture(65535, 65535, 0, 0, 0),
gsDPSetEnvColor(255, 255, 255, 255), gsDPSetEnvColor(255, 255, 255, 255),
gsDPSetAlphaCompare(G_AC_NONE), gsDPSetAlphaCompare(G_AC_NONE),
gsSPEndDisplayList(),
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(),
}; };

BIN
actors/toad_player/custom_toad_blush.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 723 B

BIN
actors/toad_player/custom_toad_cap.ia16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 807 B

After

Width:  |  Height:  |  Size: 693 B

BIN
actors/toad_player/custom_toad_eyes_center.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 816 B

After

Width:  |  Height:  |  Size: 345 B

BIN
actors/toad_player/custom_toad_eyes_closed.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 682 B

After

Width:  |  Height:  |  Size: 220 B

BIN
actors/toad_player/custom_toad_eyes_dead.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 390 B

BIN
actors/toad_player/custom_toad_eyes_down.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 846 B

After

Width:  |  Height:  |  Size: 361 B

BIN
actors/toad_player/custom_toad_eyes_half_closed.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 308 B

BIN
actors/toad_player/custom_toad_eyes_left.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 815 B

After

Width:  |  Height:  |  Size: 346 B

BIN
actors/toad_player/custom_toad_eyes_right.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 830 B

After

Width:  |  Height:  |  Size: 348 B

BIN
actors/toad_player/custom_toad_eyes_up.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 358 B

BIN
actors/toad_player/custom_toad_face_dead.rgba32.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 819 B

BIN
actors/toad_player/custom_toad_face_neutral.rgba32.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 792 B

BIN
actors/toad_player/custom_toad_hair.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 813 B

BIN
actors/toad_player/custom_toad_hair.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 499 B

BIN
actors/toad_player/custom_toad_spots.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 692 B

502
actors/toad_player/geo.inc.c
View file

File diff suppressed because it is too large Load diff

320
actors/toad_player/geo_header.h
View file

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

2249
actors/toad_player/model.inc.c
View file

File diff suppressed because it is too large Load diff

4
actors/toad_player/toad_player_externs.h
View file

@ -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_spots[];
extern ALIGNED8 const Texture toad_player_texture_hair[]; 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_front[];
extern ALIGNED8 const Texture toad_player_texture_eyes_half_closed[]; extern ALIGNED8 const Texture toad_player_texture_eyes_half_closed[];
extern ALIGNED8 const Texture toad_player_texture_eyes_closed[]; extern ALIGNED8 const Texture toad_player_texture_eyes_closed[];

4
data/dynos_mgr_builtin_externs.h
View file

@ -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_add_sideburn[];
extern ALIGNED8 const Texture luigi_texture_skin_sideburn[]; extern ALIGNED8 const Texture luigi_texture_skin_sideburn[];
extern ALIGNED8 const Texture luigi_texture_mustache[]; 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_spots[];
extern ALIGNED8 const Texture toad_player_texture_hair[]; 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_front[];
extern ALIGNED8 const Texture toad_player_texture_eyes_half_closed[]; extern ALIGNED8 const Texture toad_player_texture_eyes_half_closed[];
extern ALIGNED8 const Texture toad_player_texture_eyes_closed[]; extern ALIGNED8 const Texture toad_player_texture_eyes_closed[];

8
data/dynos_mgr_builtin_tex.cpp
View file

@ -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_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_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(luigi_texture_mustache, "actors/luigi/custom_luigi_mustache.rgba16.png", 32, 32, 16),
define_builtin_tex(toad_player_texture_spots, "actors/toad_player/custom_toad_cap.ia16.png", 32, 32, 16), define_builtin_tex(toad_player_texture_cap, "actors/toad_player/custom_toad_cap.ia16.png", 32, 32, 16),
define_builtin_tex(toad_player_texture_hair, "actors/toad_player/custom_toad_hair.rgba16.png", 32, 32, 16), define_builtin_tex(toad_player_texture_spots, "actors/toad_player/custom_toad_spots.ia16.png", 32, 32, 16),
define_builtin_tex(toad_player_texture_blush, "actors/toad_player/custom_toad_blush.rgba16.png", 32, 32, 16), define_builtin_tex(toad_player_texture_hair, "actors/toad_player/custom_toad_hair.ia16.png", 32, 32, 16),
define_builtin_tex(toad_player_texture_face_neutral, "actors/toad_player/custom_toad_face_neutral.rgba32.png", 32, 32, 16),
define_builtin_tex(toad_player_texture_face_dead, "actors/toad_player/custom_toad_face_dead.rgba32.png", 32, 32, 16),
define_builtin_tex(toad_player_texture_eyes_front, "actors/toad_player/custom_toad_eyes_center.rgba32.png", 32, 32, 16), define_builtin_tex(toad_player_texture_eyes_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_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), define_builtin_tex(toad_player_texture_eyes_closed, "actors/toad_player/custom_toad_eyes_closed.rgba32.png", 32, 32, 16),

2
src/game/characters.c
View file

@ -595,7 +595,7 @@ struct Character gCharacters[CT_MAX] = {
.capMetalModelId = MODEL_TOADS_METAL_CAP, .capMetalModelId = MODEL_TOADS_METAL_CAP,
.capWingModelId = MODEL_TOADS_WING_CAP, .capWingModelId = MODEL_TOADS_WING_CAP,
.capMetalWingModelId = MODEL_TOADS_WINGED_METAL_CAP, .capMetalWingModelId = MODEL_TOADS_WINGED_METAL_CAP,
.capEnemyLayer = LAYER_TRANSPARENT, .capEnemyLayer = LAYER_ALPHA,
.capEnemyGfx = toad_cap_Cap_mesh_layer_1, .capEnemyGfx = toad_cap_Cap_mesh_layer_1,
.capEnemyDecalGfx = toad_cap_Cap_mesh_layer_5, .capEnemyDecalGfx = toad_cap_Cap_mesh_layer_5,
.torsoRotMult = 1.0f, .torsoRotMult = 1.0f,