From 4f7da1288fc442be8f36b06ff5316a08721686a4 Mon Sep 17 00:00:00 2001
From: FluffaMario <marshidino101@gmail.com>
Date: Sat, 9 Dec 2023 14:05:19 -0600
Subject: [PATCH] It's better this way...

---
 actors/toad_cap/geo.inc.c                     |   4 +-
 actors/toad_cap/model.inc.c                   |  11 ++---
 actors/toad_player/custom_toad_hair.ia16.png  | Bin 813 -> 692 bytes
 actors/toad_player/custom_toad_spots.ia16.png | Bin 692 -> 578 bytes
 actors/toad_player/geo.inc.c                  |  42 +++++++++---------
 actors/toad_player/geo_header.h               |  12 ++---
 actors/toad_player/model.inc.c                |  37 +++++++--------
 7 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/actors/toad_cap/geo.inc.c b/actors/toad_cap/geo.inc.c
index b95973b1f..704507611 100644
--- a/actors/toad_cap/geo.inc.c
+++ b/actors/toad_cap/geo.inc.c
@@ -15,7 +15,7 @@ const GeoLayout toads_cap_geo[] = {
 					GEO_NODE_START(),
 					GEO_OPEN_NODE(),
 						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_NODE_START(),
 					GEO_OPEN_NODE(),
@@ -81,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_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_CLOSE_NODE(),
 					GEO_CLOSE_NODE(),
diff --git a/actors/toad_cap/model.inc.c b/actors/toad_cap/model.inc.c
index 25e5fd11e..5e9a4820a 100644
--- a/actors/toad_cap/model.inc.c
+++ b/actors/toad_cap/model.inc.c
@@ -378,14 +378,9 @@ Gfx mat_revert_toad_cap_metal[] = {
 
 Gfx mat_toad_cap_cap_base[] = {
 	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),
 	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(),
 };
 
@@ -492,14 +487,14 @@ Gfx mat_revert_toad_cap_metal_wing_tip[] = {
 };
 
 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(),
diff --git a/actors/toad_player/custom_toad_hair.ia16.png b/actors/toad_player/custom_toad_hair.ia16.png
index b93cf7eb567fc70b351273e52e0f7bbb6d5980b3..cd797ee0f6cc15b032f7e4e56b9e16b7e77d11e2 100644
GIT binary patch
delta 617
zcmV-v0+#))2DAl`R)0xJL_t(oN9C0*lEOd`MrT%m0|ycb4jf1%k}Gfw&cYRtTmgv#
zi9~_}m+jY;P7PUpW`GJ}UsWn3Gui(7>z-aepU>Sl`N{8J!vtjQb~~F)Ci!D^r~nD<
z8;yp$TrOF++pScH3RtaHuG8uG<MHVF{l1fXWg?0mK!lXR?|=7u*X#8v6LHmqh-fyO
ze!JaPCgMr}R4w9<04SH^a5!Z7lJPN7HwD0Qxpe3A*~{hRWVrEooUb^2-tBf}Q7>^<
z0Ib(*hYL~?#1sK*wVH3WT5dQT=5Jo-p#YHC;N{|&76GL^u3oR}+|U<q@KnHNv!Msn
z1q(=zP#WI7%YRb=z<?6lHFE=3n4S!-7}&>@<znnxGEo9#vp=0qDj*2x5hXk<!*n{O
zbQ%=FAb*2zJ-?#_5ZGK0ih%S%=t>!mDn~e<C+ziddORgGq6F{(4j`ahce1)Q6L`lE
zBRE5i;l|M}6D0u1fV$@{=$%Hy1&(USt>9tSA<+T^J%5g5%uq7x5h7Pn77IQY3{)7l
z-wO`W0>X@OgSlXia2eEmG#cq1*?-gakZ1u+Me75h$e3qD0fUM$4bp7-%`;L;pcw;=
zXkrL%$4k~T))-u}rpN3VNdmAH2uL{$gv@3$EepS?eN6U{BtX!t2oj!uT(HrMGvY*4
z_K+$-%VI!4Y_{54DY)~V{~xg=2_OKOh5-RLq%0ZFR;E~z1Ta`|fF2-VSO)B8EyaFF
z60le-^iK8!EJOC@N-W7e@CY1;?SA8<0$$<23vliiSPMYx47jLM00000NkvXXu0mjf
D8!r@$

delta 739
zcmV<90v!Fc1+4~<R)4}tL_t(oN9C2RcN#$y#iv!^z=6w3aEoK>kVq=2LsqtqzacUb
zm&&X};!0iDfy-8PqY4gOdw+9gIfM|HB{>_>d(JRBZ)SOS?)%tx<MG(MCEmOF&5#qg
zZ#J9X`~7~ytxJO?AjeUyR%>pz+j*<iDwT*OFr7{xf*^=itACXV!;pDi7KvRBKtf@N
zQlZ^$2W63Xl!TC|*Xz+@u_%qiBLbjo5>E(#!*FC-Hg{V&?q7@4Q34>2<A=>=Gt@Au
zjG))+b=?;0Y`I(>lDY`b5&%C0i7;14jEH=5W>cwDZW@h7&=s8NVw@xZ)EllfjLLN9
zP~n+Xt5x>C*ndMWz*z!GlElgZg9^Drazu(`vVF9NUVyU%fGXimvUBsDLy?)Od(yZD
z&U6ww*H!M^YW&gv{MP%o*u4noaJ*ixA+YZ-fs}BPz+f<FC~|-G?p%Z;nU?yGj^6#m
zz83*vE)_^VmVIk9CL<5DH+1VKpj0Vgl`<-(Ivc5aK7SBGcf^kXFGzt50*ZU+%xiuK
z!?B)#jV4APp{dc_C~ddBgBJmyKbt8OsL)}pIip9Qf=ab#4>=rjzJKd|coPsT0dB0O
z6iUtvBdTZ+TZ`Ozr_%}Oq{#l9bKp%tPLlk_auBL5teql^D|gHg^C*h=hS0o*$7J7!
zHvu)pgnvrFp<u%RSc_DfXBri4n`c@zos{QOC=vq7@h3BhC^9wYoUmA@+W)LQRDjr5
zZ0AsjfMiXWsb|UCv_=6UqtWO}VHxtw_rvG*pb!DUDu5FuS86Q+Du__P?Fo~VxOQ7-
zQIx<h5)X%xxy1}zC|b<O&-cS_c%TpgIY_Al=Ugyk22z8t+^|-d?yS)hg$Sszq$ofy
zz#)!vAU}H=Q)lu*Ap(=hWXp{7I6MTkFBNQ}`l4tKoCFHcFWk}#uS(z&{O<&e`3Gz5
VckH6o3Gn~`002ovPDHLkV1fxjU7r8|

diff --git a/actors/toad_player/custom_toad_spots.ia16.png b/actors/toad_player/custom_toad_spots.ia16.png
index 3e2d80f848f005474393763716209f5258196b0c..831e09d7e1c6f2b3edf814615a09c6c52d39762f 100644
GIT binary patch
delta 515
zcmV+e0{s271;PZ7Nq@fp01m$aI0aKA0005kNkl<ZSVzs4F;c@Y6hsp$=%9m=BX9*u
z4ot}vas*1~po1>xO|+WTA6c<uO~TIn`SwKKeU=={+x>pOxumXgznD&)ftys<hr^=Z
zR6mEq`C0-%=xwSy>w+NsE7iC4Suk?|2)<ACkn7RT9pEF?XMd{qe5~^>$T0xI34F@M
zF~PkVAQ*^UE{-Q5dH^2&oV&u~`b&Tag7CN8Cn2T)Jp3hh&ZmN-0MRVG=H7&8{SDWK
zBgVEo@UGMX-~r<TP5aVt$sy#0cclmbA?wWGHQ|y&P<U6f5CM3=7{o>NHQ^E-?ny>b
z1mLgL9Jo?`V}E26IRI0`K-P&q;_fB9+`BA;1270WNGr-ga_@3;aS8ZAHCj#Y2yk{q
z0N!A#(Q0}-06(yy@E)g+mU|Zn2jD%;M#2_KuSi!4FZV8cLR<pq*fbzz;3(mxZMvG>
z2;c+hBW3{)_pEL#0x&fUV*At<x(0%4@sJ<h)s`Fq5Pa*zVE>pn1;WGSg?FVE0ED{G
zKPHwyczE}NWcyz~$s~uMe5dqxI>9{M{ty$~4M)cS5D@wdr-0D80}#v_6Ued7C&SSk
z07=_5cix);^=`1V1i%GMd=7w^73w+_V3=Be!!v5L`2)3nzzt4HkSYKG002ovPDHLk
FV1oJy?fd`$

delta 630
zcmV-+0*U>?1hfT^Nq@iq01m(bYSxJf0006>Nkl<ZSVzs*&59F26vgq3_%W!c2+qQ-
zf(u1oK{syP_yj)OJb@cGZuAutT?o2$p&%+MeqlU6nQp3UI+O0CNj&hUlhAeQ_Py0r
zH#_tBe6~#;JGgF5t7Ks3;7ZNs(qxq3m;hw!WH=Mfg|p#ApnqTCOZXhVhM(b2SgIib
znD|t<6t0A8;YPR`E(H1*UWXUqRd^HLhacg{K$Zn?JX{Rd!<}$DTn^_$Uj{yfx8Z4c
z5?+Q6;dkiOQ306TWOu{;a5L-$WuS5`P-7(h@51x&Fgy-|>J4I10L|q0!h;~?r^C><
zM%upxCD{*;LVs@%eTIIMc292dTfxE`Iyt%57-M<x;(5rU&(wlbb7}YFyP;0^5E)}E
z4_-WZcT@-9yVY*NskyYTGI=9odGO-NyEA7UfCc7Nv)V1Vz6^~O4_-WZH;ee6$_YfP
zZr*bXuyf;@;>DA<Iohn&PiTizGw=D-;>p__t?B@5E`N47*L7-Ni&yF0sxE<@&Gy>t
za8s)EURZ*Ss|>)FXis;rxK6FoyWM{43^-7nYOV_pi50}F^lnuL;5@f~JJqHZPu}Ke
zRhK|B;XHS6IMt>SFP^;3v9JVg)J!<f9jSx5nkC}Fizn~SgVh1JStp~JaGpC-*I5h3
z^5DgjcW>vR>HtU^rIXQ2sM+_hN)W~v%YzqB-W~M?AVO`FPDV5FEU4R<a=6zRV|no6
zdC23xZOIyKwJB|+Oj~QqO9@2!H~z<@R$2Szb7?ZlaFqZiRo`p4LCt1=0k{po4bw#G
Qp#T5?07*qoM6N<$f_c?9%K!iX

diff --git a/actors/toad_player/geo.inc.c b/actors/toad_player/geo.inc.c
index 7ff56780f..1676b9361 100644
--- a/actors/toad_player/geo.inc.c
+++ b/actors/toad_player/geo.inc.c
@@ -40,9 +40,9 @@ const GeoLayout toad_player_toad_player_right_hand_peace[] = {
 const GeoLayout toad_player_toad_player_right_hand_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),
+		GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_right_hand_cap),
 		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_RETURN(),
@@ -50,9 +50,9 @@ const GeoLayout toad_player_toad_player_right_hand_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_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_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_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[] = {
 	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),
+		GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_right_hand_cap),
 		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_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[] = {
 	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),
+		GEO_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_right_hand_cap),
 		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_CLOSE_NODE(),
 	GEO_CLOSE_NODE(),
@@ -190,7 +190,8 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt1[] = {
 									GEO_OPEN_NODE(),
 										GEO_NODE_START(),
 										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_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt1_jump_toad_player_toad_player_head_capless),
 									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[] = {
 	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_CLOSE_NODE(),
+		GEO_ANIMATED_PART(LAYER_OPAQUE, 26, 0, 0, toad_player_right_hand_cap_metal),
 	GEO_CLOSE_NODE(),
 	GEO_RETURN(),
 };
 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_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_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(),
@@ -399,7 +396,7 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt2[] = {
 									GEO_OPEN_NODE(),
 										GEO_NODE_START(),
 										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_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt2_jump_toad_player_toad_player_head_capless),
 									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[] = {
 	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_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_right_hand_cap_metal),
 		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_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[] = {
 	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_ANIMATED_PART(LAYER_TRANSPARENT, 26, 0, 0, toad_player_right_hand_cap_metal),
 		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_CLOSE_NODE(),
 	GEO_CLOSE_NODE(),
@@ -601,7 +598,7 @@ const GeoLayout toad_player_2_Cap_Effect_Switch_opt3[] = {
 									GEO_OPEN_NODE(),
 										GEO_NODE_START(),
 										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_BRANCH(1, toad_player_2_Cap_Effect_Switch_opt3_jump_toad_player_toad_player_head_capless),
 									GEO_CLOSE_NODE(),
@@ -808,7 +805,8 @@ const GeoLayout toad_player_geo[] = {
 													GEO_OPEN_NODE(),
 														GEO_NODE_START(),
 														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_BRANCH(1, toad_player_toad_player_head_capless),
 													GEO_CLOSE_NODE(),
diff --git a/actors/toad_player/geo_header.h b/actors/toad_player/geo_header.h
index 45e779d6e..e4dcca894 100644
--- a/actors/toad_player/geo_header.h
+++ b/actors/toad_player/geo_header.h
@@ -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_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_cap_base[];
+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_mat_override_metal_0[];
 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_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_cap[];
+extern const Gfx toad_player_right_hand_cap_metal[];
+extern const Gfx toad_player_right_hand_cap_decal[];
 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[];
diff --git a/actors/toad_player/model.inc.c b/actors/toad_player/model.inc.c
index 55468585f..fa243b975 100644
--- a/actors/toad_player/model.inc.c
+++ b/actors/toad_player/model.inc.c
@@ -2000,14 +2000,9 @@ Gfx mat_revert_toad_player_metal_vest[] = {
 
 Gfx mat_toad_player_cap_base[] = {
 	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),
 	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(),
 };
 
@@ -2363,15 +2358,19 @@ Gfx toad_player_Torso_mesh_layer_1_mat_override_metal_0[] = {
 	gsSPEndDisplayList(),
 };
 
-Gfx toad_player_Cap_DL_mesh_layer_4[] = {
+Gfx toad_player_cap_base[] = {
 	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_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(toad_player_Cap_DL_mesh_layer_4_tri_0),
 	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(),
 };
 
-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(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(toad_player_Right_Hand_Switch_Option_Right_Hand_Cap_mesh_layer_1_tri_1),
 	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(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(mat_revert_toad_player_metal),
 	gsSPEndDisplayList(),
 };
 
-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),
+Gfx toad_player_right_hand_cap_decal[] = {
 	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(mat_revert_toad_player_metal),
 	gsSPEndDisplayList(),
 };