etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-12-01 00:13:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

It's better this way...

Browse source
This commit is contained in:
FluffaMario 2023-12-09 14:05:19 -06:00
parent a1ee126010
commit 4f7da1288f
7 changed files with 46 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ const GeoLayout toads_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_ALPHA, toad_cap_Cap_mesh_layer_5), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_cap_Cap_mesh_layer_5),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_NODE_START(), GEO_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
@ -81,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_ALPHA, toad_cap_Cap_mesh_layer_5), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, 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(),

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

@ -378,14 +378,9 @@ Gfx mat_revert_toad_cap_metal[] = {
Gfx mat_toad_cap_cap_base[] = { Gfx mat_toad_cap_cap_base[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
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(),
}; };
@ -492,14 +487,14 @@ Gfx mat_revert_toad_cap_metal_wing_tip[] = {
}; };
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(),

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 813 B

After

Width:  |  Height:  |  Size: 692 B

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 692 B

After

Width:  |  Height:  |  Size: 578 B

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

@ -40,9 +40,9 @@ const GeoLayout toad_player_toad_player_right_hand_peace[] = {
const GeoLayout toad_player_toad_player_right_hand_cap[] = { const GeoLayout toad_player_toad_player_right_hand_cap[] = {
GEO_NODE_START(), GEO_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1), GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_right_hand_cap),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_right_hand_cap_decal),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_RETURN(), GEO_RETURN(),
@ -50,9 +50,9 @@ const GeoLayout toad_player_toad_player_right_hand_cap[] = {
const GeoLayout toad_player_toad_player_right_hand_wing_cap[] = { const GeoLayout toad_player_toad_player_right_hand_wing_cap[] = {
GEO_NODE_START(), GEO_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1), GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_right_hand_cap),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_right_hand_cap_decal),
GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_mesh_layer_4), GEO_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_CLOSE_NODE(), GEO_CLOSE_NODE(),
@ -99,9 +99,9 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_playe
const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_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_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_right_hand_cap),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
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_cap_decal),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_RETURN(), GEO_RETURN(),
@ -109,9 +109,9 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_playe
const GeoLayout toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_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_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_right_hand_cap),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
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_cap_decal),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Right_Hand_Wing_Cap_Switch_Option_Right_Hand_Wing_Cap_Wings_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_CLOSE_NODE(), GEO_CLOSE_NODE(),
@ -190,7 +190,8 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt1[] = {
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_NODE_START(), GEO_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Cap_DL_mesh_layer_4), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_cap_base),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_cap_decal),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_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_CLOSE_NODE(),
@ -357,19 +358,15 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_playe
const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_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_NODE_START(),
GEO_OPEN_NODE(), 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_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_right_hand_cap_metal),
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_CLOSE_NODE(),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_RETURN(), GEO_RETURN(),
}; };
const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_wing_cap[] = { const GeoLayout toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_right_hand_wing_cap[] = {
GEO_NODE_START(), GEO_NODE_START(),
GEO_OPEN_NODE(), 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_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_right_hand_cap_metal),
GEO_OPEN_NODE(), 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_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_CLOSE_NODE(), GEO_CLOSE_NODE(),
@ -399,7 +396,7 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt2[] = {
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_NODE_START(), GEO_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Cap_DL_mesh_layer_4_mat_override_metal_0), GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_metal_cap),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_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_CLOSE_NODE(),
@ -559,9 +556,9 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_playe
const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_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_NODE_START(),
GEO_OPEN_NODE(), 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_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_right_hand_cap_metal),
GEO_OPEN_NODE(), 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_cap_metal),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_RETURN(), GEO_RETURN(),
@ -569,9 +566,9 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_playe
const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_wing_cap[] = { const GeoLayout toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_right_hand_wing_cap[] = {
GEO_NODE_START(), GEO_NODE_START(),
GEO_OPEN_NODE(), 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_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_right_hand_cap_metal),
GEO_OPEN_NODE(), 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_cap_metal),
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_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_CLOSE_NODE(), GEO_CLOSE_NODE(),
@ -601,7 +598,7 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt3[] = {
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_NODE_START(), GEO_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_Cap_DL_mesh_layer_4_mat_override_metal_0), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_cap),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_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_CLOSE_NODE(),
@ -808,7 +805,8 @@ const GeoLayout toad_player_geo[] = {
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_NODE_START(), GEO_NODE_START(),
GEO_OPEN_NODE(), GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, toad_player_Cap_DL_mesh_layer_4), GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_cap_base),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_cap_decal),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),
GEO_BRANCH(1, toad_player_toad_player_head_capless), GEO_BRANCH(1, toad_player_toad_player_head_capless),
GEO_CLOSE_NODE(), GEO_CLOSE_NODE(),

12
actors/toad_player/geo_header.h
View file

@ -76,8 +76,9 @@ 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_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[];
extern const Gfx toad_player_Torso_mesh_layer_1_mat_override_metal_0[]; 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_base[];
extern const Gfx toad_player_Cap_DL_mesh_layer_4_mat_override_metal_0[]; extern const Gfx toad_player_cap_decal[];
extern const Gfx toad_player_metal_cap[];
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[];
extern const Gfx toad_player_Head_Capless_Switch_Option_Head_Capless_mesh_layer_4_mat_override_metal_0[]; 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[];
@ -109,10 +110,9 @@ extern const Gfx toad_player_Right_Hand_Open_Switch_Option_Right_Hand_Open_mesh_
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_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[];
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_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_cap[];
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_cap_metal[];
extern const Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4[]; extern const Gfx toad_player_right_hand_cap_decal[];
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[];
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_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[];

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

@ -2000,14 +2000,9 @@ Gfx mat_revert_toad_player_metal_vest[] = {
Gfx mat_toad_player_cap_base[] = { Gfx mat_toad_player_cap_base[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, ENVIRONMENT, 0), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
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_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(), gsSPEndDisplayList(),
}; };
@ -2363,15 +2358,19 @@ Gfx toad_player_Torso_mesh_layer_1_mat_override_metal_0[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
Gfx toad_player_Cap_DL_mesh_layer_4[] = { Gfx toad_player_cap_base[] = {
gsSPDisplayList(mat_toad_player_cap_base), gsSPDisplayList(mat_toad_player_cap_base),
gsSPDisplayList(toad_player_Cap_DL_mesh_layer_4_tri_0), 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(), gsSPEndDisplayList(),
}; };
Gfx toad_player_Cap_DL_mesh_layer_4_mat_override_metal_0[] = { Gfx toad_player_cap_decal[] = {
gsSPDisplayList(mat_toad_player_cap_spots),
gsSPDisplayList(toad_player_Cap_DL_mesh_layer_4_tri_0),
gsSPEndDisplayList(),
};
Gfx toad_player_metal_cap[] = {
gsSPDisplayList(mat_toad_player_metal), gsSPDisplayList(mat_toad_player_metal),
gsSPDisplayList(toad_player_Cap_DL_mesh_layer_4_tri_0), gsSPDisplayList(toad_player_Cap_DL_mesh_layer_4_tri_0),
gsSPDisplayList(mat_revert_toad_player_metal), gsSPDisplayList(mat_revert_toad_player_metal),
@ -2585,34 +2584,28 @@ Gfx toad_player_Right_Hand_Peace_Switch_Option_Right_Hand_Peace_mesh_layer_1_mat
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1[] = { Gfx toad_player_right_hand_cap[] = {
gsSPDisplayList(mat_toad_player_beige), gsSPDisplayList(mat_toad_player_beige),
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_0),
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_toad_cap_inside), gsSPDisplayList(mat_toad_player_toad_cap_inside),
gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1), gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_mat_override_metal_0[] = { Gfx toad_player_right_hand_cap_metal[] = {
gsSPDisplayList(mat_toad_player_metal), 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_0),
gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_0),
gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1), gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1),
gsSPDisplayList(mat_revert_toad_player_metal), gsSPDisplayList(mat_revert_toad_player_metal),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
Gfx toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4[] = { Gfx toad_player_right_hand_cap_decal[] = {
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(mat_toad_player_cap_spots),
gsSPDisplayList(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_1),
gsSPEndDisplayList(),
};
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(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_4_tri_0),
gsSPDisplayList(mat_revert_toad_player_metal),
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };