From 1df1cc9558f2b8299954297497e5b32bfb2a3ebd Mon Sep 17 00:00:00 2001 From: FluffaMario Date: Fri, 8 Dec 2023 03:38:52 -0600 Subject: [PATCH] Update Wario, hope this works... --- actors/luigi_cap/model.inc.c | 1 - actors/mario_cap/model.inc.c | 1 - actors/wario/custom_wario_sideburn.rgba16.png | Bin 671 -> 0 bytes actors/wario/custom_wario_sideburn.rgba32.png | Bin 0 -> 642 bytes .../custom_wario_sideburn_add.rgba32.png | Bin 0 -> 436 bytes actors/wario/custom_wario_skin.rgba32.png | Bin 0 -> 296 bytes actors/wario/geo.inc.c | 47 ++-- actors/wario/geo_header.h | 4 +- actors/wario/model.inc.c | 214 ++++++++++++------ actors/wario/wario_externs.h | 15 ++ .../custom_wario_cap_logo.rgba16.png | Bin 547 -> 0 bytes actors/wario_cap/geo.inc.c | 114 +++++++--- actors/wario_cap/geo_header.h | 19 ++ actors/wario_cap/model.inc.c | 160 ++++++++----- data/dynos_mgr_builtin_externs.h | 3 +- data/dynos_mgr_builtin_tex.cpp | 5 +- 16 files changed, 392 insertions(+), 191 deletions(-) delete mode 100644 actors/wario/custom_wario_sideburn.rgba16.png create mode 100644 actors/wario/custom_wario_sideburn.rgba32.png create mode 100644 actors/wario/custom_wario_sideburn_add.rgba32.png create mode 100644 actors/wario/custom_wario_skin.rgba32.png create mode 100644 actors/wario/wario_externs.h delete mode 100644 actors/wario_cap/custom_wario_cap_logo.rgba16.png create mode 100644 actors/wario_cap/geo_header.h diff --git a/actors/luigi_cap/model.inc.c b/actors/luigi_cap/model.inc.c index 9647d74b..6cb07c22 100644 --- a/actors/luigi_cap/model.inc.c +++ b/actors/luigi_cap/model.inc.c @@ -368,7 +368,6 @@ const Gfx luigi_cap_seg3_dl_03023160[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&luigi_cap_seg3_lights_0301CF38.a, 2), - gsSPDisplayList(luigi_cap_seg3_dl_03022B30), gsSPDisplayList(luigi_cap_seg3_dl_03022D10), gsDPPipeSync(), gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK), diff --git a/actors/mario_cap/model.inc.c b/actors/mario_cap/model.inc.c index c8bef3c3..465aa52f 100644 --- a/actors/mario_cap/model.inc.c +++ b/actors/mario_cap/model.inc.c @@ -397,7 +397,6 @@ const Gfx mario_cap_seg3_dl_03023160[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&mario_cap_seg3_lights_0301CF38.a, 2), - gsSPDisplayList(mario_cap_seg3_dl_03022B30), gsSPDisplayList(mario_cap_seg3_dl_03022D10), gsDPPipeSync(), gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK), diff --git a/actors/wario/custom_wario_sideburn.rgba16.png b/actors/wario/custom_wario_sideburn.rgba16.png deleted file mode 100644 index d74c4ad279eb0fcdc635ccec2e42063f9e1b271f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 671 zcmV;Q0$}}#P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0yIfPK~z{r<(8qA z!Y~j;(^cTWfkYy~Vfh3k|HUWp3pg|mBoYY@9Jp?7Hq#Ah(l&+N6?@O=X_B7yy<{en zX4~yn{Uxmo%;)pmHVdxTt9m>h<`NhaMx&8B91fZ779<-8iNpPVSGU{E7;uFd19$9l zxv0Tlp!)rO_F>0frrYhRPN!pgWwe-WDI<;vNHP$c{VTj}1=^BifH=pfdIo+D2uTKZ zyPa*7ksT09z!2y2+1!&1%w{unI-Q-*FdmO- zrf);US%u^ASj?K`Y`XML{7q3xHlW2bOxSj5cD}g(+$Y%pU_xSupnJK5mL4Plp_Kuk zuG=_9ajPFt0bw{Cnme>M0DMSSN0ZTnrPu4(C)F$#3)_0pfZ)!w&IHS^6Sz1P-(nyI z$sM7!0ry}c*(BlIMD&wT=Z%_9r?&TnF`!)~opP?Y{0B6FoM8vquE7|EPtgypO^gEd4A2yD;IW}~=VGXkQJ zDlF6*aG_w4eEa?0^vMrmT(`_sBpLV#e*G}=`R@jl`UH)Ykvw4h>-hix002ovPDHLk FV1kSRD$4)> diff --git a/actors/wario/custom_wario_sideburn.rgba32.png b/actors/wario/custom_wario_sideburn.rgba32.png new file mode 100644 index 0000000000000000000000000000000000000000..30034c317633a8fb41ae6a977f96d6d94a96edb1 GIT binary patch literal 642 zcmV-|0)737P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0vAa{K~z{r<(Bb{ z!XOlf>5X6vchM1yGZ;rOj$j#*vKTBfkQ@Cgyln=?Qe;4;Ek#!w=yqK$GC&~Z;G>cRf-i^k zD>ATNuifc%YKc%zZNWZfvsuW;oCEcIKK~Z+)_@+pHAX!esEUIS@$2>K&gXL@Dl;Gq znR-t+l!^^_@d^{M+!6*WZrd%z1^^SQ)hd(`)JbE-rLLckG60-EX#B{jV;}r-(sKyZ5Bow&=-^5hB^>!5Yo@a zO)%isu;`Z4;)w9!ArO4*pjZtA13sb&jJof-rQMGFa=8p1y?-~>o`j>=H`c5T(QMZ! zg^Zefh&Xjd?^F7h%!^ihkeSdUvhbXC=_CF6#7QY}XkA9kM06VVwVn+OLP`{@Fo-zk zg{R*D_*rP(c9N$^i3%dlAabLJ|f9u2WdZ8W7l?yWK9_|JsZo;-$huuK^7Q7E6N}K$NZ9H_crX8Tbi){W7xr ccLUCS0u))2H5GN5mjD0&07*qoM6N<$g8r8uod5s; literal 0 HcmV?d00001 diff --git a/actors/wario/custom_wario_sideburn_add.rgba32.png b/actors/wario/custom_wario_sideburn_add.rgba32.png new file mode 100644 index 0000000000000000000000000000000000000000..101d980292e98ece19c471a832c4f104f5601361 GIT binary patch literal 436 zcmV;l0ZaagP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0ZBH0o%5%PdZNK?m=4W5-!uN!)H7l1$K_POk@EBN+zN# z2MXgipA$fiYEg0(C>Dg~2#N%u&H;Ru8dL$GC|&P_L=N@T3TVj=0A-nKKnX;b3#uXt zlRJNl+tE!)+FQJ#aU7#R0C0@|1LWLI<+Kx&495bpy6d_yIzy5x?*H4T%O?(tyx4HG zg(vhUu9Ml;6G#dG{6-LOorBmy$snT6!PBBPh)2i7(?tXWE+3QZaQu6($Dff}kEtS# e^23K0#(V>q;*I%&`@W(80000!lvI6;>1s;*b3=DkxL735kHCP2GxYyIgF(ktM?es{#1_d70gTL=b>M}NO+Gdm4 z;g|Gd;_-k3N8hQt39fATsyjVp&DrfTOPYnRnD2983fRG?SjH3Gnj8g(-Prc$-rK<>a*ONT&UV)yD$Q+S z9({Q$7@qi;pXd|RKgiSB@?5jRd(n*FA_^CTuI`z`&^Td1Pnw@+!waqx2VNcjYpf+3 n-nqj0@BIziSb~4-YA|G9BBP`5P$1(m&?5|Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0k}y-K~z{r?N*_- z!Y~Xi?+cJ1kw|dhut;!7B$iJ=@(V~LzX6{C4jd92k~Jx5*St44duN7w&fT)!EV=C% zYYPBellb9tWB3~Q8fe_WC$HgOH?;U%3E35BVF_XaYFx!_HqWRT8%UC%*9(QJG)@tW z42Q3{WP~1pe++?mcyX~n)xhxxa5w;5uRM^!Y8BUG7QIlW%g8`6l5)SNQZcBh=>0yx z`OJa>nbUO=;;{&QK*SqN6KR9>I@Xs<78qo(-HvmF)CW@vhCpbU7z|Kl=-F#(laon4 zM>i)%7eZ_4Xx4;u_Ci^O%_gt&qr~XN=z>{bxASUB%bd{Cw_7gkfg_$FPzaHK(6oUTRdbO7#m7V@Az1#@4+(tzN0bMA8S=lPrm6;3CwjmOS) zyF6G%^hvTl$EJxI5E-yGBvDe0DAoOKM?}eW88K_UyCbTaT-o?1Te4cw_@?x0AZOse le-u&uoPoMtJqxP7b5G~Y6(NaQ8(jbZ002ovPDHLkV1gOE=xzW2 diff --git a/actors/wario_cap/geo.inc.c b/actors/wario_cap/geo.inc.c index 3083e114..9c8a1044 100644 --- a/actors/wario_cap/geo.inc.c +++ b/actors/wario_cap/geo.inc.c @@ -1,84 +1,124 @@ +#include "geo_header.h" // 0x16000CA4 const GeoLayout warios_cap_geo[] = { - GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75), + GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_SCALE(0x00, 16384), + GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75), GEO_OPEN_NODE(), - GEO_ASM(1, geo_mario_set_player_colors), - GEO_ASM(10, geo_update_layer_transparency), - GEO_SWITCH_CASE(2, geo_switch_anim_state), + GEO_SCALE(0x00, 16384), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_seg3_dl_03022F48), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_seg3_dl_03022F48), + GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors), + GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors), + GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors), + GEO_ASM(10, geo_update_layer_transparency), + GEO_SWITCH_CASE(2, geo_switch_anim_state), + GEO_OPEN_NODE(), + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_seg3_dl_03022F48), + GEO_CLOSE_NODE(), + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_seg3_dl_03022F48), + GEO_CLOSE_NODE(), + GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_material_revert_render_settings), GEO_CLOSE_NODE(), GEO_END(), }; // 0x16000CF0 const GeoLayout warios_metal_cap_geo[] = { - GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75), + GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_SCALE(0x00, 16384), + GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75), GEO_OPEN_NODE(), - GEO_ASM(10, geo_update_layer_transparency), - GEO_SWITCH_CASE(2, geo_switch_anim_state), + GEO_SCALE(0x00, 16384), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_seg3_dl_03022FF8), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_seg3_dl_03022FF8), + GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors), + GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors), + GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors), + GEO_ASM(10, geo_update_layer_transparency), + GEO_SWITCH_CASE(2, geo_switch_anim_state), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_seg3_dl_03022FF8), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_seg3_dl_03022FF8), + GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_material_revert_render_settings), GEO_CLOSE_NODE(), GEO_END(), }; // 0x16000D3C const GeoLayout warios_wing_cap_geo[] = { - GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75), + GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_SCALE(0x00, 16384), + GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75), GEO_OPEN_NODE(), - GEO_ASM(1, geo_mario_set_player_colors), - GEO_ASM(10, geo_update_layer_transparency), - GEO_SWITCH_CASE(2, geo_switch_anim_state), + GEO_SCALE(0x00, 16384), GEO_OPEN_NODE(), - GEO_NODE_START(), + GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors), + GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors), + GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors), + GEO_ASM(10, geo_update_layer_transparency), + GEO_SWITCH_CASE(2, geo_switch_anim_state), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_seg3_dl_03022F48), - GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_seg3_dl_030230B0), - GEO_CLOSE_NODE(), - GEO_NODE_START(), - GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_seg3_dl_03023160), + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_seg3_dl_03022F48), + GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_seg3_dl_030230B0), + GEO_CLOSE_NODE(), + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_seg3_dl_03023160), + GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_material_revert_render_settings), GEO_CLOSE_NODE(), GEO_END(), }; // 0x16000DA8 const GeoLayout warios_winged_metal_cap_geo[] = { - GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75), + GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_SCALE(0x00, 16384), + GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75), GEO_OPEN_NODE(), - GEO_ASM(1, geo_mario_set_player_colors), - GEO_ASM(10, geo_update_layer_transparency), - GEO_SWITCH_CASE(2, geo_switch_anim_state), + GEO_SCALE(0x00, 16384), GEO_OPEN_NODE(), - GEO_NODE_START(), + GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors), + GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors), + GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors), + GEO_ASM(10, geo_update_layer_transparency), + GEO_SWITCH_CASE(2, geo_switch_anim_state), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_seg3_dl_03022FF8), - GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_seg3_dl_03023108), - GEO_CLOSE_NODE(), - GEO_NODE_START(), - GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_seg3_dl_03023298), + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_seg3_dl_03022FF8), + GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_seg3_dl_03023108), + GEO_CLOSE_NODE(), + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_seg3_dl_03023298), + GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_cap_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_material_revert_render_settings), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_material_revert_render_settings), GEO_CLOSE_NODE(), GEO_END(), }; diff --git a/actors/wario_cap/geo_header.h b/actors/wario_cap/geo_header.h new file mode 100644 index 00000000..d51a692e --- /dev/null +++ b/actors/wario_cap/geo_header.h @@ -0,0 +1,19 @@ +extern const GeoLayout warios_cap_geo[]; +extern const GeoLayout warios_metal_cap_geo[]; +extern const GeoLayout warios_wing_cap_geo[]; +extern const GeoLayout warios_winged_metal_cap_geo[]; +extern const Gfx wario_cap_seg3_dl_03022B30[]; +extern const Gfx wario_cap_seg3_dl_03022B68[]; +extern const Gfx wario_cap_seg3_dl_03022CC8[]; +extern const Gfx wario_cap_seg3_dl_03022D10[]; +extern const Gfx wario_cap_seg3_dl_03022E78[]; +extern const Gfx wario_cap_seg3_dl_03022EA8[]; +extern const Gfx wario_cap_seg3_dl_03022ED8[]; +extern const Gfx wario_cap_seg3_dl_03022F20[]; +extern const Gfx wario_cap_seg3_dl_03022F48[]; +extern const Gfx wario_cap_seg3_dl_03022FF8[]; +extern const Gfx wario_cap_seg3_dl_030230B0[]; +extern const Gfx wario_cap_seg3_dl_03023108[]; +extern const Gfx wario_cap_seg3_dl_03023160[]; +extern const Gfx wario_cap_seg3_dl_03023298[]; +extern const Gfx wario_cap_material_revert_render_settings[]; \ No newline at end of file diff --git a/actors/wario_cap/model.inc.c b/actors/wario_cap/model.inc.c index fb5bffe2..dd5f18d5 100644 --- a/actors/wario_cap/model.inc.c +++ b/actors/wario_cap/model.inc.c @@ -18,19 +18,21 @@ static const Lights1 wario_cap_seg3_lights_0301CF38 = gdSPDefLights1( 0xff, 0xbd, 0x00, 0x28, 0x28, 0x28 ); -#include "actors/mario/mario_externs.h" -#include "actors/mario_cap/mario_cap_externs.h" -#define wario_cap_seg3_texture_0301CF50 mario_cap_seg3_texture_0301CF50 -#define wario_cap_seg3_texture_0301E750 mario_cap_seg3_texture_0301E750 -#define wario_cap_seg3_texture_0301F750 mario_cap_seg3_texture_0301F750 -#define wario_cap_seg3_texture_03020750 mario_cap_seg3_texture_03020750 -#define wario_cap_seg3_texture_03021750 mario_cap_seg3_texture_03021750 -#define wario_cap_texture_cap_inside mario_texture_cap_inside +static const Lights1 wario_cap_black_lights_group = gdSPDefLights1( + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 +); -// 0x0301DF50 -ALIGNED8 const Texture wario_cap_seg3_texture_0301DF50[] = { -#include "actors/wario_cap/custom_wario_cap_logo.rgba16.inc.c" -}; +#include "actors/mario/mario_externs.h" +#include "actors/wario/wario_externs.h" +#define wario_cap_texture_metal_shade mario_texture_metal_shade +#define wario_cap_texture_metal_light mario_texture_metal_light +#define wario_cap_texture_w_logo wario_texture_w_logo +#define wario_cap_texture_wings_half_1 mario_texture_wings_half_1 +#define wario_cap_texture_wings_half_2 mario_texture_wings_half_2 +#define wario_cap_texture_metal_wings_half_1 mario_texture_metal_wings_half_1 +#define wario_cap_texture_metal_wings_half_2 mario_texture_metal_wings_half_2 +#define wario_cap_texture_cap_inside mario_texture_cap_inside // 0x03022750 static const Vtx wario_cap_seg3_vertex_03022750[] = { @@ -183,30 +185,30 @@ const Gfx wario_cap_seg3_dl_03022D10[] = { // 0x03022D38 static const Vtx wario_cap_seg3_vertex_03022D38[] = { - {{{ 199, 247, -55}, 0, { 990, 0}, {0x59, 0xed, 0x58, 0xff}}}, - {{{ 131, 274, 20}, 0, { 0, 0}, {0x59, 0xed, 0x58, 0xff}}}, - {{{ 69, 71, 38}, 0, { 0, 2012}, {0x59, 0xed, 0x58, 0xff}}}, - {{{ 199, 247, -55}, 0, { 990, 0}, {0x58, 0xee, 0x58, 0xff}}}, - {{{ 69, 71, 38}, 0, { 0, 2012}, {0x58, 0xee, 0x58, 0xff}}}, - {{{ 138, 44, -37}, 0, { 990, 2012}, {0x58, 0xee, 0x58, 0xff}}}, - {{{ -137, 44, -37}, 0, { 990, 2012}, {0xa8, 0xee, 0x58, 0xff}}}, - {{{ -68, 71, 38}, 0, { 0, 2012}, {0xa8, 0xee, 0x58, 0xff}}}, - {{{ -198, 247, -55}, 0, { 990, 0}, {0xa8, 0xee, 0x58, 0xff}}}, - {{{ -68, 71, 38}, 0, { 0, 2012}, {0xa7, 0xed, 0x58, 0xff}}}, - {{{ -130, 274, 20}, 0, { 0, 0}, {0xa7, 0xed, 0x58, 0xff}}}, - {{{ -198, 247, -55}, 0, { 990, 0}, {0xa7, 0xed, 0x58, 0xff}}}, + {{{ 199, 247, -55}, 0, { 990, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 131, 274, 20}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 69, 71, 38}, 0, { 0, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 199, 247, -55}, 0, { 990, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 69, 71, 38}, 0, { 0, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 138, 44, -37}, 0, { 990, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -137, 44, -37}, 0, { 990, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -68, 71, 38}, 0, { 0, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -198, 247, -55}, 0, { 990, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -68, 71, 38}, 0, { 0, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -130, 274, 20}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -198, 247, -55}, 0, { 990, 0}, {0xff, 0xff, 0xff, 0xff}}}, }; // 0x03022DF8 static const Vtx wario_cap_seg3_vertex_03022DF8[] = { - {{{ 268, 219, -132}, 0, { 990, 0}, {0x59, 0xed, 0x57, 0xff}}}, - {{{ 199, 247, -55}, 0, { 0, 0}, {0x59, 0xed, 0x57, 0xff}}}, - {{{ 138, 44, -37}, 0, { 0, 2012}, {0x59, 0xed, 0x57, 0xff}}}, - {{{ 207, 16, -114}, 0, { 990, 2012}, {0x59, 0xed, 0x57, 0xff}}}, - {{{ -206, 16, -114}, 0, { 990, 2012}, {0xa7, 0xed, 0x57, 0xff}}}, - {{{ -137, 44, -37}, 0, { 0, 2012}, {0xa7, 0xed, 0x57, 0xff}}}, - {{{ -267, 219, -132}, 0, { 990, 0}, {0xa7, 0xed, 0x57, 0xff}}}, - {{{ -198, 247, -55}, 0, { 0, 0}, {0xa7, 0xed, 0x57, 0xff}}}, + {{{ 268, 219, -132}, 0, { 990, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 199, 247, -55}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 138, 44, -37}, 0, { 0, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ 207, 16, -114}, 0, { 990, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -206, 16, -114}, 0, { 990, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -137, 44, -37}, 0, { 0, 2012}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -267, 219, -132}, 0, { 990, 0}, {0xff, 0xff, 0xff, 0xff}}}, + {{{ -198, 247, -55}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, }; // 0x03022E78 - 0x03022EA8 @@ -256,7 +258,7 @@ const Gfx wario_cap_seg3_dl_03022F48[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_0301DF50), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_w_logo), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&wario_cap_seg3_lights_0301CF38.a, 2), @@ -274,12 +276,22 @@ const Gfx wario_cap_seg3_dl_03022F48[] = { // 0x03022FF8 - 0x030230B0 const Gfx wario_cap_seg3_dl_03022FF8[] = { - gsDPPipeSync(), - gsSPSetGeometryMode(G_TEXTURE_GEN), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT), - gsDPLoadTextureBlock(wario_cap_seg3_texture_0301CF50, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD), - gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPCopyLightsPlayerPart(METAL), + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT), + gsSPSetGeometryMode(G_TEXTURE_GEN), + gsSPTexture(4032, 1984, 0, 0, 1), + gsSPLight(&wario_cap_black_lights_group.l, 1), + gsSPCopyLightEXT(2, 15), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_shade), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPLoadBlock(7, 0, 0, 2047, 128), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), + gsDPSetTileSize(0, 0, 0, 252, 124), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_light), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPLoadBlock(6, 0, 0, 2047, 128), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), + gsDPSetTileSize(1, 0, 0, 252, 124), gsSPDisplayList(wario_cap_seg3_dl_03022B30), gsSPDisplayList(wario_cap_seg3_dl_03022B68), gsSPDisplayList(wario_cap_seg3_dl_03022CC8), @@ -295,11 +307,11 @@ const Gfx wario_cap_seg3_dl_03022FF8[] = { // 0x030230B0 - 0x03023108 const Gfx wario_cap_seg3_dl_030230B0[] = { gsSPDisplayList(wario_cap_seg3_dl_03022ED8), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_0301E750), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_wings_half_1), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPDisplayList(wario_cap_seg3_dl_03022E78), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_0301F750), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_wings_half_2), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPDisplayList(wario_cap_seg3_dl_03022EA8), @@ -310,11 +322,11 @@ const Gfx wario_cap_seg3_dl_030230B0[] = { // 0x03023108 - 0x03023160 const Gfx wario_cap_seg3_dl_03023108[] = { gsSPDisplayList(wario_cap_seg3_dl_03022ED8), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_03020750), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_1), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPDisplayList(wario_cap_seg3_dl_03022E78), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_03021750), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_2), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPDisplayList(wario_cap_seg3_dl_03022EA8), @@ -331,7 +343,7 @@ const Gfx wario_cap_seg3_dl_03023160[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_0301DF50), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_w_logo), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&wario_cap_seg3_lights_0301CF38.a, 2), @@ -347,11 +359,11 @@ const Gfx wario_cap_seg3_dl_03023160[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_0301E750), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_wings_half_1), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPDisplayList(wario_cap_seg3_dl_03022E78), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_0301F750), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_wings_half_2), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPDisplayList(wario_cap_seg3_dl_03022EA8), @@ -366,18 +378,22 @@ const Gfx wario_cap_seg3_dl_03023160[] = { // 0x03023298 - 0x030233D0 const Gfx wario_cap_seg3_dl_03023298[] = { - gsDPPipeSync(), - gsSPSetGeometryMode(G_TEXTURE_GEN), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, 0, 0, 0, 0, ENVIRONMENT), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_0301CF50), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 6, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 6, G_TX_NOLOD), - gsDPSetTileSize(0, 0, 0, (64 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPCopyLightsPlayerPart(METAL), + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT), + gsSPSetGeometryMode(G_TEXTURE_GEN), + gsSPTexture(4032, 1984, 0, 0, 1), + gsSPLight(&wario_cap_black_lights_group.l, 1), + gsSPCopyLightEXT(2, 15), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_shade), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPLoadBlock(7, 0, 0, 2047, 128), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), + gsDPSetTileSize(0, 0, 0, 252, 124), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_light), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPLoadBlock(6, 0, 0, 2047, 128), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), + gsDPSetTileSize(1, 0, 0, 252, 124), gsSPDisplayList(wario_cap_seg3_dl_03022B30), gsSPDisplayList(wario_cap_seg3_dl_03022B68), gsSPDisplayList(wario_cap_seg3_dl_03022CC8), @@ -389,11 +405,11 @@ const Gfx wario_cap_seg3_dl_03023298[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_03020750), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_1), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPDisplayList(wario_cap_seg3_dl_03022E78), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_seg3_texture_03021750), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_cap_texture_metal_wings_half_2), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPDisplayList(wario_cap_seg3_dl_03022EA8), @@ -405,3 +421,27 @@ const Gfx wario_cap_seg3_dl_03023298[] = { gsDPSetEnvColor(255, 255, 255, 255), gsSPEndDisplayList(), }; + +const Gfx wario_cap_material_revert_render_settings[] = { + gsDPPipeSync(), + gsSPSetGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_TEXTURE_GEN), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), + gsSPTexture(65535, 65535, 0, 0, 0), + gsDPSetEnvColor(255, 255, 255, 255), + gsDPSetAlphaCompare(G_AC_NONE), + + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, 0), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPLoadBlock(7, 0, 0, 1023, 256), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), + gsDPSetTileSize(0, 0, 0, 124, 124), + + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, 0), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), + gsDPLoadBlock(6, 0, 0, 1023, 256), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), + gsDPSetTileSize(1, 0, 0, 124, 124), + + gsSPEndDisplayList(), +}; diff --git a/data/dynos_mgr_builtin_externs.h b/data/dynos_mgr_builtin_externs.h index 0c40bb6a..3fcbd8f4 100644 --- a/data/dynos_mgr_builtin_externs.h +++ b/data/dynos_mgr_builtin_externs.h @@ -1678,6 +1678,8 @@ extern ALIGNED8 const Texture toad_player_texture_eyes_dead[]; extern ALIGNED8 const Texture wario_texture_white_button[]; extern ALIGNED8 const Texture wario_texture_w_logo[]; extern ALIGNED8 const Texture wario_texture_hair_sideburn[]; +extern ALIGNED8 const Texture wario_texture_add_sideburn[]; +extern ALIGNED8 const Texture wario_texture_skin_sideburn[]; extern ALIGNED8 const Texture wario_texture_mouth[]; extern ALIGNED8 const Texture wario_texture_mouth_dead[]; extern ALIGNED8 const Texture wario_texture_eyes_front[]; @@ -1688,7 +1690,6 @@ extern ALIGNED8 const Texture wario_texture_eyes_left[]; extern ALIGNED8 const Texture wario_texture_eyes_up[]; extern ALIGNED8 const Texture wario_texture_eyes_down[]; extern ALIGNED8 const Texture wario_texture_eyes_dead[]; -extern ALIGNED8 const Texture wario_cap_seg3_texture_0301DF50[]; extern ALIGNED8 const Texture waluigi_custom_waluigi_overalls_button_rgba16[]; extern ALIGNED8 const Texture waluigi_custom_waluigi_metal_rgba16[]; diff --git a/data/dynos_mgr_builtin_tex.cpp b/data/dynos_mgr_builtin_tex.cpp index e71d4c28..e3114f32 100644 --- a/data/dynos_mgr_builtin_tex.cpp +++ b/data/dynos_mgr_builtin_tex.cpp @@ -1109,7 +1109,9 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = { define_builtin_tex(toad_player_texture_eyes_dead, "actors/toad_player/custom_toad_eyes_dead.rgba32.png", 32, 32, 16), define_builtin_tex(wario_texture_white_button, "actors/wario/custom_wario_overalls_button.rgba16.png", 32, 32, 16), define_builtin_tex(wario_texture_w_logo, "actors/wario/custom_wario_logo.rgba16.png", 32, 32, 16), - define_builtin_tex(wario_texture_hair_sideburn, "actors/wario/custom_wario_sideburn.rgba16.png", 32, 32, 16), + define_builtin_tex(wario_texture_hair_sideburn, "actors/wario/custom_wario_sideburn.rgba32.png", 32, 32, 16), + define_builtin_tex(wario_texture_add_sideburn, "actors/wario/custom_wario_sideburn_add.rgba32.png", 32, 32, 16), + define_builtin_tex(wario_texture_skin_sideburn, "actors/wario/custom_wario_skin.rgba16.png", 32, 32, 16), define_builtin_tex(wario_texture_mouth, "actors/wario/custom_wario_mouth.rgba16.png", 64, 32, 16), define_builtin_tex(wario_texture_mouth_dead, "actors/wario/custom_wario_mouth_dead.rgba16.png", 64, 32, 16), define_builtin_tex(wario_texture_eyes_front, "actors/wario/custom_wario_eyes_center.rgba16.png", 64, 32, 16), @@ -1120,7 +1122,6 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = { define_builtin_tex(wario_texture_eyes_up, "actors/wario/custom_wario_eyes_up_unused.rgba16.png", 64, 32, 16), define_builtin_tex(wario_texture_eyes_down, "actors/wario/custom_wario_eyes_down_unused.rgba16.png", 64, 32, 16), define_builtin_tex(wario_texture_eyes_dead, "actors/wario/custom_wario_eyes_dead.rgba16.png", 64, 32, 16), - define_builtin_tex(wario_cap_seg3_texture_0301DF50, "actors/wario_cap/custom_wario_cap_logo.rgba16.png", 32, 32, 16), // Waluigi define_builtin_tex(waluigi_custom_waluigi_overalls_button_rgba16, "actors/waluigi/custom_waluigi_overalls_button.rgba16.png", 32, 32, 16),