From 76a19a2cb73beef5ba195d38a052ee6ceb1c3887 Mon Sep 17 00:00:00 2001 From: MysterD Date: Tue, 8 Mar 2022 21:41:46 -0800 Subject: [PATCH] Updated Wario model by FluffaLuigi Fixed Wario's hip offset Updated UV and textures --- .../custom_wario_eyes_down_unused.rgba16.png | Bin 0 -> 1017 bytes .../custom_wario_eyes_left_unused.rgba16.png | Bin 0 -> 1068 bytes .../custom_wario_eyes_right_unused.rgba16.png | Bin 0 -> 1060 bytes .../custom_wario_eyes_up_unused.rgba16.png | Bin 0 -> 1075 bytes actors/wario/custom_wario_gloves.rgba16.png | Bin 408 -> 0 bytes actors/wario/custom_wario_mouth.rgba16.png | Bin 592 -> 594 bytes actors/wario/geo.inc.c | 357 +- actors/wario/geo_header.h | 189 +- actors/wario/model.inc.c | 3763 +++++++++-------- 9 files changed, 2409 insertions(+), 1900 deletions(-) create mode 100644 actors/wario/custom_wario_eyes_down_unused.rgba16.png create mode 100644 actors/wario/custom_wario_eyes_left_unused.rgba16.png create mode 100644 actors/wario/custom_wario_eyes_right_unused.rgba16.png create mode 100644 actors/wario/custom_wario_eyes_up_unused.rgba16.png delete mode 100644 actors/wario/custom_wario_gloves.rgba16.png diff --git a/actors/wario/custom_wario_eyes_down_unused.rgba16.png b/actors/wario/custom_wario_eyes_down_unused.rgba16.png new file mode 100644 index 0000000000000000000000000000000000000000..170480eb3ce9bf04f6764fe5d9ed3fbefe822d49 GIT binary patch literal 1017 zcmVpIt4TybRA>e5mp@MxK@`RJsRfD6vxCmc&|?7=knmBAG=2mUO(^{Y z(pp$pT0#UW8qk(X>7bHV_y>vloZsph?hZS%v-=*z@Vv>(&YwHyo_l8Y&c5DoI4maF zZcTFXoe*o>eZ}d*uZ~M?@;Qlz!m#G)+S-)~p~Q*Nl^+

Pin-;;H0b%7QYLg-gS1})}by~tT`*r zDmnXWkU)0#x&~k!L?KLD3D9n9T05@fiBFEgrSAoxL$x25jVgjjjx%|33v=|xfq=Qk zpCfK9bu_!Y4!Oy<;bHmO*PtRmliCF2{$E^KDV7!&OU#|!-C}oZ%PU(aMjH{Dl2_6x z9(5cffVlYDq>6|GS4>^SM;P9n2hZOOUwruPmed>T@xwpFVN4|4>dNh-zUE`=!6rt` z;0DJS2RN~wI6kHtJh3o1eE{d)ejYx4_ca!~GQPdJS*{610EZYhrfoBaPu)5&a}17f ztrJ0;P>E?fv@wam6U6}JxBux!4hQeUT45=va0e8hxXj6qr{a6Sj0POV*Tx5n7>cLo zr2$RoDX`q#ck3#~&RG$nL>#%$FL&1~0bNI@0PfC`IaaPg6p}sM{!*;I|MurdxWT#p zZB4a$F1dpF>h;S)#ft*P@l>$`j5cE`Uih+xwO!0|B?oeeSyTWP91MQ>br#eQW;Q|* z!n+t4jg6W-SeC2Jfw|C<0))<^^buk8$)oZlXs0b6VIdwPTBG4 z@ufuT#wE<&iPR~$QbgpW|fNa0(KmU}F8QUIL- z0io>1$9fSIV8{J2N|--UU3?m_OK#eII5+J+9Q?n*1fg;&{Frd!_%m#eD9-MSuB`U1 zs9D&Y(2+Dv$Tzk8l!}&!5pI-bqA3RA>e5n7>aIK@i9H(1OI~*+FMzC{3_{!~{s7@$WFwSXz>3 zLg`-st%Zf9B}Aa20kx!3I;i9o{y-z1`#G6qcD=pZ+xMO^;3SXR-J6;3cfPwfccCcD z(p+U5yUN8=`}H;filT_R{41wt5ROp+B8T5RGnN7vcQuI}R`K9dqvU1o1Ykn9AC?U&f{+|$@zfU9=#B$` zsmGrquC3{4<~$Cm#dqPM`Rd2O6QE6P0D1q)``(Ygtp?P z=q4U@97F)&;(C*GL>zd<)OCD>;n}(U>{Yq;{+kV{H{$WbKg`3Lkg(C-+ehYdKNe4J zFk%KbIL0`@iFj}vrVO}ZAvkjqPQU(CK78{fhV89yZERFAp$OywLu2YO_wcEUBWH@i z5w3M2$R>E0dcqhJ5xAll3Hj}P{E@=J`4B6)q^NKQ1Rq@Pi62+NcL@^)a1_28pIl%F zo?QP}kQ;K9WU0Gv<2+;Mv#j9HWBg)cG0=9uP64b&2|r~m})_kX%LNxCpQ zYbI|_RzJom7K#wQi^(Bty7(L{atT+)x(4QxnmDWyK6cm zW$YDN6X5Wq58#uEwSRJEmfxM~w8h@S4L$e9jVAz4t>F6M_nd+~z%G*vaSa^BGpI)=5M`RA>e5m_1JwK@^5((E?+0>7cVRl$vV+6_CI`G2X_XK%xny z{sC+)EG$iIAOeXA4X7oR+Ce3^@B@vy&a-mHGsDjA?6TJwt|z(de4KgDd)}Envmwj# z+>EnLjC1njez{J7EX$%U|H|n(567qg0=hUimmeIwH^br33DN8I% zNmubG;~)YE7gw94BI3XmQ&#a2hIi-sgJ=2r+pl&>xv?HU{6ieZgoIt~-9FNn`Ph1} zi4iln!7;`GPOK-6izyABSQwl>fc+OA^EB9>g}m%8g-K--a10C#JZIeOP13W?p?`eX*Lzx+ND zcCg>OBvXx^i?(1sdHUE$@uEO+Jf+wHMw>AyUih+xwQWpuB?oeeSyTWP><@psbsE$S zMjA`=^JZphrufkgMF{U=U}UUm@?k8nG*_JibD>oV5IU#yAw)9vQ@Hri77+$_Zx<&) zc3R^xM)LTi?tCnk#;t32E`TI&-{0chLkQX3`)g~(cSMX7cRN0*Cb4+WiKkHN0s2U2KTyStgx13kwWb9yYb9mZ+GHToYRg7;WgrwbB4PTe2 zi>DXG+F`7R&tICsn-lGx?JZr^eXm_BfK@P;N{X86H?MdAEjpbF5XQIHo;$UtyI(0l zWeq?%n|uZkh7gb5eG6kY>DMI>R*Fw)Ot|UIf_v5O7s05YDHeWASm3mUf54k2)(GG7 z^YH5u7h09CfH);SV}w0oiCEfgRJcWq%3DCQNNAro(O8I4;TG{KYe0Gvz(v~4 eHo1)b3HSw47;|~(x#_$B0000pIe5m_1JwK@^7Pss)M7wS&&eP?}(IJ0O97Vx;jWkZ6L9 z(LW%qg@vUhM4*BK)RIc+ppskofuHL<3uiccn3=n~_Yw^_$+EL&&Uw%Ko;f>vwNn&@ zyUgRtWfqV2Yl8~V>2$I#f4hT*<(KRLfVpORy<)sOUW~c1aPf?t%81_}BH1c7T(miJ z9K|=8f*rIM&M{D31exn%ND_-Ts%OD(%P+>GgHaDEhNynOug$gQz20rNzO_}pGZwcN zK*mWrjE&jadYAExFLk?JchEmLqqp)3kc0$n#FG|cbjE|l#X<S#FGt8 zXtTU36=9Ji&FICwr5lFr1UR+b^%%1wcT~|FIzSS|g4)>FDPAR8@g`Wrg3)%@W4UY> zgaY8aySo>QX>FtJ+7>~?w|yN`q^-u#4kWDG{v0T&5hI*BfKnJa@lA8ba_HBf@qHOsdV zi=4D{g1#WnyL0QwtK!-FZ$2bH)>c+Ze~rN$4D$Hs=*1d7u{baX4YrchKH(!z*B&qo0NHU9O33#`X1G()65Q~iw!!H-iA2`BQ{B;q)BaaUW zSD1(q2O%v40OZ>K_|v32ew1Wja}kG)!OjUDWSEn~FI6sV)=zdlhhHX9f8Z#5^#&yK zS|avYz;e5P0$z%R3;M9huth)+f^j`|ueLt1A|4FEXO7+CW7k8v0PcQ-Jh6G@GYBae zch)|;g|}ZzqS&UoS7j-CU-yTg9W(yWeDU&mc>u9yKSkQcA%!n7cEqr)56_w_8qks& zm9Kzx+UfreCJh>lClkI5Zr8cl`T5e~cdYzcXg>rk+`sD{KYFUoXXf}=@pbSu&@tB^ zrAcehJ~B^sfH>5-uWfFYf)Os_vDxu(Y02>uS$`tM2ODen*ijeX#?^Vwc0e5f@renR zHGTJforxP0Mde%U9cX>l{4~6FCQd(&Y+kzqcKW|YmURDc|IB|g#cXX8HsP8rz*P5i zxd~_;;+)7b^jvJi+%;FNA%=OX(5!CHUU&Wg2|LAMvU51PE->jv_6SFP@Sy=MsgW#z z1n3Gb?|m2ZKYQ04HTM+ZYyqST1c=Hme;BF=p`%iSyuFT3G#qZS`*0q#`+yAm*O_Fp zKPG%}PG4ei%HNv`YlQFlRq%6duW8mUfDTH`Q-mwT60te+dEu5hNA^3wqYW!GRfO}x tE%Rm1fE1&PWdC1)i?o|pGN=ZaPR9Fe^mC=#HFbqVUtBOV_ghHSY=mYwok(}S%ZM!uat#)OhglV4VbmaOvQXK73!05o}K+}QSEv0EnGkfb5eLPZny|z$=5AJ61A!0wD z=1ET|ncivIm;$DNDPRhi0;Yf| zU<#N5ra(b~&1TazP1A+ta=G}qg4<*exFCL5FbAGPf_^EDyMM)E;a00vWR5vhkN|MK zUOmosyN<>N+78`?0z7o$Y`F>I@z~OMnt|1YD zaS0oXOKVF!vw!6KNwomS#4 zZWrAJkOV3Ul4PPJ#(*J)xiNU?i*p~91zaFPunRQ#(SNn@YqB;VL87JVMYbOgU6V}t85h#;I?F2^8xTL$hO9p zCiqnmKq^X4MklG&G<4MFL1YfRzE8q&a0 ztsHK>Q7YTNiZy)4Ckf(Y-l_G8+;2mZe?LTGhAelB0Ezk`$Sa=&P7oZUw^@MQZdW`) zjv(R|Oljj1u5Sxa(yVll9DbEI`|~Pp8Gxq|4kW=2|3OSD=>hoXBt}4EKVkD=N(LvdmjqxkcM1Y~YEd{Wdc86*^5hyt x09jBzODJLBw~8Z&MBW&KqK+?Dz!i8>;13Pt7!N=3c$okI002ovPDHLkV1o7{36=l= diff --git a/actors/wario/geo.inc.c b/actors/wario/geo.inc.c index 5261ec8e..dca4cd9d 100644 --- a/actors/wario/geo.inc.c +++ b/actors/wario/geo.inc.c @@ -3,25 +3,53 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt1[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Half_Closed_1), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_half_closed_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt2[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Closed_2), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_closed_2), GEO_CLOSE_NODE(), GEO_RETURN(), }; const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt3[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Dead_3), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_right_3), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_ArmatureWario_Head_Capless[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt4[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_left_4), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt5[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_up_5), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt6[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_down_6), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt7[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_dead_7), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_head_capless[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_eyes), @@ -33,18 +61,22 @@ const GeoLayout wario_ArmatureWario_Head_Capless[] = { GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt1), GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt2), GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt3), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt4), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt5), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt6), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt7), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_ArmatureWario_Left_Hand_Open[] = { +const GeoLayout wario_left_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 83, 0, 0, wario_001_switch_000_offset_left_hand_open_mesh_layer_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_ArmatureWario_Right_Hand_Open[] = { +const GeoLayout wario_right_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_001_switch_000_offset_right_hand_open_mesh_layer_1), @@ -54,24 +86,24 @@ const GeoLayout wario_ArmatureWario_Right_Hand_Open[] = { GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_ArmatureWario_Right_Hand_Peace[] = { +const GeoLayout wario_right_hand_peace[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_001_switch_000_offset_right_hand_peace_mesh_layer_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_ArmatureWario_Right_Hand_Cap[] = { +const GeoLayout wario_right_hand_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_001_switch_000_offset_right_hand_cap_mesh_layer_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_ArmatureWario_Right_Hand_Wing_Cap[] = { +const GeoLayout wario_right_hand_wing_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_001_switch_000_offset_right_hand_cap_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_ALPHA, wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4), GEO_CLOSE_NODE(), @@ -81,25 +113,53 @@ const GeoLayout wario_ArmatureWario_Right_Hand_Wing_Cap[] = { const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt1[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Half_Closed_1), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_half_closed_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt2[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Closed_2), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_closed_2), GEO_CLOSE_NODE(), GEO_RETURN(), }; const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt3[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Dead_3), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_right_3), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Head_Capless[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt4[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_left_4), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt5[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_up_5), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt6[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_down_6), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt7[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_dead_7), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_head_capless[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_eyes), @@ -111,18 +171,22 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_H GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt1), GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt2), GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt3), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt4), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt5), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt6), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt7), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Left_Hand_Open[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_left_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 83, 0, 0, wario_001_switch_000_offset_left_hand_open_mesh_layer_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Open[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_001_switch_000_offset_right_hand_open_mesh_layer_1), @@ -132,24 +196,24 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_R GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Peace[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_peace[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_001_switch_000_offset_right_hand_peace_mesh_layer_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Cap[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_001_switch_000_offset_right_hand_cap_mesh_layer_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Wing_Cap[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_wing_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_001_switch_000_offset_right_hand_cap_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4), GEO_CLOSE_NODE(), @@ -159,28 +223,56 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_R const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt1[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Half_Closed_1), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_half_closed_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt2[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Closed_2), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_closed_2), GEO_CLOSE_NODE(), GEO_RETURN(), }; const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt3[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Dead_3), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_right_3), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt4[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_left_4), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt5[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_up_5), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt6[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_down_6), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt7[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_dead_7), GEO_CLOSE_NODE(), GEO_RETURN(), }; const GeoLayout wario_002_switch_opt0_001_switch_opt1[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 0, -52, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, wario_000_offset_pelvis_mesh_layer_1), GEO_OPEN_NODE(), @@ -188,9 +280,9 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt1[] = { GEO_ASM(0, geo_mario_tilt_torso), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 90, 0, 0, wario_000_offset_chest_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 66, 0, 0, wario_000_offset_chest_mesh_layer_1), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 158, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 128, 0, 0, NULL), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_head_rotation), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), @@ -208,29 +300,33 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt1[] = { GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt1), GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt2), GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt3), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt4), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt5), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt6), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt7), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Head_Capless), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_head_capless), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, -146, 15, -33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, -146, 22, -40, -135), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_right_wing_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_wings_transparent), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, 146, -15, 33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, 146, -22, 40, -135), GEO_OPEN_NODE(), GEO_ASM(1, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_left_wing_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_cap_wings_transparent), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 134, -10, 115, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 104, -10, 115, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, wario_000_offset_left_upper_arm_mesh_layer_1), GEO_OPEN_NODE(), @@ -249,12 +345,12 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt1[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Left_Hand_Open), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_left_hand_open), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 135, -10, -116, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 105, -10, -116, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, wario_000_offset_right_upper_arm_mesh_layer_1), GEO_OPEN_NODE(), @@ -274,17 +370,17 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt1[] = { GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Open), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Peace), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Cap), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Wing_Cap), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_open), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_peace), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_cap), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_wing_cap), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 9, -8, 80, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, -45, -8, 80, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, wario_000_offset_left_upper_leg_mesh_layer_1), GEO_OPEN_NODE(), @@ -294,7 +390,7 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt1[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 9, -8, -80, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, -45, -8, -80, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, wario_000_offset_right_upper_leg_mesh_layer_1), GEO_OPEN_NODE(), @@ -316,7 +412,7 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt1[] = { GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Head_Capless[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_head_capless[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_eyes), @@ -329,14 +425,14 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_H GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Left_Hand_Open[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_left_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 83, 0, 0, wario_001_switch_000_offset_left_hand_open_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Open[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_001_switch_000_offset_right_hand_open_mesh_layer_1_mat_override_metal_0), @@ -346,24 +442,24 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_R GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Peace[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_peace[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Cap[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Wing_Cap[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_wing_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 82, 0, 0, wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_ALPHA, wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4_mat_override_metal_0), GEO_CLOSE_NODE(), @@ -373,7 +469,7 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_R const GeoLayout wario_002_switch_opt0_001_switch_opt2[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 0, -52, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wario_000_offset_pelvis_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), @@ -381,9 +477,9 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt2[] = { GEO_ASM(0, geo_mario_tilt_torso), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 90, 0, 0, wario_000_offset_chest_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_OPAQUE, 66, 0, 0, wario_000_offset_chest_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 158, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 128, 0, 0, NULL), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_head_rotation), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), @@ -400,27 +496,27 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt2[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Head_Capless), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_head_capless), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, -146, 15, -33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, -146, 22, -40, -135), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, wario_000_displaylist_right_wing_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_ALPHA, wario_metal_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, 146, -15, 33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, 146, -22, 40, -135), GEO_OPEN_NODE(), GEO_ASM(1, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, wario_000_displaylist_left_wing_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_ALPHA, wario_metal_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 134, -10, 115, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 104, -10, 115, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wario_000_offset_left_upper_arm_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), @@ -439,12 +535,12 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt2[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Left_Hand_Open), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_left_hand_open), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 135, -10, -116, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 105, -10, -116, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wario_000_offset_right_upper_arm_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), @@ -464,17 +560,17 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt2[] = { GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Open), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Peace), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Cap), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Wing_Cap), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_open), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_peace), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_cap), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_wing_cap), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 9, -8, 80, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, -45, -8, 80, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wario_000_offset_left_upper_leg_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), @@ -484,7 +580,7 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt2[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 9, -8, -80, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, -45, -8, -80, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wario_000_offset_right_upper_leg_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), @@ -506,7 +602,7 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt2[] = { GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Head_Capless[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_head_capless[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_SWITCH_CASE(0, geo_switch_mario_eyes), @@ -519,14 +615,14 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_H GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Left_Hand_Open[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_left_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 83, 0, 0, wario_001_switch_000_offset_left_hand_open_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Open[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_open[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_001_switch_000_offset_right_hand_open_mesh_layer_1_mat_override_metal_0), @@ -536,34 +632,34 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_R GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Peace[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_peace[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Cap[] = { +const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_cap[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_mat_override_metal_0), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_wing_cap[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4_mat_override_metal_0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_RETURN(), }; -const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Wing_Cap[] = { - GEO_NODE_START(), - GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 82, 0, 0, wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_mat_override_metal_0), - GEO_CLOSE_NODE(), - GEO_RETURN(), -}; const GeoLayout wario_002_switch_opt0_001_switch_opt3[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 0, -52, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, wario_000_offset_pelvis_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), @@ -571,9 +667,9 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt3[] = { GEO_ASM(0, geo_mario_tilt_torso), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 90, 0, 0, wario_000_offset_chest_mesh_layer_1_mat_override_metal_0), + GEO_ANIMATED_PART(LAYER_TRANSPARENT, 66, 0, 0, wario_000_offset_chest_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 158, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 128, 0, 0, NULL), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_head_rotation), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), @@ -590,27 +686,27 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt3[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Head_Capless), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_head_capless), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, -146, 15, -33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, -146, 22, -40, -135), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_right_wing_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_metal_cap_wings_transparent), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, 146, -15, 33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, 146, -22, 40, -135), GEO_OPEN_NODE(), GEO_ASM(1, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_000_displaylist_left_wing_mesh_layer_4_mat_override_metal_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, wario_metal_cap_wings_transparent), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 134, -10, 115, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 104, -10, 115, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, wario_000_offset_left_upper_arm_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), @@ -629,12 +725,12 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt3[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Left_Hand_Open), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_left_hand_open), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 135, -10, -116, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 105, -10, -116, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, wario_000_offset_right_upper_arm_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), @@ -654,17 +750,17 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt3[] = { GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Open), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Peace), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Cap), - GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Wing_Cap), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_open), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_peace), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_cap), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_wing_cap), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 9, -8, 80, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, -45, -8, 80, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, wario_000_offset_left_upper_leg_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), @@ -674,7 +770,7 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt3[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 9, -8, -80, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, -45, -8, -80, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, wario_000_offset_right_upper_leg_mesh_layer_1_mat_override_metal_0), GEO_OPEN_NODE(), @@ -699,21 +795,49 @@ const GeoLayout wario_002_switch_opt0_001_switch_opt3[] = { const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt1[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Half_Closed_1), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_half_closed_1), GEO_CLOSE_NODE(), GEO_RETURN(), }; const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt2[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Closed_2), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_closed_2), GEO_CLOSE_NODE(), GEO_RETURN(), }; const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt3[] = { GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Dead_3), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_right_3), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt4[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_left_4), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt5[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_up_5), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt6[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_down_6), + GEO_CLOSE_NODE(), + GEO_RETURN(), +}; +const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt7[] = { + GEO_NODE_START(), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_OPAQUE, wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_dead_7), GEO_CLOSE_NODE(), GEO_RETURN(), }; @@ -724,10 +848,9 @@ const GeoLayout wario_geo[] = { GEO_OPEN_NODE(), GEO_SCALE(LAYER_FORCE, 16384), GEO_OPEN_NODE(), - GEO_ASM(0, geo_mario_set_player_colors), + GEO_ASM(0, geo_mario_set_player_colors), GEO_ASM(0, geo_mirror_mario_backface_culling), GEO_ASM(0, geo_mirror_mario_set_alpha), - GEO_SWITCH_CASE(0, geo_switch_mario_stand_run), GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), @@ -735,7 +858,7 @@ const GeoLayout wario_geo[] = { GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 0, -52, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wario_000_offset_pelvis_mesh_layer_1), GEO_OPEN_NODE(), @@ -743,9 +866,9 @@ const GeoLayout wario_geo[] = { GEO_ASM(0, geo_mario_tilt_torso), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 90, 0, 0, wario_000_offset_chest_mesh_layer_1), + GEO_ANIMATED_PART(LAYER_OPAQUE, 66, 0, 0, wario_000_offset_chest_mesh_layer_1), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 158, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 128, 0, 0, NULL), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_head_rotation), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), @@ -763,29 +886,33 @@ const GeoLayout wario_geo[] = { GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt1), GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt2), GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt3), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt4), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt5), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt6), + GEO_BRANCH(1, wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt7), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_ArmatureWario_Head_Capless), + GEO_BRANCH(1, wario_head_capless), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, -146, 15, -33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, -146, 22, -40, -135), GEO_OPEN_NODE(), GEO_ASM(0, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, wario_000_displaylist_right_wing_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, 146, -15, 33, -133), + GEO_TRANSLATE_ROTATE(LAYER_FORCE, 158, -62, 146, -22, 40, -135), GEO_OPEN_NODE(), GEO_ASM(1, geo_mario_rotate_wing_cap_wings), GEO_ROTATION_NODE(LAYER_FORCE, 0, 0, 0), GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_ALPHA, wario_000_displaylist_left_wing_mesh_layer_4), + GEO_DISPLAY_LIST(LAYER_ALPHA, wario_cap_wings), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 134, -10, 115, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 104, -10, 115, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wario_000_offset_left_upper_arm_mesh_layer_1), GEO_OPEN_NODE(), @@ -804,12 +931,12 @@ const GeoLayout wario_geo[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_ArmatureWario_Left_Hand_Open), + GEO_BRANCH(1, wario_left_hand_open), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 135, -10, -116, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 105, -10, -116, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wario_000_offset_right_upper_arm_mesh_layer_1), GEO_OPEN_NODE(), @@ -829,17 +956,17 @@ const GeoLayout wario_geo[] = { GEO_HELD_OBJECT(0, 0, 0, 0, geo_switch_mario_hand_grab_pos), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_BRANCH(1, wario_ArmatureWario_Right_Hand_Open), - GEO_BRANCH(1, wario_ArmatureWario_Right_Hand_Peace), - GEO_BRANCH(1, wario_ArmatureWario_Right_Hand_Cap), - GEO_BRANCH(1, wario_ArmatureWario_Right_Hand_Wing_Cap), + GEO_BRANCH(1, wario_right_hand_open), + GEO_BRANCH(1, wario_right_hand_peace), + GEO_BRANCH(1, wario_right_hand_cap), + GEO_BRANCH(1, wario_right_hand_wing_cap), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 9, -8, 80, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, -45, -8, 80, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wario_000_offset_left_upper_leg_mesh_layer_1), GEO_OPEN_NODE(), @@ -849,7 +976,7 @@ const GeoLayout wario_geo[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(LAYER_OPAQUE, 9, -8, -80, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, -45, -8, -80, NULL), GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wario_000_offset_right_upper_leg_mesh_layer_1), GEO_OPEN_NODE(), diff --git a/actors/wario/geo_header.h b/actors/wario/geo_header.h index 4d182007..20c0cb25 100644 --- a/actors/wario/geo_header.h +++ b/actors/wario/geo_header.h @@ -1,68 +1,59 @@ extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt1[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt2[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt3[]; -extern const GeoLayout wario_ArmatureWario_Head_Capless[]; -extern const GeoLayout wario_ArmatureWario_Left_Hand_Open[]; -extern const GeoLayout wario_ArmatureWario_Right_Hand_Open[]; -extern const GeoLayout wario_ArmatureWario_Right_Hand_Peace[]; -extern const GeoLayout wario_ArmatureWario_Right_Hand_Cap[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt4[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt5[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt6[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt1_000_switch_001_opt7[]; +extern const GeoLayout wario_head_capless[]; +extern const GeoLayout wario_left_hand_open[]; +extern const GeoLayout wario_right_hand_open[]; +extern const GeoLayout wario_right_hand_peace[]; +extern const GeoLayout wario_right_hand_cap[]; +extern const GeoLayout wario_right_hand_wing_cap[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt1[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt2[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt3[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Head_Capless[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Left_Hand_Open[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Open[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Peace[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_ArmatureWario_Right_Hand_Cap[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt4[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt5[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt6[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt1_000_switch_001_opt7[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_head_capless[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_left_hand_open[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_open[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_peace[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_cap[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_jump_wario_right_hand_wing_cap[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt1[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt2[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt3[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt4[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt5[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt6[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt1_000_switch_opt0_000_switch_001_opt7[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt1[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Head_Capless[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Left_Hand_Open[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Open[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Peace[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_ArmatureWario_Right_Hand_Cap[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_head_capless[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_left_hand_open[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_open[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_peace[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_cap[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt2_jump_wario_right_hand_wing_cap[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt2[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Head_Capless[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Left_Hand_Open[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Open[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Peace[]; -extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_ArmatureWario_Right_Hand_Cap[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_head_capless[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_left_hand_open[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_open[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_peace[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_cap[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt3_jump_wario_right_hand_wing_cap[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt3[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt1[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt2[]; extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt3[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt4[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt5[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt6[]; +extern const GeoLayout wario_002_switch_opt0_001_switch_opt0_000_switch_opt0_000_switch_001_opt7[]; extern const GeoLayout wario_geo[]; -extern Lights1 wario_Wario_Overalls_lights; -extern Lights1 wario_Wario_Cap_lights; -extern Lights1 wario_Wario_Button_lights; -extern Lights1 wario_Wario_Logo_lights; -extern Lights1 wario_Wario_Hair_lights; -extern Lights1 wario_Wario_Eyes_lights; -extern Lights1 wario_Wario_Sideburn_lights; -extern Lights1 wario_Wario_Skin_lights; -extern Lights1 wario_Wario_Mustache_lights; -extern Lights1 wario_Wario_Nose_lights; -extern Lights1 wario_Wario_Mouth_lights; -extern Lights1 wario_Wario_Eyes_Half_Closed_lights; -extern Lights1 wario_Wario_Eyes_Closed_lights; -extern Lights1 wario_Wario_Eyes_Dead_lights; -extern Lights1 wario_Wario_Gloves_lights; -extern Lights1 wario_wings_half_1_lights; -extern Lights1 wario_wings_half_2_lights; -extern Lights1 wario_Wario_Shoes_lights; -extern u8 wario_mario_metal_rgba16[]; -extern u8 wario_wario_overalls_button_rgba16[]; -extern u8 wario_wario_logo_rgba16[]; -extern u8 wario_custom_wario_eyes_center_rgba16[]; -extern u8 wario_custom_wario_sideburn_rgba16[]; -extern u8 wario_custom_wario_mouth_rgba16[]; -extern u8 wario_custom_wario_eyes_half_closed_rgba16[]; -extern u8 wario_custom_wario_eyes_closed_rgba16[]; -extern u8 wario_custom_wario_eyes_dead_rgba16[]; -extern u8 wario_mario_wing_tip_rgba16[]; -extern u8 wario_mario_wing_rgba16[]; extern Vtx wario_000_offset_pelvis_mesh_layer_1_vtx_0[76]; extern Gfx wario_000_offset_pelvis_mesh_layer_1_tri_0[]; extern Vtx wario_000_offset_chest_mesh_layer_1_vtx_0[94]; @@ -103,33 +94,25 @@ extern Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_5[40]; extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_5[]; extern Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_6[10]; extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6[]; -extern Vtx wario_000_displaylist_right_wing_mesh_layer_4_vtx_0[4]; -extern Gfx wario_000_displaylist_right_wing_mesh_layer_4_tri_0[]; -extern Vtx wario_000_displaylist_right_wing_mesh_layer_4_vtx_1[4]; -extern Gfx wario_000_displaylist_right_wing_mesh_layer_4_tri_1[]; -extern Vtx wario_000_displaylist_left_wing_mesh_layer_4_vtx_0[4]; -extern Gfx wario_000_displaylist_left_wing_mesh_layer_4_tri_0[]; -extern Vtx wario_000_displaylist_left_wing_mesh_layer_4_vtx_1[4]; -extern Gfx wario_000_displaylist_left_wing_mesh_layer_4_tri_1[]; extern Vtx wario_000_offset_left_upper_arm_mesh_layer_1_vtx_0[31]; extern Gfx wario_000_offset_left_upper_arm_mesh_layer_1_tri_0[]; extern Vtx wario_000_offset_left_lower_arm_mesh_layer_1_vtx_0[16]; extern Gfx wario_000_offset_left_lower_arm_mesh_layer_1_tri_0[]; -extern Vtx wario_000_displaylist_left_hand_fist_mesh_layer_1_vtx_0[52]; +extern Vtx wario_000_displaylist_left_hand_fist_mesh_layer_1_vtx_0[45]; extern Gfx wario_000_displaylist_left_hand_fist_mesh_layer_1_tri_0[]; -extern Vtx wario_001_switch_000_offset_left_hand_open_mesh_layer_1_vtx_0[72]; +extern Vtx wario_001_switch_000_offset_left_hand_open_mesh_layer_1_vtx_0[56]; extern Gfx wario_001_switch_000_offset_left_hand_open_mesh_layer_1_tri_0[]; extern Vtx wario_000_offset_right_upper_arm_mesh_layer_1_vtx_0[28]; extern Gfx wario_000_offset_right_upper_arm_mesh_layer_1_tri_0[]; extern Vtx wario_000_offset_right_lower_arm_mesh_layer_1_vtx_0[16]; extern Gfx wario_000_offset_right_lower_arm_mesh_layer_1_tri_0[]; -extern Vtx wario_000_displaylist_right_hand_fist_mesh_layer_1_vtx_0[52]; +extern Vtx wario_000_displaylist_right_hand_fist_mesh_layer_1_vtx_0[41]; extern Gfx wario_000_displaylist_right_hand_fist_mesh_layer_1_tri_0[]; -extern Vtx wario_001_switch_000_offset_right_hand_open_mesh_layer_1_vtx_0[76]; +extern Vtx wario_001_switch_000_offset_right_hand_open_mesh_layer_1_vtx_0[60]; extern Gfx wario_001_switch_000_offset_right_hand_open_mesh_layer_1_tri_0[]; -extern Vtx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0[101]; +extern Vtx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0[87]; extern Gfx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_tri_0[]; -extern Vtx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_0[57]; +extern Vtx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_0[46]; extern Gfx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_tri_0[]; extern Vtx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_1[5]; extern Gfx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_tri_1[]; @@ -137,6 +120,14 @@ extern Vtx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_2[41]; extern Gfx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_tri_2[]; extern Vtx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_3[10]; extern Gfx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_tri_3[]; +extern Vtx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_0[46]; +extern Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_0[]; +extern Vtx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_1[5]; +extern Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_1[]; +extern Vtx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_2[41]; +extern Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_2[]; +extern Vtx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_3[10]; +extern Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_3[]; extern Vtx wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4_vtx_0[8]; extern Gfx wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4_tri_0[]; extern Vtx wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4_vtx_1[8]; @@ -153,50 +144,54 @@ extern Vtx wario_000_offset_right_lower_leg_mesh_layer_1_vtx_0[22]; extern Gfx wario_000_offset_right_lower_leg_mesh_layer_1_tri_0[]; extern Vtx wario_000_displaylist_right_foot_mesh_layer_1_vtx_0[38]; extern Gfx wario_000_displaylist_right_foot_mesh_layer_1_tri_0[]; -extern Gfx mat_wario_Wario_Overalls[]; +extern Gfx mat_wario_overalls[]; extern Gfx mat_wario_metal[]; extern Gfx mat_revert_wario_metal[]; -extern Gfx mat_wario_Wario_Cap[]; -extern Gfx mat_wario_Wario_Button[]; -extern Gfx mat_wario_Wario_Logo[]; -extern Gfx mat_wario_Wario_Hair[]; -extern Gfx mat_wario_Wario_Eyes[]; -extern Gfx mat_wario_Wario_Sideburn[]; -extern Gfx mat_wario_Wario_Skin[]; -extern Gfx mat_wario_Wario_Mustache[]; -extern Gfx mat_wario_Wario_Nose[]; -extern Gfx mat_wario_Wario_Mouth[]; -extern Gfx mat_wario_Wario_Eyes_Half_Closed[]; -extern Gfx mat_wario_Wario_Eyes_Closed[]; -extern Gfx mat_wario_Wario_Eyes_Dead[]; -extern Gfx mat_wario_wing_tip[]; -extern Gfx mat_revert_wario_wing_tip[]; -extern Gfx mat_wario_wing[]; -extern Gfx mat_revert_wario_wing[]; -extern Gfx mat_wario_Wario_Gloves[]; +extern Gfx mat_wario_cap[]; +extern Gfx mat_wario_button[]; +extern Gfx mat_wario_logo[]; +extern Gfx mat_wario_hair[]; +extern Gfx mat_wario_eyes_center[]; +extern Gfx mat_wario_sideburn[]; +extern Gfx mat_wario_face[]; +extern Gfx mat_wario_mustache[]; +extern Gfx mat_wario_nose[]; +extern Gfx mat_wario_mouth[]; +extern Gfx mat_wario_eyes_half_closed[]; +extern Gfx mat_wario_eyes_closed[]; +extern Gfx mat_wario_eyes_right[]; +extern Gfx mat_wario_eyes_left[]; +extern Gfx mat_wario_eyes_up[]; +extern Gfx mat_wario_eyes_down[]; +extern Gfx mat_wario_eyes_dead[]; +extern Gfx mat_wario_gloves[]; extern Gfx mat_wario_wings_half_1[]; extern Gfx mat_revert_wario_wings_half_1[]; extern Gfx mat_wario_wings_half_2[]; extern Gfx mat_revert_wario_wings_half_2[]; -extern Gfx mat_wario_Wario_Shoes[]; +extern Gfx mat_wario_shoes[]; extern Gfx wario_000_offset_pelvis_mesh_layer_1[]; extern Gfx wario_000_offset_pelvis_mesh_layer_1_mat_override_metal_0[]; extern Gfx wario_000_offset_chest_mesh_layer_1[]; extern Gfx wario_000_offset_chest_mesh_layer_1_mat_override_metal_0[]; extern Gfx wario_000_displaylist_head_cap_mesh_layer_1[]; extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_metal_0[]; -extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Half_Closed_1[]; -extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Closed_2[]; -extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Dead_3[]; +extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_half_closed_1[]; +extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_closed_2[]; +extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_right_3[]; +extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_left_4[]; +extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_up_5[]; +extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_down_6[]; +extern Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_dead_7[]; extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1[]; extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_metal_0[]; -extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Half_Closed_1[]; -extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Closed_2[]; -extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Dead_3[]; -extern Gfx wario_000_displaylist_right_wing_mesh_layer_4[]; -extern Gfx wario_000_displaylist_right_wing_mesh_layer_4_mat_override_metal_0[]; -extern Gfx wario_000_displaylist_left_wing_mesh_layer_4[]; -extern Gfx wario_000_displaylist_left_wing_mesh_layer_4_mat_override_metal_0[]; +extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_half_closed_1[]; +extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_closed_2[]; +extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_right_3[]; +extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_left_4[]; +extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_up_5[]; +extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_down_6[]; +extern Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_dead_7[]; extern Gfx wario_000_offset_left_upper_arm_mesh_layer_1[]; extern Gfx wario_000_offset_left_upper_arm_mesh_layer_1_mat_override_metal_0[]; extern Gfx wario_000_offset_left_lower_arm_mesh_layer_1[]; @@ -217,6 +212,8 @@ extern Gfx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1[]; extern Gfx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_mat_override_metal_0[]; extern Gfx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1[]; extern Gfx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_mat_override_metal_0[]; +extern Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1[]; +extern Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_mat_override_metal_0[]; extern Gfx wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4[]; extern Gfx wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4_mat_override_metal_0[]; extern Gfx wario_000_offset_left_upper_leg_mesh_layer_1[]; @@ -231,4 +228,10 @@ extern Gfx wario_000_offset_right_lower_leg_mesh_layer_1[]; extern Gfx wario_000_offset_right_lower_leg_mesh_layer_1_mat_override_metal_0[]; extern Gfx wario_000_displaylist_right_foot_mesh_layer_1[]; extern Gfx wario_000_displaylist_right_foot_mesh_layer_1_mat_override_metal_0[]; +extern const Gfx wario_wings_half_1_dl[]; +extern const Gfx wario_wings_half_2_dl[]; +extern const Gfx wario_cap_wings[]; +extern const Gfx wario_cap_wings_transparent[]; +extern const Gfx wario_metal_cap_wings[]; +extern const Gfx wario_metal_cap_wings_transparent[]; extern Gfx wario_material_revert_render_settings[]; diff --git a/actors/wario/model.inc.c b/actors/wario/model.inc.c index 67aa9252..619f0fd3 100644 --- a/actors/wario/model.inc.c +++ b/actors/wario/model.inc.c @@ -1,207 +1,188 @@ -Lights1 wario_Wario_Overalls_lights = gdSPDefLights1( - 0x57, 0x0, 0x57, - 0xAF, 0x0, 0xAF, 0x28, 0x28, 0x28); +static const Lights1 wario_purple_lights_group = gdSPDefLights1( + 0x57, 0x00, 0x57, + 0xAF, 0x00, 0xAF, 0x28, 0x28, 0x28 +); -Lights1 wario_Wario_Cap_lights = gdSPDefLights1( - 0x7F, 0x6F, 0x0, - 0xFE, 0xDF, 0x0, 0x28, 0x28, 0x28); +static const Lights1 wario_yellow_lights_group = gdSPDefLights1( + 0x7F, 0x67, 0x00, + 0xFF, 0xCF, 0x00, 0x28, 0x28, 0x28 +); -Lights1 wario_Wario_Button_lights = gdSPDefLights1( - 0x57, 0x0, 0x57, - 0xAF, 0x0, 0xAF, 0x28, 0x28, 0x28); +static const Lights1 wario_white_lights_group = gdSPDefLights1( + 0x7F, 0x7F, 0x7F, + 0xFF, 0xFF, 0xFF, 0x28, 0x28, 0x28 +); -Lights1 wario_Wario_Logo_lights = gdSPDefLights1( - 0x7F, 0x6F, 0x0, - 0xFE, 0xDF, 0x0, 0x28, 0x28, 0x28); +static const Lights1 wario_green_lights_group = gdSPDefLights1( + 0x07, 0x39, 0x0E, + 0x0E, 0x72, 0x1C, 0x28, 0x28, 0x28 +); -Lights1 wario_Wario_Hair_lights = gdSPDefLights1( - 0x37, 0x27, 0x0, - 0x6F, 0x4E, 0x0, 0x28, 0x28, 0x28); +static const Lights1 wario_beige_lights_group = gdSPDefLights1( + 0x7F, 0x60, 0x3C, + 0xFE, 0xC1, 0x79, 0x28, 0x28, 0x28 +); -Lights1 wario_Wario_Eyes_lights = gdSPDefLights1( - 0x7E, 0x60, 0x3C, - 0xFD, 0xC0, 0x79, 0x28, 0x28, 0x28); +static const Lights1 wario_brown_lights_group = gdSPDefLights1( + 0x39, 0x29, 0x00, + 0x73, 0x53, 0x00, 0x28, 0x28, 0x28 +); -Lights1 wario_Wario_Sideburn_lights = gdSPDefLights1( - 0x7E, 0x60, 0x3C, - 0xFD, 0xC0, 0x79, 0x28, 0x28, 0x28); +static const Lights1 wario_black_lights_group = gdSPDefLights1( + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 +); -Lights1 wario_Wario_Skin_lights = gdSPDefLights1( - 0x7E, 0x60, 0x3C, - 0xFD, 0xC0, 0x79, 0x28, 0x28, 0x28); - -Lights1 wario_Wario_Mustache_lights = gdSPDefLights1( - 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x28, 0x28, 0x28); - -Lights1 wario_Wario_Nose_lights = gdSPDefLights1( +static const Lights1 wario_pink_lights_group = gdSPDefLights1( 0x7F, 0x37, 0x57, - 0xFE, 0x6E, 0xAF, 0x28, 0x28, 0x28); + 0xFF, 0x6F, 0xAF, 0x28, 0x28, 0x28 +); -Lights1 wario_Wario_Mouth_lights = gdSPDefLights1( - 0x7E, 0x60, 0x3C, - 0xFD, 0xC0, 0x79, 0x28, 0x28, 0x28); - -Lights1 wario_Wario_Eyes_Half_Closed_lights = gdSPDefLights1( - 0x7E, 0x60, 0x3C, - 0xFD, 0xC0, 0x79, 0x28, 0x28, 0x28); - -Lights1 wario_Wario_Eyes_Closed_lights = gdSPDefLights1( - 0x7E, 0x60, 0x3C, - 0xFD, 0xC0, 0x79, 0x28, 0x28, 0x28); - -Lights1 wario_Wario_Eyes_Dead_lights = gdSPDefLights1( - 0x7E, 0x60, 0x3C, - 0xFD, 0xC0, 0x79, 0x28, 0x28, 0x28); - -Lights1 wario_Wario_Gloves_lights = gdSPDefLights1( - 0x7F, 0x7F, 0x7F, - 0xFE, 0xFE, 0xFE, 0x28, 0x28, 0x28); - -Lights1 wario_wings_half_1_lights = gdSPDefLights1( - 0x7F, 0x7F, 0x7F, - 0xFE, 0xFE, 0xFE, 0x28, 0x28, 0x28); - -Lights1 wario_wings_half_2_lights = gdSPDefLights1( - 0x7F, 0x7F, 0x7F, - 0xFE, 0xFE, 0xFE, 0x28, 0x28, 0x28); - -Lights1 wario_Wario_Shoes_lights = gdSPDefLights1( - 0x6, 0x38, 0xD, - 0xD, 0x71, 0x1B, 0x28, 0x28, 0x28); - -Gfx wario_mario_metal_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_mario_metal_rgba16[] = { - #include "actors/mario/mario_metal.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_metal[] = { +#include "actors/mario/mario_metal.rgba16.inc.c" }; -Gfx wario_wario_overalls_button_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_wario_overalls_button_rgba16[] = { - #include "actors/wario/custom_wario_overalls_button.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_white_button[] = { +#include "actors/wario/custom_wario_overalls_button.rgba16.inc.c" }; -Gfx wario_wario_logo_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_wario_logo_rgba16[] = { - #include "actors/wario/custom_wario_logo.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_w_logo[] = { +#include "actors/wario/custom_wario_logo.rgba16.inc.c" }; -Gfx wario_custom_wario_eyes_center_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_custom_wario_eyes_center_rgba16[] = { - #include "actors/wario/custom_wario_eyes_center.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_hair_sideburn[] = { +#include "actors/wario/custom_wario_sideburn.rgba16.inc.c" }; -Gfx wario_custom_wario_sideburn_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_custom_wario_sideburn_rgba16[] = { - #include "actors/wario/custom_wario_sideburn.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_mouth[] = { +#include "actors/wario/custom_wario_mouth.rgba16.inc.c" }; -Gfx wario_custom_wario_mouth_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_custom_wario_mouth_rgba16[] = { - #include "actors/wario/custom_wario_mouth.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_eyes_front[] = { +#include "actors/wario/custom_wario_eyes_center.rgba16.inc.c" }; -Gfx wario_custom_wario_eyes_half_closed_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_custom_wario_eyes_half_closed_rgba16[] = { - #include "actors/wario/custom_wario_eyes_half_closed.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_eyes_half_closed[] = { +#include "actors/wario/custom_wario_eyes_half_closed.rgba16.inc.c" }; -Gfx wario_custom_wario_eyes_closed_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_custom_wario_eyes_closed_rgba16[] = { - #include "actors/wario/custom_wario_eyes_closed.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_eyes_closed[] = { +#include "actors/wario/custom_wario_eyes_closed.rgba16.inc.c" }; -Gfx wario_custom_wario_eyes_dead_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_custom_wario_eyes_dead_rgba16[] = { - #include "actors/wario/custom_wario_eyes_dead.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_eyes_right[] = { +#include "actors/wario/custom_wario_eyes_left_unused.rgba16.inc.c" }; -Gfx wario_mario_wing_tip_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_mario_wing_tip_rgba16[] = { - #include "actors/mario/mario_wing_tip.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_eyes_left[] = { +#include "actors/wario/custom_wario_eyes_right_unused.rgba16.inc.c" }; -Gfx wario_mario_wing_rgba16_aligner[] = {gsSPEndDisplayList()}; -u8 wario_mario_wing_rgba16[] = { - #include "actors/mario/mario_wing.rgba16.inc.c" +ALIGNED8 static const u8 wario_texture_eyes_up[] = { +#include "actors/wario/custom_wario_eyes_up_unused.rgba16.inc.c" +}; + +ALIGNED8 static const u8 wario_texture_eyes_down[] = { +#include "actors/wario/custom_wario_eyes_down_unused.rgba16.inc.c" +}; + +ALIGNED8 static const u8 wario_texture_eyes_dead[] = { +#include "actors/wario/custom_wario_eyes_dead.rgba16.inc.c" +}; + +ALIGNED8 static const u8 wario_texture_wings_half_1[] = { +#include "actors/mario/mario_wing.rgba16.inc.c" +}; + +ALIGNED8 static const u8 wario_texture_wings_half_2[] = { +#include "actors/mario/mario_wing_tip.rgba16.inc.c" +}; + +ALIGNED8 static const u8 wario_texture_metal_wings_half_1[] = { +#include "actors/mario/mario_metal_wing_unused.rgba16.inc.c" +}; + +ALIGNED8 static const u8 wario_texture_metal_wings_half_2[] = { +#include "actors/mario/mario_metal_wing_tip_unused.rgba16.inc.c" }; Vtx wario_000_offset_pelvis_mesh_layer_1_vtx_0[76] = { - {{{127, 17, 0},0, {-16, -16},{0x7F, 0x4, 0x0, 0xFF}}}, - {{{100, -95, -54},0, {-16, -16},{0x64, 0xB5, 0xE8, 0xFF}}}, - {{{84, -15, -142},0, {-16, -16},{0x4D, 0xF0, 0x9C, 0xFF}}}, - {{{100, -95, 54},0, {-16, -16},{0x64, 0xB5, 0x18, 0xFF}}}, - {{{84, -15, 142},0, {-16, -16},{0x4D, 0xF0, 0x64, 0xFF}}}, - {{{82, 62, 140},0, {-16, -16},{0x42, 0x2D, 0x63, 0xFF}}}, - {{{96, 108, 58},0, {-16, -16},{0x5D, 0x53, 0x1A, 0xFF}}}, - {{{96, 108, -58},0, {-16, -16},{0x5D, 0x53, 0xE6, 0xFF}}}, - {{{83, 62, -140},0, {-16, -16},{0x42, 0x2D, 0x9D, 0xFF}}}, - {{{29, 51, -142},0, {-16, -16},{0xE0, 0x27, 0x8B, 0xFF}}}, - {{{31, -12, -148},0, {-16, -16},{0xE7, 0xF5, 0x84, 0xFF}}}, - {{{72, -79, -121},0, {-16, -16},{0x39, 0xB7, 0xA9, 0xFF}}}, - {{{57, -114, -68},0, {-16, -16},{0x19, 0x88, 0xDF, 0xFF}}}, - {{{57, -114, 68},0, {-16, -16},{0x19, 0x88, 0x21, 0xFF}}}, - {{{72, -79, 121},0, {-16, -16},{0x39, 0xB7, 0x57, 0xFF}}}, - {{{31, -12, 149},0, {-16, -16},{0xE7, 0xF5, 0x7C, 0xFF}}}, - {{{29, 51, 142},0, {-16, -16},{0xE0, 0x27, 0x75, 0xFF}}}, - {{{31, -12, 149},0, {-16, -16},{0xE7, 0xF5, 0x7C, 0xFF}}}, - {{{84, -15, 142},0, {-16, -16},{0x4D, 0xF0, 0x64, 0xFF}}}, - {{{82, 62, 140},0, {-16, -16},{0x42, 0x2D, 0x63, 0xFF}}}, - {{{59, 111, 95},0, {-16, -16},{0xF, 0x6D, 0x40, 0xFF}}}, - {{{96, 108, 58},0, {-16, -16},{0x5D, 0x53, 0x1A, 0xFF}}}, - {{{52, 127, 39},0, {-16, -16},{0x4, 0x7E, 0xD, 0xFF}}}, - {{{52, 127, -39},0, {-16, -16},{0x4, 0x7E, 0xF3, 0xFF}}}, - {{{96, 108, -58},0, {-16, -16},{0x5D, 0x53, 0xE6, 0xFF}}}, - {{{59, 111, -95},0, {-16, -16},{0xF, 0x6D, 0xC0, 0xFF}}}, - {{{83, 62, -140},0, {-16, -16},{0x42, 0x2D, 0x9D, 0xFF}}}, - {{{29, 51, -142},0, {-16, -16},{0xE0, 0x27, 0x8B, 0xFF}}}, - {{{11, 91, -108},0, {-16, -16},{0xC5, 0x55, 0xB6, 0xFF}}}, - {{{-7, 49, -119},0, {-16, -16},{0xA1, 0x20, 0xB2, 0xFF}}}, - {{{-11, -12, -122},0, {-16, -16},{0x9D, 0xF7, 0xB1, 0xFF}}}, - {{{31, -12, -148},0, {-16, -16},{0xE7, 0xF5, 0x84, 0xFF}}}, - {{{-11, -12, -122},0, {-16, -16},{0x9D, 0xF7, 0xB1, 0xFF}}}, - {{{31, -12, -148},0, {-16, -16},{0xE7, 0xF5, 0x84, 0xFF}}}, - {{{25, -75, -129},0, {-16, -16},{0xDE, 0xBC, 0x9A, 0xFF}}}, - {{{72, -79, -121},0, {-16, -16},{0x39, 0xB7, 0xA9, 0xFF}}}, - {{{57, -114, -68},0, {-16, -16},{0x19, 0x88, 0xDF, 0xFF}}}, - {{{5, -107, -82},0, {-16, -16},{0xCC, 0x99, 0xCB, 0xFF}}}, - {{{-2, -114, 0},0, {-16, -16},{0xC7, 0x8E, 0x0, 0xFF}}}, - {{{57, -114, 68},0, {-16, -16},{0x19, 0x88, 0x21, 0xFF}}}, - {{{5, -107, 83},0, {-16, -16},{0xCC, 0x99, 0x35, 0xFF}}}, - {{{25, -75, 129},0, {-16, -16},{0xDE, 0xBC, 0x66, 0xFF}}}, - {{{72, -79, 121},0, {-16, -16},{0x39, 0xB7, 0x57, 0xFF}}}, - {{{31, -12, 149},0, {-16, -16},{0xE7, 0xF5, 0x7C, 0xFF}}}, - {{{-11, -12, 122},0, {-16, -16},{0x9D, 0xF7, 0x4F, 0xFF}}}, - {{{29, 51, 142},0, {-16, -16},{0xE0, 0x27, 0x75, 0xFF}}}, - {{{-7, 50, 119},0, {-16, -16},{0xA1, 0x20, 0x4E, 0xFF}}}, - {{{11, 91, 108},0, {-16, -16},{0xC5, 0x55, 0x4A, 0xFF}}}, - {{{59, 111, 95},0, {-16, -16},{0xF, 0x6D, 0x40, 0xFF}}}, - {{{11, 91, 108},0, {-16, -16},{0xC5, 0x55, 0x4A, 0xFF}}}, - {{{29, 51, 142},0, {-16, -16},{0xE0, 0x27, 0x75, 0xFF}}}, - {{{5, 112, 51},0, {-16, -16},{0xB8, 0x67, 0x15, 0xFF}}}, - {{{52, 127, 39},0, {-16, -16},{0x4, 0x7E, 0xD, 0xFF}}}, - {{{52, 127, -39},0, {-16, -16},{0x4, 0x7E, 0xF3, 0xFF}}}, - {{{5, 112, -51},0, {-16, -16},{0xB8, 0x67, 0xEB, 0xFF}}}, - {{{59, 111, -95},0, {-16, -16},{0xF, 0x6D, 0xC0, 0xFF}}}, - {{{11, 91, -108},0, {-16, -16},{0xC5, 0x55, 0xB6, 0xFF}}}, - {{{-29, 62, -59},0, {-16, -16},{0x89, 0x26, 0xEB, 0xFF}}}, - {{{-7, 49, -119},0, {-16, -16},{0xA1, 0x20, 0xB2, 0xFF}}}, - {{{-11, -12, -122},0, {-16, -16},{0x9D, 0xF7, 0xB1, 0xFF}}}, - {{{-28, -79, -63},0, {-16, -16},{0x8E, 0xD1, 0xE1, 0xFF}}}, - {{{25, -75, -129},0, {-16, -16},{0xDE, 0xBC, 0x9A, 0xFF}}}, - {{{5, -107, -82},0, {-16, -16},{0xCC, 0x99, 0xCB, 0xFF}}}, - {{{-2, -114, 0},0, {-16, -16},{0xC7, 0x8E, 0x0, 0xFF}}}, - {{{-28, -79, 63},0, {-16, -16},{0x8E, 0xD1, 0x1F, 0xFF}}}, - {{{-28, -79, -63},0, {-16, -16},{0x8E, 0xD1, 0xE1, 0xFF}}}, - {{{-2, -114, 0},0, {-16, -16},{0xC7, 0x8E, 0x0, 0xFF}}}, - {{{5, -107, 83},0, {-16, -16},{0xCC, 0x99, 0x35, 0xFF}}}, - {{{25, -75, 129},0, {-16, -16},{0xDE, 0xBC, 0x66, 0xFF}}}, - {{{-11, -12, 122},0, {-16, -16},{0x9D, 0xF7, 0x4F, 0xFF}}}, - {{{-29, 62, 59},0, {-16, -16},{0x89, 0x26, 0x15, 0xFF}}}, - {{{-7, 50, 119},0, {-16, -16},{0xA1, 0x20, 0x4E, 0xFF}}}, - {{{11, 91, 108},0, {-16, -16},{0xC5, 0x55, 0x4A, 0xFF}}}, - {{{5, 112, 51},0, {-16, -16},{0xB8, 0x67, 0x15, 0xFF}}}, - {{{-29, 62, -59},0, {-16, -16},{0x89, 0x26, 0xEB, 0xFF}}}, - {{{5, 112, -51},0, {-16, -16},{0xB8, 0x67, 0xEB, 0xFF}}}, + {{{73, 17, 0},0, {-16, -16},{0x7F, 0x4, 0x0, 0xFF}}}, + {{{46, -95, -54},0, {-16, -16},{0x64, 0xB5, 0xE8, 0xFF}}}, + {{{30, -15, -142},0, {-16, -16},{0x4E, 0xF0, 0x9D, 0xFF}}}, + {{{46, -95, 54},0, {-16, -16},{0x64, 0xB5, 0x18, 0xFF}}}, + {{{30, -15, 142},0, {-16, -16},{0x4D, 0xF0, 0x64, 0xFF}}}, + {{{29, 62, 140},0, {-16, -16},{0x42, 0x2D, 0x63, 0xFF}}}, + {{{42, 108, 58},0, {-16, -16},{0x5D, 0x53, 0x1A, 0xFF}}}, + {{{42, 108, -58},0, {-16, -16},{0x5D, 0x53, 0xE6, 0xFF}}}, + {{{29, 62, -140},0, {-16, -16},{0x42, 0x2D, 0x9D, 0xFF}}}, + {{{-25, 51, -142},0, {-16, -16},{0xE1, 0x27, 0x8B, 0xFF}}}, + {{{-23, -12, -149},0, {-16, -16},{0xE7, 0xF5, 0x84, 0xFF}}}, + {{{18, -79, -121},0, {-16, -16},{0x38, 0xB6, 0xA9, 0xFF}}}, + {{{3, -114, -68},0, {-16, -16},{0x19, 0x88, 0xDF, 0xFF}}}, + {{{3, -114, 68},0, {-16, -16},{0x18, 0x88, 0x21, 0xFF}}}, + {{{18, -79, 121},0, {-16, -16},{0x38, 0xB7, 0x57, 0xFF}}}, + {{{-23, -12, 148},0, {-16, -16},{0xE7, 0xF5, 0x7C, 0xFF}}}, + {{{-25, 51, 142},0, {-16, -16},{0xE1, 0x27, 0x75, 0xFF}}}, + {{{-23, -12, 148},0, {-16, -16},{0xE7, 0xF5, 0x7C, 0xFF}}}, + {{{30, -15, 142},0, {-16, -16},{0x4D, 0xF0, 0x64, 0xFF}}}, + {{{29, 62, 140},0, {-16, -16},{0x42, 0x2D, 0x63, 0xFF}}}, + {{{5, 111, 95},0, {-16, -16},{0xF, 0x6D, 0x40, 0xFF}}}, + {{{42, 108, 58},0, {-16, -16},{0x5D, 0x53, 0x1A, 0xFF}}}, + {{{-2, 127, 39},0, {-16, -16},{0x4, 0x7E, 0xD, 0xFF}}}, + {{{-2, 127, -39},0, {-16, -16},{0x4, 0x7E, 0xF3, 0xFF}}}, + {{{42, 108, -58},0, {-16, -16},{0x5D, 0x53, 0xE6, 0xFF}}}, + {{{5, 111, -95},0, {-16, -16},{0xF, 0x6D, 0xC0, 0xFF}}}, + {{{29, 62, -140},0, {-16, -16},{0x42, 0x2D, 0x9D, 0xFF}}}, + {{{-25, 51, -142},0, {-16, -16},{0xE1, 0x27, 0x8B, 0xFF}}}, + {{{-43, 91, -108},0, {-16, -16},{0xC5, 0x56, 0xB7, 0xFF}}}, + {{{-61, 50, -119},0, {-16, -16},{0xA1, 0x20, 0xB1, 0xFF}}}, + {{{-65, -12, -122},0, {-16, -16},{0x9D, 0xF7, 0xB1, 0xFF}}}, + {{{-23, -12, -149},0, {-16, -16},{0xE7, 0xF5, 0x84, 0xFF}}}, + {{{-65, -12, -122},0, {-16, -16},{0x9D, 0xF7, 0xB1, 0xFF}}}, + {{{-23, -12, -149},0, {-16, -16},{0xE7, 0xF5, 0x84, 0xFF}}}, + {{{-29, -75, -129},0, {-16, -16},{0xDE, 0xBC, 0x9A, 0xFF}}}, + {{{18, -79, -121},0, {-16, -16},{0x38, 0xB6, 0xA9, 0xFF}}}, + {{{3, -114, -68},0, {-16, -16},{0x19, 0x88, 0xDF, 0xFF}}}, + {{{-49, -107, -83},0, {-16, -16},{0xCC, 0x99, 0xCB, 0xFF}}}, + {{{-56, -114, 0},0, {-16, -16},{0xC7, 0x8E, 0x0, 0xFF}}}, + {{{3, -114, 68},0, {-16, -16},{0x18, 0x88, 0x21, 0xFF}}}, + {{{-49, -107, 82},0, {-16, -16},{0xCC, 0x99, 0x35, 0xFF}}}, + {{{-29, -75, 129},0, {-16, -16},{0xDE, 0xBD, 0x66, 0xFF}}}, + {{{18, -79, 121},0, {-16, -16},{0x38, 0xB7, 0x57, 0xFF}}}, + {{{-23, -12, 148},0, {-16, -16},{0xE7, 0xF5, 0x7C, 0xFF}}}, + {{{-65, -12, 122},0, {-16, -16},{0x9D, 0xF7, 0x50, 0xFF}}}, + {{{-25, 51, 142},0, {-16, -16},{0xE1, 0x27, 0x75, 0xFF}}}, + {{{-61, 50, 119},0, {-16, -16},{0xA1, 0x20, 0x4F, 0xFF}}}, + {{{-43, 91, 108},0, {-16, -16},{0xC5, 0x56, 0x49, 0xFF}}}, + {{{5, 111, 95},0, {-16, -16},{0xF, 0x6D, 0x40, 0xFF}}}, + {{{-43, 91, 108},0, {-16, -16},{0xC5, 0x56, 0x49, 0xFF}}}, + {{{-25, 51, 142},0, {-16, -16},{0xE1, 0x27, 0x75, 0xFF}}}, + {{{-49, 112, 51},0, {-16, -16},{0xB8, 0x67, 0x15, 0xFF}}}, + {{{-2, 127, 39},0, {-16, -16},{0x4, 0x7E, 0xD, 0xFF}}}, + {{{-2, 127, -39},0, {-16, -16},{0x4, 0x7E, 0xF3, 0xFF}}}, + {{{-49, 112, -51},0, {-16, -16},{0xB8, 0x67, 0xEB, 0xFF}}}, + {{{5, 111, -95},0, {-16, -16},{0xF, 0x6D, 0xC0, 0xFF}}}, + {{{-43, 91, -108},0, {-16, -16},{0xC5, 0x56, 0xB7, 0xFF}}}, + {{{-83, 62, -59},0, {-16, -16},{0x89, 0x26, 0xEB, 0xFF}}}, + {{{-61, 50, -119},0, {-16, -16},{0xA1, 0x20, 0xB1, 0xFF}}}, + {{{-65, -12, -122},0, {-16, -16},{0x9D, 0xF7, 0xB1, 0xFF}}}, + {{{-82, -79, -63},0, {-16, -16},{0x8E, 0xD2, 0xE1, 0xFF}}}, + {{{-29, -75, -129},0, {-16, -16},{0xDE, 0xBC, 0x9A, 0xFF}}}, + {{{-49, -107, -83},0, {-16, -16},{0xCC, 0x99, 0xCB, 0xFF}}}, + {{{-56, -114, 0},0, {-16, -16},{0xC7, 0x8E, 0x0, 0xFF}}}, + {{{-82, -79, 63},0, {-16, -16},{0x8E, 0xD1, 0x1F, 0xFF}}}, + {{{-82, -79, -63},0, {-16, -16},{0x8E, 0xD2, 0xE1, 0xFF}}}, + {{{-56, -114, 0},0, {-16, -16},{0xC7, 0x8E, 0x0, 0xFF}}}, + {{{-49, -107, 82},0, {-16, -16},{0xCC, 0x99, 0x35, 0xFF}}}, + {{{-29, -75, 129},0, {-16, -16},{0xDE, 0xBD, 0x66, 0xFF}}}, + {{{-65, -12, 122},0, {-16, -16},{0x9D, 0xF7, 0x50, 0xFF}}}, + {{{-83, 62, 59},0, {-16, -16},{0x89, 0x26, 0x15, 0xFF}}}, + {{{-61, 50, 119},0, {-16, -16},{0xA1, 0x20, 0x4F, 0xFF}}}, + {{{-43, 91, 108},0, {-16, -16},{0xC5, 0x56, 0x49, 0xFF}}}, + {{{-49, 112, 51},0, {-16, -16},{0xB8, 0x67, 0x15, 0xFF}}}, + {{{-83, 62, -59},0, {-16, -16},{0x89, 0x26, 0xEB, 0xFF}}}, + {{{-49, 112, -51},0, {-16, -16},{0xB8, 0x67, 0xEB, 0xFF}}}, }; Gfx wario_000_offset_pelvis_mesh_layer_1_tri_0[] = { @@ -286,100 +267,100 @@ Gfx wario_000_offset_pelvis_mesh_layer_1_tri_0[] = { }; Vtx wario_000_offset_chest_mesh_layer_1_vtx_0[94] = { - {{{107, 116, -54},0, {-16, -16},{0x4D, 0x63, 0xE9, 0xFF}}}, - {{{79, 131, 45},0, {-16, -16},{0x2E, 0x76, 0xE, 0xFF}}}, - {{{107, 116, 54},0, {-16, -16},{0x4D, 0x63, 0x17, 0xFF}}}, - {{{79, 131, -45},0, {-16, -16},{0x2E, 0x76, 0xF2, 0xFF}}}, - {{{51, 137, -63},0, {-16, -16},{0x12, 0x79, 0xDD, 0xFF}}}, - {{{51, 137, 63},0, {-16, -16},{0x12, 0x79, 0x23, 0xFF}}}, - {{{8, 135, 55},0, {-16, -16},{0xEC, 0x7A, 0x1C, 0xFF}}}, - {{{8, 135, -54},0, {-16, -16},{0xEC, 0x7A, 0xE4, 0xFF}}}, - {{{42, 122, -95},0, {-16, -16},{0x3, 0x6D, 0xBF, 0xFF}}}, - {{{-11, 97, -116},0, {-16, -16},{0xCA, 0x48, 0xA6, 0xFF}}}, - {{{24, 90, -128},0, {-16, -16},{0xF8, 0x3F, 0x92, 0xFF}}}, - {{{62, 105, -117},0, {-16, -16},{0x16, 0x57, 0xA6, 0xFF}}}, - {{{50, 62, -135},0, {-16, -16},{0x11, 0x1A, 0x85, 0xFF}}}, - {{{85, 99, -113},0, {-16, -16},{0x2D, 0x4D, 0xA5, 0xFF}}}, - {{{103, 91, -108},0, {-16, -16},{0x45, 0x3B, 0xA7, 0xFF}}}, - {{{109, 99, -91},0, {-16, -16},{0x4F, 0x58, 0xD0, 0xFF}}}, - {{{156, 30, -85},0, {-16, -16},{0x68, 0x23, 0xC0, 0xFF}}}, - {{{103, 91, -108},0, {-16, -16},{0x45, 0x3B, 0xA7, 0xFF}}}, - {{{109, 99, -91},0, {-16, -16},{0x4F, 0x58, 0xD0, 0xFF}}}, - {{{152, 57, -41},0, {-16, -16},{0x6C, 0x42, 0xF3, 0xFF}}}, - {{{107, 116, -54},0, {-16, -16},{0x4D, 0x63, 0xE9, 0xFF}}}, - {{{179, 1, -36},0, {-16, -16},{0x7D, 0xF, 0xF0, 0xFF}}}, - {{{162, -40, -82},0, {-16, -16},{0x64, 0xD9, 0xBC, 0xFF}}}, - {{{168, -56, -39},0, {-16, -16},{0x6B, 0xBC, 0xF2, 0xFF}}}, - {{{134, -77, -66},0, {-16, -16},{0x3E, 0x99, 0xD6, 0xFF}}}, - {{{110, -98, 0},0, {-16, -16},{0x30, 0x8A, 0x0, 0xFF}}}, - {{{61, -92, -96},0, {-16, -16},{0xF, 0x98, 0xB9, 0xFF}}}, - {{{42, -114, 0},0, {-16, -16},{0x2, 0x81, 0x0, 0xFF}}}, - {{{61, -92, 96},0, {-16, -16},{0xF, 0x97, 0x46, 0xFF}}}, - {{{134, -77, 66},0, {-16, -16},{0x3D, 0x99, 0x2A, 0xFF}}}, - {{{168, -56, 40},0, {-16, -16},{0x6A, 0xBC, 0xF, 0xFF}}}, - {{{162, -40, 83},0, {-16, -16},{0x64, 0xD9, 0x44, 0xFF}}}, - {{{162, -40, 83},0, {-16, -16},{0x64, 0xD9, 0x44, 0xFF}}}, - {{{168, -56, 40},0, {-16, -16},{0x6A, 0xBC, 0xF, 0xFF}}}, - {{{179, 1, 37},0, {-16, -16},{0x7D, 0xF, 0x11, 0xFF}}}, - {{{156, 30, 85},0, {-16, -16},{0x68, 0x23, 0x40, 0xFF}}}, - {{{152, 57, 41},0, {-16, -16},{0x6C, 0x42, 0xD, 0xFF}}}, - {{{109, 99, 91},0, {-16, -16},{0x4F, 0x58, 0x30, 0xFF}}}, - {{{107, 116, 54},0, {-16, -16},{0x4D, 0x63, 0x17, 0xFF}}}, - {{{103, 91, 108},0, {-16, -16},{0x45, 0x3B, 0x59, 0xFF}}}, - {{{85, 99, 113},0, {-16, -16},{0x2D, 0x4E, 0x5A, 0xFF}}}, - {{{50, 62, 136},0, {-16, -16},{0x12, 0x1A, 0x7B, 0xFF}}}, - {{{62, 105, 117},0, {-16, -16},{0x17, 0x57, 0x59, 0xFF}}}, - {{{24, 90, 129},0, {-16, -16},{0xF8, 0x3F, 0x6E, 0xFF}}}, - {{{42, 122, 95},0, {-16, -16},{0x4, 0x6D, 0x41, 0xFF}}}, - {{{-11, 97, 115},0, {-16, -16},{0xC9, 0x48, 0x59, 0xFF}}}, - {{{8, 135, 55},0, {-16, -16},{0xEC, 0x7A, 0x1C, 0xFF}}}, - {{{51, 137, 63},0, {-16, -16},{0x12, 0x79, 0x23, 0xFF}}}, - {{{8, 135, 55},0, {-16, -16},{0xEC, 0x7A, 0x1C, 0xFF}}}, - {{{-29, 111, 85},0, {-16, -16},{0xBF, 0x58, 0x41, 0xFF}}}, - {{{-11, 97, 115},0, {-16, -16},{0xC9, 0x48, 0x59, 0xFF}}}, - {{{-34, 128, 38},0, {-16, -16},{0xC3, 0x6E, 0x11, 0xFF}}}, - {{{-34, 128, -38},0, {-16, -16},{0xC3, 0x6E, 0xEF, 0xFF}}}, - {{{8, 135, -54},0, {-16, -16},{0xEC, 0x7A, 0xE4, 0xFF}}}, - {{{-29, 111, -85},0, {-16, -16},{0xBF, 0x58, 0xBF, 0xFF}}}, - {{{-11, 97, -116},0, {-16, -16},{0xCA, 0x48, 0xA6, 0xFF}}}, - {{{-75, 84, -45},0, {-16, -16},{0x8B, 0x24, 0xDF, 0xFF}}}, - {{{-10, 40, -139},0, {-16, -16},{0xC6, 0xC, 0x90, 0xFF}}}, - {{{24, 90, -128},0, {-16, -16},{0xF8, 0x3F, 0x92, 0xFF}}}, - {{{50, 62, -135},0, {-16, -16},{0x11, 0x1A, 0x85, 0xFF}}}, - {{{39, -10, -139},0, {-16, -16},{0x6, 0xEA, 0x83, 0xFF}}}, - {{{-10, -39, -133},0, {-16, -16},{0xCA, 0xD7, 0x94, 0xFF}}}, - {{{61, -92, -96},0, {-16, -16},{0xF, 0x98, 0xB9, 0xFF}}}, - {{{-13, -90, -91},0, {-16, -16},{0xC7, 0x9E, 0xC6, 0xFF}}}, - {{{-13, -90, -91},0, {-16, -16},{0xC7, 0x9E, 0xC6, 0xFF}}}, - {{{61, -92, -96},0, {-16, -16},{0xF, 0x98, 0xB9, 0xFF}}}, - {{{42, -114, 0},0, {-16, -16},{0x2, 0x81, 0x0, 0xFF}}}, - {{{-14, -102, 0},0, {-16, -16},{0xBE, 0x93, 0x0, 0xFF}}}, - {{{-13, -90, 92},0, {-16, -16},{0xC8, 0x9E, 0x3B, 0xFF}}}, - {{{61, -92, 96},0, {-16, -16},{0xF, 0x97, 0x46, 0xFF}}}, - {{{-10, -39, 134},0, {-16, -16},{0xCB, 0xD8, 0x6C, 0xFF}}}, - {{{39, -10, 139},0, {-16, -16},{0x7, 0xEA, 0x7D, 0xFF}}}, - {{{-10, 40, 139},0, {-16, -16},{0xC6, 0xC, 0x70, 0xFF}}}, - {{{50, 62, 136},0, {-16, -16},{0x12, 0x1A, 0x7B, 0xFF}}}, - {{{24, 90, 129},0, {-16, -16},{0xF8, 0x3F, 0x6E, 0xFF}}}, - {{{-11, 97, 115},0, {-16, -16},{0xC9, 0x48, 0x59, 0xFF}}}, - {{{-75, 84, 45},0, {-16, -16},{0x8B, 0x24, 0x21, 0xFF}}}, - {{{-29, 111, 85},0, {-16, -16},{0xBF, 0x58, 0x41, 0xFF}}}, - {{{-34, 128, 38},0, {-16, -16},{0xC3, 0x6E, 0x11, 0xFF}}}, - {{{-75, 84, -45},0, {-16, -16},{0x8B, 0x24, 0xDF, 0xFF}}}, - {{{-34, 128, 38},0, {-16, -16},{0xC3, 0x6E, 0x11, 0xFF}}}, - {{{-34, 128, -38},0, {-16, -16},{0xC3, 0x6E, 0xEF, 0xFF}}}, - {{{-75, 84, -45},0, {-16, -16},{0x8B, 0x24, 0xDF, 0xFF}}}, - {{{-29, 111, -85},0, {-16, -16},{0xBF, 0x58, 0xBF, 0xFF}}}, - {{{-57, -43, 59},0, {-16, -16},{0x8C, 0xD6, 0x20, 0xFF}}}, - {{{-75, 84, 45},0, {-16, -16},{0x8B, 0x24, 0x21, 0xFF}}}, - {{{-57, -43, -58},0, {-16, -16},{0x8C, 0xD6, 0xE0, 0xFF}}}, - {{{-10, 40, -139},0, {-16, -16},{0xC6, 0xC, 0x90, 0xFF}}}, - {{{-10, -39, -133},0, {-16, -16},{0xCA, 0xD7, 0x94, 0xFF}}}, - {{{-13, -90, -91},0, {-16, -16},{0xC7, 0x9E, 0xC6, 0xFF}}}, - {{{-14, -102, 0},0, {-16, -16},{0xBE, 0x93, 0x0, 0xFF}}}, - {{{-13, -90, 92},0, {-16, -16},{0xC8, 0x9E, 0x3B, 0xFF}}}, - {{{-10, -39, 134},0, {-16, -16},{0xCB, 0xD8, 0x6C, 0xFF}}}, - {{{-10, 40, 139},0, {-16, -16},{0xC6, 0xC, 0x70, 0xFF}}}, + {{{77, 116, -54},0, {-16, -16},{0x4D, 0x63, 0xE9, 0xFF}}}, + {{{49, 131, 45},0, {-16, -16},{0x2D, 0x76, 0xD, 0xFF}}}, + {{{77, 116, 54},0, {-16, -16},{0x4D, 0x63, 0x17, 0xFF}}}, + {{{49, 131, -45},0, {-16, -16},{0x2D, 0x76, 0xF3, 0xFF}}}, + {{{21, 137, -63},0, {-16, -16},{0x11, 0x79, 0xDE, 0xFF}}}, + {{{21, 137, 63},0, {-16, -16},{0x11, 0x79, 0x22, 0xFF}}}, + {{{-22, 135, 55},0, {-16, -16},{0xEC, 0x7A, 0x1C, 0xFF}}}, + {{{-22, 135, -54},0, {-16, -16},{0xEC, 0x7A, 0xE4, 0xFF}}}, + {{{12, 122, -95},0, {-16, -16},{0x3, 0x6E, 0xC0, 0xFF}}}, + {{{-41, 97, -116},0, {-16, -16},{0xCA, 0x47, 0xA6, 0xFF}}}, + {{{-6, 90, -128},0, {-16, -16},{0xF9, 0x3E, 0x91, 0xFF}}}, + {{{33, 105, -117},0, {-16, -16},{0x18, 0x55, 0xA4, 0xFF}}}, + {{{20, 62, -135},0, {-16, -16},{0x11, 0x1A, 0x85, 0xFF}}}, + {{{55, 99, -113},0, {-16, -16},{0x2E, 0x4D, 0xA6, 0xFF}}}, + {{{73, 91, -108},0, {-16, -16},{0x44, 0x3C, 0xA7, 0xFF}}}, + {{{79, 99, -91},0, {-16, -16},{0x4E, 0x57, 0xCF, 0xFF}}}, + {{{126, 30, -85},0, {-16, -16},{0x68, 0x23, 0xC0, 0xFF}}}, + {{{73, 91, -108},0, {-16, -16},{0x44, 0x3C, 0xA7, 0xFF}}}, + {{{79, 99, -91},0, {-16, -16},{0x4E, 0x57, 0xCF, 0xFF}}}, + {{{122, 57, -41},0, {-16, -16},{0x6C, 0x42, 0xF3, 0xFF}}}, + {{{77, 116, -54},0, {-16, -16},{0x4D, 0x63, 0xE9, 0xFF}}}, + {{{149, 1, -36},0, {-16, -16},{0x7D, 0xF, 0xF0, 0xFF}}}, + {{{133, -40, -82},0, {-16, -16},{0x65, 0xD9, 0xBD, 0xFF}}}, + {{{138, -56, -39},0, {-16, -16},{0x6B, 0xBC, 0xF2, 0xFF}}}, + {{{104, -77, -66},0, {-16, -16},{0x3E, 0x99, 0xD6, 0xFF}}}, + {{{80, -98, 0},0, {-16, -16},{0x2F, 0x8A, 0x0, 0xFF}}}, + {{{32, -92, -96},0, {-16, -16},{0xF, 0x98, 0xB9, 0xFF}}}, + {{{12, -114, 0},0, {-16, -16},{0x2, 0x81, 0x0, 0xFF}}}, + {{{32, -92, 96},0, {-16, -16},{0xF, 0x97, 0x46, 0xFF}}}, + {{{104, -77, 66},0, {-16, -16},{0x3D, 0x99, 0x2A, 0xFF}}}, + {{{138, -56, 40},0, {-16, -16},{0x6A, 0xBC, 0xF, 0xFF}}}, + {{{133, -40, 83},0, {-16, -16},{0x64, 0xD9, 0x44, 0xFF}}}, + {{{133, -40, 83},0, {-16, -16},{0x64, 0xD9, 0x44, 0xFF}}}, + {{{138, -56, 40},0, {-16, -16},{0x6A, 0xBC, 0xF, 0xFF}}}, + {{{149, 1, 37},0, {-16, -16},{0x7D, 0x10, 0x10, 0xFF}}}, + {{{126, 30, 85},0, {-16, -16},{0x68, 0x24, 0x40, 0xFF}}}, + {{{122, 57, 41},0, {-16, -16},{0x6C, 0x42, 0xD, 0xFF}}}, + {{{79, 99, 91},0, {-16, -16},{0x4E, 0x57, 0x31, 0xFF}}}, + {{{77, 116, 54},0, {-16, -16},{0x4D, 0x63, 0x17, 0xFF}}}, + {{{73, 91, 108},0, {-16, -16},{0x45, 0x3C, 0x59, 0xFF}}}, + {{{55, 99, 113},0, {-16, -16},{0x2E, 0x4E, 0x5A, 0xFF}}}, + {{{20, 62, 136},0, {-16, -16},{0x12, 0x1A, 0x7B, 0xFF}}}, + {{{33, 105, 117},0, {-16, -16},{0x19, 0x56, 0x5B, 0xFF}}}, + {{{-6, 90, 129},0, {-16, -16},{0xF7, 0x3F, 0x6E, 0xFF}}}, + {{{12, 122, 95},0, {-16, -16},{0x3, 0x6E, 0x40, 0xFF}}}, + {{{-41, 97, 115},0, {-16, -16},{0xC8, 0x48, 0x59, 0xFF}}}, + {{{-22, 135, 55},0, {-16, -16},{0xEC, 0x7A, 0x1C, 0xFF}}}, + {{{21, 137, 63},0, {-16, -16},{0x11, 0x79, 0x22, 0xFF}}}, + {{{-22, 135, 55},0, {-16, -16},{0xEC, 0x7A, 0x1C, 0xFF}}}, + {{{-59, 111, 85},0, {-16, -16},{0xBF, 0x58, 0x41, 0xFF}}}, + {{{-41, 97, 115},0, {-16, -16},{0xC8, 0x48, 0x59, 0xFF}}}, + {{{-63, 128, 38},0, {-16, -16},{0xC4, 0x6F, 0x11, 0xFF}}}, + {{{-63, 128, -38},0, {-16, -16},{0xC4, 0x6F, 0xEF, 0xFF}}}, + {{{-22, 135, -54},0, {-16, -16},{0xEC, 0x7A, 0xE4, 0xFF}}}, + {{{-59, 111, -85},0, {-16, -16},{0xBF, 0x59, 0xC0, 0xFF}}}, + {{{-41, 97, -116},0, {-16, -16},{0xCA, 0x47, 0xA6, 0xFF}}}, + {{{-105, 84, -45},0, {-16, -16},{0x8B, 0x25, 0xE0, 0xFF}}}, + {{{-40, 40, -139},0, {-16, -16},{0xC6, 0xB, 0x8F, 0xFF}}}, + {{{-6, 90, -128},0, {-16, -16},{0xF9, 0x3E, 0x91, 0xFF}}}, + {{{20, 62, -135},0, {-16, -16},{0x11, 0x1A, 0x85, 0xFF}}}, + {{{9, -10, -139},0, {-16, -16},{0x6, 0xEB, 0x83, 0xFF}}}, + {{{-40, -39, -133},0, {-16, -16},{0xCA, 0xD7, 0x94, 0xFF}}}, + {{{32, -92, -96},0, {-16, -16},{0xF, 0x98, 0xB9, 0xFF}}}, + {{{-43, -90, -91},0, {-16, -16},{0xC7, 0x9E, 0xC6, 0xFF}}}, + {{{-43, -90, -91},0, {-16, -16},{0xC7, 0x9E, 0xC6, 0xFF}}}, + {{{32, -92, -96},0, {-16, -16},{0xF, 0x98, 0xB9, 0xFF}}}, + {{{12, -114, 0},0, {-16, -16},{0x2, 0x81, 0x0, 0xFF}}}, + {{{-44, -102, 0},0, {-16, -16},{0xBE, 0x93, 0x0, 0xFF}}}, + {{{-43, -90, 92},0, {-16, -16},{0xC8, 0x9E, 0x3B, 0xFF}}}, + {{{32, -92, 96},0, {-16, -16},{0xF, 0x97, 0x46, 0xFF}}}, + {{{-40, -39, 134},0, {-16, -16},{0xCB, 0xD8, 0x6C, 0xFF}}}, + {{{9, -10, 139},0, {-16, -16},{0x6, 0xEA, 0x7D, 0xFF}}}, + {{{-40, 40, 139},0, {-16, -16},{0xC6, 0xB, 0x71, 0xFF}}}, + {{{20, 62, 136},0, {-16, -16},{0x12, 0x1A, 0x7B, 0xFF}}}, + {{{-6, 90, 129},0, {-16, -16},{0xF7, 0x3F, 0x6E, 0xFF}}}, + {{{-41, 97, 115},0, {-16, -16},{0xC8, 0x48, 0x59, 0xFF}}}, + {{{-105, 84, 45},0, {-16, -16},{0x8B, 0x25, 0x20, 0xFF}}}, + {{{-59, 111, 85},0, {-16, -16},{0xBF, 0x58, 0x41, 0xFF}}}, + {{{-63, 128, 38},0, {-16, -16},{0xC4, 0x6F, 0x11, 0xFF}}}, + {{{-105, 84, -45},0, {-16, -16},{0x8B, 0x25, 0xE0, 0xFF}}}, + {{{-63, 128, 38},0, {-16, -16},{0xC4, 0x6F, 0x11, 0xFF}}}, + {{{-63, 128, -38},0, {-16, -16},{0xC4, 0x6F, 0xEF, 0xFF}}}, + {{{-105, 84, -45},0, {-16, -16},{0x8B, 0x25, 0xE0, 0xFF}}}, + {{{-59, 111, -85},0, {-16, -16},{0xBF, 0x59, 0xC0, 0xFF}}}, + {{{-87, -43, 59},0, {-16, -16},{0x8C, 0xD6, 0x20, 0xFF}}}, + {{{-105, 84, 45},0, {-16, -16},{0x8B, 0x25, 0x20, 0xFF}}}, + {{{-87, -43, -58},0, {-16, -16},{0x8C, 0xD6, 0xE0, 0xFF}}}, + {{{-40, 40, -139},0, {-16, -16},{0xC6, 0xB, 0x8F, 0xFF}}}, + {{{-40, -39, -133},0, {-16, -16},{0xCA, 0xD7, 0x94, 0xFF}}}, + {{{-43, -90, -91},0, {-16, -16},{0xC7, 0x9E, 0xC6, 0xFF}}}, + {{{-44, -102, 0},0, {-16, -16},{0xBE, 0x93, 0x0, 0xFF}}}, + {{{-43, -90, 92},0, {-16, -16},{0xC8, 0x9E, 0x3B, 0xFF}}}, + {{{-40, -39, 134},0, {-16, -16},{0xCB, 0xD8, 0x6C, 0xFF}}}, + {{{-40, 40, 139},0, {-16, -16},{0xC6, 0xB, 0x71, 0xFF}}}, }; Gfx wario_000_offset_chest_mesh_layer_1_tri_0[] = { @@ -476,37 +457,37 @@ Gfx wario_000_offset_chest_mesh_layer_1_tri_0[] = { }; Vtx wario_000_offset_chest_mesh_layer_1_vtx_1[31] = { - {{{107, 116, -54},0, {-16, -16},{0x4D, 0x63, 0xE9, 0xFF}}}, - {{{107, 116, 54},0, {-16, -16},{0x4D, 0x63, 0x17, 0xFF}}}, - {{{152, 57, 41},0, {-16, -16},{0x6C, 0x42, 0xD, 0xFF}}}, - {{{152, 57, -41},0, {-16, -16},{0x6C, 0x42, 0xF3, 0xFF}}}, - {{{179, 1, 37},0, {-16, -16},{0x7D, 0xF, 0x11, 0xFF}}}, - {{{179, 1, -36},0, {-16, -16},{0x7D, 0xF, 0xF0, 0xFF}}}, - {{{168, -56, 40},0, {-16, -16},{0x6A, 0xBC, 0xF, 0xFF}}}, - {{{168, -56, -39},0, {-16, -16},{0x6B, 0xBC, 0xF2, 0xFF}}}, - {{{110, -98, 0},0, {-16, -16},{0x30, 0x8A, 0x0, 0xFF}}}, - {{{61, -92, 96},0, {-16, -16},{0xF, 0x97, 0x46, 0xFF}}}, - {{{103, -48, 124},0, {-16, -16},{0x28, 0xC9, 0x6B, 0xFF}}}, - {{{39, -10, 139},0, {-16, -16},{0x7, 0xEA, 0x7D, 0xFF}}}, - {{{134, -77, 66},0, {-16, -16},{0x3D, 0x99, 0x2A, 0xFF}}}, - {{{162, -40, 83},0, {-16, -16},{0x64, 0xD9, 0x44, 0xFF}}}, - {{{104, 12, 132},0, {-16, -16},{0x33, 0x6, 0x74, 0xFF}}}, - {{{156, 30, 85},0, {-16, -16},{0x68, 0x23, 0x40, 0xFF}}}, - {{{103, 91, 108},0, {-16, -16},{0x45, 0x3B, 0x59, 0xFF}}}, - {{{104, 12, 132},0, {-16, -16},{0x33, 0x6, 0x74, 0xFF}}}, - {{{156, 30, 85},0, {-16, -16},{0x68, 0x23, 0x40, 0xFF}}}, - {{{50, 62, 136},0, {-16, -16},{0x12, 0x1A, 0x7B, 0xFF}}}, - {{{39, -10, 139},0, {-16, -16},{0x7, 0xEA, 0x7D, 0xFF}}}, - {{{103, -48, 124},0, {-16, -16},{0x28, 0xC9, 0x6B, 0xFF}}}, - {{{39, -10, -139},0, {-16, -16},{0x6, 0xEA, 0x83, 0xFF}}}, - {{{50, 62, -135},0, {-16, -16},{0x11, 0x1A, 0x85, 0xFF}}}, - {{{104, 12, -132},0, {-16, -16},{0x33, 0x6, 0x8C, 0xFF}}}, - {{{103, 91, -108},0, {-16, -16},{0x45, 0x3B, 0xA7, 0xFF}}}, - {{{156, 30, -85},0, {-16, -16},{0x68, 0x23, 0xC0, 0xFF}}}, - {{{162, -40, -82},0, {-16, -16},{0x64, 0xD9, 0xBC, 0xFF}}}, - {{{103, -48, -124},0, {-16, -16},{0x28, 0xC9, 0x95, 0xFF}}}, - {{{134, -77, -66},0, {-16, -16},{0x3E, 0x99, 0xD6, 0xFF}}}, - {{{61, -92, -96},0, {-16, -16},{0xF, 0x98, 0xB9, 0xFF}}}, + {{{77, 116, -54},0, {-16, -16},{0x4D, 0x63, 0xE9, 0xFF}}}, + {{{77, 116, 54},0, {-16, -16},{0x4D, 0x63, 0x17, 0xFF}}}, + {{{122, 57, 41},0, {-16, -16},{0x6C, 0x42, 0xD, 0xFF}}}, + {{{122, 57, -41},0, {-16, -16},{0x6C, 0x42, 0xF3, 0xFF}}}, + {{{149, 1, 37},0, {-16, -16},{0x7D, 0x10, 0x10, 0xFF}}}, + {{{149, 1, -36},0, {-16, -16},{0x7D, 0xF, 0xF0, 0xFF}}}, + {{{138, -56, 40},0, {-16, -16},{0x6A, 0xBC, 0xF, 0xFF}}}, + {{{138, -56, -39},0, {-16, -16},{0x6B, 0xBC, 0xF2, 0xFF}}}, + {{{80, -98, 0},0, {-16, -16},{0x2F, 0x8A, 0x0, 0xFF}}}, + {{{32, -92, 96},0, {-16, -16},{0xF, 0x97, 0x46, 0xFF}}}, + {{{73, -48, 124},0, {-16, -16},{0x28, 0xC9, 0x6B, 0xFF}}}, + {{{9, -10, 139},0, {-16, -16},{0x6, 0xEA, 0x7D, 0xFF}}}, + {{{104, -77, 66},0, {-16, -16},{0x3D, 0x99, 0x2A, 0xFF}}}, + {{{133, -40, 83},0, {-16, -16},{0x64, 0xD9, 0x44, 0xFF}}}, + {{{74, 12, 132},0, {-16, -16},{0x33, 0x6, 0x74, 0xFF}}}, + {{{126, 30, 85},0, {-16, -16},{0x68, 0x24, 0x40, 0xFF}}}, + {{{73, 91, 108},0, {-16, -16},{0x45, 0x3C, 0x59, 0xFF}}}, + {{{74, 12, 132},0, {-16, -16},{0x33, 0x6, 0x74, 0xFF}}}, + {{{126, 30, 85},0, {-16, -16},{0x68, 0x24, 0x40, 0xFF}}}, + {{{20, 62, 136},0, {-16, -16},{0x12, 0x1A, 0x7B, 0xFF}}}, + {{{9, -10, 139},0, {-16, -16},{0x6, 0xEA, 0x7D, 0xFF}}}, + {{{73, -48, 124},0, {-16, -16},{0x28, 0xC9, 0x6B, 0xFF}}}, + {{{9, -10, -139},0, {-16, -16},{0x6, 0xEB, 0x83, 0xFF}}}, + {{{20, 62, -135},0, {-16, -16},{0x11, 0x1A, 0x85, 0xFF}}}, + {{{74, 12, -132},0, {-16, -16},{0x33, 0x6, 0x8C, 0xFF}}}, + {{{73, 91, -108},0, {-16, -16},{0x44, 0x3C, 0xA7, 0xFF}}}, + {{{126, 30, -85},0, {-16, -16},{0x68, 0x23, 0xC0, 0xFF}}}, + {{{133, -40, -82},0, {-16, -16},{0x65, 0xD9, 0xBD, 0xFF}}}, + {{{73, -48, -124},0, {-16, -16},{0x28, 0xCA, 0x94, 0xFF}}}, + {{{104, -77, -66},0, {-16, -16},{0x3E, 0x99, 0xD6, 0xFF}}}, + {{{32, -92, -96},0, {-16, -16},{0xF, 0x98, 0xB9, 0xFF}}}, }; Gfx wario_000_offset_chest_mesh_layer_1_tri_1[] = { @@ -541,20 +522,20 @@ Gfx wario_000_offset_chest_mesh_layer_1_tri_1[] = { }; Vtx wario_000_offset_chest_mesh_layer_1_vtx_2[14] = { - {{{51, 137, -63},0, {874, 1134},{0x12, 0x79, 0xDD, 0xFF}}}, - {{{79, 131, -45},0, {1142, 624},{0x2E, 0x76, 0xF2, 0xFF}}}, - {{{107, 116, -54},0, {966, 74},{0x4D, 0x63, 0xE9, 0xFF}}}, - {{{42, 122, -95},0, {234, 1199},{0x3, 0x6D, 0xBF, 0xFF}}}, - {{{62, 105, -117},0, {-168, 786},{0x16, 0x57, 0xA6, 0xFF}}}, - {{{85, 99, -113},0, {-126, 372},{0x2D, 0x4D, 0xA5, 0xFF}}}, - {{{109, 99, -91},0, {294, -16},{0x4F, 0x58, 0xD0, 0xFF}}}, - {{{107, 116, 54},0, {-54, 116},{0x4D, 0x63, 0x17, 0xFF}}}, - {{{79, 131, 45},0, {-171, 699},{0x2E, 0x76, 0xE, 0xFF}}}, - {{{51, 137, 63},0, {129, 1186},{0x12, 0x79, 0x23, 0xFF}}}, - {{{42, 122, 95},0, {756, 1192},{0x4, 0x6D, 0x41, 0xFF}}}, - {{{62, 105, 117},0, {1112, 722},{0x17, 0x57, 0x59, 0xFF}}}, - {{{85, 99, 113},0, {1032, 299},{0x2D, 0x4E, 0x5A, 0xFF}}}, - {{{109, 99, 91},0, {589, -16},{0x4F, 0x58, 0x30, 0xFF}}}, + {{{21, 137, -63},0, {874, 1134},{0x11, 0x79, 0xDE, 0xFF}}}, + {{{49, 131, -45},0, {1142, 624},{0x2D, 0x76, 0xF3, 0xFF}}}, + {{{77, 116, -54},0, {966, 74},{0x4D, 0x63, 0xE9, 0xFF}}}, + {{{12, 122, -95},0, {234, 1199},{0x3, 0x6E, 0xC0, 0xFF}}}, + {{{33, 105, -117},0, {-168, 786},{0x18, 0x55, 0xA4, 0xFF}}}, + {{{55, 99, -113},0, {-126, 372},{0x2E, 0x4D, 0xA6, 0xFF}}}, + {{{79, 99, -91},0, {294, -16},{0x4E, 0x57, 0xCF, 0xFF}}}, + {{{77, 116, 54},0, {-54, 116},{0x4D, 0x63, 0x17, 0xFF}}}, + {{{49, 131, 45},0, {-171, 699},{0x2D, 0x76, 0xD, 0xFF}}}, + {{{21, 137, 63},0, {129, 1186},{0x11, 0x79, 0x22, 0xFF}}}, + {{{12, 122, 95},0, {756, 1192},{0x3, 0x6E, 0x40, 0xFF}}}, + {{{33, 105, 117},0, {1112, 722},{0x19, 0x56, 0x5B, 0xFF}}}, + {{{55, 99, 113},0, {1032, 299},{0x2E, 0x4E, 0x5A, 0xFF}}}, + {{{79, 99, 91},0, {589, -16},{0x4E, 0x57, 0x31, 0xFF}}}, }; Gfx wario_000_offset_chest_mesh_layer_1_tri_2[] = { @@ -575,9 +556,9 @@ Gfx wario_000_offset_chest_mesh_layer_1_tri_2[] = { Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_0[7] = { {{{250, 88, -81},0, {-162, 175},{0x40, 0x4B, 0xB0, 0xFF}}}, {{{155, 49, -108},0, {-680, 929},{0xF7, 0x41, 0x93, 0xFF}}}, - {{{192, 116, -52},0, {72, 684},{0x47, 0x57, 0xC5, 0xFF}}}, - {{{269, 116, 0},0, {496, 55},{0x51, 0x61, 0x0, 0xFF}}}, - {{{192, 116, 52},0, {920, 684},{0x47, 0x57, 0x3B, 0xFF}}}, + {{{192, 116, -52},0, {72, 684},{0x48, 0x56, 0xC4, 0xFF}}}, + {{{269, 116, 0},0, {496, 55},{0x52, 0x61, 0x0, 0xFF}}}, + {{{192, 116, 52},0, {920, 684},{0x48, 0x56, 0x3C, 0xFF}}}, {{{250, 88, 81},0, {1154, 175},{0x40, 0x4B, 0x50, 0xFF}}}, {{{155, 49, 108},0, {1672, 929},{0xF7, 0x41, 0x6D, 0xFF}}}, }; @@ -593,28 +574,28 @@ Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_0[] = { }; Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_1[47] = { - {{{287, 17, -52},0, {-16, -16},{0x77, 0xE6, 0xDB, 0xFF}}}, + {{{287, 17, -52},0, {-16, -16},{0x76, 0xE6, 0xDA, 0xFF}}}, {{{250, 88, -81},0, {-16, -16},{0x40, 0x4B, 0xB0, 0xFF}}}, - {{{269, 116, 0},0, {-16, -16},{0x51, 0x61, 0x0, 0xFF}}}, + {{{269, 116, 0},0, {-16, -16},{0x52, 0x61, 0x0, 0xFF}}}, {{{196, 5, -156},0, {-16, -16},{0x1A, 0xA, 0x84, 0xFF}}}, {{{187, -89, -88},0, {-16, -16},{0x57, 0xB2, 0xCD, 0xFF}}}, {{{187, -89, 88},0, {-16, -16},{0x57, 0xB2, 0x33, 0xFF}}}, - {{{287, 17, 52},0, {-16, -16},{0x77, 0xE6, 0x25, 0xFF}}}, + {{{287, 17, 52},0, {-16, -16},{0x76, 0xE6, 0x26, 0xFF}}}, {{{250, 88, 81},0, {-16, -16},{0x40, 0x4B, 0x50, 0xFF}}}, {{{196, 5, 156},0, {-16, -16},{0x1A, 0xA, 0x7C, 0xFF}}}, {{{155, 49, 108},0, {-16, -16},{0xF7, 0x41, 0x6D, 0xFF}}}, - {{{137, -5, 118},0, {-16, -16},{0xE3, 0x32, 0x71, 0xFF}}}, + {{{137, -5, 118},0, {-16, -16},{0xE3, 0x33, 0x71, 0xFF}}}, {{{146, -57, 144},0, {-16, -16},{0xEB, 0xDE, 0x79, 0xFF}}}, - {{{109, -51, 108},0, {-16, -16},{0xBE, 0xB8, 0x52, 0xFF}}}, - {{{74, -119, 61},0, {-16, -16},{0xE8, 0x8D, 0x30, 0xFF}}}, + {{{109, -51, 108},0, {-16, -16},{0xBF, 0xB8, 0x52, 0xFF}}}, + {{{74, -119, 61},0, {-16, -16},{0xE7, 0x8D, 0x31, 0xFF}}}, {{{93, -148, 60},0, {-16, -16},{0xBF, 0x9F, 0x32, 0xFF}}}, - {{{93, -149, -60},0, {-16, -16},{0xBF, 0x9F, 0xCE, 0xFF}}}, - {{{74, -119, 61},0, {-16, -16},{0xE8, 0x8D, 0x30, 0xFF}}}, - {{{74, -119, -61},0, {-16, -16},{0xE8, 0x8D, 0xD0, 0xFF}}}, - {{{93, -149, -60},0, {-16, -16},{0xBF, 0x9F, 0xCE, 0xFF}}}, + {{{93, -148, -60},0, {-16, -16},{0xBF, 0x9F, 0xCE, 0xFF}}}, + {{{74, -119, 61},0, {-16, -16},{0xE7, 0x8D, 0x31, 0xFF}}}, + {{{74, -119, -61},0, {-16, -16},{0xE7, 0x8D, 0xCF, 0xFF}}}, + {{{93, -148, -60},0, {-16, -16},{0xBF, 0x9F, 0xCE, 0xFF}}}, {{{146, -57, -144},0, {-16, -16},{0xEB, 0xDE, 0x87, 0xFF}}}, - {{{109, -51, -108},0, {-16, -16},{0xBE, 0xB8, 0xAE, 0xFF}}}, - {{{137, -5, -118},0, {-16, -16},{0xE3, 0x32, 0x8F, 0xFF}}}, + {{{109, -51, -108},0, {-16, -16},{0xBF, 0xB8, 0xAE, 0xFF}}}, + {{{137, -5, -118},0, {-16, -16},{0xE3, 0x33, 0x8F, 0xFF}}}, {{{196, 5, -156},0, {-16, -16},{0x1A, 0xA, 0x84, 0xFF}}}, {{{155, 49, -108},0, {-16, -16},{0xF7, 0x41, 0x93, 0xFF}}}, {{{250, 88, -81},0, {-16, -16},{0x40, 0x4B, 0xB0, 0xFF}}}, @@ -624,21 +605,21 @@ Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_1[47] = { {{{187, -89, 88},0, {-16, -16},{0x57, 0xB2, 0x33, 0xFF}}}, {{{146, -57, 144},0, {-16, -16},{0xEB, 0xDE, 0x79, 0xFF}}}, {{{196, 5, 156},0, {-16, -16},{0x1A, 0xA, 0x7C, 0xFF}}}, - {{{287, 17, 52},0, {-16, -16},{0x77, 0xE6, 0x25, 0xFF}}}, + {{{287, 17, 52},0, {-16, -16},{0x76, 0xE6, 0x26, 0xFF}}}, {{{93, -148, 60},0, {-16, -16},{0xBF, 0x9F, 0x32, 0xFF}}}, {{{141, -159, 59},0, {-16, -16},{0x27, 0x8F, 0x2B, 0xFF}}}, {{{146, -57, 144},0, {-16, -16},{0xEB, 0xDE, 0x79, 0xFF}}}, - {{{93, -149, -60},0, {-16, -16},{0xBF, 0x9F, 0xCE, 0xFF}}}, + {{{93, -148, -60},0, {-16, -16},{0xBF, 0x9F, 0xCE, 0xFF}}}, {{{141, -159, -59},0, {-16, -16},{0x27, 0x8F, 0xD5, 0xFF}}}, {{{146, -57, -144},0, {-16, -16},{0xEB, 0xDE, 0x87, 0xFF}}}, - {{{192, 116, 52},0, {-16, -16},{0x47, 0x57, 0x3B, 0xFF}}}, - {{{192, 116, -52},0, {-16, -16},{0x47, 0x57, 0xC5, 0xFF}}}, - {{{170, 183, 0},0, {-16, -16},{0xE8, 0x7D, 0x0, 0xFF}}}, - {{{166, 150, -76},0, {-16, -16},{0xD7, 0x54, 0xAA, 0xFF}}}, + {{{192, 116, 52},0, {-16, -16},{0x48, 0x56, 0x3C, 0xFF}}}, + {{{192, 116, -52},0, {-16, -16},{0x48, 0x56, 0xC4, 0xFF}}}, + {{{170, 183, 0},0, {-16, -16},{0xE9, 0x7D, 0x0, 0xFF}}}, + {{{166, 150, -76},0, {-16, -16},{0xD8, 0x54, 0xA9, 0xFF}}}, {{{155, 49, -108},0, {-16, -16},{0xF7, 0x41, 0x93, 0xFF}}}, - {{{176, 112, -52},0, {-16, -16},{0x94, 0x43, 0xF6, 0xFF}}}, - {{{176, 112, 52},0, {-16, -16},{0x94, 0x43, 0xA, 0xFF}}}, - {{{166, 150, 76},0, {-16, -16},{0xD7, 0x54, 0x56, 0xFF}}}, + {{{176, 112, -52},0, {-16, -16},{0x95, 0x43, 0xF6, 0xFF}}}, + {{{176, 112, 52},0, {-16, -16},{0x95, 0x43, 0xA, 0xFF}}}, + {{{166, 150, 76},0, {-16, -16},{0xD8, 0x54, 0x57, 0xFF}}}, {{{155, 49, 108},0, {-16, -16},{0xF7, 0x41, 0x6D, 0xFF}}}, }; @@ -693,30 +674,30 @@ Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_1[] = { }; Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_2[24] = { - {{{109, -51, -108},0, {-16, -16},{0xBE, 0xB8, 0xAE, 0xFF}}}, - {{{74, -119, -61},0, {-16, -16},{0xE8, 0x8D, 0xD0, 0xFF}}}, - {{{55, -34, -93},0, {-16, -16},{0xB9, 0xCB, 0xA5, 0xFF}}}, - {{{62, -129, -88},0, {-16, -16},{0x4C, 0xAE, 0xC3, 0xFF}}}, - {{{41, -127, -44},0, {-16, -16},{0xEC, 0x94, 0x3F, 0xFF}}}, + {{{109, -51, -108},0, {-16, -16},{0xBF, 0xB8, 0xAE, 0xFF}}}, + {{{74, -119, -61},0, {-16, -16},{0xE7, 0x8D, 0xCF, 0xFF}}}, + {{{55, -34, -93},0, {-16, -16},{0xB8, 0xCB, 0xA5, 0xFF}}}, + {{{62, -129, -88},0, {-16, -16},{0x4B, 0xAE, 0xC2, 0xFF}}}, + {{{41, -127, -44},0, {-16, -16},{0xEC, 0x94, 0x40, 0xFF}}}, {{{34, -81, 0},0, {-16, -16},{0x98, 0xB7, 0x0, 0xFF}}}, - {{{74, -119, 61},0, {-16, -16},{0xE8, 0x8D, 0x30, 0xFF}}}, - {{{41, -127, 44},0, {-16, -16},{0xEC, 0x94, 0xC1, 0xFF}}}, - {{{62, -129, 88},0, {-16, -16},{0x4C, 0xAE, 0x3D, 0xFF}}}, - {{{55, -34, 93},0, {-16, -16},{0xB9, 0xCB, 0x5B, 0xFF}}}, - {{{109, -51, 108},0, {-16, -16},{0xBE, 0xB8, 0x52, 0xFF}}}, - {{{32, -93, 104},0, {-16, -16},{0xE3, 0x4, 0x7C, 0xFF}}}, - {{{5, -96, 76},0, {-16, -16},{0x85, 0xEF, 0x1A, 0xFF}}}, - {{{15, -47, 44},0, {-16, -16},{0x83, 0xF4, 0x12, 0xFF}}}, - {{{35, -132, 93},0, {-16, -16},{0xD9, 0x9B, 0x42, 0xFF}}}, - {{{32, -93, -104},0, {-16, -16},{0xE3, 0x4, 0x84, 0xFF}}}, - {{{55, -34, -93},0, {-16, -16},{0xB9, 0xCB, 0xA5, 0xFF}}}, - {{{32, -93, -104},0, {-16, -16},{0xE3, 0x4, 0x84, 0xFF}}}, - {{{5, -96, -76},0, {-16, -16},{0x85, 0xEF, 0xE6, 0xFF}}}, - {{{35, -132, -93},0, {-16, -16},{0xD9, 0x9B, 0xBE, 0xFF}}}, - {{{62, -129, -88},0, {-16, -16},{0x4C, 0xAE, 0xC3, 0xFF}}}, - {{{41, -127, -44},0, {-16, -16},{0xEC, 0x94, 0x3F, 0xFF}}}, + {{{74, -119, 61},0, {-16, -16},{0xE7, 0x8D, 0x31, 0xFF}}}, + {{{41, -127, 44},0, {-16, -16},{0xEC, 0x94, 0xC0, 0xFF}}}, + {{{62, -129, 88},0, {-16, -16},{0x4B, 0xAE, 0x3E, 0xFF}}}, + {{{55, -34, 93},0, {-16, -16},{0xB8, 0xCB, 0x5B, 0xFF}}}, + {{{109, -51, 108},0, {-16, -16},{0xBF, 0xB8, 0x52, 0xFF}}}, + {{{33, -93, 104},0, {-16, -16},{0xE3, 0x4, 0x7C, 0xFF}}}, + {{{5, -96, 76},0, {-16, -16},{0x85, 0xEE, 0x1A, 0xFF}}}, + {{{15, -47, 44},0, {-16, -16},{0x83, 0xF3, 0x12, 0xFF}}}, + {{{35, -132, 93},0, {-16, -16},{0xD9, 0x9B, 0x43, 0xFF}}}, + {{{33, -93, -104},0, {-16, -16},{0xE3, 0x4, 0x84, 0xFF}}}, + {{{55, -34, -93},0, {-16, -16},{0xB8, 0xCB, 0xA5, 0xFF}}}, + {{{33, -93, -104},0, {-16, -16},{0xE3, 0x4, 0x84, 0xFF}}}, + {{{5, -96, -76},0, {-16, -16},{0x85, 0xEE, 0xE6, 0xFF}}}, + {{{35, -132, -93},0, {-16, -16},{0xD9, 0x9B, 0xBD, 0xFF}}}, + {{{62, -129, -88},0, {-16, -16},{0x4B, 0xAE, 0xC2, 0xFF}}}, + {{{41, -127, -44},0, {-16, -16},{0xEC, 0x94, 0x40, 0xFF}}}, {{{34, -81, 0},0, {-16, -16},{0x98, 0xB7, 0x0, 0xFF}}}, - {{{15, -47, -44},0, {-16, -16},{0x83, 0xF4, 0xEE, 0xFF}}}, + {{{15, -47, -44},0, {-16, -16},{0x83, 0xF3, 0xEE, 0xFF}}}, }; Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_2[] = { @@ -754,13 +735,13 @@ Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_2[] = { Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_3[9] = { {{{155, 49, -108},0, {-56, 144},{0xF7, 0x41, 0x93, 0xFF}}}, - {{{101, 64, -108},0, {0, 784},{0x1A, 0x2C, 0x8C, 0xFF}}}, - {{{176, 112, -52},0, {476, -16},{0x94, 0x43, 0xF6, 0xFF}}}, - {{{101, 120, -39},0, {560, 816},{0x58, 0x49, 0xC9, 0xFF}}}, - {{{108, 127, 0},0, {1008, 752},{0x74, 0x33, 0x0, 0xFF}}}, - {{{176, 112, 52},0, {1540, -16},{0x94, 0x43, 0xA, 0xFF}}}, - {{{101, 120, 39},0, {1456, 816},{0x58, 0x49, 0x37, 0xFF}}}, - {{{101, 64, 108},0, {2016, 784},{0x1A, 0x2C, 0x74, 0xFF}}}, + {{{101, 64, -108},0, {0, 816},{0x1A, 0x2C, 0x8C, 0xFF}}}, + {{{176, 112, -52},0, {572, -16},{0x95, 0x43, 0xF6, 0xFF}}}, + {{{101, 120, -39},0, {656, 848},{0x58, 0x49, 0xC8, 0xFF}}}, + {{{108, 127, 0},0, {1008, 784},{0x74, 0x33, 0x0, 0xFF}}}, + {{{176, 112, 52},0, {1444, -16},{0x95, 0x43, 0xA, 0xFF}}}, + {{{101, 120, 39},0, {1360, 848},{0x58, 0x49, 0x38, 0xFF}}}, + {{{101, 64, 108},0, {2016, 816},{0x1A, 0x2C, 0x74, 0xFF}}}, {{{155, 49, 108},0, {2072, 144},{0xF7, 0x41, 0x6D, 0xFF}}}, }; @@ -779,14 +760,14 @@ Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_3[] = { Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_4[12] = { {{{101, 64, -108},0, {-56, 648},{0x1A, 0x2C, 0x8C, 0xFF}}}, {{{155, 49, -108},0, {40, -28},{0xF7, 0x41, 0x93, 0xFF}}}, - {{{137, -5, -118},0, {926, 88},{0xE3, 0x32, 0x8F, 0xFF}}}, - {{{84, -15, -119},0, {1196, 684},{0x1B, 0x50, 0xA1, 0xFF}}}, + {{{137, -5, -118},0, {926, 88},{0xE3, 0x33, 0x8F, 0xFF}}}, + {{{84, -15, -119},0, {1196, 684},{0x1A, 0x50, 0xA0, 0xFF}}}, {{{43, 11, -121},0, {908, 1224},{0xC6, 0xF0, 0x90, 0xFF}}}, {{{26, 57, -121},0, {260, 1512},{0xC9, 0x3, 0x8D, 0xFF}}}, - {{{137, -5, 118},0, {926, 88},{0xE3, 0x32, 0x71, 0xFF}}}, + {{{137, -5, 118},0, {926, 88},{0xE3, 0x33, 0x71, 0xFF}}}, {{{155, 49, 108},0, {40, -28},{0xF7, 0x41, 0x6D, 0xFF}}}, {{{101, 64, 108},0, {-56, 648},{0x1A, 0x2C, 0x74, 0xFF}}}, - {{{84, -15, 119},0, {1196, 684},{0x1B, 0x50, 0x5F, 0xFF}}}, + {{{84, -15, 119},0, {1196, 684},{0x1A, 0x50, 0x60, 0xFF}}}, {{{43, 11, 121},0, {908, 1224},{0xC6, 0xF0, 0x70, 0xFF}}}, {{{26, 57, 121},0, {260, 1512},{0xC9, 0x3, 0x73, 0xFF}}}, }; @@ -805,35 +786,35 @@ Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_4[] = { }; Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_5[63] = { - {{{15, -47, -44},0, {-16, -16},{0x83, 0xF4, 0xEE, 0xFF}}}, + {{{15, -47, -44},0, {-16, -16},{0x83, 0xF3, 0xEE, 0xFF}}}, {{{34, -81, 0},0, {-16, -16},{0x98, 0xB7, 0x0, 0xFF}}}, - {{{15, -47, 44},0, {-16, -16},{0x83, 0xF4, 0x12, 0xFF}}}, + {{{15, -47, 44},0, {-16, -16},{0x83, 0xF3, 0x12, 0xFF}}}, {{{-8, 73, 74},0, {-16, -16},{0x8C, 0xEE, 0x30, 0xFF}}}, {{{26, 57, 121},0, {-16, -16},{0xC9, 0x3, 0x73, 0xFF}}}, {{{43, 11, 121},0, {-16, -16},{0xC6, 0xF0, 0x70, 0xFF}}}, - {{{55, -34, 93},0, {-16, -16},{0xB9, 0xCB, 0x5B, 0xFF}}}, - {{{72, -24, 156},0, {-16, -16},{0xD9, 0x0, 0x79, 0xFF}}}, - {{{109, -51, 108},0, {-16, -16},{0xBE, 0xB8, 0x52, 0xFF}}}, - {{{169, -44, 158},0, {-16, -16},{0x6A, 0xE2, 0x40, 0xFF}}}, - {{{137, -5, 118},0, {-16, -16},{0xE3, 0x32, 0x71, 0xFF}}}, - {{{84, -15, 119},0, {-16, -16},{0x1B, 0x50, 0x5F, 0xFF}}}, + {{{55, -34, 93},0, {-16, -16},{0xB8, 0xCB, 0x5B, 0xFF}}}, + {{{72, -24, 156},0, {-16, -16},{0xD8, 0x0, 0x79, 0xFF}}}, + {{{109, -51, 108},0, {-16, -16},{0xBF, 0xB8, 0x52, 0xFF}}}, + {{{169, -44, 158},0, {-16, -16},{0x6A, 0xE3, 0x40, 0xFF}}}, + {{{137, -5, 118},0, {-16, -16},{0xE3, 0x33, 0x71, 0xFF}}}, + {{{84, -15, 119},0, {-16, -16},{0x1A, 0x50, 0x60, 0xFF}}}, {{{18, 105, 98},0, {-16, -16},{0xCF, 0x43, 0x60, 0xFF}}}, - {{{70, 111, 103},0, {-16, -16},{0xE, 0x56, 0x5D, 0xFF}}}, + {{{70, 111, 103},0, {-16, -16},{0xE, 0x55, 0x5D, 0xFF}}}, {{{101, 64, 108},0, {-16, -16},{0x1A, 0x2C, 0x74, 0xFF}}}, - {{{89, 108, 97},0, {-16, -16},{0x4B, 0x4C, 0x45, 0xFF}}}, + {{{89, 108, 97},0, {-16, -16},{0x4A, 0x4C, 0x46, 0xFF}}}, {{{101, 64, 108},0, {-16, -16},{0x1A, 0x2C, 0x74, 0xFF}}}, - {{{101, 120, 39},0, {-16, -16},{0x58, 0x49, 0x37, 0xFF}}}, - {{{89, 108, 97},0, {-16, -16},{0x4B, 0x4C, 0x45, 0xFF}}}, - {{{66, 129, 55},0, {-16, -16},{0xD, 0x7B, 0x1F, 0xFF}}}, - {{{70, 111, 103},0, {-16, -16},{0xE, 0x56, 0x5D, 0xFF}}}, + {{{101, 120, 39},0, {-16, -16},{0x58, 0x49, 0x38, 0xFF}}}, + {{{89, 108, 97},0, {-16, -16},{0x4A, 0x4C, 0x46, 0xFF}}}, + {{{66, 129, 55},0, {-16, -16},{0xD, 0x7A, 0x20, 0xFF}}}, + {{{70, 111, 103},0, {-16, -16},{0xE, 0x55, 0x5D, 0xFF}}}, {{{-8, 73, 74},0, {-16, -16},{0x8C, 0xEE, 0x30, 0xFF}}}, {{{18, 105, 98},0, {-16, -16},{0xCF, 0x43, 0x60, 0xFF}}}, {{{-19, 133, 63},0, {-16, -16},{0xB3, 0x51, 0x3D, 0xFF}}}, {{{16, 127, 55},0, {-16, -16},{0x11, 0x79, 0x24, 0xFF}}}, - {{{-3, 144, 23},0, {-16, -16},{0xFF, 0x7F, 0xF5, 0xFF}}}, - {{{15, 127, 0},0, {-16, -16},{0x16, 0x7D, 0x0, 0xFF}}}, - {{{-8, 133, 0},0, {-16, -16},{0xCC, 0x74, 0x0, 0xFF}}}, - {{{-3, 144, -23},0, {-16, -16},{0xFF, 0x7F, 0xB, 0xFF}}}, + {{{-3, 144, 23},0, {-16, -16},{0xFC, 0x7E, 0xF5, 0xFF}}}, + {{{15, 127, 0},0, {-16, -16},{0x15, 0x7D, 0x0, 0xFF}}}, + {{{-8, 133, 0},0, {-16, -16},{0xCB, 0x74, 0x0, 0xFF}}}, + {{{-3, 144, -23},0, {-16, -16},{0xFC, 0x7E, 0xB, 0xFF}}}, {{{16, 127, -55},0, {-16, -16},{0x11, 0x79, 0xDC, 0xFF}}}, {{{-19, 133, -63},0, {-16, -16},{0xB3, 0x51, 0xC3, 0xFF}}}, {{{18, 105, -98},0, {-16, -16},{0xCF, 0x43, 0xA0, 0xFF}}}, @@ -841,33 +822,33 @@ Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_5[63] = { {{{18, 105, -98},0, {-16, -16},{0xCF, 0x43, 0xA0, 0xFF}}}, {{{-8, 73, -74},0, {-16, -16},{0x8C, 0xEE, 0xD0, 0xFF}}}, {{{26, 57, -121},0, {-16, -16},{0xC9, 0x3, 0x8D, 0xFF}}}, - {{{70, 111, -103},0, {-16, -16},{0xE, 0x56, 0xA3, 0xFF}}}, + {{{70, 111, -103},0, {-16, -16},{0xE, 0x55, 0xA3, 0xFF}}}, {{{101, 64, -108},0, {-16, -16},{0x1A, 0x2C, 0x8C, 0xFF}}}, - {{{89, 108, -97},0, {-16, -16},{0x4B, 0x4C, 0xBB, 0xFF}}}, - {{{66, 129, -55},0, {-16, -16},{0xD, 0x7B, 0xE1, 0xFF}}}, - {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC9, 0xFF}}}, - {{{15, -47, -44},0, {-16, -16},{0x83, 0xF4, 0xEE, 0xFF}}}, + {{{89, 108, -97},0, {-16, -16},{0x4A, 0x4C, 0xBA, 0xFF}}}, + {{{66, 129, -55},0, {-16, -16},{0xD, 0x7A, 0xE0, 0xFF}}}, + {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC8, 0xFF}}}, + {{{15, -47, -44},0, {-16, -16},{0x83, 0xF3, 0xEE, 0xFF}}}, {{{-8, 73, 74},0, {-16, -16},{0x8C, 0xEE, 0x30, 0xFF}}}, {{{-8, 106, 0},0, {-16, -16},{0x97, 0xB8, 0x0, 0xFF}}}, - {{{-30, 111, 5},0, {-16, -16},{0x95, 0xEE, 0xBE, 0xFF}}}, + {{{-30, 111, 5},0, {-16, -16},{0x95, 0xED, 0xBE, 0xFF}}}, {{{-19, 133, 63},0, {-16, -16},{0xB3, 0x51, 0x3D, 0xFF}}}, - {{{-3, 144, 23},0, {-16, -16},{0xFF, 0x7F, 0xF5, 0xFF}}}, - {{{-8, 133, 0},0, {-16, -16},{0xCC, 0x74, 0x0, 0xFF}}}, - {{{-8, 133, 0},0, {-16, -16},{0xCC, 0x74, 0x0, 0xFF}}}, - {{{-30, 111, -5},0, {-16, -16},{0x95, 0xEE, 0x42, 0xFF}}}, + {{{-3, 144, 23},0, {-16, -16},{0xFC, 0x7E, 0xF5, 0xFF}}}, + {{{-8, 133, 0},0, {-16, -16},{0xCB, 0x74, 0x0, 0xFF}}}, + {{{-8, 133, 0},0, {-16, -16},{0xCB, 0x74, 0x0, 0xFF}}}, + {{{-30, 111, -5},0, {-16, -16},{0x95, 0xED, 0x42, 0xFF}}}, {{{-8, 106, 0},0, {-16, -16},{0x97, 0xB8, 0x0, 0xFF}}}, - {{{-3, 144, -23},0, {-16, -16},{0xFF, 0x7F, 0xB, 0xFF}}}, + {{{-3, 144, -23},0, {-16, -16},{0xFC, 0x7E, 0xB, 0xFF}}}, {{{-19, 133, -63},0, {-16, -16},{0xB3, 0x51, 0xC3, 0xFF}}}, {{{-8, 73, -74},0, {-16, -16},{0x8C, 0xEE, 0xD0, 0xFF}}}, {{{43, 11, -121},0, {-16, -16},{0xC6, 0xF0, 0x90, 0xFF}}}, - {{{15, -47, -44},0, {-16, -16},{0x83, 0xF4, 0xEE, 0xFF}}}, + {{{15, -47, -44},0, {-16, -16},{0x83, 0xF3, 0xEE, 0xFF}}}, {{{26, 57, -121},0, {-16, -16},{0xC9, 0x3, 0x8D, 0xFF}}}, - {{{55, -34, -93},0, {-16, -16},{0xB9, 0xCB, 0xA5, 0xFF}}}, - {{{72, -24, -156},0, {-16, -16},{0xD9, 0x0, 0x87, 0xFF}}}, - {{{84, -15, -119},0, {-16, -16},{0x1B, 0x50, 0xA1, 0xFF}}}, - {{{169, -44, -158},0, {-16, -16},{0x6A, 0xE2, 0xC0, 0xFF}}}, - {{{137, -5, -118},0, {-16, -16},{0xE3, 0x32, 0x8F, 0xFF}}}, - {{{109, -51, -108},0, {-16, -16},{0xBE, 0xB8, 0xAE, 0xFF}}}, + {{{55, -34, -93},0, {-16, -16},{0xB8, 0xCB, 0xA5, 0xFF}}}, + {{{72, -24, -156},0, {-16, -16},{0xD8, 0x0, 0x87, 0xFF}}}, + {{{84, -15, -119},0, {-16, -16},{0x1A, 0x50, 0xA0, 0xFF}}}, + {{{169, -44, -158},0, {-16, -16},{0x6A, 0xE3, 0xC0, 0xFF}}}, + {{{137, -5, -118},0, {-16, -16},{0xE3, 0x33, 0x8F, 0xFF}}}, + {{{109, -51, -108},0, {-16, -16},{0xBF, 0xB8, 0xAE, 0xFF}}}, }; Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_5[] = { @@ -937,31 +918,31 @@ Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_5[] = { }; Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_6[26] = { - {{{89, 90, 137},0, {-16, -16},{0xB, 0x6E, 0x3E, 0xFF}}}, - {{{66, 108, 108},0, {-16, -16},{0x2, 0x60, 0x54, 0xFF}}}, - {{{38, 108, 113},0, {-16, -16},{0xE, 0x64, 0x4D, 0xFF}}}, - {{{51, 122, 97},0, {-16, -16},{0xFF, 0x6A, 0x46, 0xFF}}}, - {{{77, 122, 102},0, {-16, -16},{0xF0, 0x5E, 0x53, 0xFF}}}, - {{{60, 129, 79},0, {-16, -16},{0xFD, 0x76, 0x30, 0xFF}}}, - {{{31, 129, 79},0, {-16, -16},{0x0, 0x76, 0x2F, 0xFF}}}, + {{{89, 90, 137},0, {-16, -16},{0xA, 0x70, 0x3C, 0xFF}}}, + {{{66, 108, 108},0, {-16, -16},{0x2, 0x5F, 0x55, 0xFF}}}, + {{{38, 108, 113},0, {-16, -16},{0xE, 0x63, 0x4E, 0xFF}}}, + {{{51, 122, 97},0, {-16, -16},{0xFF, 0x6A, 0x47, 0xFF}}}, + {{{77, 122, 102},0, {-16, -16},{0xF0, 0x5D, 0x55, 0xFF}}}, + {{{60, 129, 79},0, {-16, -16},{0xFD, 0x76, 0x2F, 0xFF}}}, + {{{31, 129, 79},0, {-16, -16},{0x0, 0x76, 0x2E, 0xFF}}}, {{{45, 134, 66},0, {-16, -16},{0x0, 0x7D, 0x14, 0xFF}}}, - {{{76, 134, 69},0, {-16, -16},{0xFE, 0x7D, 0x14, 0xFF}}}, - {{{60, 133, 45},0, {-16, -16},{0x0, 0x7F, 0xFA, 0xFF}}}, - {{{26, 133, 45},0, {-16, -16},{0x0, 0x7F, 0xFA, 0xFF}}}, + {{{76, 134, 69},0, {-16, -16},{0xFF, 0x7E, 0x13, 0xFF}}}, + {{{60, 133, 45},0, {-16, -16},{0x0, 0x7F, 0xFB, 0xFF}}}, + {{{26, 133, 45},0, {-16, -16},{0x0, 0x7F, 0xFB, 0xFF}}}, {{{55, 131, 0},0, {-16, -16},{0x0, 0x7F, 0xFB, 0xFF}}}, - {{{89, 90, -137},0, {-16, -16},{0xB, 0x6E, 0xC2, 0xFF}}}, - {{{38, 108, -113},0, {-16, -16},{0xE, 0x64, 0xB3, 0xFF}}}, - {{{66, 108, -108},0, {-16, -16},{0x2, 0x60, 0xAC, 0xFF}}}, - {{{51, 122, -97},0, {-16, -16},{0xFF, 0x6A, 0xBA, 0xFF}}}, - {{{66, 108, -108},0, {-16, -16},{0x2, 0x60, 0xAC, 0xFF}}}, - {{{51, 122, -97},0, {-16, -16},{0xFF, 0x6A, 0xBA, 0xFF}}}, - {{{77, 122, -102},0, {-16, -16},{0xF0, 0x5E, 0xAD, 0xFF}}}, - {{{60, 129, -79},0, {-16, -16},{0xFD, 0x76, 0xD0, 0xFF}}}, - {{{31, 129, -79},0, {-16, -16},{0x0, 0x76, 0xD1, 0xFF}}}, + {{{89, 90, -137},0, {-16, -16},{0xA, 0x70, 0xC4, 0xFF}}}, + {{{38, 108, -113},0, {-16, -16},{0xE, 0x63, 0xB2, 0xFF}}}, + {{{66, 108, -108},0, {-16, -16},{0x2, 0x5F, 0xAB, 0xFF}}}, + {{{51, 122, -97},0, {-16, -16},{0xFF, 0x6A, 0xB9, 0xFF}}}, + {{{66, 108, -108},0, {-16, -16},{0x2, 0x5F, 0xAB, 0xFF}}}, + {{{51, 122, -97},0, {-16, -16},{0xFF, 0x6A, 0xB9, 0xFF}}}, + {{{77, 122, -102},0, {-16, -16},{0xF0, 0x5D, 0xAB, 0xFF}}}, + {{{60, 129, -79},0, {-16, -16},{0xFD, 0x76, 0xD1, 0xFF}}}, + {{{31, 129, -79},0, {-16, -16},{0x0, 0x76, 0xD2, 0xFF}}}, {{{45, 134, -66},0, {-16, -16},{0x0, 0x7D, 0xEC, 0xFF}}}, - {{{76, 134, -69},0, {-16, -16},{0xFE, 0x7D, 0xEC, 0xFF}}}, - {{{60, 133, -45},0, {-16, -16},{0x0, 0x7F, 0x6, 0xFF}}}, - {{{26, 133, -45},0, {-16, -16},{0x0, 0x7F, 0x6, 0xFF}}}, + {{{76, 134, -69},0, {-16, -16},{0xFF, 0x7E, 0xED, 0xFF}}}, + {{{60, 133, -45},0, {-16, -16},{0x0, 0x7F, 0x5, 0xFF}}}, + {{{26, 133, -45},0, {-16, -16},{0x0, 0x7F, 0x5, 0xFF}}}, {{{55, 131, 0},0, {-16, -16},{0x0, 0x7F, 0x5, 0xFF}}}, }; @@ -992,45 +973,45 @@ Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_6[] = { }; Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_7[40] = { - {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC9, 0xFF}}}, - {{{94, 116, -63},0, {-16, -16},{0x55, 0x1D, 0xA6, 0xFF}}}, - {{{106, 161, -34},0, {-16, -16},{0x58, 0x38, 0xB7, 0xFF}}}, - {{{88, 166, -45},0, {-16, -16},{0x31, 0x60, 0xBC, 0xFF}}}, - {{{66, 122, -74},0, {-16, -16},{0xF1, 0x2D, 0x8A, 0xFF}}}, - {{{52, 176, -45},0, {-16, -16},{0xCF, 0x6D, 0xD5, 0xFF}}}, - {{{49, 122, -52},0, {-16, -16},{0x91, 0xC, 0xC4, 0xFF}}}, + {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC8, 0xFF}}}, + {{{94, 116, -63},0, {-16, -16},{0x54, 0x1E, 0xA5, 0xFF}}}, + {{{106, 161, -34},0, {-16, -16},{0x57, 0x38, 0xB7, 0xFF}}}, + {{{88, 166, -45},0, {-16, -16},{0x2F, 0x60, 0xBC, 0xFF}}}, + {{{66, 122, -74},0, {-16, -16},{0xF2, 0x2E, 0x8A, 0xFF}}}, + {{{52, 176, -45},0, {-16, -16},{0xCF, 0x6D, 0xD6, 0xFF}}}, + {{{49, 122, -52},0, {-16, -16},{0x91, 0xD, 0xC3, 0xFF}}}, {{{47, 171, -34},0, {-16, -16},{0xA0, 0x45, 0xD1, 0xFF}}}, - {{{43, 122, -34},0, {-16, -16},{0x83, 0xA, 0xE9, 0xFF}}}, - {{{44, 132, 0},0, {-16, -16},{0x81, 0xF8, 0x0, 0xFF}}}, - {{{32, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, + {{{43, 122, -34},0, {-16, -16},{0x83, 0xA, 0xEA, 0xFF}}}, + {{{44, 132, 0},0, {-16, -16},{0x81, 0xF9, 0x0, 0xFF}}}, + {{{33, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, {{{47, 171, 34},0, {-16, -16},{0xA0, 0x45, 0x2F, 0xFF}}}, - {{{43, 122, 34},0, {-16, -16},{0x83, 0xA, 0x17, 0xFF}}}, - {{{49, 122, 52},0, {-16, -16},{0x91, 0xC, 0x3C, 0xFF}}}, - {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2B, 0xFF}}}, - {{{66, 122, 74},0, {-16, -16},{0xF1, 0x2D, 0x76, 0xFF}}}, - {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2B, 0xFF}}}, - {{{66, 122, 74},0, {-16, -16},{0xF1, 0x2D, 0x76, 0xFF}}}, - {{{88, 166, 45},0, {-16, -16},{0x31, 0x60, 0x44, 0xFF}}}, - {{{94, 116, 63},0, {-16, -16},{0x55, 0x1D, 0x5A, 0xFF}}}, - {{{106, 161, 34},0, {-16, -16},{0x58, 0x38, 0x49, 0xFF}}}, - {{{101, 120, 39},0, {-16, -16},{0x58, 0x49, 0x37, 0xFF}}}, + {{{43, 122, 34},0, {-16, -16},{0x83, 0xA, 0x16, 0xFF}}}, + {{{49, 122, 52},0, {-16, -16},{0x91, 0xD, 0x3D, 0xFF}}}, + {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2A, 0xFF}}}, + {{{66, 122, 74},0, {-16, -16},{0xF2, 0x2E, 0x76, 0xFF}}}, + {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2A, 0xFF}}}, + {{{66, 122, 74},0, {-16, -16},{0xF2, 0x2E, 0x76, 0xFF}}}, + {{{88, 166, 45},0, {-16, -16},{0x2F, 0x60, 0x44, 0xFF}}}, + {{{94, 116, 63},0, {-16, -16},{0x54, 0x1E, 0x5B, 0xFF}}}, + {{{106, 161, 34},0, {-16, -16},{0x57, 0x38, 0x49, 0xFF}}}, + {{{101, 120, 39},0, {-16, -16},{0x58, 0x49, 0x38, 0xFF}}}, {{{125, 157, 0},0, {-16, -16},{0x7E, 0xC, 0x0, 0xFF}}}, {{{108, 127, 0},0, {-16, -16},{0x74, 0x33, 0x0, 0xFF}}}, - {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC9, 0xFF}}}, - {{{106, 161, -34},0, {-16, -16},{0x58, 0x38, 0xB7, 0xFF}}}, - {{{105, 188, 0},0, {-16, -16},{0x46, 0x6A, 0x0, 0xFF}}}, - {{{55, 204, 0},0, {-16, -16},{0xE0, 0x7B, 0x0, 0xFF}}}, + {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC8, 0xFF}}}, + {{{106, 161, -34},0, {-16, -16},{0x57, 0x38, 0xB7, 0xFF}}}, + {{{105, 188, 0},0, {-16, -16},{0x45, 0x6B, 0x0, 0xFF}}}, + {{{55, 204, 0},0, {-16, -16},{0xDF, 0x7B, 0x0, 0xFF}}}, {{{47, 171, -34},0, {-16, -16},{0xA0, 0x45, 0xD1, 0xFF}}}, - {{{52, 176, -45},0, {-16, -16},{0xCF, 0x6D, 0xD5, 0xFF}}}, - {{{88, 166, -45},0, {-16, -16},{0x31, 0x60, 0xBC, 0xFF}}}, - {{{32, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, - {{{32, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, + {{{52, 176, -45},0, {-16, -16},{0xCF, 0x6D, 0xD6, 0xFF}}}, + {{{88, 166, -45},0, {-16, -16},{0x2F, 0x60, 0xBC, 0xFF}}}, + {{{33, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, + {{{33, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, {{{47, 171, 34},0, {-16, -16},{0xA0, 0x45, 0x2F, 0xFF}}}, - {{{55, 204, 0},0, {-16, -16},{0xE0, 0x7B, 0x0, 0xFF}}}, - {{{106, 161, 34},0, {-16, -16},{0x58, 0x38, 0x49, 0xFF}}}, - {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2B, 0xFF}}}, - {{{88, 166, 45},0, {-16, -16},{0x31, 0x60, 0x44, 0xFF}}}, - {{{105, 188, 0},0, {-16, -16},{0x46, 0x6A, 0x0, 0xFF}}}, + {{{55, 204, 0},0, {-16, -16},{0xDF, 0x7B, 0x0, 0xFF}}}, + {{{106, 161, 34},0, {-16, -16},{0x57, 0x38, 0x49, 0xFF}}}, + {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2A, 0xFF}}}, + {{{88, 166, 45},0, {-16, -16},{0x2F, 0x60, 0x44, 0xFF}}}, + {{{105, 188, 0},0, {-16, -16},{0x45, 0x6B, 0x0, 0xFF}}}, {{{125, 157, 0},0, {-16, -16},{0x7E, 0xC, 0x0, 0xFF}}}, }; @@ -1076,16 +1057,16 @@ Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_7[] = { }; Vtx wario_000_displaylist_head_cap_mesh_layer_1_vtx_8[10] = { - {{{70, 111, -103},0, {208, 304},{0xE, 0x56, 0xA3, 0xFF}}}, - {{{18, 105, -98},0, {240, 912},{0xCF, 0x43, 0xA0, 0xFF}}}, - {{{16, 127, -55},0, {624, 912},{0x11, 0x79, 0xDC, 0xFF}}}, - {{{66, 129, -55},0, {624, 336},{0xD, 0x7B, 0xE1, 0xFF}}}, - {{{44, 132, 0},0, {1008, 560},{0xF1, 0x7E, 0x0, 0xFF}}}, - {{{15, 127, 0},0, {1008, 912},{0x16, 0x7D, 0x0, 0xFF}}}, - {{{16, 127, 55},0, {1392, 912},{0x11, 0x79, 0x24, 0xFF}}}, - {{{66, 129, 55},0, {1392, 336},{0xD, 0x7B, 0x1F, 0xFF}}}, - {{{70, 111, 103},0, {1808, 304},{0xE, 0x56, 0x5D, 0xFF}}}, - {{{18, 105, 98},0, {1776, 912},{0xCF, 0x43, 0x60, 0xFF}}}, + {{{70, 111, -103},0, {192, 304},{0xE, 0x55, 0xA3, 0xFF}}}, + {{{18, 105, -98},0, {224, 912},{0xCF, 0x43, 0xA0, 0xFF}}}, + {{{16, 127, -55},0, {608, 912},{0x11, 0x79, 0xDC, 0xFF}}}, + {{{66, 129, -55},0, {608, 336},{0xD, 0x7A, 0xE0, 0xFF}}}, + {{{44, 132, 0},0, {992, 560},{0xF2, 0x7E, 0x0, 0xFF}}}, + {{{15, 127, 0},0, {992, 912},{0x15, 0x7D, 0x0, 0xFF}}}, + {{{16, 127, 55},0, {1376, 912},{0x11, 0x79, 0x24, 0xFF}}}, + {{{66, 129, 55},0, {1376, 336},{0xD, 0x7A, 0x20, 0xFF}}}, + {{{70, 111, 103},0, {1792, 304},{0xE, 0x55, 0x5D, 0xFF}}}, + {{{18, 105, 98},0, {1760, 912},{0xCF, 0x43, 0x60, 0xFF}}}, }; Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_8[] = { @@ -1103,13 +1084,13 @@ Gfx wario_000_displaylist_head_cap_mesh_layer_1_tri_8[] = { Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_0[9] = { {{{155, 49, -108},0, {-56, 144},{0xF7, 0x31, 0x8B, 0xFF}}}, - {{{101, 64, -108},0, {0, 784},{0x1A, 0x2C, 0x8C, 0xFF}}}, - {{{176, 112, -52},0, {476, -16},{0xF5, 0x70, 0xC4, 0xFF}}}, - {{{101, 120, -39},0, {560, 816},{0x58, 0x49, 0xC9, 0xFF}}}, - {{{108, 127, 0},0, {1008, 752},{0x74, 0x33, 0x0, 0xFF}}}, - {{{176, 112, 52},0, {1540, -16},{0xF, 0x71, 0x39, 0xFF}}}, - {{{101, 120, 39},0, {1456, 816},{0x58, 0x49, 0x37, 0xFF}}}, - {{{101, 64, 108},0, {2016, 784},{0x1A, 0x2C, 0x74, 0xFF}}}, + {{{101, 64, -108},0, {0, 816},{0x1A, 0x2C, 0x8C, 0xFF}}}, + {{{176, 112, -52},0, {572, -16},{0xF6, 0x6F, 0xC3, 0xFF}}}, + {{{101, 120, -39},0, {656, 848},{0x58, 0x49, 0xC8, 0xFF}}}, + {{{108, 127, 0},0, {1008, 784},{0x74, 0x33, 0x0, 0xFF}}}, + {{{176, 112, 52},0, {1444, -16},{0xF, 0x70, 0x3A, 0xFF}}}, + {{{101, 120, 39},0, {1360, 848},{0x58, 0x49, 0x38, 0xFF}}}, + {{{101, 64, 108},0, {2016, 816},{0x1A, 0x2C, 0x74, 0xFF}}}, {{{155, 49, 108},0, {2072, 144},{0x3, 0x33, 0x74, 0xFF}}}, }; @@ -1128,14 +1109,14 @@ Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_0[] = { Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_1[12] = { {{{101, 64, -108},0, {-56, 648},{0x1A, 0x2C, 0x8C, 0xFF}}}, {{{155, 49, -108},0, {40, -28},{0xF7, 0x31, 0x8B, 0xFF}}}, - {{{137, -5, -118},0, {926, 88},{0x7, 0x16, 0x83, 0xFF}}}, - {{{84, -15, -119},0, {1196, 684},{0x1B, 0x50, 0xA1, 0xFF}}}, + {{{137, -5, -118},0, {926, 88},{0x8, 0x17, 0x83, 0xFF}}}, + {{{84, -15, -119},0, {1196, 684},{0x1A, 0x50, 0xA0, 0xFF}}}, {{{43, 11, -121},0, {908, 1224},{0xC6, 0xF0, 0x90, 0xFF}}}, {{{26, 57, -121},0, {260, 1512},{0xC9, 0x3, 0x8D, 0xFF}}}, - {{{137, -5, 118},0, {926, 88},{0x7, 0x16, 0x7D, 0xFF}}}, + {{{137, -5, 118},0, {926, 88},{0x8, 0x17, 0x7D, 0xFF}}}, {{{155, 49, 108},0, {40, -28},{0x3, 0x33, 0x74, 0xFF}}}, {{{101, 64, 108},0, {-56, 648},{0x1A, 0x2C, 0x74, 0xFF}}}, - {{{84, -15, 119},0, {1196, 684},{0x1B, 0x50, 0x5F, 0xFF}}}, + {{{84, -15, 119},0, {1196, 684},{0x1A, 0x50, 0x60, 0xFF}}}, {{{43, 11, 121},0, {908, 1224},{0xC6, 0xF0, 0x70, 0xFF}}}, {{{26, 57, 121},0, {260, 1512},{0xC9, 0x3, 0x73, 0xFF}}}, }; @@ -1154,59 +1135,59 @@ Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_1[] = { }; Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_2[100] = { - {{{199, 71, -111},0, {-16, -16},{0x2C, 0x36, 0x96, 0xFF}}}, + {{{199, 71, -111},0, {-16, -16},{0x2D, 0x36, 0x96, 0xFF}}}, {{{155, 49, -108},0, {-16, -16},{0xF7, 0x31, 0x8B, 0xFF}}}, - {{{154, 85, -79},0, {-16, -16},{0xDF, 0x5A, 0xAC, 0xFF}}}, + {{{154, 85, -79},0, {-16, -16},{0xE0, 0x5A, 0xAC, 0xFF}}}, {{{182, -4, -124},0, {-16, -16},{0x2B, 0xF4, 0x89, 0xFF}}}, - {{{217, 39, -85},0, {-16, -16},{0x73, 0x2, 0xC9, 0xFF}}}, + {{{217, 39, -85},0, {-16, -16},{0x73, 0x1, 0xC9, 0xFF}}}, {{{208, 97, -81},0, {-16, -16},{0x35, 0x4C, 0xA9, 0xFF}}}, - {{{176, 112, -52},0, {-16, -16},{0xF5, 0x70, 0xC4, 0xFF}}}, - {{{200, 138, -15},0, {-16, -16},{0xE, 0x7E, 0xFF, 0xFF}}}, - {{{161, 120, 0},0, {-16, -16},{0xCA, 0x73, 0x5, 0xFF}}}, - {{{176, 112, 52},0, {-16, -16},{0xF, 0x71, 0x39, 0xFF}}}, + {{{176, 112, -52},0, {-16, -16},{0xF6, 0x6F, 0xC3, 0xFF}}}, + {{{200, 138, -15},0, {-16, -16},{0xF, 0x7E, 0xFF, 0xFF}}}, + {{{161, 120, 0},0, {-16, -16},{0xCD, 0x74, 0x5, 0xFF}}}, + {{{176, 112, 52},0, {-16, -16},{0xF, 0x70, 0x3A, 0xFF}}}, {{{207, 91, 68},0, {-16, -16},{0x4C, 0x54, 0x3A, 0xFF}}}, {{{199, 77, 96},0, {-16, -16},{0x2E, 0x46, 0x5F, 0xFF}}}, - {{{154, 85, 79},0, {-16, -16},{0xED, 0x58, 0x5A, 0xFF}}}, + {{{154, 85, 79},0, {-16, -16},{0xEE, 0x58, 0x5A, 0xFF}}}, {{{155, 49, 108},0, {-16, -16},{0x3, 0x33, 0x74, 0xFF}}}, {{{182, -4, 124},0, {-16, -16},{0x2A, 0xF7, 0x78, 0xFF}}}, - {{{137, -5, 118},0, {-16, -16},{0x7, 0x16, 0x7D, 0xFF}}}, + {{{137, -5, 118},0, {-16, -16},{0x8, 0x17, 0x7D, 0xFF}}}, {{{148, -72, 103},0, {-16, -16},{0x9, 0xC3, 0x6F, 0xFF}}}, {{{182, -4, 124},0, {-16, -16},{0x2A, 0xF7, 0x78, 0xFF}}}, - {{{137, -5, 118},0, {-16, -16},{0x7, 0x16, 0x7D, 0xFF}}}, - {{{109, -51, 108},0, {-16, -16},{0xEF, 0xA4, 0x56, 0xFF}}}, - {{{74, -119, 61},0, {-16, -16},{0x1E, 0x89, 0x22, 0xFF}}}, - {{{55, -34, 93},0, {-16, -16},{0xB9, 0xCB, 0x5B, 0xFF}}}, - {{{62, -129, 88},0, {-16, -16},{0x4C, 0xAE, 0x3D, 0xFF}}}, - {{{32, -93, 104},0, {-16, -16},{0xE3, 0x4, 0x7C, 0xFF}}}, - {{{5, -96, 76},0, {-16, -16},{0x85, 0xEF, 0x1A, 0xFF}}}, - {{{15, -47, 44},0, {-16, -16},{0x83, 0xF4, 0x12, 0xFF}}}, + {{{137, -5, 118},0, {-16, -16},{0x8, 0x17, 0x7D, 0xFF}}}, + {{{109, -51, 108},0, {-16, -16},{0xF0, 0xA4, 0x57, 0xFF}}}, + {{{74, -119, 61},0, {-16, -16},{0x1D, 0x89, 0x23, 0xFF}}}, + {{{55, -34, 93},0, {-16, -16},{0xB8, 0xCB, 0x5B, 0xFF}}}, + {{{62, -129, 88},0, {-16, -16},{0x4B, 0xAE, 0x3E, 0xFF}}}, + {{{33, -93, 104},0, {-16, -16},{0xE3, 0x4, 0x7C, 0xFF}}}, + {{{5, -96, 76},0, {-16, -16},{0x85, 0xEE, 0x1A, 0xFF}}}, + {{{15, -47, 44},0, {-16, -16},{0x83, 0xF3, 0x12, 0xFF}}}, {{{34, -81, 0},0, {-16, -16},{0x98, 0xB7, 0x0, 0xFF}}}, - {{{41, -127, 44},0, {-16, -16},{0xEC, 0x94, 0xC1, 0xFF}}}, - {{{74, -119, -61},0, {-16, -16},{0x1E, 0x89, 0xDE, 0xFF}}}, - {{{41, -127, -44},0, {-16, -16},{0xEC, 0x94, 0x3F, 0xFF}}}, - {{{5, -96, -76},0, {-16, -16},{0x85, 0xEF, 0xE6, 0xFF}}}, - {{{15, -47, -44},0, {-16, -16},{0x83, 0xF4, 0xEE, 0xFF}}}, - {{{15, -47, -44},0, {-16, -16},{0x83, 0xF4, 0xEE, 0xFF}}}, - {{{55, -34, -93},0, {-16, -16},{0xB9, 0xCB, 0xA5, 0xFF}}}, - {{{5, -96, -76},0, {-16, -16},{0x85, 0xEF, 0xE6, 0xFF}}}, - {{{32, -93, -104},0, {-16, -16},{0xE3, 0x4, 0x84, 0xFF}}}, - {{{62, -129, -88},0, {-16, -16},{0x4C, 0xAE, 0xC3, 0xFF}}}, - {{{74, -119, -61},0, {-16, -16},{0x1E, 0x89, 0xDE, 0xFF}}}, - {{{109, -51, -108},0, {-16, -16},{0xEF, 0xA4, 0xAA, 0xFF}}}, + {{{41, -127, 44},0, {-16, -16},{0xEC, 0x94, 0xC0, 0xFF}}}, + {{{74, -119, -61},0, {-16, -16},{0x1D, 0x89, 0xDD, 0xFF}}}, + {{{41, -127, -44},0, {-16, -16},{0xEC, 0x94, 0x40, 0xFF}}}, + {{{5, -96, -76},0, {-16, -16},{0x85, 0xEE, 0xE6, 0xFF}}}, + {{{15, -47, -44},0, {-16, -16},{0x83, 0xF3, 0xEE, 0xFF}}}, + {{{15, -47, -44},0, {-16, -16},{0x83, 0xF3, 0xEE, 0xFF}}}, + {{{55, -34, -93},0, {-16, -16},{0xB8, 0xCB, 0xA5, 0xFF}}}, + {{{5, -96, -76},0, {-16, -16},{0x85, 0xEE, 0xE6, 0xFF}}}, + {{{33, -93, -104},0, {-16, -16},{0xE3, 0x4, 0x84, 0xFF}}}, + {{{62, -129, -88},0, {-16, -16},{0x4B, 0xAE, 0xC2, 0xFF}}}, + {{{74, -119, -61},0, {-16, -16},{0x1D, 0x89, 0xDD, 0xFF}}}, + {{{109, -51, -108},0, {-16, -16},{0xF0, 0xA4, 0xA9, 0xFF}}}, {{{148, -72, -103},0, {-16, -16},{0x9, 0xC3, 0x91, 0xFF}}}, - {{{137, -5, -118},0, {-16, -16},{0x7, 0x16, 0x83, 0xFF}}}, + {{{137, -5, -118},0, {-16, -16},{0x8, 0x17, 0x83, 0xFF}}}, {{{182, -4, -124},0, {-16, -16},{0x2B, 0xF4, 0x89, 0xFF}}}, {{{155, 49, -108},0, {-16, -16},{0xF7, 0x31, 0x8B, 0xFF}}}, {{{188, -93, -77},0, {-16, -16},{0x46, 0xB0, 0xBB, 0xFF}}}, {{{223, -10, -67},0, {-16, -16},{0x74, 0xEE, 0xCF, 0xFF}}}, - {{{217, 39, -85},0, {-16, -16},{0x73, 0x2, 0xC9, 0xFF}}}, - {{{233, 64, -1},0, {-16, -16},{0x7F, 0xFC, 0x3, 0xFF}}}, - {{{227, 70, -39},0, {-16, -16},{0x78, 0xE9, 0xDE, 0xFF}}}, - {{{217, 39, -85},0, {-16, -16},{0x73, 0x2, 0xC9, 0xFF}}}, + {{{217, 39, -85},0, {-16, -16},{0x73, 0x1, 0xC9, 0xFF}}}, + {{{233, 64, -1},0, {-16, -16},{0x7F, 0xFD, 0x3, 0xFF}}}, + {{{227, 70, -39},0, {-16, -16},{0x78, 0xEA, 0xDD, 0xFF}}}, + {{{217, 39, -85},0, {-16, -16},{0x73, 0x1, 0xC9, 0xFF}}}, {{{208, 97, -81},0, {-16, -16},{0x35, 0x4C, 0xA9, 0xFF}}}, - {{{227, 70, -39},0, {-16, -16},{0x78, 0xE9, 0xDE, 0xFF}}}, - {{{242, 112, -49},0, {-16, -16},{0x6A, 0x35, 0xD1, 0xFF}}}, - {{{200, 138, -15},0, {-16, -16},{0xE, 0x7E, 0xFF, 0xFF}}}, + {{{227, 70, -39},0, {-16, -16},{0x78, 0xEA, 0xDD, 0xFF}}}, + {{{242, 112, -49},0, {-16, -16},{0x6A, 0x34, 0xD1, 0xFF}}}, + {{{200, 138, -15},0, {-16, -16},{0xF, 0x7E, 0xFF, 0xFF}}}, {{{207, 91, 68},0, {-16, -16},{0x4C, 0x54, 0x3A, 0xFF}}}, {{{226, 85, 37},0, {-16, -16},{0x72, 0x2D, 0x23, 0xFF}}}, {{{223, 39, 86},0, {-16, -16},{0x6E, 0xA, 0x3F, 0xFF}}}, @@ -1216,44 +1197,44 @@ Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_2[100] = { {{{188, -93, 77},0, {-16, -16},{0x46, 0xB0, 0x45, 0xFF}}}, {{{148, -72, 103},0, {-16, -16},{0x9, 0xC3, 0x6F, 0xFF}}}, {{{121, -119, 62},0, {-16, -16},{0xB, 0x92, 0x3F, 0xFF}}}, - {{{74, -119, 61},0, {-16, -16},{0x1E, 0x89, 0x22, 0xFF}}}, + {{{74, -119, 61},0, {-16, -16},{0x1D, 0x89, 0x23, 0xFF}}}, {{{124, -134, 0},0, {-16, -16},{0x6, 0x81, 0x0, 0xFF}}}, - {{{74, -119, 61},0, {-16, -16},{0x1E, 0x89, 0x22, 0xFF}}}, - {{{74, -119, -61},0, {-16, -16},{0x1E, 0x89, 0xDE, 0xFF}}}, + {{{74, -119, 61},0, {-16, -16},{0x1D, 0x89, 0x23, 0xFF}}}, + {{{74, -119, -61},0, {-16, -16},{0x1D, 0x89, 0xDD, 0xFF}}}, {{{124, -134, 0},0, {-16, -16},{0x6, 0x81, 0x0, 0xFF}}}, {{{121, -119, -62},0, {-16, -16},{0xB, 0x92, 0xC1, 0xFF}}}, {{{148, -72, -103},0, {-16, -16},{0x9, 0xC3, 0x91, 0xFF}}}, {{{188, -93, -77},0, {-16, -16},{0x46, 0xB0, 0xBB, 0xFF}}}, - {{{199, -113, 0},0, {-16, -16},{0x51, 0x9E, 0x0, 0xFF}}}, + {{{199, -113, 0},0, {-16, -16},{0x51, 0x9F, 0x0, 0xFF}}}, {{{236, -35, 0},0, {-16, -16},{0x7C, 0xE4, 0x0, 0xFF}}}, {{{223, -10, -67},0, {-16, -16},{0x74, 0xEE, 0xCF, 0xFF}}}, - {{{233, 64, -1},0, {-16, -16},{0x7F, 0xFC, 0x3, 0xFF}}}, + {{{233, 64, -1},0, {-16, -16},{0x7F, 0xFD, 0x3, 0xFF}}}, {{{223, -10, 67},0, {-16, -16},{0x74, 0xE9, 0x2F, 0xFF}}}, {{{223, 39, 86},0, {-16, -16},{0x6E, 0xA, 0x3F, 0xFF}}}, {{{226, 85, 37},0, {-16, -16},{0x72, 0x2D, 0x23, 0xFF}}}, - {{{242, 112, -49},0, {-16, -16},{0x6A, 0x35, 0xD1, 0xFF}}}, - {{{227, 70, -39},0, {-16, -16},{0x78, 0xE9, 0xDE, 0xFF}}}, + {{{242, 112, -49},0, {-16, -16},{0x6A, 0x34, 0xD1, 0xFF}}}, + {{{227, 70, -39},0, {-16, -16},{0x78, 0xEA, 0xDD, 0xFF}}}, {{{188, -93, 77},0, {-16, -16},{0x46, 0xB0, 0x45, 0xFF}}}, - {{{199, -113, 0},0, {-16, -16},{0x51, 0x9E, 0x0, 0xFF}}}, + {{{199, -113, 0},0, {-16, -16},{0x51, 0x9F, 0x0, 0xFF}}}, {{{188, -93, 77},0, {-16, -16},{0x46, 0xB0, 0x45, 0xFF}}}, {{{121, -119, 62},0, {-16, -16},{0xB, 0x92, 0x3F, 0xFF}}}, {{{124, -134, 0},0, {-16, -16},{0x6, 0x81, 0x0, 0xFF}}}, {{{121, -119, -62},0, {-16, -16},{0xB, 0x92, 0xC1, 0xFF}}}, - {{{74, -119, -61},0, {-16, -16},{0x1E, 0x89, 0xDE, 0xFF}}}, - {{{41, -127, -44},0, {-16, -16},{0xEC, 0x94, 0x3F, 0xFF}}}, - {{{62, -129, -88},0, {-16, -16},{0x4C, 0xAE, 0xC3, 0xFF}}}, - {{{35, -132, -93},0, {-16, -16},{0xD9, 0x9B, 0xBE, 0xFF}}}, - {{{5, -96, -76},0, {-16, -16},{0x85, 0xEF, 0xE6, 0xFF}}}, - {{{32, -93, -104},0, {-16, -16},{0xE3, 0x4, 0x84, 0xFF}}}, - {{{74, -119, 61},0, {-16, -16},{0x1E, 0x89, 0x22, 0xFF}}}, - {{{62, -129, 88},0, {-16, -16},{0x4C, 0xAE, 0x3D, 0xFF}}}, - {{{41, -127, 44},0, {-16, -16},{0xEC, 0x94, 0xC1, 0xFF}}}, - {{{35, -132, 93},0, {-16, -16},{0xD9, 0x9B, 0x42, 0xFF}}}, - {{{32, -93, 104},0, {-16, -16},{0xE3, 0x4, 0x7C, 0xFF}}}, - {{{35, -132, 93},0, {-16, -16},{0xD9, 0x9B, 0x42, 0xFF}}}, - {{{32, -93, 104},0, {-16, -16},{0xE3, 0x4, 0x7C, 0xFF}}}, - {{{5, -96, 76},0, {-16, -16},{0x85, 0xEF, 0x1A, 0xFF}}}, - {{{41, -127, 44},0, {-16, -16},{0xEC, 0x94, 0xC1, 0xFF}}}, + {{{74, -119, -61},0, {-16, -16},{0x1D, 0x89, 0xDD, 0xFF}}}, + {{{41, -127, -44},0, {-16, -16},{0xEC, 0x94, 0x40, 0xFF}}}, + {{{62, -129, -88},0, {-16, -16},{0x4B, 0xAE, 0xC2, 0xFF}}}, + {{{35, -132, -93},0, {-16, -16},{0xD9, 0x9B, 0xBD, 0xFF}}}, + {{{5, -96, -76},0, {-16, -16},{0x85, 0xEE, 0xE6, 0xFF}}}, + {{{33, -93, -104},0, {-16, -16},{0xE3, 0x4, 0x84, 0xFF}}}, + {{{74, -119, 61},0, {-16, -16},{0x1D, 0x89, 0x23, 0xFF}}}, + {{{62, -129, 88},0, {-16, -16},{0x4B, 0xAE, 0x3E, 0xFF}}}, + {{{41, -127, 44},0, {-16, -16},{0xEC, 0x94, 0xC0, 0xFF}}}, + {{{35, -132, 93},0, {-16, -16},{0xD9, 0x9B, 0x43, 0xFF}}}, + {{{33, -93, 104},0, {-16, -16},{0xE3, 0x4, 0x7C, 0xFF}}}, + {{{35, -132, 93},0, {-16, -16},{0xD9, 0x9B, 0x43, 0xFF}}}, + {{{33, -93, 104},0, {-16, -16},{0xE3, 0x4, 0x7C, 0xFF}}}, + {{{5, -96, 76},0, {-16, -16},{0x85, 0xEE, 0x1A, 0xFF}}}, + {{{41, -127, 44},0, {-16, -16},{0xEC, 0x94, 0xC0, 0xFF}}}, }; Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_2[] = { @@ -1354,35 +1335,35 @@ Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_2[] = { }; Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_3[63] = { - {{{15, -47, -44},0, {-16, -16},{0x83, 0xF4, 0xEE, 0xFF}}}, + {{{15, -47, -44},0, {-16, -16},{0x83, 0xF3, 0xEE, 0xFF}}}, {{{34, -81, 0},0, {-16, -16},{0x98, 0xB7, 0x0, 0xFF}}}, - {{{15, -47, 44},0, {-16, -16},{0x83, 0xF4, 0x12, 0xFF}}}, + {{{15, -47, 44},0, {-16, -16},{0x83, 0xF3, 0x12, 0xFF}}}, {{{-8, 73, 74},0, {-16, -16},{0x8C, 0xEE, 0x30, 0xFF}}}, {{{26, 57, 121},0, {-16, -16},{0xC9, 0x3, 0x73, 0xFF}}}, {{{43, 11, 121},0, {-16, -16},{0xC6, 0xF0, 0x70, 0xFF}}}, - {{{55, -34, 93},0, {-16, -16},{0xB9, 0xCB, 0x5B, 0xFF}}}, - {{{72, -24, 156},0, {-16, -16},{0xD9, 0x0, 0x79, 0xFF}}}, - {{{109, -51, 108},0, {-16, -16},{0xEF, 0xA4, 0x56, 0xFF}}}, - {{{169, -44, 158},0, {-16, -16},{0x6A, 0xE2, 0x40, 0xFF}}}, - {{{137, -5, 118},0, {-16, -16},{0x7, 0x16, 0x7D, 0xFF}}}, - {{{84, -15, 119},0, {-16, -16},{0x1B, 0x50, 0x5F, 0xFF}}}, + {{{55, -34, 93},0, {-16, -16},{0xB8, 0xCB, 0x5B, 0xFF}}}, + {{{72, -24, 156},0, {-16, -16},{0xD8, 0x0, 0x79, 0xFF}}}, + {{{109, -51, 108},0, {-16, -16},{0xF0, 0xA4, 0x57, 0xFF}}}, + {{{169, -44, 158},0, {-16, -16},{0x6A, 0xE3, 0x40, 0xFF}}}, + {{{137, -5, 118},0, {-16, -16},{0x8, 0x17, 0x7D, 0xFF}}}, + {{{84, -15, 119},0, {-16, -16},{0x1A, 0x50, 0x60, 0xFF}}}, {{{18, 105, 98},0, {-16, -16},{0xCF, 0x43, 0x60, 0xFF}}}, - {{{70, 111, 103},0, {-16, -16},{0xE, 0x56, 0x5D, 0xFF}}}, + {{{70, 111, 103},0, {-16, -16},{0xE, 0x55, 0x5D, 0xFF}}}, {{{101, 64, 108},0, {-16, -16},{0x1A, 0x2C, 0x74, 0xFF}}}, - {{{89, 108, 97},0, {-16, -16},{0x4B, 0x4C, 0x45, 0xFF}}}, + {{{89, 108, 97},0, {-16, -16},{0x4A, 0x4C, 0x46, 0xFF}}}, {{{101, 64, 108},0, {-16, -16},{0x1A, 0x2C, 0x74, 0xFF}}}, - {{{101, 120, 39},0, {-16, -16},{0x58, 0x49, 0x37, 0xFF}}}, - {{{89, 108, 97},0, {-16, -16},{0x4B, 0x4C, 0x45, 0xFF}}}, - {{{66, 129, 55},0, {-16, -16},{0xD, 0x7B, 0x1F, 0xFF}}}, - {{{70, 111, 103},0, {-16, -16},{0xE, 0x56, 0x5D, 0xFF}}}, + {{{101, 120, 39},0, {-16, -16},{0x58, 0x49, 0x38, 0xFF}}}, + {{{89, 108, 97},0, {-16, -16},{0x4A, 0x4C, 0x46, 0xFF}}}, + {{{66, 129, 55},0, {-16, -16},{0xD, 0x7A, 0x20, 0xFF}}}, + {{{70, 111, 103},0, {-16, -16},{0xE, 0x55, 0x5D, 0xFF}}}, {{{-8, 73, 74},0, {-16, -16},{0x8C, 0xEE, 0x30, 0xFF}}}, {{{18, 105, 98},0, {-16, -16},{0xCF, 0x43, 0x60, 0xFF}}}, {{{-19, 133, 63},0, {-16, -16},{0xB3, 0x51, 0x3D, 0xFF}}}, {{{16, 127, 55},0, {-16, -16},{0x11, 0x79, 0x24, 0xFF}}}, - {{{-3, 144, 23},0, {-16, -16},{0xFF, 0x7F, 0xF5, 0xFF}}}, - {{{15, 127, 0},0, {-16, -16},{0x16, 0x7D, 0x0, 0xFF}}}, - {{{-8, 133, 0},0, {-16, -16},{0xCC, 0x74, 0x0, 0xFF}}}, - {{{-3, 144, -23},0, {-16, -16},{0xFF, 0x7F, 0xB, 0xFF}}}, + {{{-3, 144, 23},0, {-16, -16},{0xFC, 0x7E, 0xF5, 0xFF}}}, + {{{15, 127, 0},0, {-16, -16},{0x15, 0x7D, 0x0, 0xFF}}}, + {{{-8, 133, 0},0, {-16, -16},{0xCB, 0x74, 0x0, 0xFF}}}, + {{{-3, 144, -23},0, {-16, -16},{0xFC, 0x7E, 0xB, 0xFF}}}, {{{16, 127, -55},0, {-16, -16},{0x11, 0x79, 0xDC, 0xFF}}}, {{{-19, 133, -63},0, {-16, -16},{0xB3, 0x51, 0xC3, 0xFF}}}, {{{18, 105, -98},0, {-16, -16},{0xCF, 0x43, 0xA0, 0xFF}}}, @@ -1390,33 +1371,33 @@ Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_3[63] = { {{{18, 105, -98},0, {-16, -16},{0xCF, 0x43, 0xA0, 0xFF}}}, {{{-8, 73, -74},0, {-16, -16},{0x8C, 0xEE, 0xD0, 0xFF}}}, {{{26, 57, -121},0, {-16, -16},{0xC9, 0x3, 0x8D, 0xFF}}}, - {{{70, 111, -103},0, {-16, -16},{0xE, 0x56, 0xA3, 0xFF}}}, + {{{70, 111, -103},0, {-16, -16},{0xE, 0x55, 0xA3, 0xFF}}}, {{{101, 64, -108},0, {-16, -16},{0x1A, 0x2C, 0x8C, 0xFF}}}, - {{{89, 108, -97},0, {-16, -16},{0x4B, 0x4C, 0xBB, 0xFF}}}, - {{{66, 129, -55},0, {-16, -16},{0xD, 0x7B, 0xE1, 0xFF}}}, - {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC9, 0xFF}}}, - {{{15, -47, -44},0, {-16, -16},{0x83, 0xF4, 0xEE, 0xFF}}}, + {{{89, 108, -97},0, {-16, -16},{0x4A, 0x4C, 0xBA, 0xFF}}}, + {{{66, 129, -55},0, {-16, -16},{0xD, 0x7A, 0xE0, 0xFF}}}, + {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC8, 0xFF}}}, + {{{15, -47, -44},0, {-16, -16},{0x83, 0xF3, 0xEE, 0xFF}}}, {{{-8, 73, 74},0, {-16, -16},{0x8C, 0xEE, 0x30, 0xFF}}}, {{{-8, 106, 0},0, {-16, -16},{0x97, 0xB8, 0x0, 0xFF}}}, - {{{-30, 111, 5},0, {-16, -16},{0x95, 0xEE, 0xBE, 0xFF}}}, + {{{-30, 111, 5},0, {-16, -16},{0x95, 0xED, 0xBE, 0xFF}}}, {{{-19, 133, 63},0, {-16, -16},{0xB3, 0x51, 0x3D, 0xFF}}}, - {{{-3, 144, 23},0, {-16, -16},{0xFF, 0x7F, 0xF5, 0xFF}}}, - {{{-8, 133, 0},0, {-16, -16},{0xCC, 0x74, 0x0, 0xFF}}}, - {{{-8, 133, 0},0, {-16, -16},{0xCC, 0x74, 0x0, 0xFF}}}, - {{{-30, 111, -5},0, {-16, -16},{0x95, 0xEE, 0x42, 0xFF}}}, + {{{-3, 144, 23},0, {-16, -16},{0xFC, 0x7E, 0xF5, 0xFF}}}, + {{{-8, 133, 0},0, {-16, -16},{0xCB, 0x74, 0x0, 0xFF}}}, + {{{-8, 133, 0},0, {-16, -16},{0xCB, 0x74, 0x0, 0xFF}}}, + {{{-30, 111, -5},0, {-16, -16},{0x95, 0xED, 0x42, 0xFF}}}, {{{-8, 106, 0},0, {-16, -16},{0x97, 0xB8, 0x0, 0xFF}}}, - {{{-3, 144, -23},0, {-16, -16},{0xFF, 0x7F, 0xB, 0xFF}}}, + {{{-3, 144, -23},0, {-16, -16},{0xFC, 0x7E, 0xB, 0xFF}}}, {{{-19, 133, -63},0, {-16, -16},{0xB3, 0x51, 0xC3, 0xFF}}}, {{{-8, 73, -74},0, {-16, -16},{0x8C, 0xEE, 0xD0, 0xFF}}}, {{{43, 11, -121},0, {-16, -16},{0xC6, 0xF0, 0x90, 0xFF}}}, - {{{15, -47, -44},0, {-16, -16},{0x83, 0xF4, 0xEE, 0xFF}}}, + {{{15, -47, -44},0, {-16, -16},{0x83, 0xF3, 0xEE, 0xFF}}}, {{{26, 57, -121},0, {-16, -16},{0xC9, 0x3, 0x8D, 0xFF}}}, - {{{55, -34, -93},0, {-16, -16},{0xB9, 0xCB, 0xA5, 0xFF}}}, - {{{72, -24, -156},0, {-16, -16},{0xD9, 0x0, 0x87, 0xFF}}}, - {{{84, -15, -119},0, {-16, -16},{0x1B, 0x50, 0xA1, 0xFF}}}, - {{{169, -44, -158},0, {-16, -16},{0x6A, 0xE2, 0xC0, 0xFF}}}, - {{{137, -5, -118},0, {-16, -16},{0x7, 0x16, 0x83, 0xFF}}}, - {{{109, -51, -108},0, {-16, -16},{0xEF, 0xA4, 0xAA, 0xFF}}}, + {{{55, -34, -93},0, {-16, -16},{0xB8, 0xCB, 0xA5, 0xFF}}}, + {{{72, -24, -156},0, {-16, -16},{0xD8, 0x0, 0x87, 0xFF}}}, + {{{84, -15, -119},0, {-16, -16},{0x1A, 0x50, 0xA0, 0xFF}}}, + {{{169, -44, -158},0, {-16, -16},{0x6A, 0xE3, 0xC0, 0xFF}}}, + {{{137, -5, -118},0, {-16, -16},{0x8, 0x17, 0x83, 0xFF}}}, + {{{109, -51, -108},0, {-16, -16},{0xF0, 0xA4, 0xA9, 0xFF}}}, }; Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_3[] = { @@ -1486,31 +1467,31 @@ Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_3[] = { }; Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_4[26] = { - {{{89, 90, 137},0, {-16, -16},{0xB, 0x6E, 0x3E, 0xFF}}}, - {{{66, 108, 108},0, {-16, -16},{0x2, 0x60, 0x54, 0xFF}}}, - {{{38, 108, 113},0, {-16, -16},{0xE, 0x64, 0x4D, 0xFF}}}, - {{{51, 122, 97},0, {-16, -16},{0xFF, 0x6A, 0x46, 0xFF}}}, - {{{77, 122, 102},0, {-16, -16},{0xF0, 0x5E, 0x53, 0xFF}}}, - {{{60, 129, 79},0, {-16, -16},{0xFD, 0x76, 0x30, 0xFF}}}, - {{{31, 129, 79},0, {-16, -16},{0x0, 0x76, 0x2F, 0xFF}}}, + {{{89, 90, 137},0, {-16, -16},{0xA, 0x70, 0x3C, 0xFF}}}, + {{{66, 108, 108},0, {-16, -16},{0x2, 0x5F, 0x55, 0xFF}}}, + {{{38, 108, 113},0, {-16, -16},{0xE, 0x63, 0x4E, 0xFF}}}, + {{{51, 122, 97},0, {-16, -16},{0xFF, 0x6A, 0x47, 0xFF}}}, + {{{77, 122, 102},0, {-16, -16},{0xF0, 0x5D, 0x55, 0xFF}}}, + {{{60, 129, 79},0, {-16, -16},{0xFD, 0x76, 0x2F, 0xFF}}}, + {{{31, 129, 79},0, {-16, -16},{0x0, 0x76, 0x2E, 0xFF}}}, {{{45, 134, 66},0, {-16, -16},{0x0, 0x7D, 0x14, 0xFF}}}, - {{{76, 134, 69},0, {-16, -16},{0xFE, 0x7D, 0x14, 0xFF}}}, - {{{60, 133, 45},0, {-16, -16},{0x0, 0x7F, 0xFA, 0xFF}}}, - {{{26, 133, 45},0, {-16, -16},{0x0, 0x7F, 0xFA, 0xFF}}}, + {{{76, 134, 69},0, {-16, -16},{0xFF, 0x7E, 0x13, 0xFF}}}, + {{{60, 133, 45},0, {-16, -16},{0x0, 0x7F, 0xFB, 0xFF}}}, + {{{26, 133, 45},0, {-16, -16},{0x0, 0x7F, 0xFB, 0xFF}}}, {{{55, 131, 0},0, {-16, -16},{0x0, 0x7F, 0x0, 0xFF}}}, - {{{89, 90, -137},0, {-16, -16},{0xB, 0x6E, 0xC2, 0xFF}}}, - {{{38, 108, -113},0, {-16, -16},{0xE, 0x64, 0xB3, 0xFF}}}, - {{{66, 108, -108},0, {-16, -16},{0x2, 0x60, 0xAC, 0xFF}}}, - {{{51, 122, -97},0, {-16, -16},{0xFF, 0x6A, 0xBA, 0xFF}}}, - {{{66, 108, -108},0, {-16, -16},{0x2, 0x60, 0xAC, 0xFF}}}, - {{{51, 122, -97},0, {-16, -16},{0xFF, 0x6A, 0xBA, 0xFF}}}, - {{{77, 122, -102},0, {-16, -16},{0xF0, 0x5E, 0xAD, 0xFF}}}, - {{{60, 129, -79},0, {-16, -16},{0xFD, 0x76, 0xD0, 0xFF}}}, - {{{31, 129, -79},0, {-16, -16},{0x0, 0x76, 0xD1, 0xFF}}}, + {{{89, 90, -137},0, {-16, -16},{0xA, 0x70, 0xC4, 0xFF}}}, + {{{38, 108, -113},0, {-16, -16},{0xE, 0x63, 0xB2, 0xFF}}}, + {{{66, 108, -108},0, {-16, -16},{0x2, 0x5F, 0xAB, 0xFF}}}, + {{{51, 122, -97},0, {-16, -16},{0xFF, 0x6A, 0xB9, 0xFF}}}, + {{{66, 108, -108},0, {-16, -16},{0x2, 0x5F, 0xAB, 0xFF}}}, + {{{51, 122, -97},0, {-16, -16},{0xFF, 0x6A, 0xB9, 0xFF}}}, + {{{77, 122, -102},0, {-16, -16},{0xF0, 0x5D, 0xAB, 0xFF}}}, + {{{60, 129, -79},0, {-16, -16},{0xFD, 0x76, 0xD1, 0xFF}}}, + {{{31, 129, -79},0, {-16, -16},{0x0, 0x76, 0xD2, 0xFF}}}, {{{45, 134, -66},0, {-16, -16},{0x0, 0x7D, 0xEC, 0xFF}}}, - {{{76, 134, -69},0, {-16, -16},{0xFE, 0x7D, 0xEC, 0xFF}}}, - {{{60, 133, -45},0, {-16, -16},{0x0, 0x7F, 0x6, 0xFF}}}, - {{{26, 133, -45},0, {-16, -16},{0x0, 0x7F, 0x6, 0xFF}}}, + {{{76, 134, -69},0, {-16, -16},{0xFF, 0x7E, 0xED, 0xFF}}}, + {{{60, 133, -45},0, {-16, -16},{0x0, 0x7F, 0x5, 0xFF}}}, + {{{26, 133, -45},0, {-16, -16},{0x0, 0x7F, 0x5, 0xFF}}}, {{{55, 131, 0},0, {-16, -16},{0x0, 0x7F, 0x0, 0xFF}}}, }; @@ -1541,45 +1522,45 @@ Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_4[] = { }; Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_5[40] = { - {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC9, 0xFF}}}, - {{{94, 116, -63},0, {-16, -16},{0x55, 0x1D, 0xA6, 0xFF}}}, - {{{106, 161, -34},0, {-16, -16},{0x58, 0x38, 0xB7, 0xFF}}}, - {{{88, 166, -45},0, {-16, -16},{0x31, 0x60, 0xBC, 0xFF}}}, - {{{66, 122, -74},0, {-16, -16},{0xF1, 0x2D, 0x8A, 0xFF}}}, - {{{52, 176, -45},0, {-16, -16},{0xCF, 0x6D, 0xD5, 0xFF}}}, - {{{49, 122, -52},0, {-16, -16},{0x91, 0xC, 0xC4, 0xFF}}}, + {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC8, 0xFF}}}, + {{{94, 116, -63},0, {-16, -16},{0x54, 0x1E, 0xA5, 0xFF}}}, + {{{106, 161, -34},0, {-16, -16},{0x57, 0x38, 0xB7, 0xFF}}}, + {{{88, 166, -45},0, {-16, -16},{0x2F, 0x60, 0xBC, 0xFF}}}, + {{{66, 122, -74},0, {-16, -16},{0xF2, 0x2E, 0x8A, 0xFF}}}, + {{{52, 176, -45},0, {-16, -16},{0xCF, 0x6D, 0xD6, 0xFF}}}, + {{{49, 122, -52},0, {-16, -16},{0x91, 0xD, 0xC3, 0xFF}}}, {{{47, 171, -34},0, {-16, -16},{0xA0, 0x45, 0xD1, 0xFF}}}, - {{{43, 122, -34},0, {-16, -16},{0x83, 0xA, 0xE9, 0xFF}}}, - {{{44, 132, 0},0, {-16, -16},{0x81, 0xF8, 0x0, 0xFF}}}, - {{{32, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, + {{{43, 122, -34},0, {-16, -16},{0x83, 0xA, 0xEA, 0xFF}}}, + {{{44, 132, 0},0, {-16, -16},{0x81, 0xF9, 0x0, 0xFF}}}, + {{{33, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, {{{47, 171, 34},0, {-16, -16},{0xA0, 0x45, 0x2F, 0xFF}}}, - {{{43, 122, 34},0, {-16, -16},{0x83, 0xA, 0x17, 0xFF}}}, - {{{49, 122, 52},0, {-16, -16},{0x91, 0xC, 0x3C, 0xFF}}}, - {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2B, 0xFF}}}, - {{{66, 122, 74},0, {-16, -16},{0xF1, 0x2D, 0x76, 0xFF}}}, - {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2B, 0xFF}}}, - {{{66, 122, 74},0, {-16, -16},{0xF1, 0x2D, 0x76, 0xFF}}}, - {{{88, 166, 45},0, {-16, -16},{0x31, 0x60, 0x44, 0xFF}}}, - {{{94, 116, 63},0, {-16, -16},{0x55, 0x1D, 0x5A, 0xFF}}}, - {{{106, 161, 34},0, {-16, -16},{0x58, 0x38, 0x49, 0xFF}}}, - {{{101, 120, 39},0, {-16, -16},{0x58, 0x49, 0x37, 0xFF}}}, + {{{43, 122, 34},0, {-16, -16},{0x83, 0xA, 0x16, 0xFF}}}, + {{{49, 122, 52},0, {-16, -16},{0x91, 0xD, 0x3D, 0xFF}}}, + {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2A, 0xFF}}}, + {{{66, 122, 74},0, {-16, -16},{0xF2, 0x2E, 0x76, 0xFF}}}, + {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2A, 0xFF}}}, + {{{66, 122, 74},0, {-16, -16},{0xF2, 0x2E, 0x76, 0xFF}}}, + {{{88, 166, 45},0, {-16, -16},{0x2F, 0x60, 0x44, 0xFF}}}, + {{{94, 116, 63},0, {-16, -16},{0x54, 0x1E, 0x5B, 0xFF}}}, + {{{106, 161, 34},0, {-16, -16},{0x57, 0x38, 0x49, 0xFF}}}, + {{{101, 120, 39},0, {-16, -16},{0x58, 0x49, 0x38, 0xFF}}}, {{{125, 157, 0},0, {-16, -16},{0x7E, 0xC, 0x0, 0xFF}}}, {{{108, 127, 0},0, {-16, -16},{0x74, 0x33, 0x0, 0xFF}}}, - {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC9, 0xFF}}}, - {{{106, 161, -34},0, {-16, -16},{0x58, 0x38, 0xB7, 0xFF}}}, - {{{105, 188, 0},0, {-16, -16},{0x46, 0x6A, 0x0, 0xFF}}}, - {{{55, 204, 0},0, {-16, -16},{0xE0, 0x7B, 0x0, 0xFF}}}, + {{{101, 120, -39},0, {-16, -16},{0x58, 0x49, 0xC8, 0xFF}}}, + {{{106, 161, -34},0, {-16, -16},{0x57, 0x38, 0xB7, 0xFF}}}, + {{{105, 188, 0},0, {-16, -16},{0x45, 0x6B, 0x0, 0xFF}}}, + {{{55, 204, 0},0, {-16, -16},{0xDF, 0x7B, 0x0, 0xFF}}}, {{{47, 171, -34},0, {-16, -16},{0xA0, 0x45, 0xD1, 0xFF}}}, - {{{52, 176, -45},0, {-16, -16},{0xCF, 0x6D, 0xD5, 0xFF}}}, - {{{88, 166, -45},0, {-16, -16},{0x31, 0x60, 0xBC, 0xFF}}}, - {{{32, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, - {{{32, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, + {{{52, 176, -45},0, {-16, -16},{0xCF, 0x6D, 0xD6, 0xFF}}}, + {{{88, 166, -45},0, {-16, -16},{0x2F, 0x60, 0xBC, 0xFF}}}, + {{{33, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, + {{{33, 169, 0},0, {-16, -16},{0x82, 0xE, 0x0, 0xFF}}}, {{{47, 171, 34},0, {-16, -16},{0xA0, 0x45, 0x2F, 0xFF}}}, - {{{55, 204, 0},0, {-16, -16},{0xE0, 0x7B, 0x0, 0xFF}}}, - {{{106, 161, 34},0, {-16, -16},{0x58, 0x38, 0x49, 0xFF}}}, - {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2B, 0xFF}}}, - {{{88, 166, 45},0, {-16, -16},{0x31, 0x60, 0x44, 0xFF}}}, - {{{105, 188, 0},0, {-16, -16},{0x46, 0x6A, 0x0, 0xFF}}}, + {{{55, 204, 0},0, {-16, -16},{0xDF, 0x7B, 0x0, 0xFF}}}, + {{{106, 161, 34},0, {-16, -16},{0x57, 0x38, 0x49, 0xFF}}}, + {{{52, 176, 45},0, {-16, -16},{0xCF, 0x6D, 0x2A, 0xFF}}}, + {{{88, 166, 45},0, {-16, -16},{0x2F, 0x60, 0x44, 0xFF}}}, + {{{105, 188, 0},0, {-16, -16},{0x45, 0x6B, 0x0, 0xFF}}}, {{{125, 157, 0},0, {-16, -16},{0x7E, 0xC, 0x0, 0xFF}}}, }; @@ -1625,16 +1606,16 @@ Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_5[] = { }; Vtx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_vtx_6[10] = { - {{{16, 127, 55},0, {1392, 912},{0x11, 0x79, 0x24, 0xFF}}}, - {{{18, 105, 98},0, {1776, 912},{0xCF, 0x43, 0x60, 0xFF}}}, - {{{70, 111, 103},0, {1808, 304},{0xE, 0x56, 0x5D, 0xFF}}}, - {{{66, 129, 55},0, {1392, 336},{0xD, 0x7B, 0x1F, 0xFF}}}, - {{{44, 132, 0},0, {1008, 560},{0xF1, 0x7E, 0x0, 0xFF}}}, - {{{15, 127, 0},0, {1008, 912},{0x16, 0x7D, 0x0, 0xFF}}}, - {{{16, 127, -55},0, {624, 912},{0x11, 0x79, 0xDC, 0xFF}}}, - {{{66, 129, -55},0, {624, 336},{0xD, 0x7B, 0xE1, 0xFF}}}, - {{{70, 111, -103},0, {208, 304},{0xE, 0x56, 0xA3, 0xFF}}}, - {{{18, 105, -98},0, {240, 912},{0xCF, 0x43, 0xA0, 0xFF}}}, + {{{16, 127, 55},0, {1376, 912},{0x11, 0x79, 0x24, 0xFF}}}, + {{{18, 105, 98},0, {1760, 912},{0xCF, 0x43, 0x60, 0xFF}}}, + {{{70, 111, 103},0, {1792, 304},{0xE, 0x55, 0x5D, 0xFF}}}, + {{{66, 129, 55},0, {1376, 336},{0xD, 0x7A, 0x20, 0xFF}}}, + {{{44, 132, 0},0, {992, 560},{0xF2, 0x7E, 0x0, 0xFF}}}, + {{{15, 127, 0},0, {992, 912},{0x15, 0x7D, 0x0, 0xFF}}}, + {{{16, 127, -55},0, {608, 912},{0x11, 0x79, 0xDC, 0xFF}}}, + {{{66, 129, -55},0, {608, 336},{0xD, 0x7A, 0xE0, 0xFF}}}, + {{{70, 111, -103},0, {192, 304},{0xE, 0x55, 0xA3, 0xFF}}}, + {{{18, 105, -98},0, {224, 912},{0xCF, 0x43, 0xA0, 0xFF}}}, }; Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6[] = { @@ -1650,94 +1631,38 @@ Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6[] = { gsSPEndDisplayList(), }; -Vtx wario_000_displaylist_right_wing_mesh_layer_4_vtx_0[4] = { - {{{0, -1, 0},0, {-16, 1996},{0x17, 0xFF, 0x7D, 0xFF}}}, - {{{107, -1, -20},0, {974, 1996},{0x17, 0x0, 0x7D, 0xFF}}}, - {{{107, 219, -20},0, {974, -16},{0x17, 0x0, 0x7D, 0xFF}}}, - {{{1, 218, 0},0, {-16, -16},{0x17, 0xFF, 0x7D, 0xFF}}}, -}; - -Gfx wario_000_displaylist_right_wing_mesh_layer_4_tri_0[] = { - gsSPVertex(wario_000_displaylist_right_wing_mesh_layer_4_vtx_0 + 0, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSPEndDisplayList(), -}; - -Vtx wario_000_displaylist_right_wing_mesh_layer_4_vtx_1[4] = { - {{{-106, 218, 19},0, {-16, -16},{0x17, 0xFF, 0x7D, 0xFF}}}, - {{{0, -1, 0},0, {974, 1996},{0x17, 0xFF, 0x7D, 0xFF}}}, - {{{1, 218, 0},0, {974, -16},{0x17, 0xFF, 0x7D, 0xFF}}}, - {{{-106, -1, 19},0, {-16, 1996},{0x17, 0xFF, 0x7D, 0xFF}}}, -}; - -Gfx wario_000_displaylist_right_wing_mesh_layer_4_tri_1[] = { - gsSPVertex(wario_000_displaylist_right_wing_mesh_layer_4_vtx_1 + 0, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSPEndDisplayList(), -}; - -Vtx wario_000_displaylist_left_wing_mesh_layer_4_vtx_0[4] = { - {{{0, -1, 0},0, {-16, 1996},{0xE9, 0x1, 0x7D, 0xFF}}}, - {{{107, -1, 20},0, {974, 1996},{0xE9, 0x0, 0x7D, 0xFF}}}, - {{{107, 219, 20},0, {974, -16},{0xE9, 0x0, 0x7D, 0xFF}}}, - {{{1, 218, 0},0, {-16, -16},{0xE9, 0x1, 0x7D, 0xFF}}}, -}; - -Gfx wario_000_displaylist_left_wing_mesh_layer_4_tri_0[] = { - gsSPVertex(wario_000_displaylist_left_wing_mesh_layer_4_vtx_0 + 0, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSPEndDisplayList(), -}; - -Vtx wario_000_displaylist_left_wing_mesh_layer_4_vtx_1[4] = { - {{{-106, 218, -19},0, {-16, -16},{0xE9, 0x1, 0x7D, 0xFF}}}, - {{{-106, -1, -19},0, {-16, 1996},{0xE9, 0x1, 0x7D, 0xFF}}}, - {{{0, -1, 0},0, {974, 1996},{0xE9, 0x1, 0x7D, 0xFF}}}, - {{{1, 218, 0},0, {974, -16},{0xE9, 0x1, 0x7D, 0xFF}}}, -}; - -Gfx wario_000_displaylist_left_wing_mesh_layer_4_tri_1[] = { - gsSPVertex(wario_000_displaylist_left_wing_mesh_layer_4_vtx_1 + 0, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSPEndDisplayList(), -}; - Vtx wario_000_offset_left_upper_arm_mesh_layer_1_vtx_0[31] = { - {{{9, -17, -64},0, {-16, -16},{0xDB, 0xE1, 0x8A, 0xFF}}}, + {{{9, -17, -64},0, {-16, -16},{0xDA, 0xE0, 0x8B, 0xFF}}}, {{{-12, -11, -41},0, {-16, -16},{0x8F, 0xF1, 0xC7, 0xFF}}}, - {{{-12, 30, -25},0, {-16, -16},{0x92, 0x36, 0xDF, 0xFF}}}, - {{{8, -61, -7},0, {-16, -16},{0xD9, 0x87, 0xFE, 0xFF}}}, - {{{89, -52, -7},0, {-16, -16},{0x33, 0x8C, 0xFE, 0xFF}}}, + {{{-12, 30, -25},0, {-16, -16},{0x91, 0x36, 0xE0, 0xFF}}}, + {{{8, -61, -7},0, {-16, -16},{0xD8, 0x87, 0xFE, 0xFF}}}, + {{{89, -52, -7},0, {-16, -16},{0x34, 0x8C, 0xFD, 0xFF}}}, {{{90, -17, -52},0, {-16, -16},{0x34, 0xDF, 0x91, 0xFF}}}, - {{{11, 48, -40},0, {-16, -16},{0xE1, 0x67, 0xBC, 0xFF}}}, - {{{-12, 29, 16},0, {-16, -16},{0x92, 0x34, 0x24, 0xFF}}}, - {{{-12, -14, 28},0, {-16, -16},{0x91, 0xEC, 0x3A, 0xFF}}}, - {{{-14, -36, -7},0, {-16, -16},{0x8E, 0xC8, 0xFE, 0xFF}}}, - {{{9, -21, 50},0, {-16, -16},{0xDB, 0xD9, 0x73, 0xFF}}}, - {{{90, -20, 40},0, {-16, -16},{0x36, 0xD8, 0x6C, 0xFF}}}, - {{{103, -15, 25},0, {-16, -16},{0x70, 0xE9, 0x38, 0xFF}}}, - {{{103, -36, -7},0, {-16, -16},{0x6E, 0xC1, 0x0, 0xFF}}}, - {{{105, -12, -38},0, {-16, -16},{0x6F, 0xF0, 0xC4, 0xFF}}}, - {{{105, 23, -24},0, {-16, -16},{0x70, 0x31, 0xDC, 0xFF}}}, - {{{92, 36, -31},0, {-16, -16},{0x38, 0x5F, 0xC1, 0xFF}}}, - {{{105, 23, -24},0, {-16, -16},{0x70, 0x31, 0xDC, 0xFF}}}, + {{{11, 48, -40},0, {-16, -16},{0xE0, 0x66, 0xBB, 0xFF}}}, + {{{-12, 29, 16},0, {-16, -16},{0x92, 0x33, 0x25, 0xFF}}}, + {{{-12, -14, 28},0, {-16, -16},{0x90, 0xEC, 0x39, 0xFF}}}, + {{{-14, -36, -7},0, {-16, -16},{0x8D, 0xCA, 0xFE, 0xFF}}}, + {{{9, -21, 50},0, {-16, -16},{0xD9, 0xD9, 0x73, 0xFF}}}, + {{{90, -20, 40},0, {-16, -16},{0x37, 0xD8, 0x6B, 0xFF}}}, + {{{103, -15, 25},0, {-16, -16},{0x71, 0xE9, 0x36, 0xFF}}}, + {{{103, -36, -7},0, {-16, -16},{0x70, 0xC4, 0x0, 0xFF}}}, + {{{105, -12, -38},0, {-16, -16},{0x6F, 0xF1, 0xC3, 0xFF}}}, + {{{105, 23, -24},0, {-16, -16},{0x71, 0x2F, 0xDD, 0xFF}}}, + {{{92, 36, -31},0, {-16, -16},{0x39, 0x5F, 0xC2, 0xFF}}}, + {{{105, 23, -24},0, {-16, -16},{0x71, 0x2F, 0xDD, 0xFF}}}, {{{90, -17, -52},0, {-16, -16},{0x34, 0xDF, 0x91, 0xFF}}}, - {{{11, 48, -40},0, {-16, -16},{0xE1, 0x67, 0xBC, 0xFF}}}, - {{{10, 45, 31},0, {-16, -16},{0xDF, 0x60, 0x4C, 0xFF}}}, - {{{-12, 29, 16},0, {-16, -16},{0x92, 0x34, 0x24, 0xFF}}}, - {{{-12, -14, 28},0, {-16, -16},{0x91, 0xEC, 0x3A, 0xFF}}}, - {{{9, -21, 50},0, {-16, -16},{0xDB, 0xD9, 0x73, 0xFF}}}, - {{{-14, -36, -7},0, {-16, -16},{0x8E, 0xC8, 0xFE, 0xFF}}}, - {{{91, 35, 24},0, {-16, -16},{0x36, 0x5B, 0x47, 0xFF}}}, - {{{90, -20, 40},0, {-16, -16},{0x36, 0xD8, 0x6C, 0xFF}}}, - {{{103, -15, 25},0, {-16, -16},{0x70, 0xE9, 0x38, 0xFF}}}, - {{{105, 22, 15},0, {-16, -16},{0x70, 0x2D, 0x28, 0xFF}}}, - {{{105, -12, -38},0, {-16, -16},{0x6F, 0xF0, 0xC4, 0xFF}}}, - {{{103, -36, -7},0, {-16, -16},{0x6E, 0xC1, 0x0, 0xFF}}}, + {{{11, 48, -40},0, {-16, -16},{0xE0, 0x66, 0xBB, 0xFF}}}, + {{{10, 45, 31},0, {-16, -16},{0xDE, 0x60, 0x4C, 0xFF}}}, + {{{-12, 29, 16},0, {-16, -16},{0x92, 0x33, 0x25, 0xFF}}}, + {{{-12, -14, 28},0, {-16, -16},{0x90, 0xEC, 0x39, 0xFF}}}, + {{{9, -21, 50},0, {-16, -16},{0xD9, 0xD9, 0x73, 0xFF}}}, + {{{-14, -36, -7},0, {-16, -16},{0x8D, 0xCA, 0xFE, 0xFF}}}, + {{{91, 35, 24},0, {-16, -16},{0x37, 0x5B, 0x46, 0xFF}}}, + {{{90, -20, 40},0, {-16, -16},{0x37, 0xD8, 0x6B, 0xFF}}}, + {{{103, -15, 25},0, {-16, -16},{0x71, 0xE9, 0x36, 0xFF}}}, + {{{105, 22, 15},0, {-16, -16},{0x71, 0x2B, 0x28, 0xFF}}}, + {{{105, -12, -38},0, {-16, -16},{0x6F, 0xF1, 0xC3, 0xFF}}}, + {{{103, -36, -7},0, {-16, -16},{0x70, 0xC4, 0x0, 0xFF}}}, }; Gfx wario_000_offset_left_upper_arm_mesh_layer_1_tri_0[] = { @@ -1783,22 +1708,22 @@ Gfx wario_000_offset_left_upper_arm_mesh_layer_1_tri_0[] = { }; Vtx wario_000_offset_left_lower_arm_mesh_layer_1_vtx_0[16] = { - {{{-3, 36, -31},0, {-16, -16},{0xDF, 0x67, 0xBE, 0xFF}}}, - {{{-21, 23, -22},0, {-16, -16},{0x96, 0x3D, 0xDE, 0xFF}}}, + {{{-3, 36, -31},0, {-16, -16},{0xDE, 0x67, 0xBE, 0xFF}}}, + {{{-21, 23, -22},0, {-16, -16},{0x95, 0x3C, 0xDE, 0xFF}}}, {{{-21, 20, 16},0, {-16, -16},{0x95, 0x37, 0x29, 0xFF}}}, - {{{-4, -18, -52},0, {-16, -16},{0xDD, 0xE1, 0x8A, 0xFF}}}, - {{{71, -18, -46},0, {-16, -16},{0x40, 0xE1, 0x97, 0xFF}}}, + {{{-4, -18, -52},0, {-16, -16},{0xDE, 0xE2, 0x89, 0xFF}}}, + {{{71, -18, -46},0, {-16, -16},{0x3F, 0xE1, 0x96, 0xFF}}}, {{{73, 29, -28},0, {-16, -16},{0x44, 0x5A, 0xC5, 0xFF}}}, - {{{-3, 33, 25},0, {-16, -16},{0xE1, 0x61, 0x4C, 0xFF}}}, - {{{-24, -17, 27},0, {-16, -16},{0x94, 0xEB, 0x40, 0xFF}}}, - {{{-23, -38, -6},0, {-16, -16},{0x93, 0xBE, 0xFC, 0xFF}}}, - {{{-23, -14, -37},0, {-16, -16},{0x94, 0xF0, 0xBF, 0xFF}}}, - {{{-4, -55, -6},0, {-16, -16},{0xDD, 0x86, 0xFC, 0xFF}}}, + {{{-3, 33, 25},0, {-16, -16},{0xDF, 0x61, 0x4B, 0xFF}}}, + {{{-24, -17, 27},0, {-16, -16},{0x94, 0xEB, 0x3F, 0xFF}}}, + {{{-23, -38, -6},0, {-16, -16},{0x93, 0xBF, 0xFD, 0xFF}}}, + {{{-23, -14, -37},0, {-16, -16},{0x94, 0xF2, 0xBE, 0xFF}}}, + {{{-4, -55, -6},0, {-16, -16},{0xDC, 0x86, 0xFC, 0xFF}}}, {{{70, -49, -6},0, {-16, -16},{0x3E, 0x91, 0xFB, 0xFF}}}, - {{{90, -8, -4},0, {-16, -16},{0x7F, 0xFC, 0x2, 0xFF}}}, - {{{72, 25, 21},0, {-16, -16},{0x42, 0x54, 0x45, 0xFF}}}, - {{{-5, -23, 41},0, {-16, -16},{0xDE, 0xD6, 0x73, 0xFF}}}, - {{{71, -23, 35},0, {-16, -16},{0x40, 0xD8, 0x66, 0xFF}}}, + {{{90, -8, -4},0, {-16, -16},{0x7F, 0xFC, 0x1, 0xFF}}}, + {{{72, 25, 21},0, {-16, -16},{0x42, 0x53, 0x46, 0xFF}}}, + {{{-5, -23, 41},0, {-16, -16},{0xDE, 0xD7, 0x73, 0xFF}}}, + {{{71, -23, 35},0, {-16, -16},{0x3F, 0xD8, 0x67, 0xFF}}}, }; Gfx wario_000_offset_left_lower_arm_mesh_layer_1_tri_0[] = { @@ -1834,188 +1759,164 @@ Gfx wario_000_offset_left_lower_arm_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx wario_000_displaylist_left_hand_fist_mesh_layer_1_vtx_0[52] = { - {{{4, 24, -31},0, {-16, -16},{0xFC, 0x44, 0x95, 0xFF}}}, - {{{-1, 40, 6},0, {-16, -16},{0xDB, 0x71, 0x2D, 0xFF}}}, - {{{12, 61, 11},0, {-16, -16},{0xAF, 0x55, 0x30, 0xFF}}}, - {{{-11, 26, -39},0, {-16, -16},{0xCC, 0x39, 0x9B, 0xFF}}}, - {{{26, -26, -32},0, {-16, -16},{0x17, 0xC9, 0x90, 0xFF}}}, - {{{34, 7, -45},0, {-16, -16},{0xC4, 0xFD, 0x90, 0xFF}}}, - {{{33, 65, -28},0, {-16, -16},{0xD0, 0x5C, 0xB6, 0xFF}}}, - {{{61, 83, 9},0, {-16, -16},{0x14, 0x79, 0x21, 0xFF}}}, - {{{58, 56, -38},0, {-16, -16},{0x17, 0x55, 0xA4, 0xFF}}}, - {{{102, 41, -16},0, {-16, -16},{0x6C, 0x40, 0xEB, 0xFF}}}, - {{{88, 30, 43},0, {-16, -16},{0x40, 0x19, 0x6B, 0xFF}}}, - {{{110, -27, 5},0, {-16, -16},{0x65, 0xBF, 0x29, 0xFF}}}, - {{{103, -6, -47},0, {-16, -16},{0x6A, 0xFE, 0xB9, 0xFF}}}, - {{{82, -32, -62},0, {-16, -16},{0x1C, 0xB6, 0x9C, 0xFF}}}, - {{{60, -47, 8},0, {-16, -16},{0x6, 0x8A, 0x2E, 0xFF}}}, - {{{35, -43, 4},0, {-16, -16},{0x3D, 0x97, 0x26, 0xFF}}}, - {{{17, -39, -40},0, {-16, -16},{0x1, 0xB5, 0x99, 0xFF}}}, - {{{26, -26, -32},0, {-16, -16},{0x17, 0xC9, 0x90, 0xFF}}}, - {{{35, -43, 4},0, {-16, -16},{0x3D, 0x97, 0x26, 0xFF}}}, +Vtx wario_000_displaylist_left_hand_fist_mesh_layer_1_vtx_0[45] = { + {{{-11, 26, -39},0, {-16, -16},{0xCC, 0x38, 0x9A, 0xFF}}}, + {{{-15, -15, -4},0, {-16, -16},{0x8C, 0xCD, 0x3, 0xFF}}}, + {{{-19, 46, 9},0, {-16, -16},{0x82, 0xF5, 0xF, 0xFF}}}, + {{{17, -39, -40},0, {-16, -16},{0x1, 0xB6, 0x99, 0xFF}}}, + {{{27, -26, -32},0, {-16, -16},{0x17, 0xC7, 0x91, 0xFF}}}, + {{{4, 24, -31},0, {-16, -16},{0xFC, 0x45, 0x95, 0xFF}}}, + {{{-1, 40, 6},0, {-16, -16},{0xD8, 0x70, 0x2D, 0xFF}}}, + {{{-19, 46, 9},0, {-16, -16},{0x2B, 0x75, 0x1B, 0xFF}}}, + {{{5, -7, 38},0, {-16, -16},{0x46, 0x1C, 0x66, 0xFF}}}, + {{{17, -1, 28},0, {-16, -16},{0x0, 0x0, 0x7F, 0xFF}}}, + {{{35, -43, 4},0, {-16, -16},{0x3E, 0x97, 0x25, 0xFF}}}, {{{28, -60, 7},0, {-16, -16},{0x75, 0xD4, 0x17, 0xFF}}}, - {{{5, -7, 38},0, {-16, -16},{0x43, 0x1C, 0x68, 0xFF}}}, - {{{17, -1, 28},0, {-16, -16},{0xFE, 0xFD, 0x7F, 0xFF}}}, - {{{-1, 40, 6},0, {-16, -16},{0xDB, 0x71, 0x2D, 0xFF}}}, - {{{-19, 46, 9},0, {-16, -16},{0x2D, 0x74, 0x1B, 0xFF}}}, - {{{-11, 26, -39},0, {-16, -16},{0xCC, 0x39, 0x9B, 0xFF}}}, - {{{-15, -15, -4},0, {-16, -16},{0x8B, 0xCE, 0x3, 0xFF}}}, - {{{28, -60, 7},0, {-16, -16},{0xA2, 0xAC, 0xE, 0xFF}}}, - {{{5, -7, 38},0, {-16, -16},{0x99, 0xD2, 0x3A, 0xFF}}}, - {{{-19, 46, 9},0, {-16, -16},{0x82, 0xF5, 0xE, 0xFF}}}, - {{{34, 7, -45},0, {-16, -16},{0xC4, 0xFD, 0x90, 0xFF}}}, + {{{60, -47, 8},0, {-16, -16},{0x7, 0x8A, 0x2E, 0xFF}}}, {{{82, -32, -62},0, {-16, -16},{0x1C, 0xB6, 0x9C, 0xFF}}}, - {{{63, 12, -61},0, {-16, -16},{0xF5, 0x17, 0x84, 0xFF}}}, + {{{34, 7, -45},0, {-16, -16},{0xC4, 0xFD, 0x90, 0xFF}}}, + {{{33, 65, -28},0, {-16, -16},{0xD1, 0x5C, 0xB6, 0xFF}}}, + {{{12, 61, 11},0, {-16, -16},{0xAF, 0x55, 0x2F, 0xFF}}}, + {{{33, 65, -28},0, {-16, -16},{0xD1, 0x5C, 0xB6, 0xFF}}}, + {{{4, 24, -31},0, {-16, -16},{0xFC, 0x45, 0x95, 0xFF}}}, + {{{-1, 40, 6},0, {-16, -16},{0xD8, 0x70, 0x2D, 0xFF}}}, + {{{37, 6, 44},0, {-16, -16},{0xE3, 0xEF, 0x7B, 0xFF}}}, + {{{17, -1, 28},0, {-16, -16},{0x0, 0x0, 0x7F, 0xFF}}}, + {{{35, -43, 4},0, {-16, -16},{0x3E, 0x97, 0x25, 0xFF}}}, + {{{60, -47, 8},0, {-16, -16},{0x7, 0x8A, 0x2E, 0xFF}}}, + {{{110, -27, 5},0, {-16, -16},{0x66, 0xC0, 0x29, 0xFF}}}, + {{{82, -32, -62},0, {-16, -16},{0x1C, 0xB6, 0x9C, 0xFF}}}, + {{{103, -6, -47},0, {-16, -16},{0x69, 0xFD, 0xB9, 0xFF}}}, {{{63, 12, -61},0, {-16, -16},{0xF5, 0x17, 0x84, 0xFF}}}, {{{34, 7, -45},0, {-16, -16},{0xC4, 0xFD, 0x90, 0xFF}}}, - {{{33, 65, -28},0, {-16, -16},{0xD0, 0x5C, 0xB6, 0xFF}}}, - {{{58, 56, -38},0, {-16, -16},{0x17, 0x55, 0xA4, 0xFF}}}, - {{{92, 17, -47},0, {-16, -16},{0x48, 0x31, 0xA3, 0xFF}}}, + {{{58, 56, -38},0, {-16, -16},{0x15, 0x54, 0xA3, 0xFF}}}, + {{{61, 83, 9},0, {-16, -16},{0x15, 0x79, 0x21, 0xFF}}}, + {{{88, 30, 43},0, {-16, -16},{0x3F, 0x1A, 0x6B, 0xFF}}}, + {{{110, -27, 5},0, {-16, -16},{0x66, 0xC0, 0x29, 0xFF}}}, {{{102, 41, -16},0, {-16, -16},{0x6C, 0x40, 0xEB, 0xFF}}}, - {{{103, -6, -47},0, {-16, -16},{0x6A, 0xFE, 0xB9, 0xFF}}}, - {{{82, -32, -62},0, {-16, -16},{0x1C, 0xB6, 0x9C, 0xFF}}}, - {{{37, 6, 44},0, {504, 518},{0xE3, 0xEF, 0x7B, 0xFF}}}, - {{{61, 83, 9},0, {-211, 74},{0x14, 0x79, 0x21, 0xFF}}}, - {{{12, 61, 11},0, {-131, 627},{0xAF, 0x55, 0x30, 0xFF}}}, - {{{88, 30, 43},0, {496, -16},{0x40, 0x19, 0x6B, 0xFF}}}, - {{{110, -27, 5},0, {1226, 67},{0x65, 0xBF, 0x29, 0xFF}}}, - {{{60, -47, 8},0, {1129, 624},{0x6, 0x8A, 0x2E, 0xFF}}}, - {{{35, -43, 4},0, {988, 848},{0x3D, 0x97, 0x26, 0xFF}}}, - {{{17, -1, 28},0, {496, 752},{0xFE, 0xFD, 0x7F, 0xFF}}}, - {{{-1, 40, 6},0, {8, 850},{0xDB, 0x71, 0x2D, 0xFF}}}, - {{{17, -1, 28},0, {496, 752},{0xFE, 0xFD, 0x7F, 0xFF}}}, - {{{37, 6, 44},0, {504, 518},{0xE3, 0xEF, 0x7B, 0xFF}}}, - {{{12, 61, 11},0, {-131, 627},{0xAF, 0x55, 0x30, 0xFF}}}, + {{{88, 30, 43},0, {-16, -16},{0x3F, 0x1A, 0x6B, 0xFF}}}, + {{{103, -6, -47},0, {-16, -16},{0x69, 0xFD, 0xB9, 0xFF}}}, + {{{93, 17, -47},0, {-16, -16},{0x47, 0x31, 0xA2, 0xFF}}}, + {{{63, 12, -61},0, {-16, -16},{0xF5, 0x17, 0x84, 0xFF}}}, + {{{58, 56, -38},0, {-16, -16},{0x15, 0x54, 0xA3, 0xFF}}}, + {{{61, 83, 9},0, {-16, -16},{0x15, 0x79, 0x21, 0xFF}}}, + {{{28, -60, 7},0, {-16, -16},{0xA3, 0xAB, 0xE, 0xFF}}}, + {{{-15, -15, -4},0, {-16, -16},{0x8C, 0xCD, 0x3, 0xFF}}}, + {{{17, -39, -40},0, {-16, -16},{0x1, 0xB6, 0x99, 0xFF}}}, + {{{5, -7, 38},0, {-16, -16},{0x99, 0xD1, 0x3A, 0xFF}}}, + {{{-19, 46, 9},0, {-16, -16},{0x82, 0xF5, 0xF, 0xFF}}}, }; Gfx wario_000_displaylist_left_hand_fist_mesh_layer_1_tri_0[] = { gsSPVertex(wario_000_displaylist_left_hand_fist_mesh_layer_1_vtx_0 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 0, 3, 0), - gsSP1Triangle(3, 0, 4, 0), - gsSP1Triangle(4, 0, 5, 0), + gsSP1Triangle(3, 1, 0, 0), + gsSP1Triangle(4, 3, 0, 0), + gsSP1Triangle(0, 5, 4, 0), gsSP1Triangle(6, 5, 0, 0), - gsSP1Triangle(2, 6, 0, 0), - gsSP1Triangle(6, 2, 7, 0), - gsSP1Triangle(7, 8, 6, 0), - gsSP1Triangle(7, 9, 8, 0), - gsSP1Triangle(10, 9, 7, 0), - gsSP1Triangle(11, 9, 10, 0), - gsSP1Triangle(12, 9, 11, 0), - gsSP1Triangle(13, 12, 11, 0), - gsSP1Triangle(13, 11, 14, 0), - gsSP1Triangle(4, 13, 14, 0), - gsSP1Triangle(14, 15, 4, 0), + gsSP1Triangle(0, 7, 6, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(8, 9, 6, 0), + gsSP1Triangle(10, 9, 8, 0), + gsSP1Triangle(8, 11, 10, 0), + gsSP1Triangle(10, 11, 3, 0), + gsSP1Triangle(3, 4, 10, 0), + gsSP1Triangle(12, 10, 4, 0), + gsSP1Triangle(4, 13, 12, 0), + gsSP1Triangle(4, 14, 13, 0), + gsSP1Triangle(4, 5, 14, 0), + gsSP1Triangle(15, 14, 5, 0), gsSPVertex(wario_000_displaylist_left_hand_fist_mesh_layer_1_vtx_0 + 16, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(2, 3, 0, 0), - gsSP1Triangle(4, 3, 2, 0), - gsSP1Triangle(2, 5, 4, 0), + gsSP1Triangle(3, 4, 0, 0), + gsSP1Triangle(3, 5, 4, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(6, 7, 4, 0), - gsSP1Triangle(8, 7, 6, 0), - gsSP1Triangle(1, 0, 8, 0), - gsSP1Triangle(0, 9, 8, 0), - gsSP1Triangle(10, 9, 0, 0), - gsSP1Triangle(11, 9, 10, 0), - gsSP1Triangle(12, 9, 11, 0), - gsSP1Triangle(8, 9, 12, 0), - gsSP1Triangle(1, 13, 14, 0), - gsSP1Triangle(13, 15, 14, 0), - gsSPVertex(wario_000_displaylist_left_hand_fist_mesh_layer_1_vtx_0 + 32, 16, 0), + gsSP1Triangle(7, 8, 4, 0), + gsSP1Triangle(9, 8, 7, 0), + gsSP1Triangle(9, 10, 8, 0), + gsSP1Triangle(11, 10, 9, 0), + gsSP1Triangle(12, 11, 9, 0), + gsSP1Triangle(11, 12, 1, 0), + gsSP1Triangle(11, 1, 13, 0), + gsSP1Triangle(14, 13, 1, 0), + gsSP1Triangle(1, 0, 14, 0), + gsSP1Triangle(4, 14, 0, 0), + gsSP1Triangle(4, 15, 14, 0), + gsSP1Triangle(8, 15, 4, 0), + gsSPVertex(wario_000_displaylist_left_hand_fist_mesh_layer_1_vtx_0 + 32, 13, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(3, 4, 0, 0), - gsSP1Triangle(4, 3, 5, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(0, 4, 6, 0), - gsSP1Triangle(0, 6, 7, 0), + gsSP1Triangle(3, 1, 0, 0), + gsSP1Triangle(4, 1, 3, 0), + gsSP1Triangle(5, 4, 3, 0), + gsSP1Triangle(6, 4, 5, 0), + gsSP1Triangle(4, 6, 1, 0), + gsSP1Triangle(7, 1, 6, 0), + gsSP1Triangle(2, 1, 7, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 11, 8, 0), - gsSP1Triangle(13, 12, 8, 0), - gsSP1Triangle(14, 13, 8, 0), - gsSP1Triangle(8, 15, 14, 0), - gsSPVertex(wario_000_displaylist_left_hand_fist_mesh_layer_1_vtx_0 + 48, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(11, 9, 8, 0), + gsSP1Triangle(12, 9, 11, 0), gsSPEndDisplayList(), }; -Vtx wario_001_switch_000_offset_left_hand_open_mesh_layer_1_vtx_0[72] = { +Vtx wario_001_switch_000_offset_left_hand_open_mesh_layer_1_vtx_0[56] = { {{{124, 75, -21},0, {-16, -16},{0x4D, 0x5F, 0x22, 0xFF}}}, {{{72, 91, -20},0, {-16, -16},{0xF0, 0x7E, 0xF9, 0xFF}}}, {{{79, 42, 22},0, {-16, -16},{0x14, 0x28, 0x77, 0xFF}}}, {{{122, 72, -43},0, {-16, -16},{0x32, 0x41, 0x9F, 0xFF}}}, {{{145, 35, -7},0, {-16, -16},{0x74, 0xF8, 0x34, 0xFF}}}, {{{85, -18, 11},0, {-16, -16},{0x43, 0xC1, 0x58, 0xFF}}}, + {{{26, 16, 29},0, {-16, -16},{0xDE, 0xD, 0x7A, 0xFF}}}, + {{{6, 54, -9},0, {-16, -16},{0xAC, 0x5D, 0x17, 0xFF}}}, + {{{26, 42, -42},0, {-16, -16},{0xF5, 0x41, 0x93, 0xFF}}}, + {{{80, 61, -35},0, {-16, -16},{0xF6, 0x16, 0x83, 0xFF}}}, {{{137, 29, -41},0, {-16, -16},{0x50, 0xD8, 0xA6, 0xFF}}}, {{{91, -6, -27},0, {-16, -16},{0x65, 0xE3, 0xB8, 0xFF}}}, {{{91, -49, -38},0, {-16, -16},{0x4B, 0xA4, 0xD4, 0xFF}}}, {{{46, -35, 11},0, {-16, -16},{0xFF, 0x9F, 0x52, 0xFF}}}, + {{{26, -33, 7},0, {-16, -16},{0x37, 0xA8, 0x49, 0xFF}}}, + {{{11, 5, 18},0, {-16, -16},{0x5, 0x1B, 0x7C, 0xFF}}}, + {{{-3, 36, -9},0, {-16, -16},{0xCE, 0x72, 0x18, 0xFF}}}, + {{{11, 5, 18},0, {-16, -16},{0x5, 0x1B, 0x7C, 0xFF}}}, + {{{26, 16, 29},0, {-16, -16},{0xDE, 0xD, 0x7A, 0xFF}}}, + {{{6, 54, -9},0, {-16, -16},{0xAC, 0x5D, 0x17, 0xFF}}}, + {{{11, 30, -53},0, {-16, -16},{0xDB, 0x1E, 0x8A, 0xFF}}}, + {{{26, 42, -42},0, {-16, -16},{0xF5, 0x41, 0x93, 0xFF}}}, + {{{25, -1, -45},0, {-16, -16},{0xE0, 0xE3, 0x89, 0xFF}}}, + {{{78, -19, -49},0, {-16, -16},{0x2D, 0x3, 0x89, 0xFF}}}, + {{{71, 10, -37},0, {-16, -16},{0x33, 0x1D, 0x8F, 0xFF}}}, + {{{80, 61, -35},0, {-16, -16},{0xF6, 0x16, 0x83, 0xFF}}}, + {{{91, -6, -27},0, {-16, -16},{0x65, 0xE3, 0xB8, 0xFF}}}, + {{{137, 29, -41},0, {-16, -16},{0x50, 0xD8, 0xA6, 0xFF}}}, + {{{91, -49, -38},0, {-16, -16},{0x4B, 0xA4, 0xD4, 0xFF}}}, {{{42, -38, -37},0, {-16, -16},{0xD8, 0x9D, 0xBB, 0xFF}}}, + {{{46, -35, 11},0, {-16, -16},{0xFF, 0x9F, 0x52, 0xFF}}}, + {{{26, -33, 7},0, {-16, -16},{0x37, 0xA8, 0x49, 0xFF}}}, {{{26, -33, 7},0, {-16, -16},{0x37, 0xA8, 0x49, 0xFF}}}, {{{20, -28, -27},0, {-16, -16},{0x10, 0xB2, 0x9D, 0xFF}}}, + {{{42, -38, -37},0, {-16, -16},{0xD8, 0x9D, 0xBB, 0xFF}}}, {{{13, -41, -31},0, {-16, -16},{0x13, 0xA4, 0xAB, 0xFF}}}, {{{20, -48, 13},0, {-16, -16},{0x27, 0x99, 0x40, 0xFF}}}, {{{2, 3, 27},0, {-16, -16},{0xF9, 0x19, 0x7C, 0xFF}}}, - {{{26, -33, 7},0, {-16, -16},{0x37, 0xA8, 0x49, 0xFF}}}, {{{11, 5, 18},0, {-16, -16},{0x5, 0x1B, 0x7C, 0xFF}}}, - {{{2, 3, 27},0, {-16, -16},{0xF9, 0x19, 0x7C, 0xFF}}}, {{{-3, 36, -9},0, {-16, -16},{0xCE, 0x72, 0x18, 0xFF}}}, {{{-18, 41, -8},0, {-16, -16},{0xC4, 0x6F, 0xC, 0xFF}}}, {{{-11, 14, -44},0, {-16, -16},{0xD7, 0x23, 0x8D, 0xFF}}}, {{{1, 15, -38},0, {-16, -16},{0xE1, 0x1C, 0x88, 0xFF}}}, {{{11, 30, -53},0, {-16, -16},{0xDB, 0x1E, 0x8A, 0xFF}}}, - {{{6, 54, -9},0, {-16, -16},{0xAC, 0x5D, 0x17, 0xFF}}}, - {{{26, 42, -42},0, {-16, -16},{0xF5, 0x41, 0x93, 0xFF}}}, - {{{72, 91, -20},0, {-16, -16},{0xF0, 0x7E, 0xF9, 0xFF}}}, - {{{80, 61, -35},0, {-16, -16},{0xF6, 0x16, 0x83, 0xFF}}}, - {{{122, 72, -43},0, {-16, -16},{0x32, 0x41, 0x9F, 0xFF}}}, - {{{137, 29, -41},0, {-16, -16},{0x50, 0xD8, 0xA6, 0xFF}}}, - {{{145, 35, -7},0, {-16, -16},{0x74, 0xF8, 0x34, 0xFF}}}, - {{{91, -6, -27},0, {-16, -16},{0x65, 0xE3, 0xB8, 0xFF}}}, - {{{71, 10, -37},0, {-16, -16},{0x33, 0x1D, 0x8F, 0xFF}}}, - {{{80, 61, -35},0, {-16, -16},{0xF6, 0x16, 0x83, 0xFF}}}, - {{{91, -6, -27},0, {-16, -16},{0x65, 0xE3, 0xB8, 0xFF}}}, - {{{78, -19, -49},0, {-16, -16},{0x2D, 0x3, 0x89, 0xFF}}}, - {{{91, -49, -38},0, {-16, -16},{0x4B, 0xA4, 0xD4, 0xFF}}}, - {{{42, -38, -37},0, {-16, -16},{0xD8, 0x9D, 0xBB, 0xFF}}}, {{{25, -1, -45},0, {-16, -16},{0xE0, 0xE3, 0x89, 0xFF}}}, - {{{20, -28, -27},0, {-16, -16},{0x10, 0xB2, 0x9D, 0xFF}}}, - {{{1, 15, -38},0, {-16, -16},{0xE1, 0x1C, 0x88, 0xFF}}}, - {{{-11, 14, -44},0, {-16, -16},{0xD7, 0x23, 0x8D, 0xFF}}}, - {{{13, -41, -31},0, {-16, -16},{0x13, 0xA4, 0xAB, 0xFF}}}, + {{{78, -19, -49},0, {-16, -16},{0x2D, 0x3, 0x89, 0xFF}}}, {{{1, -34, -23},0, {-16, -16},{0x9F, 0xB3, 0xE2, 0xFF}}}, {{{6, -39, 8},0, {-16, -16},{0xA7, 0xB0, 0x2A, 0xFF}}}, - {{{20, -48, 13},0, {-16, -16},{0x27, 0x99, 0x40, 0xFF}}}, {{{2, 3, 27},0, {-16, -16},{0xF9, 0x19, 0x7C, 0xFF}}}, {{{-6, -3, 18},0, {-16, -16},{0x97, 0xE2, 0x42, 0xFF}}}, + {{{6, -39, 8},0, {-16, -16},{0xA7, 0xB0, 0x2A, 0xFF}}}, {{{-21, 22, -7},0, {-16, -16},{0x83, 0x0, 0x16, 0xFF}}}, - {{{-6, -3, 18},0, {-16, -16},{0x97, 0xE2, 0x42, 0xFF}}}, - {{{2, 3, 27},0, {-16, -16},{0xF9, 0x19, 0x7C, 0xFF}}}, {{{-18, 41, -8},0, {-16, -16},{0xC4, 0x6F, 0xC, 0xFF}}}, {{{-11, 14, -44},0, {-16, -16},{0xD7, 0x23, 0x8D, 0xFF}}}, {{{-16, 4, -32},0, {-16, -16},{0x8D, 0xDE, 0xD6, 0xFF}}}, {{{1, -34, -23},0, {-16, -16},{0x9F, 0xB3, 0xE2, 0xFF}}}, - {{{6, -39, 8},0, {-16, -16},{0xA7, 0xB0, 0x2A, 0xFF}}}, - {{{26, 42, -42},0, {-16, -16},{0xF5, 0x41, 0x93, 0xFF}}}, - {{{80, 61, -35},0, {-16, -16},{0xF6, 0x16, 0x83, 0xFF}}}, - {{{71, 10, -37},0, {-16, -16},{0x33, 0x1D, 0x8F, 0xFF}}}, - {{{78, -19, -49},0, {-16, -16},{0x2D, 0x3, 0x89, 0xFF}}}, - {{{25, -1, -45},0, {-16, -16},{0xE0, 0xE3, 0x89, 0xFF}}}, - {{{11, 30, -53},0, {-16, -16},{0xDB, 0x1E, 0x8A, 0xFF}}}, - {{{1, 15, -38},0, {-16, -16},{0xE1, 0x1C, 0x88, 0xFF}}}, - {{{85, -18, 11},0, {1045, 175},{0x43, 0xC1, 0x58, 0xFF}}}, - {{{79, 42, 22},0, {432, -16},{0x14, 0x28, 0x77, 0xFF}}}, - {{{26, 16, 29},0, {475, 548},{0xDE, 0xD, 0x7A, 0xFF}}}, - {{{72, 91, -20},0, {-251, -131},{0xF0, 0x7E, 0xF9, 0xFF}}}, - {{{6, 54, -9},0, {-68, 658},{0xAC, 0x5D, 0x17, 0xFF}}}, - {{{-3, 36, -9},0, {68, 832},{0xCE, 0x72, 0x18, 0xFF}}}, - {{{11, 5, 18},0, {496, 752},{0x5, 0x1B, 0x7C, 0xFF}}}, - {{{26, -33, 7},0, {919, 817},{0x37, 0xA8, 0x49, 0xFF}}}, - {{{46, -35, 11},0, {1026, 632},{0xFF, 0x9F, 0x52, 0xFF}}}, }; Gfx wario_001_switch_000_offset_left_hand_open_mesh_layer_1_tri_0[] = { @@ -2025,101 +1926,100 @@ Gfx wario_001_switch_000_offset_left_hand_open_mesh_layer_1_tri_0[] = { gsSP1Triangle(0, 4, 3, 0), gsSP1Triangle(4, 0, 2, 0), gsSP1Triangle(5, 4, 2, 0), - gsSP1Triangle(6, 4, 5, 0), - gsSP1Triangle(7, 6, 5, 0), - gsSP1Triangle(8, 7, 5, 0), - gsSP1Triangle(8, 5, 9, 0), - gsSP1Triangle(9, 10, 8, 0), - gsSP1Triangle(11, 10, 9, 0), - gsSP1Triangle(11, 12, 10, 0), - gsSP1Triangle(13, 12, 11, 0), - gsSP1Triangle(11, 14, 13, 0), - gsSP1Triangle(15, 14, 11, 0), + gsSP1Triangle(5, 2, 6, 0), + gsSP1Triangle(6, 2, 1, 0), + gsSP1Triangle(6, 1, 7, 0), + gsSP1Triangle(8, 7, 1, 0), + gsSP1Triangle(1, 9, 8, 0), + gsSP1Triangle(3, 9, 1, 0), + gsSP1Triangle(9, 3, 10, 0), + gsSP1Triangle(3, 4, 10, 0), + gsSP1Triangle(10, 4, 5, 0), + gsSP1Triangle(11, 10, 5, 0), + gsSP1Triangle(12, 11, 5, 0), + gsSP1Triangle(12, 5, 13, 0), + gsSP1Triangle(13, 5, 6, 0), + gsSP1Triangle(14, 13, 6, 0), + gsSP1Triangle(6, 15, 14, 0), gsSPVertex(wario_001_switch_000_offset_left_hand_open_mesh_layer_1_vtx_0 + 16, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 1, 3, 0), - gsSP1Triangle(3, 4, 2, 0), - gsSP1Triangle(5, 4, 3, 0), - gsSP1Triangle(3, 6, 5, 0), - gsSP1Triangle(7, 6, 3, 0), - gsSP1Triangle(3, 8, 7, 0), - gsSP1Triangle(8, 9, 7, 0), - gsSP1Triangle(9, 8, 10, 0), - gsSP1Triangle(10, 11, 9, 0), - gsSP1Triangle(12, 11, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSP1Triangle(12, 14, 13, 0), - gsSP1Triangle(11, 13, 15, 0), + gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(0, 3, 4, 0), + gsSP1Triangle(3, 5, 4, 0), + gsSP1Triangle(6, 4, 5, 0), + gsSP1Triangle(7, 6, 5, 0), + gsSP1Triangle(7, 5, 8, 0), + gsSP1Triangle(5, 9, 8, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(9, 11, 10, 0), + gsSP1Triangle(7, 8, 10, 0), + gsSP1Triangle(7, 10, 12, 0), + gsSP1Triangle(12, 13, 7, 0), + gsSP1Triangle(14, 13, 12, 0), + gsSP1Triangle(15, 13, 14, 0), gsSPVertex(wario_001_switch_000_offset_left_hand_open_mesh_layer_1_vtx_0 + 32, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 0, 2, 0), - gsSP1Triangle(3, 2, 4, 0), - gsSP1Triangle(4, 5, 3, 0), - gsSP1Triangle(5, 6, 3, 0), - gsSP1Triangle(7, 6, 5, 0), - gsSP1Triangle(7, 8, 6, 0), + gsSP1Triangle(3, 1, 0, 0), + gsSP1Triangle(0, 4, 3, 0), + gsSP1Triangle(5, 4, 0, 0), + gsSP1Triangle(0, 6, 5, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(7, 8, 5, 0), gsSP1Triangle(9, 8, 7, 0), gsSP1Triangle(7, 10, 9, 0), - gsSP1Triangle(10, 11, 9, 0), - gsSP1Triangle(12, 11, 10, 0), - gsSP1Triangle(13, 12, 10, 0), - gsSP1Triangle(14, 12, 13, 0), - gsSP1Triangle(14, 15, 12, 0), - gsSPVertex(wario_001_switch_000_offset_left_hand_open_mesh_layer_1_vtx_0 + 48, 15, 0), + gsSP1Triangle(11, 10, 7, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(1, 10, 12, 0), + gsSP1Triangle(1, 12, 2, 0), + gsSP1Triangle(2, 12, 13, 0), + gsSP1Triangle(9, 10, 1, 0), + gsSP1Triangle(1, 3, 9, 0), + gsSP1Triangle(3, 14, 9, 0), + gsSP1Triangle(15, 14, 3, 0), + gsSP1Triangle(4, 15, 3, 0), + gsSP1Triangle(5, 15, 4, 0), + gsSPVertex(wario_001_switch_000_offset_left_hand_open_mesh_layer_1_vtx_0 + 48, 8, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 0, 2, 0), - gsSP1Triangle(4, 0, 3, 0), - gsSP1Triangle(4, 5, 0, 0), - gsSP1Triangle(6, 5, 4, 0), - gsSP1Triangle(1, 5, 6, 0), - gsSP1Triangle(6, 7, 1, 0), - gsSP1Triangle(1, 0, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(11, 8, 10, 0), - gsSP1Triangle(11, 12, 8, 0), - gsSP1Triangle(12, 13, 8, 0), - gsSP1Triangle(14, 13, 12, 0), - gsSPVertex(wario_001_switch_000_offset_left_hand_open_mesh_layer_1_vtx_0 + 63, 9, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 1, 3, 0), - gsSP1Triangle(2, 3, 4, 0), - gsSP1Triangle(5, 2, 4, 0), - gsSP1Triangle(5, 6, 2, 0), - gsSP1Triangle(2, 6, 7, 0), - gsSP1Triangle(7, 8, 2, 0), - gsSP1Triangle(8, 0, 2, 0), + gsSP1Triangle(3, 1, 0, 0), + gsSP1Triangle(4, 3, 0, 0), + gsSP1Triangle(5, 3, 4, 0), + gsSP1Triangle(5, 6, 3, 0), + gsSP1Triangle(7, 6, 5, 0), + gsSP1Triangle(1, 6, 7, 0), + gsSP1Triangle(7, 2, 1, 0), + gsSP1Triangle(1, 3, 6, 0), gsSPEndDisplayList(), }; Vtx wario_000_offset_right_upper_arm_mesh_layer_1_vtx_0[28] = { {{{90, 34, 43},0, {-16, -16},{0x37, 0x59, 0x48, 0xFF}}}, - {{{103, 23, 34},0, {-16, -16},{0x6F, 0x32, 0x25, 0xFF}}}, - {{{103, 24, -6},0, {-16, -16},{0x70, 0x32, 0xDE, 0xFF}}}, - {{{103, -14, 44},0, {-16, -16},{0x6F, 0xE9, 0x3A, 0xFF}}}, - {{{87, -19, 58},0, {-16, -16},{0x33, 0xD7, 0x6D, 0xFF}}}, - {{{10, 46, 50},0, {-16, -16},{0xDF, 0x60, 0x4C, 0xFF}}}, - {{{10, 49, -19},0, {-16, -16},{0xE0, 0x68, 0xBF, 0xFF}}}, - {{{90, 37, -13},0, {-16, -16},{0x37, 0x61, 0xC2, 0xFF}}}, - {{{103, -11, -19},0, {-16, -16},{0x6F, 0xEF, 0xC4, 0xFF}}}, + {{{103, 23, 34},0, {-16, -16},{0x70, 0x30, 0x25, 0xFF}}}, + {{{103, 24, -6},0, {-16, -16},{0x71, 0x2F, 0xDE, 0xFF}}}, + {{{103, -14, 44},0, {-16, -16},{0x6E, 0xE7, 0x3B, 0xFF}}}, + {{{87, -19, 58},0, {-16, -16},{0x31, 0xD7, 0x6E, 0xFF}}}, + {{{10, 46, 50},0, {-16, -16},{0xE0, 0x61, 0x4C, 0xFF}}}, + {{{10, 49, -19},0, {-16, -16},{0xE0, 0x68, 0xBE, 0xFF}}}, + {{{90, 37, -13},0, {-16, -16},{0x38, 0x60, 0xC3, 0xFF}}}, + {{{103, -11, -19},0, {-16, -16},{0x6F, 0xEE, 0xC4, 0xFF}}}, {{{102, -35, 10},0, {-16, -16},{0x6F, 0xC2, 0xFA, 0xFF}}}, - {{{87, -51, 10},0, {-16, -16},{0x33, 0x8C, 0xF9, 0xFF}}}, - {{{87, -14, -34},0, {-16, -16},{0x32, 0xE4, 0x8F, 0xFF}}}, + {{{87, -51, 10},0, {-16, -16},{0x32, 0x8B, 0xFA, 0xFF}}}, + {{{87, -14, -34},0, {-16, -16},{0x32, 0xE3, 0x8F, 0xFF}}}, {{{7, -60, 9},0, {-16, -16},{0xD9, 0x87, 0xF9, 0xFF}}}, - {{{9, -22, 69},0, {-16, -16},{0xDD, 0xD5, 0x72, 0xFF}}}, - {{{-13, 30, 35},0, {-16, -16},{0x93, 0x36, 0x25, 0xFF}}}, - {{{-13, 31, -7},0, {-16, -16},{0x93, 0x38, 0xDF, 0xFF}}}, - {{{-15, -8, -22},0, {-16, -16},{0x90, 0xF7, 0xC4, 0xFF}}}, - {{{-13, 31, -7},0, {-16, -16},{0x93, 0x38, 0xDF, 0xFF}}}, - {{{10, 49, -19},0, {-16, -16},{0xE0, 0x68, 0xBF, 0xFF}}}, + {{{9, -22, 69},0, {-16, -16},{0xDD, 0xD6, 0x73, 0xFF}}}, + {{{-13, 30, 35},0, {-16, -16},{0x94, 0x37, 0x26, 0xFF}}}, + {{{-13, 31, -7},0, {-16, -16},{0x94, 0x39, 0xDE, 0xFF}}}, + {{{-15, -8, -22},0, {-16, -16},{0x90, 0xF6, 0xC4, 0xFF}}}, + {{{-13, 31, -7},0, {-16, -16},{0x94, 0x39, 0xDE, 0xFF}}}, + {{{10, 49, -19},0, {-16, -16},{0xE0, 0x68, 0xBE, 0xFF}}}, {{{9, -16, -46},0, {-16, -16},{0xDD, 0xE2, 0x8A, 0xFF}}}, - {{{90, 37, -13},0, {-16, -16},{0x37, 0x61, 0xC2, 0xFF}}}, - {{{87, -14, -34},0, {-16, -16},{0x32, 0xE4, 0x8F, 0xFF}}}, - {{{103, -11, -19},0, {-16, -16},{0x6F, 0xEF, 0xC4, 0xFF}}}, + {{{90, 37, -13},0, {-16, -16},{0x38, 0x60, 0xC3, 0xFF}}}, + {{{87, -14, -34},0, {-16, -16},{0x32, 0xE3, 0x8F, 0xFF}}}, + {{{103, -11, -19},0, {-16, -16},{0x6F, 0xEE, 0xC4, 0xFF}}}, {{{7, -60, 9},0, {-16, -16},{0xD9, 0x87, 0xF9, 0xFF}}}, - {{{-15, -35, 10},0, {-16, -16},{0x8F, 0xC6, 0xFB, 0xFF}}}, - {{{-15, -13, 47},0, {-16, -16},{0x91, 0xEF, 0x3C, 0xFF}}}, - {{{9, -22, 69},0, {-16, -16},{0xDD, 0xD5, 0x72, 0xFF}}}, - {{{-13, 30, 35},0, {-16, -16},{0x93, 0x36, 0x25, 0xFF}}}, + {{{-15, -35, 10},0, {-16, -16},{0x8F, 0xC6, 0xFA, 0xFF}}}, + {{{-15, -13, 47},0, {-16, -16},{0x92, 0xED, 0x3C, 0xFF}}}, + {{{9, -22, 69},0, {-16, -16},{0xDD, 0xD6, 0x73, 0xFF}}}, + {{{-13, 30, 35},0, {-16, -16},{0x94, 0x37, 0x26, 0xFF}}}, }; Gfx wario_000_offset_right_upper_arm_mesh_layer_1_tri_0[] = { @@ -2165,22 +2065,22 @@ Gfx wario_000_offset_right_upper_arm_mesh_layer_1_tri_0[] = { }; Vtx wario_000_offset_right_lower_arm_mesh_layer_1_vtx_0[16] = { - {{{-3, -20, 59},0, {-16, -16},{0xDD, 0xD7, 0x73, 0xFF}}}, - {{{-22, -14, 44},0, {-16, -16},{0x93, 0xEC, 0x3E, 0xFF}}}, - {{{-5, -53, 10},0, {-16, -16},{0xD7, 0x88, 0xFA, 0xFF}}}, - {{{-21, 23, 34},0, {-16, -16},{0x94, 0x35, 0x2A, 0xFF}}}, + {{{-3, -20, 59},0, {-16, -16},{0xDE, 0xD6, 0x73, 0xFF}}}, + {{{-22, -14, 44},0, {-16, -16},{0x94, 0xEB, 0x3F, 0xFF}}}, + {{{-5, -53, 10},0, {-16, -16},{0xD8, 0x88, 0xFA, 0xFF}}}, + {{{-21, 23, 34},0, {-16, -16},{0x95, 0x35, 0x2B, 0xFF}}}, {{{-2, 36, 44},0, {-16, -16},{0xE0, 0x60, 0x4D, 0xFF}}}, - {{{72, -19, 53},0, {-16, -16},{0x40, 0xD9, 0x67, 0xFF}}}, + {{{72, -19, 53},0, {-16, -16},{0x40, 0xD8, 0x66, 0xFF}}}, {{{71, -48, 10},0, {-16, -16},{0x3E, 0x91, 0xFA, 0xFF}}}, - {{{72, -16, -28},0, {-16, -16},{0x3F, 0xE3, 0x96, 0xFF}}}, - {{{-3, -16, -35},0, {-16, -16},{0xDD, 0xE3, 0x89, 0xFF}}}, + {{{72, -16, -28},0, {-16, -16},{0x40, 0xE2, 0x96, 0xFF}}}, + {{{-3, -16, -35},0, {-16, -16},{0xDD, 0xE2, 0x8A, 0xFF}}}, {{{-22, -35, 10},0, {-16, -16},{0x91, 0xC3, 0xF9, 0xFF}}}, - {{{-22, -11, -19},0, {-16, -16},{0x94, 0xF3, 0xBF, 0xFF}}}, - {{{-21, 26, -6},0, {-16, -16},{0x97, 0x3C, 0xD8, 0xFF}}}, - {{{-2, 39, -13},0, {-16, -16},{0xE2, 0x69, 0xBE, 0xFF}}}, + {{{-22, -11, -19},0, {-16, -16},{0x94, 0xF2, 0xBF, 0xFF}}}, + {{{-21, 26, -6},0, {-16, -16},{0x97, 0x3B, 0xD7, 0xFF}}}, + {{{-2, 39, -13},0, {-16, -16},{0xE1, 0x69, 0xBF, 0xFF}}}, {{{74, 28, 40},0, {-16, -16},{0x44, 0x53, 0x45, 0xFF}}}, - {{{91, -4, 12},0, {-16, -16},{0x7F, 0xFD, 0xFF, 0xFF}}}, - {{{74, 31, -10},0, {-16, -16},{0x44, 0x5A, 0xC5, 0xFF}}}, + {{{91, -4, 12},0, {-16, -16},{0x7F, 0xFE, 0xFF, 0xFF}}}, + {{{74, 31, -10},0, {-16, -16},{0x43, 0x5A, 0xC5, 0xFF}}}, }; Gfx wario_000_offset_right_lower_arm_mesh_layer_1_tri_0[] = { @@ -2216,192 +2116,164 @@ Gfx wario_000_offset_right_lower_arm_mesh_layer_1_tri_0[] = { gsSPEndDisplayList(), }; -Vtx wario_000_displaylist_right_hand_fist_mesh_layer_1_vtx_0[52] = { - {{{57, -46, -4},0, {-16, -16},{0x6, 0x8C, 0xCC, 0xFF}}}, - {{{108, -27, 2},0, {-16, -16},{0x65, 0xBF, 0xD7, 0xFF}}}, - {{{78, -34, 69},0, {-16, -16},{0x18, 0xB2, 0x62, 0xFF}}}, - {{{99, -9, 54},0, {-16, -16},{0x68, 0xFA, 0x49, 0xFF}}}, - {{{100, 40, 25},0, {-16, -16},{0x6C, 0x3D, 0x1C, 0xFF}}}, - {{{89, 31, -34},0, {-16, -16},{0x45, 0x1C, 0x99, 0xFF}}}, - {{{60, 83, 1},0, {-16, -16},{0x17, 0x7A, 0xE4, 0xFF}}}, - {{{56, 55, 46},0, {-16, -16},{0x14, 0x51, 0x5F, 0xFF}}}, - {{{30, 64, 36},0, {-16, -16},{0xCE, 0x59, 0x4B, 0xFF}}}, - {{{11, 62, -4},0, {-16, -16},{0xB1, 0x58, 0xD2, 0xFF}}}, - {{{1, 24, 37},0, {-16, -16},{0xF5, 0x3F, 0x6E, 0xFF}}}, - {{{-2, 42, -1},0, {-16, -16},{0xDA, 0x71, 0xD4, 0xFF}}}, - {{{-14, 26, 43},0, {-16, -16},{0xC5, 0x34, 0x64, 0xFF}}}, - {{{-19, 48, -4},0, {-16, -16},{0x2D, 0x75, 0xEC, 0xFF}}}, - {{{4, -3, -34},0, {-16, -16},{0x4C, 0x21, 0x9F, 0xFF}}}, - {{{16, 0, -23},0, {-16, -16},{0xC, 0x0, 0x82, 0xFF}}}, - {{{4, -3, -34},0, {-16, -16},{0x4C, 0x21, 0x9F, 0xFF}}}, - {{{16, 0, -23},0, {-16, -16},{0xC, 0x0, 0x82, 0xFF}}}, - {{{32, -42, -1},0, {-16, -16},{0x3D, 0x99, 0xD4, 0xFF}}}, +Vtx wario_000_displaylist_right_hand_fist_mesh_layer_1_vtx_0[41] = { + {{{32, -42, -1},0, {-16, -16},{0x3E, 0x9A, 0xD4, 0xFF}}}, {{{25, -59, -4},0, {-16, -16},{0x75, 0xD3, 0xED, 0xFF}}}, - {{{14, -40, 43},0, {-16, -16},{0xFC, 0xB1, 0x64, 0xFF}}}, - {{{24, -27, 37},0, {-16, -16},{0xF, 0xBF, 0x6C, 0xFF}}}, - {{{57, -46, -4},0, {-16, -16},{0x6, 0x8C, 0xCC, 0xFF}}}, - {{{78, -34, 69},0, {-16, -16},{0x18, 0xB2, 0x62, 0xFF}}}, - {{{30, 6, 51},0, {-16, -16},{0xBF, 0xFA, 0x6D, 0xFF}}}, - {{{59, 10, 69},0, {-16, -16},{0xF3, 0x14, 0x7D, 0xFF}}}, - {{{99, -9, 54},0, {-16, -16},{0x68, 0xFA, 0x49, 0xFF}}}, - {{{89, 15, 54},0, {-16, -16},{0x45, 0x2D, 0x61, 0xFF}}}, - {{{100, 40, 25},0, {-16, -16},{0x6C, 0x3D, 0x1C, 0xFF}}}, - {{{56, 55, 46},0, {-16, -16},{0x14, 0x51, 0x5F, 0xFF}}}, - {{{30, 64, 36},0, {-16, -16},{0xCE, 0x59, 0x4B, 0xFF}}}, - {{{1, 24, 37},0, {-16, -16},{0xF5, 0x3F, 0x6E, 0xFF}}}, - {{{24, -27, 37},0, {-16, -16},{0xF, 0xBF, 0x6C, 0xFF}}}, - {{{1, 24, 37},0, {-16, -16},{0xF5, 0x3F, 0x6E, 0xFF}}}, + {{{5, -3, -34},0, {-16, -16},{0x4F, 0x22, 0xA3, 0xFF}}}, + {{{14, -40, 43},0, {-16, -16},{0xFD, 0xB0, 0x63, 0xFF}}}, + {{{24, -27, 37},0, {-16, -16},{0xF, 0xC0, 0x6D, 0xFF}}}, + {{{57, -46, -4},0, {-16, -16},{0x7, 0x8C, 0xCC, 0xFF}}}, + {{{36, 9, -38},0, {-16, -16},{0xE7, 0xF6, 0x84, 0xFF}}}, + {{{16, 0, -23},0, {-16, -16},{0xC, 0x1, 0x82, 0xFF}}}, + {{{-2, 42, -1},0, {-16, -16},{0xDB, 0x71, 0xD4, 0xFF}}}, + {{{-19, 48, -4},0, {-16, -16},{0x2D, 0x75, 0xED, 0xFF}}}, {{{-14, 26, 43},0, {-16, -16},{0xC5, 0x34, 0x64, 0xFF}}}, - {{{14, -40, 43},0, {-16, -16},{0xFC, 0xB1, 0x64, 0xFF}}}, + {{{1, 24, 37},0, {-16, -16},{0xF6, 0x3E, 0x6E, 0xFF}}}, {{{-16, -13, 7},0, {-16, -16},{0x8B, 0xD0, 0xF7, 0xFF}}}, - {{{-19, 48, -4},0, {-16, -16},{0x83, 0xF7, 0xEC, 0xFF}}}, - {{{4, -3, -34},0, {-16, -16},{0x99, 0xD6, 0xC2, 0xFF}}}, - {{{25, -59, -4},0, {-16, -16},{0xA0, 0xAF, 0xED, 0xFF}}}, - {{{36, 9, -38},0, {501, 512},{0xE8, 0xF6, 0x84, 0xFF}}}, - {{{57, -46, -4},0, {-117, 614},{0x6, 0x8C, 0xCC, 0xFF}}}, - {{{32, -42, -1},0, {20, 835},{0x3D, 0x99, 0xD4, 0xFF}}}, - {{{108, -27, 2},0, {-207, 67},{0x65, 0xBF, 0xD7, 0xFF}}}, - {{{89, 31, -34},0, {496, -16},{0x45, 0x1C, 0x99, 0xFF}}}, - {{{60, 83, 1},0, {1186, 73},{0x17, 0x7A, 0xE4, 0xFF}}}, - {{{11, 62, -4},0, {1117, 624},{0xB1, 0x58, 0xD2, 0xFF}}}, - {{{-2, 42, -1},0, {985, 823},{0xDA, 0x71, 0xD4, 0xFF}}}, - {{{36, 9, -38},0, {501, 512},{0xE8, 0xF6, 0x84, 0xFF}}}, - {{{16, 0, -23},0, {496, 752},{0xC, 0x0, 0x82, 0xFF}}}, - {{{-2, 42, -1},0, {985, 823},{0xDA, 0x71, 0xD4, 0xFF}}}, - {{{32, -42, -1},0, {20, 835},{0x3D, 0x99, 0xD4, 0xFF}}}, + {{{-19, 48, -4},0, {-16, -16},{0x83, 0xF6, 0xEB, 0xFF}}}, + {{{5, -3, -34},0, {-16, -16},{0x99, 0xD7, 0xC1, 0xFF}}}, + {{{25, -59, -4},0, {-16, -16},{0xA0, 0xAF, 0xEC, 0xFF}}}, + {{{30, 6, 51},0, {-16, -16},{0xC0, 0xF9, 0x6E, 0xFF}}}, + {{{1, 24, 37},0, {-16, -16},{0xF6, 0x3E, 0x6E, 0xFF}}}, + {{{24, -27, 37},0, {-16, -16},{0xF, 0xC0, 0x6D, 0xFF}}}, + {{{30, 64, 36},0, {-16, -16},{0xCF, 0x5A, 0x4B, 0xFF}}}, + {{{59, 10, 69},0, {-16, -16},{0xF4, 0x14, 0x7D, 0xFF}}}, + {{{78, -34, 69},0, {-16, -16},{0x19, 0xB3, 0x62, 0xFF}}}, + {{{57, -46, -4},0, {-16, -16},{0x7, 0x8C, 0xCC, 0xFF}}}, + {{{108, -27, 2},0, {-16, -16},{0x66, 0xBF, 0xD8, 0xFF}}}, + {{{36, 9, -38},0, {-16, -16},{0xE7, 0xF6, 0x84, 0xFF}}}, + {{{89, 31, -34},0, {-16, -16},{0x44, 0x1D, 0x99, 0xFF}}}, + {{{60, 83, 1},0, {-16, -16},{0x18, 0x7A, 0xE5, 0xFF}}}, + {{{11, 62, -4},0, {-16, -16},{0xB2, 0x59, 0xD1, 0xFF}}}, + {{{-2, 42, -1},0, {-16, -16},{0xDB, 0x71, 0xD4, 0xFF}}}, + {{{16, 0, -23},0, {-16, -16},{0xC, 0x1, 0x82, 0xFF}}}, + {{{56, 55, 46},0, {-16, -16},{0x16, 0x52, 0x5F, 0xFF}}}, + {{{89, 15, 54},0, {-16, -16},{0x46, 0x2D, 0x60, 0xFF}}}, + {{{99, -9, 54},0, {-16, -16},{0x68, 0xFA, 0x49, 0xFF}}}, + {{{89, 15, 54},0, {-16, -16},{0x46, 0x2D, 0x60, 0xFF}}}, + {{{59, 10, 69},0, {-16, -16},{0xF4, 0x14, 0x7D, 0xFF}}}, + {{{78, -34, 69},0, {-16, -16},{0x19, 0xB3, 0x62, 0xFF}}}, + {{{108, -27, 2},0, {-16, -16},{0x66, 0xBF, 0xD8, 0xFF}}}, + {{{100, 40, 25},0, {-16, -16},{0x6B, 0x3E, 0x1C, 0xFF}}}, + {{{89, 31, -34},0, {-16, -16},{0x44, 0x1D, 0x99, 0xFF}}}, + {{{60, 83, 1},0, {-16, -16},{0x18, 0x7A, 0xE5, 0xFF}}}, + {{{56, 55, 46},0, {-16, -16},{0x16, 0x52, 0x5F, 0xFF}}}, }; Gfx wario_000_displaylist_right_hand_fist_mesh_layer_1_tri_0[] = { gsSPVertex(wario_000_displaylist_right_hand_fist_mesh_layer_1_vtx_0 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 3, 2, 0), - gsSP1Triangle(1, 4, 3, 0), - gsSP1Triangle(5, 4, 1, 0), - gsSP1Triangle(6, 4, 5, 0), - gsSP1Triangle(7, 4, 6, 0), - gsSP1Triangle(8, 7, 6, 0), - gsSP1Triangle(6, 9, 8, 0), + gsSP1Triangle(3, 1, 0, 0), + gsSP1Triangle(0, 4, 3, 0), + gsSP1Triangle(4, 0, 5, 0), + gsSP1Triangle(6, 5, 0, 0), + gsSP1Triangle(0, 7, 6, 0), + gsSP1Triangle(2, 7, 0, 0), + gsSP1Triangle(8, 7, 2, 0), + gsSP1Triangle(2, 9, 8, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(9, 11, 10, 0), - gsSP1Triangle(12, 10, 11, 0), - gsSP1Triangle(11, 13, 12, 0), - gsSP1Triangle(14, 13, 11, 0), - gsSP1Triangle(11, 15, 14, 0), + gsSP1Triangle(10, 11, 8, 0), + gsSP1Triangle(4, 11, 10, 0), + gsSP1Triangle(10, 3, 4, 0), + gsSP1Triangle(10, 12, 3, 0), + gsSP1Triangle(13, 12, 10, 0), + gsSP1Triangle(14, 12, 13, 0), + gsSP1Triangle(15, 12, 14, 0), + gsSP1Triangle(3, 12, 15, 0), gsSPVertex(wario_000_displaylist_right_hand_fist_mesh_layer_1_vtx_0 + 16, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 3, 0, 0), - gsSP1Triangle(4, 3, 2, 0), - gsSP1Triangle(2, 5, 4, 0), - gsSP1Triangle(5, 2, 6, 0), + gsSP1Triangle(1, 0, 3, 0), + gsSP1Triangle(3, 0, 4, 0), + gsSP1Triangle(5, 4, 0, 0), + gsSP1Triangle(5, 0, 2, 0), + gsSP1Triangle(6, 5, 2, 0), gsSP1Triangle(6, 7, 5, 0), - gsSP1Triangle(7, 8, 5, 0), - gsSP1Triangle(7, 9, 8, 0), - gsSP1Triangle(7, 10, 9, 0), - gsSP1Triangle(10, 11, 9, 0), - gsSP1Triangle(10, 12, 11, 0), - gsSP1Triangle(12, 13, 11, 0), - gsSP1Triangle(11, 13, 9, 0), - gsSP1Triangle(13, 14, 9, 0), - gsSP1Triangle(14, 8, 9, 0), - gsSP1Triangle(15, 8, 14, 0), - gsSP1Triangle(8, 15, 5, 0), - gsSPVertex(wario_000_displaylist_right_hand_fist_mesh_layer_1_vtx_0 + 32, 16, 0), + gsSP1Triangle(8, 7, 6, 0), + gsSP1Triangle(8, 9, 7, 0), + gsSP1Triangle(10, 9, 8, 0), + gsSP1Triangle(11, 10, 8, 0), + gsSP1Triangle(11, 8, 12, 0), + gsSP1Triangle(8, 13, 12, 0), + gsSP1Triangle(11, 12, 1, 0), + gsSP1Triangle(3, 11, 1, 0), + gsSP1Triangle(10, 11, 3, 0), + gsSP1Triangle(3, 14, 10, 0), + gsSP1Triangle(14, 3, 4, 0), + gsSP1Triangle(15, 14, 4, 0), + gsSPVertex(wario_000_displaylist_right_hand_fist_mesh_layer_1_vtx_0 + 32, 9, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 3, 0, 0), - gsSP1Triangle(2, 4, 3, 0), - gsSP1Triangle(5, 4, 2, 0), - gsSP1Triangle(6, 4, 5, 0), - gsSP1Triangle(7, 4, 6, 0), - gsSP1Triangle(3, 4, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(8, 12, 11, 0), - gsSP1Triangle(13, 12, 8, 0), - gsSP1Triangle(14, 13, 8, 0), - gsSP1Triangle(14, 8, 15, 0), - gsSPVertex(wario_000_displaylist_right_hand_fist_mesh_layer_1_vtx_0 + 48, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 1, 0, 0), + gsSP1Triangle(3, 0, 2, 0), + gsSP1Triangle(4, 0, 3, 0), + gsSP1Triangle(4, 5, 0, 0), + gsSP1Triangle(6, 5, 4, 0), + gsSP1Triangle(7, 5, 6, 0), + gsSP1Triangle(8, 5, 7, 0), + gsSP1Triangle(5, 8, 1, 0), + gsSP1Triangle(0, 5, 1, 0), gsSPEndDisplayList(), }; -Vtx wario_001_switch_000_offset_right_hand_open_mesh_layer_1_vtx_0[76] = { - {{{31, 13, -30},0, {513, 549},{0xD7, 0x3, 0x88, 0xFF}}}, - {{{89, -20, -13},0, {-52, 179},{0x3E, 0xB9, 0xAB, 0xFF}}}, - {{{50, -36, -9},0, {-35, 643},{0xF7, 0x99, 0xB6, 0xFF}}}, - {{{84, 38, -28},0, {560, -16},{0x10, 0x1D, 0x85, 0xFF}}}, - {{{79, 90, 10},0, {1257, -112},{0xF3, 0x7E, 0xFF, 0xFF}}}, - {{{14, 54, 6},0, {1063, 668},{0xAE, 0x5E, 0xE7, 0xFF}}}, - {{{3, 37, 7},0, {924, 841},{0xD7, 0x74, 0xE1, 0xFF}}}, - {{{17, 4, -17},0, {496, 752},{0x0, 0x11, 0x82, 0xFF}}}, - {{{31, -33, -4},0, {73, 825},{0x37, 0xA3, 0xBD, 0xFF}}}, - {{{50, -36, -9},0, {-16, -16},{0xF7, 0x99, 0xB6, 0xFF}}}, - {{{89, -20, -13},0, {-16, -16},{0x3E, 0xB9, 0xAB, 0xFF}}}, - {{{96, -47, 38},0, {-16, -16},{0x4C, 0xA7, 0x30, 0xFF}}}, - {{{96, -5, 23},0, {-16, -16},{0x68, 0xE6, 0x45, 0xFF}}}, +Vtx wario_001_switch_000_offset_right_hand_open_mesh_layer_1_vtx_0[60] = { {{{141, 29, 32},0, {-16, -16},{0x52, 0xDE, 0x5B, 0xFF}}}, - {{{148, 32, -1},0, {-16, -16},{0x73, 0xF0, 0xCC, 0xFF}}}, - {{{84, 38, -28},0, {-16, -16},{0x10, 0x1D, 0x85, 0xFF}}}, - {{{84, 38, -28},0, {-16, -16},{0x10, 0x1D, 0x85, 0xFF}}}, - {{{129, 73, 10},0, {-16, -16},{0x4E, 0x5A, 0xD4, 0xFF}}}, - {{{148, 32, -1},0, {-16, -16},{0x73, 0xF0, 0xCC, 0xFF}}}, - {{{79, 90, 10},0, {-16, -16},{0xF3, 0x7E, 0xFF, 0xFF}}}, {{{128, 71, 31},0, {-16, -16},{0x39, 0x46, 0x5A, 0xFF}}}, {{{87, 61, 26},0, {-16, -16},{0xFD, 0x21, 0x7B, 0xFF}}}, + {{{148, 32, -1},0, {-16, -16},{0x73, 0xF0, 0xCC, 0xFF}}}, + {{{89, -20, -13},0, {-16, -16},{0x3E, 0xB9, 0xAB, 0xFF}}}, + {{{96, -5, 23},0, {-16, -16},{0x68, 0xE6, 0x45, 0xFF}}}, + {{{78, 11, 34},0, {-16, -16},{0x3D, 0x24, 0x6A, 0xFF}}}, {{{35, 44, 38},0, {-16, -16},{0xFD, 0x4A, 0x67, 0xFF}}}, + {{{79, 90, 10},0, {-16, -16},{0xF3, 0x7E, 0xFF, 0xFF}}}, + {{{129, 73, 10},0, {-16, -16},{0x4E, 0x5A, 0xD4, 0xFF}}}, + {{{84, 38, -28},0, {-16, -16},{0x10, 0x1D, 0x85, 0xFF}}}, + {{{31, 13, -30},0, {-16, -16},{0xD7, 0x3, 0x88, 0xFF}}}, + {{{50, -36, -9},0, {-16, -16},{0xF7, 0x99, 0xB6, 0xFF}}}, + {{{96, -47, 38},0, {-16, -16},{0x4C, 0xA7, 0x30, 0xFF}}}, + {{{84, -16, 47},0, {-16, -16},{0x35, 0xB, 0x73, 0xFF}}}, + {{{33, 2, 45},0, {-16, -16},{0xE3, 0xEE, 0x7A, 0xFF}}}, + {{{35, 44, 38},0, {-16, -16},{0xFD, 0x4A, 0x67, 0xFF}}}, + {{{21, 34, 50},0, {-16, -16},{0xE2, 0x2A, 0x74, 0xFF}}}, + {{{33, 2, 45},0, {-16, -16},{0xE3, 0xEE, 0x7A, 0xFF}}}, {{{14, 54, 6},0, {-16, -16},{0xAE, 0x5E, 0xE7, 0xFF}}}, + {{{79, 90, 10},0, {-16, -16},{0xF3, 0x7E, 0xFF, 0xFF}}}, + {{{31, 13, -30},0, {-16, -16},{0xD7, 0x3, 0x88, 0xFF}}}, + {{{84, 38, -28},0, {-16, -16},{0x10, 0x1D, 0x85, 0xFF}}}, + {{{129, 73, 10},0, {-16, -16},{0x4E, 0x5A, 0xD4, 0xFF}}}, + {{{3, 37, 7},0, {-16, -16},{0xD7, 0x74, 0xE1, 0xFF}}}, + {{{17, 4, -17},0, {-16, -16},{0x0, 0x11, 0x82, 0xFF}}}, + {{{31, -33, -4},0, {-16, -16},{0x37, 0xA3, 0xBD, 0xFF}}}, + {{{50, -36, -9},0, {-16, -16},{0xF7, 0x99, 0xB6, 0xFF}}}, + {{{48, -36, 39},0, {-16, -16},{0xD8, 0xA4, 0x4E, 0xFF}}}, + {{{96, -47, 38},0, {-16, -16},{0x4C, 0xA7, 0x30, 0xFF}}}, + {{{84, -16, 47},0, {-16, -16},{0x35, 0xB, 0x73, 0xFF}}}, + {{{27, -25, 29},0, {-16, -16},{0xD, 0xBA, 0x69, 0xFF}}}, + {{{33, 2, 45},0, {-16, -16},{0xE3, 0xEE, 0x7A, 0xFF}}}, + {{{10, 18, 37},0, {-16, -16},{0xEA, 0x28, 0x77, 0xFF}}}, + {{{27, -25, 29},0, {-16, -16},{0xD, 0xBA, 0x69, 0xFF}}}, {{{21, 34, 50},0, {-16, -16},{0xE2, 0x2A, 0x74, 0xFF}}}, {{{3, 37, 7},0, {-16, -16},{0xD7, 0x74, 0xE1, 0xFF}}}, - {{{10, 18, 37},0, {-16, -16},{0xEA, 0x28, 0x77, 0xFF}}}, + {{{14, 54, 6},0, {-16, -16},{0xAE, 0x5E, 0xE7, 0xFF}}}, {{{-1, 18, 44},0, {-16, -16},{0xE1, 0x2F, 0x72, 0xFF}}}, + {{{20, -37, 35},0, {-16, -16},{0x16, 0xA9, 0x5A, 0xFF}}}, + {{{8, -31, 27},0, {-16, -16},{0x9E, 0xBA, 0x2A, 0xFF}}}, + {{{-7, 7, 34},0, {-16, -16},{0x8D, 0xE7, 0x31, 0xFF}}}, + {{{-12, 23, 7},0, {-16, -16},{0x82, 0x0, 0xF0, 0xFF}}}, {{{-9, 42, 6},0, {-16, -16},{0xC7, 0x70, 0xEC, 0xFF}}}, {{{8, 1, -26},0, {-16, -16},{0xF2, 0xD, 0x82, 0xFF}}}, {{{17, 4, -17},0, {-16, -16},{0x0, 0x11, 0x82, 0xFF}}}, {{{31, -33, -4},0, {-16, -16},{0x37, 0xA3, 0xBD, 0xFF}}}, + {{{26, -48, -9},0, {-16, -16},{0x28, 0x96, 0xC6, 0xFF}}}, + {{{48, -36, 39},0, {-16, -16},{0xD8, 0xA4, 0x4E, 0xFF}}}, + {{{27, -25, 29},0, {-16, -16},{0xD, 0xBA, 0x69, 0xFF}}}, {{{31, -33, -4},0, {-16, -16},{0x37, 0xA3, 0xBD, 0xFF}}}, - {{{26, -48, -9},0, {-16, -16},{0x28, 0x96, 0xC6, 0xFF}}}, - {{{8, 1, -26},0, {-16, -16},{0xF2, 0xD, 0x82, 0xFF}}}, {{{20, -37, 35},0, {-16, -16},{0x16, 0xA9, 0x5A, 0xFF}}}, - {{{27, -25, 29},0, {-16, -16},{0xD, 0xBA, 0x69, 0xFF}}}, - {{{48, -36, 39},0, {-16, -16},{0xD8, 0xA4, 0x4E, 0xFF}}}, - {{{50, -36, -9},0, {-16, -16},{0xF7, 0x99, 0xB6, 0xFF}}}, - {{{96, -47, 38},0, {-16, -16},{0x4C, 0xA7, 0x30, 0xFF}}}, - {{{84, -16, 47},0, {-16, -16},{0x35, 0xB, 0x73, 0xFF}}}, - {{{96, -5, 23},0, {-16, -16},{0x68, 0xE6, 0x45, 0xFF}}}, - {{{78, 11, 34},0, {-16, -16},{0x3D, 0x24, 0x6A, 0xFF}}}, - {{{87, 61, 26},0, {-16, -16},{0xFD, 0x21, 0x7B, 0xFF}}}, - {{{141, 29, 32},0, {-16, -16},{0x52, 0xDE, 0x5B, 0xFF}}}, - {{{128, 71, 31},0, {-16, -16},{0x39, 0x46, 0x5A, 0xFF}}}, - {{{148, 32, -1},0, {-16, -16},{0x73, 0xF0, 0xCC, 0xFF}}}, - {{{129, 73, 10},0, {-16, -16},{0x4E, 0x5A, 0xD4, 0xFF}}}, - {{{78, 11, 34},0, {-16, -16},{0x3D, 0x24, 0x6A, 0xFF}}}, - {{{87, 61, 26},0, {-16, -16},{0xFD, 0x21, 0x7B, 0xFF}}}, - {{{35, 44, 38},0, {-16, -16},{0xFD, 0x4A, 0x67, 0xFF}}}, - {{{84, -16, 47},0, {-16, -16},{0x35, 0xB, 0x73, 0xFF}}}, - {{{33, 2, 45},0, {-16, -16},{0xE3, 0xEE, 0x7A, 0xFF}}}, - {{{21, 34, 50},0, {-16, -16},{0xE2, 0x2A, 0x74, 0xFF}}}, - {{{10, 18, 37},0, {-16, -16},{0xEA, 0x28, 0x77, 0xFF}}}, - {{{27, -25, 29},0, {-16, -16},{0xD, 0xBA, 0x69, 0xFF}}}, - {{{-1, 18, 44},0, {-16, -16},{0xE1, 0x2F, 0x72, 0xFF}}}, - {{{20, -37, 35},0, {-16, -16},{0x16, 0xA9, 0x5A, 0xFF}}}, - {{{8, -31, 27},0, {-16, -16},{0x9E, 0xBA, 0x2A, 0xFF}}}, - {{{-7, 7, 34},0, {-16, -16},{0x8D, 0xE7, 0x31, 0xFF}}}, - {{{-12, 23, 7},0, {-16, -16},{0x82, 0x0, 0xF0, 0xFF}}}, - {{{-9, 42, 6},0, {-16, -16},{0xC7, 0x70, 0xEC, 0xFF}}}, - {{{8, 1, -26},0, {-16, -16},{0xF2, 0xD, 0x82, 0xFF}}}, - {{{0, -4, -15},0, {-16, -16},{0x91, 0xDE, 0xCC, 0xFF}}}, {{{12, -40, -3},0, {-16, -16},{0xA4, 0xAD, 0xE3, 0xFF}}}, - {{{0, -4, -15},0, {-16, -16},{0x91, 0xDE, 0xCC, 0xFF}}}, - {{{8, 1, -26},0, {-16, -16},{0xF2, 0xD, 0x82, 0xFF}}}, {{{26, -48, -9},0, {-16, -16},{0x28, 0x96, 0xC6, 0xFF}}}, - {{{20, -37, 35},0, {-16, -16},{0x16, 0xA9, 0x5A, 0xFF}}}, {{{8, -31, 27},0, {-16, -16},{0x9E, 0xBA, 0x2A, 0xFF}}}, + {{{0, -4, -15},0, {-16, -16},{0x91, 0xDE, 0xCC, 0xFF}}}, {{{-7, 7, 34},0, {-16, -16},{0x8D, 0xE7, 0x31, 0xFF}}}, {{{-12, 23, 7},0, {-16, -16},{0x82, 0x0, 0xF0, 0xFF}}}, - {{{48, -36, 39},0, {-16, -16},{0xD8, 0xA4, 0x4E, 0xFF}}}, - {{{33, 2, 45},0, {-16, -16},{0xE3, 0xEE, 0x7A, 0xFF}}}, - {{{27, -25, 29},0, {-16, -16},{0xD, 0xBA, 0x69, 0xFF}}}, - {{{84, -16, 47},0, {-16, -16},{0x35, 0xB, 0x73, 0xFF}}}, + {{{8, 1, -26},0, {-16, -16},{0xF2, 0xD, 0x82, 0xFF}}}, + {{{-9, 42, 6},0, {-16, -16},{0xC7, 0x70, 0xEC, 0xFF}}}, }; Gfx wario_001_switch_000_offset_right_hand_open_mesh_layer_1_tri_0[] = { @@ -2409,75 +2281,74 @@ Gfx wario_001_switch_000_offset_right_hand_open_mesh_layer_1_tri_0[] = { gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 3, 0, 0), - gsSP1Triangle(5, 4, 0, 0), - gsSP1Triangle(5, 0, 6, 0), - gsSP1Triangle(0, 7, 6, 0), - gsSP1Triangle(8, 7, 0, 0), - gsSP1Triangle(0, 2, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(10, 12, 11, 0), - gsSP1Triangle(10, 13, 12, 0), - gsSP1Triangle(10, 14, 13, 0), - gsSP1Triangle(15, 14, 10, 0), + gsSP1Triangle(4, 0, 5, 0), + gsSP1Triangle(5, 0, 2, 0), + gsSP1Triangle(5, 2, 6, 0), + gsSP1Triangle(6, 2, 7, 0), + gsSP1Triangle(7, 2, 8, 0), + gsSP1Triangle(8, 2, 1, 0), + gsSP1Triangle(1, 9, 8, 0), + gsSP1Triangle(1, 3, 9, 0), + gsSP1Triangle(10, 9, 3, 0), + gsSP1Triangle(10, 3, 4, 0), + gsSP1Triangle(11, 10, 4, 0), + gsSP1Triangle(11, 4, 12, 0), + gsSP1Triangle(12, 4, 13, 0), + gsSP1Triangle(4, 5, 13, 0), + gsSP1Triangle(13, 5, 14, 0), + gsSP1Triangle(5, 6, 14, 0), + gsSP1Triangle(6, 7, 14, 0), + gsSP1Triangle(7, 15, 14, 0), gsSPVertex(wario_001_switch_000_offset_right_hand_open_mesh_layer_1_vtx_0 + 16, 16, 0), gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(1, 0, 3, 0), + gsSP1Triangle(4, 3, 0, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(4, 6, 5, 0), + gsSP1Triangle(6, 4, 7, 0), + gsSP1Triangle(3, 5, 8, 0), + gsSP1Triangle(5, 9, 8, 0), + gsSP1Triangle(10, 9, 5, 0), + gsSP1Triangle(5, 11, 10, 0), + gsSP1Triangle(11, 12, 10, 0), + gsSP1Triangle(13, 12, 11, 0), + gsSP1Triangle(14, 12, 13, 0), + gsSP1Triangle(14, 2, 12, 0), + gsSP1Triangle(12, 2, 15, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_open_mesh_layer_1_vtx_0 + 32, 16, 0), + gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 1, 3, 0), gsSP1Triangle(3, 5, 4, 0), - gsSP1Triangle(6, 5, 3, 0), - gsSP1Triangle(3, 7, 6, 0), - gsSP1Triangle(8, 6, 7, 0), - gsSP1Triangle(8, 7, 9, 0), - gsSP1Triangle(9, 10, 8, 0), - gsSP1Triangle(11, 10, 9, 0), - gsSP1Triangle(9, 12, 11, 0), - gsSP1Triangle(13, 12, 9, 0), - gsSP1Triangle(9, 14, 13, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(wario_001_switch_000_offset_right_hand_open_mesh_layer_1_vtx_0 + 32, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 1, 0, 0), - gsSP1Triangle(0, 4, 3, 0), - gsSP1Triangle(5, 4, 0, 0), - gsSP1Triangle(6, 5, 0, 0), - gsSP1Triangle(7, 5, 6, 0), - gsSP1Triangle(8, 5, 7, 0), - gsSP1Triangle(7, 9, 8, 0), - gsSP1Triangle(9, 10, 8, 0), - gsSP1Triangle(9, 11, 10, 0), - gsSP1Triangle(9, 12, 11, 0), - gsSP1Triangle(12, 13, 11, 0), - gsSP1Triangle(12, 14, 13, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(wario_001_switch_000_offset_right_hand_open_mesh_layer_1_vtx_0 + 48, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(2, 4, 3, 0), - gsSP1Triangle(2, 5, 4, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(7, 6, 8, 0), - gsSP1Triangle(8, 9, 7, 0), - gsSP1Triangle(8, 10, 9, 0), - gsSP1Triangle(8, 11, 10, 0), - gsSP1Triangle(12, 11, 8, 0), - gsSP1Triangle(13, 12, 8, 0), - gsSP1Triangle(14, 12, 13, 0), + gsSP1Triangle(6, 1, 4, 0), + gsSP1Triangle(2, 1, 6, 0), + gsSP1Triangle(6, 7, 2, 0), + gsSP1Triangle(6, 8, 7, 0), + gsSP1Triangle(6, 9, 8, 0), + gsSP1Triangle(10, 9, 6, 0), + gsSP1Triangle(11, 10, 6, 0), + gsSP1Triangle(4, 11, 6, 0), + gsSP1Triangle(12, 11, 4, 0), + gsSP1Triangle(4, 13, 12, 0), + gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(14, 15, 12, 0), - gsSPVertex(wario_001_switch_000_offset_right_hand_open_mesh_layer_1_vtx_0 + 64, 12, 0), + gsSP1Triangle(7, 15, 14, 0), + gsSP1Triangle(14, 2, 7, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_open_mesh_layer_1_vtx_0 + 48, 12, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 0, 2, 0), - gsSP1Triangle(4, 0, 3, 0), - gsSP1Triangle(4, 5, 0, 0), - gsSP1Triangle(1, 0, 5, 0), - gsSP1Triangle(5, 6, 1, 0), - gsSP1Triangle(6, 7, 1, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(11, 9, 8, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(3, 6, 4, 0), + gsSP1Triangle(7, 4, 6, 0), + gsSP1Triangle(6, 8, 7, 0), + gsSP1Triangle(8, 9, 7, 0), + gsSP1Triangle(10, 7, 9, 0), + gsSP1Triangle(10, 9, 11, 0), + gsSP1Triangle(4, 7, 10, 0), + gsSP1Triangle(5, 4, 10, 0), gsSPEndDisplayList(), }; -Vtx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0[101] = { +Vtx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0[87] = { {{{87, 114, -7},0, {-16, -16},{0xC1, 0x67, 0x28, 0xFF}}}, {{{87, 101, 25},0, {-16, -16},{0xC2, 0x67, 0x29, 0xFF}}}, {{{130, 138, -3},0, {-16, -16},{0xC3, 0x67, 0x2A, 0xFF}}}, @@ -2487,21 +2358,13 @@ Vtx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0[101] = { {{{151, 113, -8},0, {-16, -16},{0x17, 0x2A, 0x8A, 0xFF}}}, {{{87, 114, -7},0, {-16, -16},{0x18, 0x5D, 0xAC, 0xFF}}}, {{{58, 134, 2},0, {-16, -16},{0x6, 0x7D, 0xED, 0xFF}}}, - {{{87, 101, 25},0, {-16, -16},{0x2E, 0x40, 0x64, 0xFF}}}, - {{{48, 102, 47},0, {-16, -16},{0xF7, 0x48, 0x68, 0xFF}}}, - {{{9, 111, -2},0, {-16, -16},{0xAF, 0x5D, 0xE2, 0xFF}}}, - {{{19, 83, 43},0, {-16, -16},{0xC9, 0x2D, 0x69, 0xFF}}}, - {{{-4, 91, 1},0, {-16, -16},{0xD9, 0x73, 0xD9, 0xFF}}}, - {{{0, 73, 39},0, {-16, -16},{0x5, 0x44, 0x6B, 0xFF}}}, - {{{-15, 75, 45},0, {-16, -16},{0xD4, 0x3B, 0x68, 0xFF}}}, - {{{-15, 75, 45},0, {-16, -16},{0xD4, 0x3B, 0x68, 0xFF}}}, - {{{-4, 91, 1},0, {-16, -16},{0xD9, 0x73, 0xD9, 0xFF}}}, - {{{-22, 96, -3},0, {-16, -16},{0xC3, 0x69, 0xDA, 0xFF}}}, - {{{15, 51, -22},0, {-16, -16},{0x3, 0x4, 0x81, 0xFF}}}, - {{{2, 47, -34},0, {-16, -16},{0xFA, 0x2, 0x81, 0xFF}}}, + {{{34, 59, -38},0, {-16, -16},{0xDF, 0xFA, 0x85, 0xFF}}}, + {{{97, 29, -18},0, {-16, -16},{0x1A, 0xA8, 0xA8, 0xFF}}}, + {{{172, 38, -17},0, {-16, -16},{0x1E, 0x6, 0x85, 0xFF}}}, + {{{167, 66, -11},0, {-16, -16},{0x26, 0x1F, 0x8B, 0xFF}}}, + {{{58, 3, -5},0, {-16, -16},{0x3, 0x8A, 0xD1, 0xFF}}}, {{{33, 7, 1},0, {-16, -16},{0x33, 0x94, 0xD4, 0xFF}}}, - {{{25, -9, -3},0, {-16, -16},{0x26, 0x8D, 0xDB, 0xFF}}}, - {{{24, 22, 38},0, {-16, -16},{0x16, 0xC5, 0x6E, 0xFF}}}, + {{{47, 22, 54},0, {-16, -16},{0xE7, 0xBC, 0x69, 0xFF}}}, {{{47, 22, 54},0, {-16, -16},{0xE7, 0xBC, 0x69, 0xFF}}}, {{{58, 3, -5},0, {-16, -16},{0x3, 0x8A, 0xD1, 0xFF}}}, {{{91, 17, 41},0, {-16, -16},{0x3D, 0xA6, 0x41, 0xFF}}}, @@ -2510,45 +2373,49 @@ Vtx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0[101] = { {{{160, 36, 22},0, {-16, -16},{0x15, 0x83, 0xF6, 0xFF}}}, {{{172, 38, -17},0, {-16, -16},{0xF, 0x82, 0xFE, 0xFF}}}, {{{93, 49, 54},0, {-16, -16},{0x48, 0x2, 0x69, 0xFF}}}, - {{{105, 22, 16},0, {-16, -16},{0x47, 0x97, 0xFB, 0xFF}}}, {{{101, 62, 30},0, {-16, -16},{0x5F, 0x1A, 0x51, 0xFF}}}, - {{{93, 49, 54},0, {-16, -16},{0x48, 0x2, 0x69, 0xFF}}}, {{{87, 101, 25},0, {-16, -16},{0x2E, 0x40, 0x64, 0xFF}}}, {{{144, 106, 26},0, {-16, -16},{0xFC, 0x13, 0x7E, 0xFF}}}, {{{127, 126, 22},0, {-16, -16},{0xFC, 0x16, 0x7D, 0xFF}}}, {{{48, 102, 47},0, {-16, -16},{0xF7, 0x48, 0x68, 0xFF}}}, + {{{58, 134, 2},0, {-16, -16},{0x6, 0x7D, 0xED, 0xFF}}}, + {{{87, 114, -7},0, {-16, -16},{0x18, 0x5D, 0xAC, 0xFF}}}, + {{{9, 111, -2},0, {-16, -16},{0xAF, 0x5D, 0xE2, 0xFF}}}, + {{{9, 111, -2},0, {-16, -16},{0xAF, 0x5D, 0xE2, 0xFF}}}, + {{{58, 134, 2},0, {-16, -16},{0x6, 0x7D, 0xED, 0xFF}}}, + {{{34, 59, -38},0, {-16, -16},{0xDF, 0xFA, 0x85, 0xFF}}}, + {{{-4, 91, 1},0, {-16, -16},{0xD9, 0x73, 0xD9, 0xFF}}}, + {{{15, 51, -22},0, {-16, -16},{0x3, 0x4, 0x81, 0xFF}}}, + {{{33, 7, 1},0, {-16, -16},{0x33, 0x94, 0xD4, 0xFF}}}, + {{{2, 47, -34},0, {-16, -16},{0xFA, 0x2, 0x81, 0xFF}}}, + {{{25, -9, -3},0, {-16, -16},{0x26, 0x8D, 0xDB, 0xFF}}}, + {{{24, 22, 38},0, {-16, -16},{0x16, 0xC5, 0x6E, 0xFF}}}, {{{47, 22, 54},0, {-16, -16},{0xE7, 0xBC, 0x69, 0xFF}}}, {{{19, 83, 43},0, {-16, -16},{0xC9, 0x2D, 0x69, 0xFF}}}, - {{{24, 22, 38},0, {-16, -16},{0x16, 0xC5, 0x6E, 0xFF}}}, + {{{48, 102, 47},0, {-16, -16},{0xF7, 0x48, 0x68, 0xFF}}}, + {{{93, 49, 54},0, {-16, -16},{0x48, 0x2, 0x69, 0xFF}}}, + {{{91, 17, 41},0, {-16, -16},{0x3D, 0xA6, 0x41, 0xFF}}}, {{{0, 73, 39},0, {-16, -16},{0x5, 0x44, 0x6B, 0xFF}}}, - {{{16, 11, 44},0, {-16, -16},{0x12, 0xBA, 0x68, 0xFF}}}, {{{-15, 75, 45},0, {-16, -16},{0xD4, 0x3B, 0x68, 0xFF}}}, - {{{0, 16, 34},0, {-16, -16},{0xA3, 0xB8, 0x31, 0xFF}}}, - {{{-21, 61, 35},0, {-16, -16},{0x8D, 0xE7, 0x2F, 0xFF}}}, + {{{-15, 75, 45},0, {-16, -16},{0xD4, 0x3B, 0x68, 0xFF}}}, + {{{-4, 91, 1},0, {-16, -16},{0xD9, 0x73, 0xD9, 0xFF}}}, {{{-22, 96, -3},0, {-16, -16},{0xC3, 0x69, 0xDA, 0xFF}}}, - {{{-22, 96, -3},0, {-16, -16},{0xC3, 0x69, 0xDA, 0xFF}}}, - {{{-25, 76, 1},0, {-16, -16},{0x84, 0xFB, 0xE5, 0xFF}}}, - {{{-21, 61, 35},0, {-16, -16},{0x8D, 0xE7, 0x2F, 0xFF}}}, + {{{15, 51, -22},0, {-16, -16},{0x3, 0x4, 0x81, 0xFF}}}, {{{2, 47, -34},0, {-16, -16},{0xFA, 0x2, 0x81, 0xFF}}}, + {{{-25, 76, 1},0, {-16, -16},{0x84, 0xFB, 0xE5, 0xFF}}}, {{{-8, 39, -20},0, {-16, -16},{0x9B, 0xD0, 0xC4, 0xFF}}}, {{{25, -9, -3},0, {-16, -16},{0x26, 0x8D, 0xDB, 0xFF}}}, {{{7, 1, 1},0, {-16, -16},{0xAB, 0xA5, 0xE6, 0xFF}}}, {{{16, 11, 44},0, {-16, -16},{0x12, 0xBA, 0x68, 0xFF}}}, {{{24, 22, 38},0, {-16, -16},{0x16, 0xC5, 0x6E, 0xFF}}}, + {{{0, 73, 39},0, {-16, -16},{0x5, 0x44, 0x6B, 0xFF}}}, + {{{19, 83, 43},0, {-16, -16},{0xC9, 0x2D, 0x69, 0xFF}}}, {{{0, 16, 34},0, {-16, -16},{0xA3, 0xB8, 0x31, 0xFF}}}, - {{{91, 17, 41},0, {-16, -16},{0x3D, 0xA6, 0x41, 0xFF}}}, - {{{93, 49, 54},0, {-16, -16},{0x48, 0x2, 0x69, 0xFF}}}, - {{{47, 22, 54},0, {-16, -16},{0xE7, 0xBC, 0x69, 0xFF}}}, + {{{-21, 61, 35},0, {-16, -16},{0x8D, 0xE7, 0x2F, 0xFF}}}, {{{151, 113, -8},0, {-16, -16},{0x5E, 0x4C, 0x28, 0xFF}}}, {{{130, 138, -3},0, {-16, -16},{0x61, 0x44, 0x2E, 0xFF}}}, {{{127, 126, 22},0, {-16, -16},{0x5E, 0x4C, 0x28, 0xFF}}}, - {{{127, 126, 22},0, {-16, -16},{0x5E, 0x4C, 0x28, 0xFF}}}, {{{144, 106, 26},0, {-16, -16},{0x5A, 0x53, 0x22, 0xFF}}}, - {{{151, 113, -8},0, {-16, -16},{0x5E, 0x4C, 0x28, 0xFF}}}, - {{{172, 38, -17},0, {-16, -16},{0x1E, 0x6, 0x85, 0xFF}}}, - {{{97, 29, -18},0, {-16, -16},{0x1A, 0xA8, 0xA8, 0xFF}}}, - {{{92, 70, -35},0, {-16, -16},{0x7, 0xA, 0x82, 0xFF}}}, - {{{167, 66, -11},0, {-16, -16},{0x26, 0x1F, 0x8B, 0xFF}}}, {{{105, 22, 16},0, {-16, -16},{0x4, 0xDC, 0x7A, 0xFF}}}, {{{160, 36, 22},0, {-16, -16},{0xF7, 0xEE, 0x7D, 0xFF}}}, {{{158, 59, 25},0, {-16, -16},{0xFE, 0xE4, 0x7C, 0xFF}}}, @@ -2561,24 +2428,14 @@ Vtx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0[101] = { {{{92, 70, -35},0, {-16, -16},{0x6, 0x7F, 0x0, 0xFF}}}, {{{109, 69, 4},0, {-16, -16},{0x9, 0x7D, 0x12, 0xFF}}}, {{{158, 59, 25},0, {-16, -16},{0xC, 0x7B, 0x1E, 0xFF}}}, + {{{109, 69, 4},0, {-16, -16},{0x9, 0x7D, 0x12, 0xFF}}}, {{{101, 62, 30},0, {-16, -16},{0x9, 0x7A, 0x23, 0xFF}}}, + {{{158, 59, 25},0, {-16, -16},{0xC, 0x7B, 0x1E, 0xFF}}}, {{{151, 113, -8},0, {-16, -16},{0x59, 0xA6, 0xF6, 0xFF}}}, {{{109, 69, 4},0, {-16, -16},{0x59, 0xA6, 0xF1, 0xFF}}}, {{{92, 70, -35},0, {-16, -16},{0x52, 0xA6, 0xDA, 0xFF}}}, {{{144, 106, 26},0, {-16, -16},{0x5C, 0xA8, 0x2, 0xFF}}}, {{{101, 62, 30},0, {-16, -16},{0x5C, 0xA8, 0x1, 0xFF}}}, - {{{9, 111, -2},0, {1114, 623},{0xAF, 0x5D, 0xE2, 0xFF}}}, - {{{58, 134, 2},0, {1176, 66},{0x6, 0x7D, 0xED, 0xFF}}}, - {{{34, 59, -38},0, {486, 518},{0xDF, 0xFA, 0x85, 0xFF}}}, - {{{92, 70, -35},0, {368, -16},{0x7, 0xA, 0x82, 0xFF}}}, - {{{97, 29, -18},0, {-69, 129},{0x1A, 0xA8, 0xA8, 0xFF}}}, - {{{58, 3, -5},0, {-147, 629},{0x3, 0x8A, 0xD1, 0xFF}}}, - {{{34, 59, -38},0, {486, 518},{0xDF, 0xFA, 0x85, 0xFF}}}, - {{{58, 3, -5},0, {-147, 629},{0x3, 0x8A, 0xD1, 0xFF}}}, - {{{33, 7, 1},0, {-4, 853},{0x33, 0x94, 0xD4, 0xFF}}}, - {{{15, 51, -22},0, {496, 752},{0x3, 0x4, 0x81, 0xFF}}}, - {{{-4, 91, 1},0, {972, 827},{0xD9, 0x73, 0xD9, 0xFF}}}, - {{{9, 111, -2},0, {1114, 623},{0xAF, 0x5D, 0xE2, 0xFF}}}, }; Gfx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_tri_0[] = { @@ -2588,195 +2445,182 @@ Gfx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_tri_0[] = { gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(5, 4, 7, 0), gsSP1Triangle(8, 7, 4, 0), - gsSP1Triangle(8, 9, 7, 0), - gsSP1Triangle(10, 9, 8, 0), - gsSP1Triangle(10, 8, 11, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(12, 11, 13, 0), - gsSP1Triangle(13, 14, 12, 0), - gsSP1Triangle(15, 14, 13, 0), + gsSP1Triangle(8, 4, 9, 0), + gsSP1Triangle(9, 4, 10, 0), + gsSP1Triangle(11, 10, 4, 0), + gsSP1Triangle(4, 12, 11, 0), + gsSP1Triangle(13, 9, 10, 0), + gsSP1Triangle(9, 13, 14, 0), + gsSP1Triangle(13, 15, 14, 0), gsSPVertex(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0 + 16, 16, 0), gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 2, 1, 0), + gsSP1Triangle(3, 1, 4, 0), + gsSP1Triangle(4, 5, 3, 0), + gsSP1Triangle(5, 4, 6, 0), + gsSP1Triangle(2, 3, 7, 0), + gsSP1Triangle(3, 8, 7, 0), + gsSP1Triangle(8, 9, 7, 0), + gsSP1Triangle(9, 8, 10, 0), + gsSP1Triangle(10, 11, 9, 0), + gsSP1Triangle(7, 9, 12, 0), + gsSP1Triangle(12, 9, 13, 0), + gsSP1Triangle(13, 9, 14, 0), + gsSP1Triangle(12, 13, 15, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0 + 32, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(2, 4, 3, 0), + gsSP1Triangle(5, 4, 2, 0), + gsSP1Triangle(6, 4, 5, 0), + gsSP1Triangle(6, 5, 7, 0), + gsSP1Triangle(7, 5, 8, 0), + gsSP1Triangle(9, 8, 5, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(9, 11, 10, 0), + gsSP1Triangle(9, 12, 11, 0), + gsSP1Triangle(13, 12, 9, 0), + gsSP1Triangle(11, 0, 10, 0), + gsSP1Triangle(10, 0, 3, 0), + gsSP1Triangle(3, 14, 10, 0), + gsSP1Triangle(15, 14, 3, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0 + 48, 15, 0), + gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(2, 1, 3, 0), gsSP1Triangle(2, 3, 4, 0), - gsSP1Triangle(4, 3, 5, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(6, 5, 7, 0), - gsSP1Triangle(8, 7, 5, 0), - gsSP1Triangle(9, 8, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(11, 10, 9, 0), - gsSP1Triangle(11, 9, 12, 0), - gsSP1Triangle(12, 13, 11, 0), - gsSP1Triangle(13, 12, 14, 0), - gsSP1Triangle(10, 11, 15, 0), - gsSPVertex(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0 + 32, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 3, 2, 0), - gsSP1Triangle(3, 1, 4, 0), - gsSP1Triangle(4, 5, 3, 0), - gsSP1Triangle(2, 3, 6, 0), - gsSP1Triangle(7, 2, 6, 0), - gsSP1Triangle(7, 6, 8, 0), - gsSP1Triangle(9, 7, 8, 0), - gsSP1Triangle(10, 9, 8, 0), - gsSP1Triangle(11, 9, 10, 0), + gsSP1Triangle(4, 5, 2, 0), + gsSP1Triangle(4, 6, 5, 0), + gsSP1Triangle(7, 6, 4, 0), + gsSP1Triangle(7, 8, 6, 0), + gsSP1Triangle(9, 8, 7, 0), + gsSP1Triangle(7, 10, 9, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(11, 10, 12, 0), - gsSP1Triangle(12, 13, 11, 0), - gsSP1Triangle(12, 14, 13, 0), - gsSP1Triangle(15, 14, 12, 0), - gsSPVertex(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0 + 48, 16, 0), + gsSP1Triangle(9, 11, 0, 0), + gsSP1Triangle(0, 13, 9, 0), + gsSP1Triangle(0, 14, 13, 0), + gsSP1Triangle(2, 14, 0, 0), + gsSP1Triangle(2, 5, 14, 0), + gsSP1Triangle(14, 5, 6, 0), + gsSP1Triangle(13, 14, 6, 0), + gsSP1Triangle(6, 8, 13, 0), + gsSP1Triangle(9, 13, 8, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0 + 63, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 1, 0, 0), - gsSP1Triangle(3, 4, 1, 0), - gsSP1Triangle(5, 4, 3, 0), - gsSP1Triangle(5, 6, 4, 0), - gsSP1Triangle(7, 6, 5, 0), - gsSP1Triangle(5, 8, 7, 0), - gsSP1Triangle(7, 9, 6, 0), - gsSP1Triangle(4, 6, 9, 0), - gsSP1Triangle(9, 2, 4, 0), - gsSP1Triangle(2, 1, 4, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0 + 64, 15, 0), + gsSP1Triangle(2, 3, 0, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(4, 6, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(14, 15, 12, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0 + 79, 8, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(5, 6, 3, 0), - gsSP1Triangle(7, 8, 9, 0), - gsSP1Triangle(7, 9, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0 + 79, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 3, 0, 0), - gsSP1Triangle(2, 4, 3, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(8, 6, 5, 0), - gsSP1Triangle(8, 9, 6, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(11, 13, 12, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(15, 12, 14, 0), - gsSPVertex(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_vtx_0 + 95, 6, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 3, 0, 0), - gsSP1Triangle(0, 3, 4, 0), - gsSP1Triangle(5, 0, 4, 0), + gsSP1Triangle(6, 4, 3, 0), + gsSP1Triangle(6, 7, 4, 0), gsSPEndDisplayList(), }; -Vtx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_0[57] = { - {{{60, 135, 1},0, {-16, -16},{0x17, 0x7A, 0xE3, 0xFF}}}, - {{{12, 114, -3},0, {-16, -16},{0xB1, 0x59, 0xD2, 0xFF}}}, - {{{30, 116, 36},0, {-16, -16},{0xCE, 0x59, 0x4B, 0xFF}}}, +Vtx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_0[46] = { {{{1, 76, 37},0, {-16, -16},{0xF9, 0x3F, 0x6E, 0xFF}}}, - {{{-2, 94, 1},0, {-16, -16},{0xDE, 0x73, 0xD7, 0xFF}}}, - {{{-13, 78, 43},0, {-16, -16},{0xC7, 0x35, 0x65, 0xFF}}}, - {{{-19, 100, -4},0, {-16, -16},{0xBD, 0x65, 0xD9, 0xFF}}}, - {{{4, 49, -32},0, {-16, -16},{0xEE, 0xFA, 0x82, 0xFF}}}, - {{{17, 53, -22},0, {-16, -16},{0x4, 0x0, 0x81, 0xFF}}}, - {{{32, 11, 1},0, {-16, -16},{0x3D, 0x98, 0xD7, 0xFF}}}, - {{{25, -5, -4},0, {-16, -16},{0x1B, 0x8A, 0xD8, 0xFF}}}, - {{{14, 14, 43},0, {-16, -16},{0xFB, 0xB1, 0x63, 0xFF}}}, + {{{30, 59, 50},0, {-16, -16},{0xC0, 0xFA, 0x6E, 0xFF}}}, + {{{30, 116, 36},0, {-16, -16},{0xCE, 0x59, 0x4B, 0xFF}}}, {{{24, 26, 37},0, {-16, -16},{0x10, 0xC0, 0x6D, 0xFF}}}, - {{{57, 7, -3},0, {-16, -16},{0x6, 0x8C, 0xCD, 0xFF}}}, - {{{78, 19, 68},0, {-16, -16},{0x19, 0xB2, 0x61, 0xFF}}}, - {{{107, 26, 2},0, {-16, -16},{0x65, 0xBF, 0xD6, 0xFF}}}, - {{{107, 26, 2},0, {-16, -16},{0x65, 0xBF, 0xD6, 0xFF}}}, - {{{98, 43, 54},0, {-16, -16},{0x67, 0xF9, 0x4A, 0xFF}}}, - {{{78, 19, 68},0, {-16, -16},{0x19, 0xB2, 0x61, 0xFF}}}, - {{{99, 92, 25},0, {-16, -16},{0x6C, 0x3D, 0x1C, 0xFF}}}, - {{{88, 83, -32},0, {-16, -16},{0x45, 0x1C, 0x99, 0xFF}}}, + {{{-13, 78, 43},0, {-16, -16},{0xC7, 0x35, 0x65, 0xFF}}}, + {{{-2, 94, 1},0, {-16, -16},{0xDE, 0x73, 0xD7, 0xFF}}}, + {{{12, 114, -3},0, {-16, -16},{0xB1, 0x59, 0xD2, 0xFF}}}, {{{60, 135, 1},0, {-16, -16},{0x17, 0x7A, 0xE3, 0xFF}}}, {{{56, 107, 46},0, {-16, -16},{0x14, 0x51, 0x60, 0xFF}}}, - {{{30, 116, 36},0, {-16, -16},{0xCE, 0x59, 0x4B, 0xFF}}}, {{{58, 63, 68},0, {-16, -16},{0xF1, 0x13, 0x7D, 0xFF}}}, - {{{30, 59, 50},0, {-16, -16},{0xC0, 0xFA, 0x6E, 0xFF}}}, - {{{1, 76, 37},0, {-16, -16},{0xF9, 0x3F, 0x6E, 0xFF}}}, - {{{24, 26, 37},0, {-16, -16},{0x10, 0xC0, 0x6D, 0xFF}}}, - {{{-13, 78, 43},0, {-16, -16},{0xC7, 0x35, 0x65, 0xFF}}}, + {{{78, 19, 68},0, {-16, -16},{0x19, 0xB2, 0x61, 0xFF}}}, + {{{57, 7, -3},0, {-16, -16},{0x6, 0x8C, 0xCD, 0xFF}}}, + {{{32, 11, 1},0, {-16, -16},{0x3D, 0x98, 0xD7, 0xFF}}}, {{{14, 14, 43},0, {-16, -16},{0xFB, 0xB1, 0x63, 0xFF}}}, {{{-15, 39, 8},0, {-16, -16},{0x8B, 0xCF, 0xF8, 0xFF}}}, {{{-19, 100, -4},0, {-16, -16},{0xBD, 0x65, 0xD9, 0xFF}}}, {{{4, 49, -32},0, {-16, -16},{0xEE, 0xFA, 0x82, 0xFF}}}, - {{{-15, 39, 8},0, {-16, -16},{0x8B, 0xCF, 0xF8, 0xFF}}}, {{{-19, 100, -4},0, {-16, -16},{0xBD, 0x65, 0xD9, 0xFF}}}, + {{{-2, 94, 1},0, {-16, -16},{0xDE, 0x73, 0xD7, 0xFF}}}, + {{{17, 53, -22},0, {-16, -16},{0x4, 0x0, 0x81, 0xFF}}}, + {{{36, 61, -37},0, {-16, -16},{0xE7, 0xF5, 0x84, 0xFF}}}, + {{{12, 114, -3},0, {-16, -16},{0xB1, 0x59, 0xD2, 0xFF}}}, + {{{60, 135, 1},0, {-16, -16},{0x17, 0x7A, 0xE3, 0xFF}}}, + {{{88, 83, -32},0, {-16, -16},{0x45, 0x1C, 0x99, 0xFF}}}, + {{{99, 92, 25},0, {-16, -16},{0x6C, 0x3D, 0x1C, 0xFF}}}, + {{{56, 107, 46},0, {-16, -16},{0x14, 0x51, 0x60, 0xFF}}}, + {{{88, 67, 54},0, {-16, -16},{0x44, 0x2C, 0x62, 0xFF}}}, + {{{58, 63, 68},0, {-16, -16},{0xF1, 0x13, 0x7D, 0xFF}}}, + {{{98, 43, 54},0, {-16, -16},{0x67, 0xF9, 0x4A, 0xFF}}}, + {{{78, 19, 68},0, {-16, -16},{0x19, 0xB2, 0x61, 0xFF}}}, + {{{107, 26, 2},0, {-16, -16},{0x65, 0xBF, 0xD6, 0xFF}}}, + {{{57, 7, -3},0, {-16, -16},{0x6, 0x8C, 0xCD, 0xFF}}}, + {{{36, 61, -37},0, {-16, -16},{0xE7, 0xF5, 0x84, 0xFF}}}, + {{{57, 7, -3},0, {-16, -16},{0x6, 0x8C, 0xCD, 0xFF}}}, + {{{32, 11, 1},0, {-16, -16},{0x3D, 0x98, 0xD7, 0xFF}}}, + {{{17, 53, -22},0, {-16, -16},{0x4, 0x0, 0x81, 0xFF}}}, + {{{4, 49, -32},0, {-16, -16},{0xEE, 0xFA, 0x82, 0xFF}}}, {{{25, -5, -4},0, {-16, -16},{0x1B, 0x8A, 0xD8, 0xFF}}}, {{{14, 14, 43},0, {-16, -16},{0xFB, 0xB1, 0x63, 0xFF}}}, - {{{78, 19, 68},0, {-16, -16},{0x19, 0xB2, 0x61, 0xFF}}}, - {{{30, 59, 50},0, {-16, -16},{0xC0, 0xFA, 0x6E, 0xFF}}}, - {{{24, 26, 37},0, {-16, -16},{0x10, 0xC0, 0x6D, 0xFF}}}, - {{{58, 63, 68},0, {-16, -16},{0xF1, 0x13, 0x7D, 0xFF}}}, + {{{-15, 39, 8},0, {-16, -16},{0x8B, 0xCF, 0xF8, 0xFF}}}, + {{{-19, 100, -4},0, {-16, -16},{0xBD, 0x65, 0xD9, 0xFF}}}, + {{{88, 83, -32},0, {-16, -16},{0x45, 0x1C, 0x99, 0xFF}}}, + {{{107, 26, 2},0, {-16, -16},{0x65, 0xBF, 0xD6, 0xFF}}}, + {{{99, 92, 25},0, {-16, -16},{0x6C, 0x3D, 0x1C, 0xFF}}}, {{{98, 43, 54},0, {-16, -16},{0x67, 0xF9, 0x4A, 0xFF}}}, {{{88, 67, 54},0, {-16, -16},{0x44, 0x2C, 0x62, 0xFF}}}, - {{{99, 92, 25},0, {-16, -16},{0x6C, 0x3D, 0x1C, 0xFF}}}, - {{{56, 107, 46},0, {-16, -16},{0x14, 0x51, 0x60, 0xFF}}}, - {{{12, 114, -3},0, {1127, 628},{0xB1, 0x59, 0xD2, 0xFF}}}, - {{{60, 135, 1},0, {1198, 70},{0x17, 0x7A, 0xE3, 0xFF}}}, - {{{36, 61, -37},0, {496, 517},{0xE7, 0xF5, 0x84, 0xFF}}}, - {{{60, 135, 1},0, {1198, 70},{0x17, 0x7A, 0xE3, 0xFF}}}, - {{{88, 83, -32},0, {496, -16},{0x45, 0x1C, 0x99, 0xFF}}}, - {{{36, 61, -37},0, {496, 517},{0xE7, 0xF5, 0x84, 0xFF}}}, - {{{107, 26, 2},0, {-214, 66},{0x65, 0xBF, 0xD6, 0xFF}}}, - {{{57, 7, -3},0, {-130, 621},{0x6, 0x8C, 0xCD, 0xFF}}}, - {{{32, 11, 1},0, {12, 847},{0x3D, 0x98, 0xD7, 0xFF}}}, - {{{17, 53, -22},0, {496, 752},{0x4, 0x0, 0x81, 0xFF}}}, - {{{-2, 94, 1},0, {991, 841},{0xDE, 0x73, 0xD7, 0xFF}}}, - {{{12, 114, -3},0, {1127, 628},{0xB1, 0x59, 0xD2, 0xFF}}}, }; Gfx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_tri_0[] = { gsSPVertex(wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_0 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 1, 3, 0), - gsSP1Triangle(1, 4, 3, 0), - gsSP1Triangle(5, 3, 4, 0), - gsSP1Triangle(4, 6, 5, 0), - gsSP1Triangle(7, 6, 4, 0), - gsSP1Triangle(4, 8, 7, 0), - gsSP1Triangle(7, 8, 9, 0), - gsSP1Triangle(9, 10, 7, 0), - gsSP1Triangle(11, 10, 9, 0), - gsSP1Triangle(9, 12, 11, 0), - gsSP1Triangle(12, 9, 13, 0), - gsSP1Triangle(13, 14, 12, 0), - gsSP1Triangle(13, 15, 14, 0), + gsSP1Triangle(1, 0, 3, 0), + gsSP1Triangle(3, 0, 4, 0), + gsSP1Triangle(4, 0, 5, 0), + gsSP1Triangle(6, 5, 0, 0), + gsSP1Triangle(2, 6, 0, 0), + gsSP1Triangle(7, 6, 2, 0), + gsSP1Triangle(2, 8, 7, 0), + gsSP1Triangle(8, 2, 9, 0), + gsSP1Triangle(2, 1, 9, 0), + gsSP1Triangle(10, 9, 1, 0), + gsSP1Triangle(10, 1, 3, 0), + gsSP1Triangle(11, 10, 3, 0), + gsSP1Triangle(3, 12, 11, 0), + gsSP1Triangle(12, 3, 13, 0), + gsSP1Triangle(4, 13, 3, 0), + gsSP1Triangle(4, 14, 13, 0), + gsSP1Triangle(15, 14, 4, 0), + gsSP1Triangle(5, 15, 4, 0), gsSPVertex(wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_0 + 16, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 3, 0, 0), - gsSP1Triangle(5, 3, 4, 0), - gsSP1Triangle(6, 3, 5, 0), - gsSP1Triangle(7, 6, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(7, 9, 8, 0), - gsSP1Triangle(10, 9, 7, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(11, 10, 12, 0), - gsSP1Triangle(12, 13, 11, 0), - gsSP1Triangle(12, 14, 13, 0), - gsSP1Triangle(15, 14, 12, 0), - gsSPVertex(wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_0 + 32, 16, 0), + gsSP1Triangle(2, 3, 0, 0), + gsSP1Triangle(4, 3, 2, 0), + gsSP1Triangle(5, 4, 2, 0), + gsSP1Triangle(5, 6, 4, 0), + gsSP1Triangle(6, 7, 4, 0), + gsSP1Triangle(6, 8, 7, 0), + gsSP1Triangle(9, 8, 6, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(10, 9, 11, 0), + gsSP1Triangle(12, 10, 11, 0), + gsSP1Triangle(13, 12, 11, 0), + gsSP1Triangle(14, 12, 13, 0), + gsSP1Triangle(15, 14, 13, 0), + gsSP1Triangle(4, 14, 15, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_0 + 32, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 1, 0, 0), - gsSP1Triangle(4, 1, 3, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(5, 8, 6, 0), - gsSP1Triangle(5, 9, 8, 0), - gsSP1Triangle(9, 10, 8, 0), + gsSP1Triangle(2, 3, 0, 0), + gsSP1Triangle(4, 3, 2, 0), + gsSP1Triangle(2, 5, 4, 0), + gsSP1Triangle(6, 5, 2, 0), + gsSP1Triangle(6, 7, 5, 0), + gsSP1Triangle(5, 7, 4, 0), + gsSP1Triangle(4, 7, 8, 0), + gsSP1Triangle(0, 9, 10, 0), gsSP1Triangle(9, 11, 10, 0), - gsSP1Triangle(11, 12, 10, 0), - gsSP1Triangle(10, 12, 8, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_vtx_0 + 48, 9, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 1, 3, 0), - gsSP1Triangle(2, 3, 4, 0), - gsSP1Triangle(2, 4, 5, 0), - gsSP1Triangle(5, 6, 2, 0), - gsSP1Triangle(2, 6, 7, 0), - gsSP1Triangle(8, 2, 7, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(12, 11, 13, 0), gsSPEndDisplayList(), }; @@ -2914,6 +2758,242 @@ Gfx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_tri_3[] = { gsSPEndDisplayList(), }; +Vtx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_0[46] = { + {{{1, 76, 37},0, {-16, -16},{0xF9, 0x3F, 0x6E, 0xFF}}}, + {{{30, 59, 50},0, {-16, -16},{0xC0, 0xFA, 0x6E, 0xFF}}}, + {{{30, 116, 36},0, {-16, -16},{0xCE, 0x59, 0x4B, 0xFF}}}, + {{{24, 26, 37},0, {-16, -16},{0x10, 0xC0, 0x6D, 0xFF}}}, + {{{-13, 78, 43},0, {-16, -16},{0xC7, 0x35, 0x65, 0xFF}}}, + {{{-2, 94, 1},0, {-16, -16},{0xDE, 0x73, 0xD7, 0xFF}}}, + {{{12, 114, -3},0, {-16, -16},{0xB1, 0x59, 0xD2, 0xFF}}}, + {{{60, 135, 1},0, {-16, -16},{0x17, 0x7A, 0xE3, 0xFF}}}, + {{{56, 107, 46},0, {-16, -16},{0x14, 0x51, 0x60, 0xFF}}}, + {{{58, 63, 68},0, {-16, -16},{0xF1, 0x13, 0x7D, 0xFF}}}, + {{{78, 19, 68},0, {-16, -16},{0x19, 0xB2, 0x61, 0xFF}}}, + {{{57, 7, -3},0, {-16, -16},{0x6, 0x8C, 0xCD, 0xFF}}}, + {{{32, 11, 1},0, {-16, -16},{0x3D, 0x98, 0xD7, 0xFF}}}, + {{{14, 14, 43},0, {-16, -16},{0xFB, 0xB1, 0x63, 0xFF}}}, + {{{-15, 39, 8},0, {-16, -16},{0x8B, 0xCF, 0xF8, 0xFF}}}, + {{{-19, 100, -4},0, {-16, -16},{0xBD, 0x65, 0xD9, 0xFF}}}, + {{{4, 49, -32},0, {-16, -16},{0xEE, 0xFA, 0x82, 0xFF}}}, + {{{-19, 100, -4},0, {-16, -16},{0xBD, 0x65, 0xD9, 0xFF}}}, + {{{-2, 94, 1},0, {-16, -16},{0xDE, 0x73, 0xD7, 0xFF}}}, + {{{17, 53, -22},0, {-16, -16},{0x4, 0x0, 0x81, 0xFF}}}, + {{{36, 61, -37},0, {-16, -16},{0xE7, 0xF5, 0x84, 0xFF}}}, + {{{12, 114, -3},0, {-16, -16},{0xB1, 0x59, 0xD2, 0xFF}}}, + {{{60, 135, 1},0, {-16, -16},{0x17, 0x7A, 0xE3, 0xFF}}}, + {{{88, 83, -32},0, {-16, -16},{0x45, 0x1C, 0x99, 0xFF}}}, + {{{99, 92, 25},0, {-16, -16},{0x6C, 0x3D, 0x1C, 0xFF}}}, + {{{56, 107, 46},0, {-16, -16},{0x14, 0x51, 0x60, 0xFF}}}, + {{{88, 67, 54},0, {-16, -16},{0x44, 0x2C, 0x62, 0xFF}}}, + {{{58, 63, 68},0, {-16, -16},{0xF1, 0x13, 0x7D, 0xFF}}}, + {{{98, 43, 54},0, {-16, -16},{0x67, 0xF9, 0x4A, 0xFF}}}, + {{{78, 19, 68},0, {-16, -16},{0x19, 0xB2, 0x61, 0xFF}}}, + {{{107, 26, 2},0, {-16, -16},{0x65, 0xBF, 0xD6, 0xFF}}}, + {{{57, 7, -3},0, {-16, -16},{0x6, 0x8C, 0xCD, 0xFF}}}, + {{{36, 61, -37},0, {-16, -16},{0xE7, 0xF5, 0x84, 0xFF}}}, + {{{57, 7, -3},0, {-16, -16},{0x6, 0x8C, 0xCD, 0xFF}}}, + {{{32, 11, 1},0, {-16, -16},{0x3D, 0x98, 0xD7, 0xFF}}}, + {{{17, 53, -22},0, {-16, -16},{0x4, 0x0, 0x81, 0xFF}}}, + {{{4, 49, -32},0, {-16, -16},{0xEE, 0xFA, 0x82, 0xFF}}}, + {{{25, -5, -4},0, {-16, -16},{0x1B, 0x8A, 0xD8, 0xFF}}}, + {{{14, 14, 43},0, {-16, -16},{0xFB, 0xB1, 0x63, 0xFF}}}, + {{{-15, 39, 8},0, {-16, -16},{0x8B, 0xCF, 0xF8, 0xFF}}}, + {{{-19, 100, -4},0, {-16, -16},{0xBD, 0x65, 0xD9, 0xFF}}}, + {{{88, 83, -32},0, {-16, -16},{0x45, 0x1C, 0x99, 0xFF}}}, + {{{107, 26, 2},0, {-16, -16},{0x65, 0xBF, 0xD6, 0xFF}}}, + {{{99, 92, 25},0, {-16, -16},{0x6C, 0x3D, 0x1C, 0xFF}}}, + {{{98, 43, 54},0, {-16, -16},{0x67, 0xF9, 0x4A, 0xFF}}}, + {{{88, 67, 54},0, {-16, -16},{0x44, 0x2C, 0x62, 0xFF}}}, +}; + +Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_0[] = { + gsSPVertex(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_0 + 0, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(1, 0, 3, 0), + gsSP1Triangle(3, 0, 4, 0), + gsSP1Triangle(4, 0, 5, 0), + gsSP1Triangle(6, 5, 0, 0), + gsSP1Triangle(2, 6, 0, 0), + gsSP1Triangle(7, 6, 2, 0), + gsSP1Triangle(2, 8, 7, 0), + gsSP1Triangle(8, 2, 9, 0), + gsSP1Triangle(2, 1, 9, 0), + gsSP1Triangle(10, 9, 1, 0), + gsSP1Triangle(10, 1, 3, 0), + gsSP1Triangle(11, 10, 3, 0), + gsSP1Triangle(3, 12, 11, 0), + gsSP1Triangle(12, 3, 13, 0), + gsSP1Triangle(4, 13, 3, 0), + gsSP1Triangle(4, 14, 13, 0), + gsSP1Triangle(15, 14, 4, 0), + gsSP1Triangle(5, 15, 4, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_0 + 16, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(2, 3, 0, 0), + gsSP1Triangle(4, 3, 2, 0), + gsSP1Triangle(5, 4, 2, 0), + gsSP1Triangle(5, 6, 4, 0), + gsSP1Triangle(6, 7, 4, 0), + gsSP1Triangle(6, 8, 7, 0), + gsSP1Triangle(9, 8, 6, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(10, 9, 11, 0), + gsSP1Triangle(12, 10, 11, 0), + gsSP1Triangle(13, 12, 11, 0), + gsSP1Triangle(14, 12, 13, 0), + gsSP1Triangle(15, 14, 13, 0), + gsSP1Triangle(4, 14, 15, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_0 + 32, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(2, 3, 0, 0), + gsSP1Triangle(4, 3, 2, 0), + gsSP1Triangle(2, 5, 4, 0), + gsSP1Triangle(6, 5, 2, 0), + gsSP1Triangle(6, 7, 5, 0), + gsSP1Triangle(5, 7, 4, 0), + gsSP1Triangle(4, 7, 8, 0), + gsSP1Triangle(0, 9, 10, 0), + gsSP1Triangle(9, 11, 10, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(12, 11, 13, 0), + gsSPEndDisplayList(), +}; + +Vtx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_1[5] = { + {{{123, 32, -25},0, {496, 55},{0xCE, 0x10, 0x8C, 0xFF}}}, + {{{130, -53, -3},0, {-162, 175},{0xD1, 0xBD, 0x9F, 0xFF}}}, + {{{83, -21, 39},0, {72, 684},{0xCC, 0xD4, 0x95, 0xFF}}}, + {{{94, 81, 48},0, {920, 684},{0xD9, 0x49, 0x9F, 0xFF}}}, + {{{148, 108, 11},0, {1154, 175},{0xE3, 0x5B, 0xAC, 0xFF}}}, +}; + +Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_1[] = { + gsSPVertex(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_1 + 0, 5, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(3, 4, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_2[41] = { + {{{213, -33, -3},0, {-16, -16},{0x48, 0xDB, 0x9E, 0xFF}}}, + {{{130, -53, -3},0, {-16, -16},{0xD1, 0xBD, 0x9F, 0xFF}}}, + {{{123, 32, -25},0, {-16, -16},{0xCE, 0x10, 0x8C, 0xFF}}}, + {{{171, -140, 74},0, {-16, -16},{0xF5, 0x88, 0xD9, 0xFF}}}, + {{{258, -86, 130},0, {-16, -16},{0x66, 0xC5, 0xD0, 0xFF}}}, + {{{278, 88, 145},0, {-16, -16},{0x71, 0x2A, 0xD9, 0xFF}}}, + {{{225, 69, 6},0, {-16, -16},{0x51, 0x25, 0xA5, 0xFF}}}, + {{{148, 108, 11},0, {-16, -16},{0xE3, 0x5B, 0xAC, 0xFF}}}, + {{{206, 168, 102},0, {-16, -16},{0x10, 0x7D, 0xEF, 0xFF}}}, + {{{143, 126, 115},0, {-16, -16},{0xA4, 0x49, 0x32, 0xFF}}}, + {{{94, 81, 48},0, {-16, -16},{0xD9, 0x49, 0x9F, 0xFF}}}, + {{{55, 109, 59},0, {-16, -16},{0xAD, 0x60, 0x7, 0xFF}}}, + {{{19, 38, 35},0, {-16, -16},{0x86, 0x10, 0xE0, 0xFF}}}, + {{{83, -21, 39},0, {-16, -16},{0xCC, 0xD4, 0x95, 0xFF}}}, + {{{38, -42, 46},0, {-16, -16},{0x99, 0xB5, 0xF9, 0xFF}}}, + {{{119, -88, 96},0, {-16, -16},{0x95, 0xC6, 0x26, 0xFF}}}, + {{{158, -105, 136},0, {-16, -16},{0xA1, 0xC9, 0x40, 0xFF}}}, + {{{119, -88, 96},0, {-16, -16},{0x95, 0xC6, 0x26, 0xFF}}}, + {{{171, -140, 74},0, {-16, -16},{0xF5, 0x88, 0xD9, 0xFF}}}, + {{{205, -139, 148},0, {-16, -16},{0x8, 0x84, 0x18, 0xFF}}}, + {{{258, -86, 130},0, {-16, -16},{0x66, 0xC5, 0xD0, 0xFF}}}, + {{{303, -68, 204},0, {-16, -16},{0x6E, 0xC6, 0x1C, 0xFF}}}, + {{{316, 48, 215},0, {-16, -16},{0x77, 0x1A, 0x23, 0xFF}}}, + {{{278, 88, 145},0, {-16, -16},{0x71, 0x2A, 0xD9, 0xFF}}}, + {{{237, 147, 173},0, {-16, -16},{0x23, 0x72, 0x2D, 0xFF}}}, + {{{206, 168, 102},0, {-16, -16},{0x10, 0x7D, 0xEF, 0xFF}}}, + {{{225, 69, 6},0, {-16, -16},{0x51, 0x25, 0xA5, 0xFF}}}, + {{{184, 127, 156},0, {-16, -16},{0xAE, 0x3F, 0x4A, 0xFF}}}, + {{{211, 111, 200},0, {-16, -16},{0xB8, 0x38, 0x59, 0xFF}}}, + {{{251, 54, 257},0, {-16, -16},{0xF6, 0x20, 0x7B, 0xFF}}}, + {{{237, -67, 247},0, {-16, -16},{0xED, 0xCF, 0x74, 0xFF}}}, + {{{187, -103, 181},0, {-16, -16},{0xAC, 0xCB, 0x4F, 0xFF}}}, + {{{206, 168, 102},0, {-16, -16},{0x10, 0x7D, 0xEF, 0xFF}}}, + {{{143, 126, 115},0, {-16, -16},{0xA4, 0x49, 0x32, 0xFF}}}, + {{{184, 127, 156},0, {-16, -16},{0xAE, 0x3F, 0x4A, 0xFF}}}, + {{{38, -42, 46},0, {-16, -16},{0x99, 0xB5, 0xF9, 0xFF}}}, + {{{119, -88, 96},0, {-16, -16},{0x95, 0xC6, 0x26, 0xFF}}}, + {{{78, -22, 55},0, {-16, -16},{0xC3, 0xE, 0x6F, 0xFF}}}, + {{{19, 38, 35},0, {-16, -16},{0x86, 0x10, 0xE0, 0xFF}}}, + {{{90, 80, 64},0, {-16, -16},{0xBF, 0xED, 0x6C, 0xFF}}}, + {{{55, 109, 59},0, {-16, -16},{0xAD, 0x60, 0x7, 0xFF}}}, +}; + +Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_2[] = { + gsSPVertex(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_2 + 0, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(4, 3, 0, 0), + gsSP1Triangle(0, 5, 4, 0), + gsSP1Triangle(6, 5, 0, 0), + gsSP1Triangle(6, 0, 2, 0), + gsSP1Triangle(6, 2, 7, 0), + gsSP1Triangle(7, 8, 6, 0), + gsSP1Triangle(7, 9, 8, 0), + gsSP1Triangle(10, 9, 7, 0), + gsSP1Triangle(10, 11, 9, 0), + gsSP1Triangle(10, 12, 11, 0), + gsSP1Triangle(10, 13, 12, 0), + gsSP1Triangle(14, 12, 13, 0), + gsSP1Triangle(15, 14, 13, 0), + gsSP1Triangle(1, 15, 13, 0), + gsSP1Triangle(3, 15, 1, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_2 + 16, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(2, 3, 0, 0), + gsSP1Triangle(4, 3, 2, 0), + gsSP1Triangle(4, 5, 3, 0), + gsSP1Triangle(5, 4, 6, 0), + gsSP1Triangle(4, 7, 6, 0), + gsSP1Triangle(8, 6, 7, 0), + gsSP1Triangle(9, 8, 7, 0), + gsSP1Triangle(10, 9, 7, 0), + gsSP1Triangle(11, 8, 9, 0), + gsSP1Triangle(8, 11, 12, 0), + gsSP1Triangle(13, 8, 12, 0), + gsSP1Triangle(13, 6, 8, 0), + gsSP1Triangle(6, 13, 5, 0), + gsSP1Triangle(13, 14, 5, 0), + gsSP1Triangle(3, 5, 14, 0), + gsSP1Triangle(14, 15, 3, 0), + gsSP1Triangle(15, 0, 3, 0), + gsSPVertex(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_2 + 32, 9, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 3, 5, 0), + gsSP1Triangle(6, 5, 7, 0), + gsSP1Triangle(8, 6, 7, 0), + gsSP1Triangle(1, 8, 7, 0), + gsSPEndDisplayList(), +}; + +Vtx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_3[10] = { + {{{237, -67, 247},0, {-16, -16},{0xED, 0xCF, 0x74, 0xFF}}}, + {{{251, 54, 257},0, {-16, -16},{0xF6, 0x20, 0x7B, 0xFF}}}, + {{{211, 111, 200},0, {-16, -16},{0xB8, 0x38, 0x59, 0xFF}}}, + {{{187, -103, 181},0, {-16, -16},{0xAC, 0xCB, 0x4F, 0xFF}}}, + {{{158, -105, 136},0, {-16, -16},{0xA1, 0xC9, 0x40, 0xFF}}}, + {{{184, 127, 156},0, {-16, -16},{0xAE, 0x3F, 0x4A, 0xFF}}}, + {{{143, 126, 115},0, {-16, -16},{0xA4, 0x49, 0x32, 0xFF}}}, + {{{90, 80, 64},0, {-16, -16},{0xBF, 0xED, 0x6C, 0xFF}}}, + {{{78, -22, 55},0, {-16, -16},{0xC3, 0xE, 0x6F, 0xFF}}}, + {{{119, -88, 96},0, {-16, -16},{0x95, 0xC6, 0x26, 0xFF}}}, +}; + +Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_3[] = { + gsSPVertex(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_vtx_3 + 0, 10, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(2, 3, 0, 0), + gsSP1Triangle(2, 4, 3, 0), + gsSP1Triangle(2, 5, 4, 0), + gsSP1Triangle(5, 6, 4, 0), + gsSP1Triangle(6, 7, 4, 0), + gsSP1Triangle(7, 8, 4, 0), + gsSP1Triangle(8, 9, 4, 0), + gsSPEndDisplayList(), +}; + Vtx wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4_vtx_0[8] = { {{{403, 203, 40},0, {974, -16},{0xBE, 0x66, 0xDB, 0xFF}}}, {{{194, 89, 100},0, {-16, 1996},{0xBE, 0x66, 0xDB, 0xFF}}}, @@ -2955,28 +3035,28 @@ Gfx wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4_tri_1[] = }; Vtx wario_000_offset_left_upper_leg_mesh_layer_1_vtx_0[22] = { - {{{-5, 33, 20},0, {-16, -16},{0x9C, 0x3E, 0x2F, 0xFF}}}, + {{{-5, 33, 20},0, {-16, -16},{0x9D, 0x40, 0x30, 0xFF}}}, {{{-12, 0, -1},0, {-16, -16},{0x81, 0xF7, 0xFD, 0xFF}}}, - {{{-1, -11, 34},0, {-16, -16},{0xA3, 0xE2, 0x51, 0xFF}}}, - {{{-3, 33, -21},0, {-16, -16},{0x9E, 0x3C, 0xC9, 0xFF}}}, - {{{12, 42, -26},0, {-16, -16},{0xEA, 0x64, 0xB5, 0xFF}}}, - {{{12, 42, 27},0, {-16, -16},{0xEB, 0x64, 0x4C, 0xFF}}}, - {{{16, -13, 45},0, {-16, -16},{0xF5, 0xDA, 0x79, 0xFF}}}, - {{{1, -38, 0},0, {-16, -16},{0xAB, 0xA1, 0x0, 0xFF}}}, - {{{0, -12, -35},0, {-16, -16},{0xA9, 0xDE, 0xA9, 0xFF}}}, - {{{17, -13, -43},0, {-16, -16},{0xFA, 0xDA, 0x87, 0xFF}}}, - {{{55, 35, -18},0, {-16, -16},{0x44, 0x59, 0xC4, 0xFF}}}, - {{{54, 35, 19},0, {-16, -16},{0x43, 0x59, 0x3D, 0xFF}}}, - {{{57, -4, 31},0, {-16, -16},{0x4D, 0xEA, 0x63, 0xFF}}}, - {{{60, -29, 0},0, {-16, -16},{0x55, 0xA1, 0x0, 0xFF}}}, - {{{19, -47, 0},0, {-16, -16},{0x0, 0x81, 0x0, 0xFF}}}, - {{{58, -4, -29},0, {-16, -16},{0x4E, 0xE9, 0x9E, 0xFF}}}, - {{{55, 35, -18},0, {-16, -16},{0x44, 0x59, 0xC4, 0xFF}}}, - {{{73, 8, 0},0, {-16, -16},{0x7F, 0xB, 0x1, 0xFF}}}, - {{{58, -4, -29},0, {-16, -16},{0x4E, 0xE9, 0x9E, 0xFF}}}, - {{{54, 35, 19},0, {-16, -16},{0x43, 0x59, 0x3D, 0xFF}}}, - {{{57, -4, 31},0, {-16, -16},{0x4D, 0xEA, 0x63, 0xFF}}}, - {{{60, -29, 0},0, {-16, -16},{0x55, 0xA1, 0x0, 0xFF}}}, + {{{-1, -11, 34},0, {-16, -16},{0xA2, 0xE0, 0x50, 0xFF}}}, + {{{-3, 33, -21},0, {-16, -16},{0xA0, 0x3E, 0xC9, 0xFF}}}, + {{{12, 42, -26},0, {-16, -16},{0xEC, 0x65, 0xB5, 0xFF}}}, + {{{12, 42, 27},0, {-16, -16},{0xEC, 0x65, 0x4B, 0xFF}}}, + {{{16, -13, 45},0, {-16, -16},{0xF5, 0xD9, 0x78, 0xFF}}}, + {{{1, -38, 0},0, {-16, -16},{0xA9, 0xA3, 0xFF, 0xFF}}}, + {{{0, -12, -35},0, {-16, -16},{0xAA, 0xDE, 0xA9, 0xFF}}}, + {{{17, -13, -43},0, {-16, -16},{0xFC, 0xDA, 0x87, 0xFF}}}, + {{{55, 35, -18},0, {-16, -16},{0x45, 0x58, 0xC4, 0xFF}}}, + {{{54, 35, 19},0, {-16, -16},{0x44, 0x59, 0x3D, 0xFF}}}, + {{{57, -4, 31},0, {-16, -16},{0x4E, 0xEA, 0x62, 0xFF}}}, + {{{60, -29, 0},0, {-16, -16},{0x56, 0xA2, 0x0, 0xFF}}}, + {{{19, -47, 0},0, {-16, -16},{0xFF, 0x81, 0xFF, 0xFF}}}, + {{{58, -4, -29},0, {-16, -16},{0x4F, 0xEA, 0x9F, 0xFF}}}, + {{{55, 35, -18},0, {-16, -16},{0x45, 0x58, 0xC4, 0xFF}}}, + {{{73, 8, 0},0, {-16, -16},{0x7F, 0xA, 0x0, 0xFF}}}, + {{{58, -4, -29},0, {-16, -16},{0x4F, 0xEA, 0x9F, 0xFF}}}, + {{{54, 35, 19},0, {-16, -16},{0x44, 0x59, 0x3D, 0xFF}}}, + {{{57, -4, 31},0, {-16, -16},{0x4E, 0xEA, 0x62, 0xFF}}}, + {{{60, -29, 0},0, {-16, -16},{0x56, 0xA2, 0x0, 0xFF}}}, }; Gfx wario_000_offset_left_upper_leg_mesh_layer_1_tri_0[] = { @@ -3018,16 +3098,16 @@ Gfx wario_000_offset_left_upper_leg_mesh_layer_1_tri_0[] = { Vtx wario_000_offset_left_lower_leg_mesh_layer_1_vtx_0[12] = { {{{6, 34, 20},0, {-16, -16},{0xC3, 0x5C, 0x3F, 0xFF}}}, {{{38, -8, 37},0, {-16, -16},{0x37, 0xDB, 0x6D, 0xFF}}}, - {{{40, 35, 23},0, {-16, -16},{0x3E, 0x58, 0x44, 0xFF}}}, - {{{4, -4, 32},0, {-16, -16},{0xBD, 0xE5, 0x69, 0xFF}}}, - {{{-12, 6, 0},0, {-16, -16},{0x81, 0x6, 0xFE, 0xFF}}}, + {{{40, 35, 23},0, {-16, -16},{0x3F, 0x58, 0x43, 0xFF}}}, + {{{4, -4, 32},0, {-16, -16},{0xBC, 0xE5, 0x68, 0xFF}}}, + {{{-12, 6, 0},0, {-16, -16},{0x81, 0x5, 0xFD, 0xFF}}}, {{{7, 34, -18},0, {-16, -16},{0xC7, 0x5D, 0xBE, 0xFF}}}, - {{{41, 35, -19},0, {-16, -16},{0x42, 0x58, 0xC0, 0xFF}}}, + {{{41, 35, -19},0, {-16, -16},{0x42, 0x58, 0xC1, 0xFF}}}, {{{50, 2, 1},0, {-16, -16},{0x7F, 0xF9, 0x0, 0xFF}}}, {{{37, -35, 1},0, {-16, -16},{0x34, 0x8C, 0x0, 0xFF}}}, - {{{3, -29, 1},0, {-16, -16},{0xB9, 0x96, 0x0, 0xFF}}}, - {{{4, -4, -29},0, {-16, -16},{0xBD, 0xE4, 0x98, 0xFF}}}, - {{{38, -8, -34},0, {-16, -16},{0x37, 0xDB, 0x94, 0xFF}}}, + {{{3, -29, 1},0, {-16, -16},{0xBA, 0x96, 0x0, 0xFF}}}, + {{{4, -4, -29},0, {-16, -16},{0xBD, 0xE5, 0x97, 0xFF}}}, + {{{38, -8, -34},0, {-16, -16},{0x37, 0xDC, 0x93, 0xFF}}}, }; Gfx wario_000_offset_left_lower_leg_mesh_layer_1_tri_0[] = { @@ -3057,42 +3137,42 @@ Gfx wario_000_offset_left_lower_leg_mesh_layer_1_tri_0[] = { Vtx wario_000_offset_left_foot_mesh_layer_1_vtx_0[37] = { {{{-10, 48, 40},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, - {{{-40, 59, -16},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, - {{{-40, 59, 15},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, + {{{-40, 59, -16},0, {-16, -16},{0x2C, 0x77, 0x0, 0xFF}}}, + {{{-40, 59, 15},0, {-16, -16},{0x2C, 0x77, 0x0, 0xFF}}}, {{{-10, 48, -38},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, {{{71, 19, 47},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, {{{71, 19, -46},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, {{{99, 9, 27},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, {{{99, 9, -30},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, - {{{-30, 12, 31},0, {-16, -16},{0xB6, 0xC9, 0x58, 0xFF}}}, - {{{-10, 48, 40},0, {-16, -16},{0xD4, 0xFF, 0x77, 0xFF}}}, - {{{-40, 59, 15},0, {-16, -16},{0x8D, 0x12, 0x34, 0xFF}}}, + {{{-30, 12, 31},0, {-16, -16},{0xB6, 0xC7, 0x57, 0xFF}}}, + {{{-10, 48, 40},0, {-16, -16},{0xD2, 0xFD, 0x76, 0xFF}}}, + {{{-40, 59, 15},0, {-16, -16},{0x8D, 0xF, 0x34, 0xFF}}}, {{{58, -9, 42},0, {-16, -16},{0xFB, 0xC0, 0x6E, 0xFF}}}, - {{{34, -27, 3},0, {-16, -16},{0xD5, 0x88, 0x1, 0xFF}}}, - {{{-48, 14, -2},0, {-16, -16},{0x8D, 0xCA, 0xFA, 0xFF}}}, - {{{-40, 59, -16},0, {-16, -16},{0x90, 0xE, 0xC6, 0xFF}}}, - {{{-30, 12, -26},0, {-16, -16},{0xBB, 0xC4, 0xA7, 0xFF}}}, - {{{-40, 59, -16},0, {-16, -16},{0x90, 0xE, 0xC6, 0xFF}}}, - {{{-10, 48, -38},0, {-16, -16},{0xD4, 0xF5, 0x89, 0xFF}}}, - {{{-30, 12, -26},0, {-16, -16},{0xBB, 0xC4, 0xA7, 0xFF}}}, + {{{34, -27, 2},0, {-16, -16},{0xD6, 0x88, 0x0, 0xFF}}}, + {{{-48, 14, -2},0, {-16, -16},{0x8E, 0xC9, 0xF9, 0xFF}}}, + {{{-40, 59, -16},0, {-16, -16},{0x8F, 0xB, 0xC7, 0xFF}}}, + {{{-30, 12, -26},0, {-16, -16},{0xBC, 0xC3, 0xA8, 0xFF}}}, + {{{-40, 59, -16},0, {-16, -16},{0x8F, 0xB, 0xC7, 0xFF}}}, + {{{-10, 48, -38},0, {-16, -16},{0xD2, 0xF3, 0x8A, 0xFF}}}, + {{{-30, 12, -26},0, {-16, -16},{0xBC, 0xC3, 0xA8, 0xFF}}}, {{{58, -9, -38},0, {-16, -16},{0xF1, 0xC0, 0x93, 0xFF}}}, - {{{71, 19, -46},0, {-16, -16},{0x7, 0xE0, 0x85, 0xFF}}}, - {{{106, -22, -22},0, {-16, -16},{0x66, 0xDD, 0xBD, 0xFF}}}, - {{{99, 9, -30},0, {-16, -16},{0x60, 0x0, 0xAD, 0xFF}}}, + {{{71, 19, -46},0, {-16, -16},{0x8, 0xE0, 0x85, 0xFF}}}, + {{{106, -22, -22},0, {-16, -16},{0x67, 0xDC, 0xBE, 0xFF}}}, + {{{99, 9, -30},0, {-16, -16},{0x61, 0x0, 0xAF, 0xFF}}}, {{{106, -22, 19},0, {-16, -16},{0x69, 0xDB, 0x3E, 0xFF}}}, - {{{99, 9, 27},0, {-16, -16},{0x67, 0x4, 0x4B, 0xFF}}}, - {{{71, 19, 47},0, {-16, -16},{0x12, 0xE8, 0x7B, 0xFF}}}, + {{{99, 9, 27},0, {-16, -16},{0x67, 0x4, 0x4A, 0xFF}}}, + {{{71, 19, 47},0, {-16, -16},{0x13, 0xE8, 0x7B, 0xFF}}}, {{{58, -9, 42},0, {-16, -16},{0xFB, 0xC0, 0x6E, 0xFF}}}, - {{{-10, 48, 40},0, {-16, -16},{0xD4, 0xFF, 0x77, 0xFF}}}, - {{{76, -33, 19},0, {-16, -16},{0xEE, 0x9D, 0x4E, 0xFF}}}, - {{{34, -27, 3},0, {-16, -16},{0xD5, 0x88, 0x1, 0xFF}}}, - {{{76, -33, -22},0, {-16, -16},{0xE8, 0xA5, 0xAA, 0xFF}}}, - {{{-48, 14, -2},0, {-16, -16},{0x8D, 0xCA, 0xFA, 0xFF}}}, - {{{106, -22, -22},0, {-16, -16},{0x66, 0xDD, 0xBD, 0xFF}}}, - {{{83, -61, -2},0, {-16, -16},{0xF1, 0x82, 0x0, 0xFF}}}, - {{{76, -33, -22},0, {-16, -16},{0xE8, 0xA5, 0xAA, 0xFF}}}, + {{{-10, 48, 40},0, {-16, -16},{0xD2, 0xFD, 0x76, 0xFF}}}, + {{{76, -33, 19},0, {-16, -16},{0xEF, 0x9D, 0x4E, 0xFF}}}, + {{{34, -27, 2},0, {-16, -16},{0xD6, 0x88, 0x0, 0xFF}}}, + {{{76, -33, -22},0, {-16, -16},{0xE9, 0xA5, 0xAA, 0xFF}}}, + {{{-48, 14, -2},0, {-16, -16},{0x8E, 0xC9, 0xF9, 0xFF}}}, + {{{106, -22, -22},0, {-16, -16},{0x67, 0xDC, 0xBE, 0xFF}}}, + {{{83, -61, -2},0, {-16, -16},{0xF1, 0x82, 0xFF, 0xFF}}}, + {{{76, -33, -22},0, {-16, -16},{0xE9, 0xA5, 0xAA, 0xFF}}}, {{{106, -22, 19},0, {-16, -16},{0x69, 0xDB, 0x3E, 0xFF}}}, - {{{76, -33, 19},0, {-16, -16},{0xEE, 0x9D, 0x4E, 0xFF}}}, + {{{76, -33, 19},0, {-16, -16},{0xEF, 0x9D, 0x4E, 0xFF}}}, }; Gfx wario_000_offset_left_foot_mesh_layer_1_tri_0[] = { @@ -3138,27 +3218,27 @@ Gfx wario_000_offset_left_foot_mesh_layer_1_tri_0[] = { Vtx wario_000_offset_right_upper_leg_mesh_layer_1_vtx_0[22] = { {{{57, -2, -32},0, {-16, -16},{0x4B, 0xEC, 0x9B, 0xFF}}}, - {{{74, 8, -1},0, {-16, -16},{0x7F, 0x9, 0xFE, 0xFF}}}, - {{{59, -27, -1},0, {-16, -16},{0x55, 0xA2, 0xFD, 0xFF}}}, + {{{74, 8, -1},0, {-16, -16},{0x7F, 0x9, 0xFF, 0xFF}}}, + {{{59, -27, -1},0, {-16, -16},{0x56, 0xA2, 0xFE, 0xFF}}}, {{{53, 36, -19},0, {-16, -16},{0x41, 0x5B, 0xC3, 0xFF}}}, {{{16, -12, -44},0, {-16, -16},{0xF7, 0xDB, 0x87, 0xFF}}}, {{{19, -48, -1},0, {-16, -16},{0x0, 0x81, 0xFE, 0xFF}}}, - {{{17, -14, 43},0, {-16, -16},{0xFA, 0xD6, 0x78, 0xFF}}}, - {{{58, -4, 29},0, {-16, -16},{0x4F, 0xE6, 0x60, 0xFF}}}, - {{{54, 36, 18},0, {-16, -16},{0x44, 0x59, 0x3C, 0xFF}}}, - {{{11, 43, -26},0, {-16, -16},{0xEB, 0x65, 0xB6, 0xFF}}}, - {{{-6, 34, -20},0, {-16, -16},{0x9C, 0x3E, 0xD0, 0xFF}}}, - {{{-1, -10, -34},0, {-16, -16},{0xA5, 0xE2, 0xAC, 0xFF}}}, - {{{1, -38, -1},0, {-16, -16},{0xA9, 0xA3, 0xFE, 0xFF}}}, - {{{0, -13, 34},0, {-16, -16},{0xA8, 0xD8, 0x52, 0xFF}}}, - {{{-5, 31, 23},0, {-16, -16},{0x9E, 0x36, 0x3C, 0xFF}}}, - {{{12, 42, 27},0, {-16, -16},{0xEC, 0x63, 0x4D, 0xFF}}}, - {{{-6, 34, -20},0, {-16, -16},{0x9C, 0x3E, 0xD0, 0xFF}}}, - {{{-12, 0, 1},0, {-16, -16},{0x82, 0xF3, 0x2, 0xFF}}}, - {{{-5, 31, 23},0, {-16, -16},{0x9E, 0x36, 0x3C, 0xFF}}}, - {{{-1, -10, -34},0, {-16, -16},{0xA5, 0xE2, 0xAC, 0xFF}}}, - {{{1, -38, -1},0, {-16, -16},{0xA9, 0xA3, 0xFE, 0xFF}}}, - {{{0, -13, 34},0, {-16, -16},{0xA8, 0xD8, 0x52, 0xFF}}}, + {{{17, -14, 43},0, {-16, -16},{0xFC, 0xD6, 0x78, 0xFF}}}, + {{{58, -4, 29},0, {-16, -16},{0x4F, 0xE7, 0x61, 0xFF}}}, + {{{54, 36, 18},0, {-16, -16},{0x43, 0x59, 0x3D, 0xFF}}}, + {{{11, 43, -26},0, {-16, -16},{0xEC, 0x66, 0xB6, 0xFF}}}, + {{{-6, 34, -20},0, {-16, -16},{0x9E, 0x40, 0xCF, 0xFF}}}, + {{{-1, -10, -34},0, {-16, -16},{0xA4, 0xE1, 0xAE, 0xFF}}}, + {{{1, -38, -1},0, {-16, -16},{0xA8, 0xA4, 0xFE, 0xFF}}}, + {{{0, -13, 34},0, {-16, -16},{0xA9, 0xD8, 0x53, 0xFF}}}, + {{{-5, 31, 23},0, {-16, -16},{0x9F, 0x38, 0x3C, 0xFF}}}, + {{{12, 42, 27},0, {-16, -16},{0xED, 0x64, 0x4D, 0xFF}}}, + {{{-6, 34, -20},0, {-16, -16},{0x9E, 0x40, 0xCF, 0xFF}}}, + {{{-12, 0, 1},0, {-16, -16},{0x82, 0xF4, 0x2, 0xFF}}}, + {{{-5, 31, 23},0, {-16, -16},{0x9F, 0x38, 0x3C, 0xFF}}}, + {{{-1, -10, -34},0, {-16, -16},{0xA4, 0xE1, 0xAE, 0xFF}}}, + {{{1, -38, -1},0, {-16, -16},{0xA8, 0xA4, 0xFE, 0xFF}}}, + {{{0, -13, 34},0, {-16, -16},{0xA9, 0xD8, 0x53, 0xFF}}}, }; Gfx wario_000_offset_right_upper_leg_mesh_layer_1_tri_0[] = { @@ -3198,28 +3278,28 @@ Gfx wario_000_offset_right_upper_leg_mesh_layer_1_tri_0[] = { }; Vtx wario_000_offset_right_lower_leg_mesh_layer_1_vtx_0[22] = { - {{{38, -8, 33},0, {-16, -16},{0xF9, 0x24, 0x7A, 0xFF}}}, - {{{41, 35, 20},0, {-16, -16},{0xF8, 0x23, 0x7A, 0xFF}}}, - {{{7, 34, 18},0, {-16, -16},{0xC6, 0x5A, 0x44, 0xFF}}}, - {{{4, -4, 29},0, {-16, -16},{0xBD, 0xE3, 0x68, 0xFF}}}, - {{{-10, 8, -1},0, {-16, -16},{0x81, 0x9, 0x0, 0xFF}}}, - {{{7, 36, -20},0, {-16, -16},{0xC5, 0x5F, 0xC3, 0xFF}}}, - {{{41, 35, 20},0, {-16, -16},{0xFE, 0x7F, 0x5, 0xFF}}}, - {{{41, 36, -23},0, {-16, -16},{0x0, 0x7F, 0x3, 0xFF}}}, - {{{4, -2, -32},0, {-16, -16},{0xBA, 0xE8, 0x99, 0xFF}}}, - {{{3, -28, -1},0, {-16, -16},{0xB6, 0x99, 0x0, 0xFF}}}, - {{{38, -7, -38},0, {-16, -16},{0xE6, 0xA1, 0xB0, 0xFF}}}, - {{{36, -35, -4},0, {-16, -16},{0xE6, 0xA0, 0xB0, 0xFF}}}, - {{{38, -8, 33},0, {-16, -16},{0xEE, 0x9C, 0x4C, 0xFF}}}, - {{{36, -35, -4},0, {-16, -16},{0xEF, 0x9B, 0x4C, 0xFF}}}, - {{{38, -7, -38},0, {-16, -16},{0xF5, 0x28, 0x88, 0xFF}}}, - {{{41, 36, -23},0, {-16, -16},{0xF6, 0x29, 0x88, 0xFF}}}, - {{{41, 35, 20},0, {-16, -16},{0x7B, 0x17, 0x18, 0xFF}}}, - {{{51, 3, -1},0, {-16, -16},{0x7F, 0xF7, 0x0, 0xFF}}}, - {{{41, 36, -23},0, {-16, -16},{0x7B, 0x17, 0xEA, 0xFF}}}, - {{{38, -8, 33},0, {-16, -16},{0x77, 0xEA, 0x27, 0xFF}}}, - {{{36, -35, -4},0, {-16, -16},{0x76, 0xD0, 0xFF, 0xFF}}}, - {{{38, -7, -38},0, {-16, -16},{0x78, 0xEC, 0xDA, 0xFF}}}, + {{{38, -8, 33},0, {-16, -16},{0xF7, 0x24, 0x7A, 0xFF}}}, + {{{41, 35, 20},0, {-16, -16},{0xF8, 0x25, 0x79, 0xFF}}}, + {{{7, 34, 18},0, {-16, -16},{0xC5, 0x5A, 0x44, 0xFF}}}, + {{{4, -4, 29},0, {-16, -16},{0xBC, 0xE4, 0x67, 0xFF}}}, + {{{-10, 8, -1},0, {-16, -16},{0x81, 0x8, 0x0, 0xFF}}}, + {{{7, 36, -20},0, {-16, -16},{0xC4, 0x5E, 0xC3, 0xFF}}}, + {{{41, 35, 20},0, {-16, -16},{0xFE, 0x7F, 0x4, 0xFF}}}, + {{{41, 36, -23},0, {-16, -16},{0x0, 0x7F, 0x2, 0xFF}}}, + {{{4, -2, -32},0, {-16, -16},{0xB8, 0xE8, 0x9A, 0xFF}}}, + {{{3, -28, -1},0, {-16, -16},{0xB6, 0x99, 0x1, 0xFF}}}, + {{{38, -7, -38},0, {-16, -16},{0xE5, 0xA1, 0xB0, 0xFF}}}, + {{{36, -35, -4},0, {-16, -16},{0xE5, 0xA1, 0xB0, 0xFF}}}, + {{{38, -8, 33},0, {-16, -16},{0xEE, 0x9C, 0x4D, 0xFF}}}, + {{{36, -35, -4},0, {-16, -16},{0xF2, 0x9A, 0x4B, 0xFF}}}, + {{{38, -7, -38},0, {-16, -16},{0xF3, 0x28, 0x88, 0xFF}}}, + {{{41, 36, -23},0, {-16, -16},{0xF6, 0x2A, 0x88, 0xFF}}}, + {{{41, 35, 20},0, {-16, -16},{0x7B, 0x17, 0x17, 0xFF}}}, + {{{51, 3, -1},0, {-16, -16},{0x7F, 0xF7, 0x1, 0xFF}}}, + {{{41, 36, -23},0, {-16, -16},{0x7B, 0x16, 0xEB, 0xFF}}}, + {{{38, -8, 33},0, {-16, -16},{0x77, 0xEB, 0x26, 0xFF}}}, + {{{36, -35, -4},0, {-16, -16},{0x76, 0xD2, 0xFF, 0xFF}}}, + {{{38, -7, -38},0, {-16, -16},{0x78, 0xED, 0xDB, 0xFF}}}, }; Gfx wario_000_offset_right_lower_leg_mesh_layer_1_tri_0[] = { @@ -3250,42 +3330,42 @@ Gfx wario_000_offset_right_lower_leg_mesh_layer_1_tri_0[] = { Vtx wario_000_displaylist_right_foot_mesh_layer_1_vtx_0[38] = { {{{-10, 48, -40},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, - {{{-40, 59, -15},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, - {{{-40, 59, 16},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, + {{{-40, 59, -15},0, {-16, -16},{0x2C, 0x77, 0x0, 0xFF}}}, + {{{-40, 59, 16},0, {-16, -16},{0x2C, 0x77, 0x0, 0xFF}}}, {{{-10, 48, 38},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, {{{71, 19, -47},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, {{{71, 19, 46},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, {{{99, 9, -27},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, {{{99, 9, 31},0, {-16, -16},{0x2B, 0x78, 0x0, 0xFF}}}, - {{{-30, 12, -31},0, {-16, -16},{0xB6, 0xC9, 0xA8, 0xFF}}}, - {{{-40, 59, -15},0, {-16, -16},{0x8D, 0x12, 0xCC, 0xFF}}}, - {{{-10, 48, -40},0, {-16, -16},{0xD4, 0xFF, 0x89, 0xFF}}}, - {{{-48, 14, 2},0, {-16, -16},{0x8D, 0xCA, 0x6, 0xFF}}}, - {{{34, -27, -2},0, {-16, -16},{0xD5, 0x88, 0xFF, 0xFF}}}, + {{{-30, 12, -31},0, {-16, -16},{0xB6, 0xC7, 0xA9, 0xFF}}}, + {{{-40, 59, -15},0, {-16, -16},{0x8D, 0xF, 0xCC, 0xFF}}}, + {{{-10, 48, -40},0, {-16, -16},{0xD2, 0xFD, 0x8A, 0xFF}}}, + {{{-48, 14, 2},0, {-16, -16},{0x8E, 0xC9, 0x7, 0xFF}}}, + {{{34, -27, -2},0, {-16, -16},{0xD6, 0x88, 0x0, 0xFF}}}, {{{58, -9, -42},0, {-16, -16},{0xFB, 0xC0, 0x92, 0xFF}}}, - {{{71, 19, -47},0, {-16, -16},{0x12, 0xE8, 0x85, 0xFF}}}, + {{{71, 19, -47},0, {-16, -16},{0x13, 0xE8, 0x85, 0xFF}}}, {{{106, -22, -19},0, {-16, -16},{0x69, 0xDB, 0xC2, 0xFF}}}, {{{106, -22, -19},0, {-16, -16},{0x69, 0xDB, 0xC2, 0xFF}}}, - {{{71, 19, -47},0, {-16, -16},{0x12, 0xE8, 0x85, 0xFF}}}, - {{{99, 9, -27},0, {-16, -16},{0x67, 0x4, 0xB5, 0xFF}}}, - {{{99, 9, 31},0, {-16, -16},{0x60, 0x0, 0x53, 0xFF}}}, - {{{106, -22, 22},0, {-16, -16},{0x66, 0xDD, 0x43, 0xFF}}}, + {{{71, 19, -47},0, {-16, -16},{0x13, 0xE8, 0x85, 0xFF}}}, + {{{99, 9, -27},0, {-16, -16},{0x67, 0x4, 0xB6, 0xFF}}}, + {{{99, 9, 31},0, {-16, -16},{0x5F, 0xFD, 0x55, 0xFF}}}, + {{{106, -22, 22},0, {-16, -16},{0x67, 0xDC, 0x42, 0xFF}}}, {{{71, 19, 46},0, {-16, -16},{0x7, 0xE0, 0x7B, 0xFF}}}, {{{58, -9, 38},0, {-16, -16},{0xF1, 0xC0, 0x6D, 0xFF}}}, - {{{-10, 48, 38},0, {-16, -16},{0xD4, 0xF5, 0x77, 0xFF}}}, - {{{-30, 12, 26},0, {-16, -16},{0xBB, 0xC4, 0x59, 0xFF}}}, - {{{-40, 59, 16},0, {-16, -16},{0x90, 0xE, 0x3A, 0xFF}}}, - {{{-48, 14, 2},0, {-16, -16},{0x8D, 0xCA, 0x6, 0xFF}}}, - {{{-40, 59, -15},0, {-16, -16},{0x8D, 0x12, 0xCC, 0xFF}}}, - {{{34, -27, -2},0, {-16, -16},{0xD5, 0x88, 0xFF, 0xFF}}}, - {{{76, -33, 22},0, {-16, -16},{0xE8, 0xA5, 0x56, 0xFF}}}, - {{{76, -33, -19},0, {-16, -16},{0xEE, 0x9D, 0xB2, 0xFF}}}, + {{{-10, 48, 38},0, {-16, -16},{0xD2, 0xF3, 0x76, 0xFF}}}, + {{{-30, 12, 26},0, {-16, -16},{0xBC, 0xC3, 0x58, 0xFF}}}, + {{{-40, 59, 16},0, {-16, -16},{0x8F, 0xB, 0x39, 0xFF}}}, + {{{-48, 14, 2},0, {-16, -16},{0x8E, 0xC9, 0x7, 0xFF}}}, + {{{-40, 59, -15},0, {-16, -16},{0x8D, 0xF, 0xCC, 0xFF}}}, + {{{34, -27, -2},0, {-16, -16},{0xD6, 0x88, 0x0, 0xFF}}}, + {{{76, -33, 22},0, {-16, -16},{0xE9, 0xA5, 0x56, 0xFF}}}, + {{{76, -33, -19},0, {-16, -16},{0xEF, 0x9D, 0xB2, 0xFF}}}, {{{58, -9, -42},0, {-16, -16},{0xFB, 0xC0, 0x92, 0xFF}}}, - {{{76, -33, -19},0, {-16, -16},{0xEE, 0x9D, 0xB2, 0xFF}}}, + {{{76, -33, -19},0, {-16, -16},{0xEF, 0x9D, 0xB2, 0xFF}}}, {{{106, -22, -19},0, {-16, -16},{0x69, 0xDB, 0xC2, 0xFF}}}, - {{{83, -61, 2},0, {-16, -16},{0xF1, 0x82, 0x0, 0xFF}}}, - {{{106, -22, 22},0, {-16, -16},{0x66, 0xDD, 0x43, 0xFF}}}, - {{{76, -33, 22},0, {-16, -16},{0xE8, 0xA5, 0x56, 0xFF}}}, + {{{83, -61, 2},0, {-16, -16},{0xF1, 0x82, 0x1, 0xFF}}}, + {{{106, -22, 22},0, {-16, -16},{0x67, 0xDC, 0x42, 0xFF}}}, + {{{76, -33, 22},0, {-16, -16},{0xE9, 0xA5, 0x56, 0xFF}}}, {{{58, -9, 38},0, {-16, -16},{0xF1, 0xC0, 0x6D, 0xFF}}}, }; @@ -3331,12 +3411,12 @@ Gfx wario_000_displaylist_right_foot_mesh_layer_1_tri_0[] = { }; -Gfx mat_wario_Wario_Overalls[] = { +Gfx mat_wario_overalls[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPCopyLightEXT(1, 3), - gsSPCopyLightEXT(2, 4), + gsSPCopyLightEXT(1, 3), // gsSPSetLights1(wario_purple_lights_group), + gsSPCopyLightEXT(2, 4), gsSPEndDisplayList(), }; @@ -3346,7 +3426,7 @@ Gfx mat_wario_metal[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4031, 1983, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_mario_metal_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_metal), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -3362,226 +3442,246 @@ Gfx mat_revert_wario_metal[] = { gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Cap[] = { +Gfx mat_wario_cap[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPCopyLightEXT(1, 5), + gsSPCopyLightEXT(1, 5), // gsSPSetLights1(wario_yellow_lights_group), gsSPCopyLightEXT(2, 6), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Button[] = { +Gfx mat_wario_button[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_wario_overalls_button_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_white_button), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 1023, 256), gsDPPipeSync(), 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), - gsSPCopyLightEXT(1, 3), - gsSPCopyLightEXT(2, 4), + gsSPCopyLightEXT(1, 3), // gsSPSetLights1(wario_purple_lights_group), + gsSPCopyLightEXT(2, 4), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Logo[] = { +Gfx mat_wario_logo[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_wario_logo_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_w_logo), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 1023, 256), gsDPPipeSync(), 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), - gsSPCopyLightEXT(1, 5), + gsSPCopyLightEXT(1, 5), // gsSPSetLights1(wario_yellow_lights_group), gsSPCopyLightEXT(2, 6), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Hair[] = { +Gfx mat_wario_hair[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(wario_Wario_Hair_lights), + gsSPSetLights1(wario_brown_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Eyes[] = { +Gfx mat_wario_eyes_center[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_custom_wario_eyes_center_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_eyes_front), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 2047, 128), gsDPPipeSync(), 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), - gsSPSetLights1(wario_Wario_Eyes_lights), + gsSPSetLights1(wario_beige_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Sideburn[] = { +Gfx mat_wario_sideburn[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_custom_wario_sideburn_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_hair_sideburn), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 1023, 256), gsDPPipeSync(), 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), - gsSPSetLights1(wario_Wario_Sideburn_lights), + gsSPSetLights1(wario_beige_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Skin[] = { +Gfx mat_wario_face[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(wario_Wario_Skin_lights), + gsSPSetLights1(wario_beige_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Mustache[] = { +Gfx mat_wario_mustache[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(wario_Wario_Mustache_lights), + gsSPSetLights1(wario_black_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Nose[] = { +Gfx mat_wario_nose[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(wario_Wario_Nose_lights), + gsSPSetLights1(wario_pink_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Mouth[] = { +Gfx mat_wario_mouth[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_custom_wario_mouth_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_mouth), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 2047, 128), gsDPPipeSync(), 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), - gsSPSetLights1(wario_Wario_Mouth_lights), + gsSPSetLights1(wario_beige_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Eyes_Half_Closed[] = { +Gfx mat_wario_eyes_half_closed[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_custom_wario_eyes_half_closed_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_eyes_half_closed), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 2047, 128), gsDPPipeSync(), 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), - gsSPSetLights1(wario_Wario_Eyes_Half_Closed_lights), + gsSPSetLights1(wario_beige_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Eyes_Closed[] = { +Gfx mat_wario_eyes_closed[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_custom_wario_eyes_closed_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_eyes_closed), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 2047, 128), gsDPPipeSync(), 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), - gsSPSetLights1(wario_Wario_Eyes_Closed_lights), + gsSPSetLights1(wario_beige_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Eyes_Dead[] = { +Gfx mat_wario_eyes_right[] = { gsDPPipeSync(), gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_custom_wario_eyes_dead_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_eyes_right), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 2047, 128), gsDPPipeSync(), 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), - gsSPSetLights1(wario_Wario_Eyes_Dead_lights), + gsSPSetLights1(wario_beige_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_wing_tip[] = { - gsDPPipeSync(), - gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0), - gsSPClearGeometryMode(G_CULL_BACK), - gsSPTexture(65535, 65535, 0, 0, 1), - gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_mario_wing_tip_rgba16), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), - gsDPLoadSync(), - gsDPLoadBlock(7, 0, 0, 2047, 256), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), - gsDPSetTileSize(0, 0, 0, 124, 252), - gsSPEndDisplayList(), -}; - -Gfx mat_revert_wario_wing_tip[] = { +Gfx mat_wario_eyes_left[] = { gsDPPipeSync(), - gsSPSetGeometryMode(G_CULL_BACK), - gsSPEndDisplayList(), -}; - -Gfx mat_wario_wing[] = { - gsDPPipeSync(), - gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0), - gsSPClearGeometryMode(G_CULL_BACK), - gsSPTexture(65535, 65535, 0, 0, 1), - gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_mario_wing_rgba16), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), - gsDPLoadSync(), - gsDPLoadBlock(7, 0, 0, 2047, 256), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), - gsDPSetTileSize(0, 0, 0, 124, 252), - gsSPEndDisplayList(), -}; - -Gfx mat_revert_wario_wing[] = { + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), + gsSPTexture(65535, 65535, 0, 0, 1), + gsDPTileSync(), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_eyes_left), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), + gsDPLoadSync(), + gsDPLoadBlock(7, 0, 0, 2047, 128), gsDPPipeSync(), - gsSPSetGeometryMode(G_CULL_BACK), + 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), + gsSPSetLights1(wario_beige_lights_group), gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Gloves[] = { +Gfx mat_wario_eyes_up[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), + gsSPTexture(65535, 65535, 0, 0, 1), + gsDPTileSync(), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_eyes_up), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), + gsDPLoadSync(), + gsDPLoadBlock(7, 0, 0, 2047, 128), + gsDPPipeSync(), + 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), + gsSPSetLights1(wario_beige_lights_group), + gsSPEndDisplayList(), +}; + +Gfx mat_wario_eyes_down[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), + gsSPTexture(65535, 65535, 0, 0, 1), + gsDPTileSync(), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_eyes_down), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), + gsDPLoadSync(), + gsDPLoadBlock(7, 0, 0, 2047, 128), + gsDPPipeSync(), + 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), + gsSPSetLights1(wario_beige_lights_group), + gsSPEndDisplayList(), +}; + +Gfx mat_wario_eyes_dead[] = { + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT), + gsSPTexture(65535, 65535, 0, 0, 1), + gsDPTileSync(), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_eyes_dead), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0), + gsDPLoadSync(), + gsDPLoadBlock(7, 0, 0, 2047, 128), + gsDPPipeSync(), + 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), + gsSPSetLights1(wario_beige_lights_group), + gsSPEndDisplayList(), +}; + +Gfx mat_wario_gloves[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(wario_Wario_Gloves_lights), + gsSPSetLights1(wario_white_lights_group), gsSPEndDisplayList(), }; @@ -3591,14 +3691,14 @@ Gfx mat_wario_wings_half_1[] = { gsSPClearGeometryMode(G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_mario_wing_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_wings_half_1), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 2047, 256), gsDPPipeSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), gsDPSetTileSize(0, 0, 0, 124, 252), - gsSPSetLights1(wario_wings_half_1_lights), + gsSPSetLights1(wario_white_lights_group), gsSPEndDisplayList(), }; @@ -3614,14 +3714,14 @@ Gfx mat_wario_wings_half_2[] = { gsSPClearGeometryMode(G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_mario_wing_tip_rgba16), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_wings_half_2), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 2047, 256), gsDPPipeSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0), gsDPSetTileSize(0, 0, 0, 124, 252), - gsSPSetLights1(wario_wings_half_2_lights), + gsSPSetLights1(wario_white_lights_group), gsSPEndDisplayList(), }; @@ -3631,16 +3731,16 @@ Gfx mat_revert_wario_wings_half_2[] = { gsSPEndDisplayList(), }; -Gfx mat_wario_Wario_Shoes[] = { +Gfx mat_wario_shoes[] = { gsDPPipeSync(), gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT), gsSPTexture(65535, 65535, 0, 0, 1), - gsSPSetLights1(wario_Wario_Shoes_lights), + gsSPSetLights1(wario_green_lights_group), gsSPEndDisplayList(), }; Gfx wario_000_offset_pelvis_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Overalls), + gsSPDisplayList(mat_wario_overalls), gsSPDisplayList(wario_000_offset_pelvis_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -3653,11 +3753,11 @@ Gfx wario_000_offset_pelvis_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_offset_chest_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Overalls), + gsSPDisplayList(mat_wario_overalls), gsSPDisplayList(wario_000_offset_chest_mesh_layer_1_tri_0), - gsSPDisplayList(mat_wario_Wario_Cap), + gsSPDisplayList(mat_wario_cap), gsSPDisplayList(wario_000_offset_chest_mesh_layer_1_tri_1), - gsSPDisplayList(mat_wario_Wario_Button), + gsSPDisplayList(mat_wario_button), gsSPDisplayList(wario_000_offset_chest_mesh_layer_1_tri_2), gsSPEndDisplayList(), }; @@ -3676,23 +3776,23 @@ Gfx wario_000_offset_chest_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_displaylist_head_cap_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Logo), + gsSPDisplayList(mat_wario_logo), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_0), - gsSPDisplayList(mat_wario_Wario_Cap), + gsSPDisplayList(mat_wario_cap), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_1), - gsSPDisplayList(mat_wario_Wario_Hair), + gsSPDisplayList(mat_wario_hair), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_2), - gsSPDisplayList(mat_wario_Wario_Eyes), + gsSPDisplayList(mat_wario_eyes_center), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_3), - gsSPDisplayList(mat_wario_Wario_Sideburn), + gsSPDisplayList(mat_wario_sideburn), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_4), - gsSPDisplayList(mat_wario_Wario_Skin), + gsSPDisplayList(mat_wario_face), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_5), - gsSPDisplayList(mat_wario_Wario_Mustache), + gsSPDisplayList(mat_wario_mustache), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_6), - gsSPDisplayList(mat_wario_Wario_Nose), + gsSPDisplayList(mat_wario_nose), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_7), - gsSPDisplayList(mat_wario_Wario_Mouth), + gsSPDisplayList(mat_wario_mouth), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_8), gsSPEndDisplayList(), }; @@ -3728,86 +3828,174 @@ Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_metal_0[] = { gsSPEndDisplayList(), }; -Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Half_Closed_1[] = { - gsSPDisplayList(mat_wario_Wario_Logo), +Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_half_closed_1[] = { + gsSPDisplayList(mat_wario_logo), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_0), - gsSPDisplayList(mat_wario_Wario_Cap), + gsSPDisplayList(mat_wario_cap), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_1), - gsSPDisplayList(mat_wario_Wario_Hair), + gsSPDisplayList(mat_wario_hair), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_2), - gsSPDisplayList(mat_wario_Wario_Eyes_Half_Closed), + gsSPDisplayList(mat_wario_eyes_half_closed), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_3), - gsSPDisplayList(mat_wario_Wario_Sideburn), + gsSPDisplayList(mat_wario_sideburn), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_4), - gsSPDisplayList(mat_wario_Wario_Skin), + gsSPDisplayList(mat_wario_face), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_5), - gsSPDisplayList(mat_wario_Wario_Mustache), + gsSPDisplayList(mat_wario_mustache), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_6), - gsSPDisplayList(mat_wario_Wario_Nose), + gsSPDisplayList(mat_wario_nose), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_7), - gsSPDisplayList(mat_wario_Wario_Mouth), + gsSPDisplayList(mat_wario_mouth), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_8), gsSPEndDisplayList(), }; -Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Closed_2[] = { - gsSPDisplayList(mat_wario_Wario_Logo), +Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_closed_2[] = { + gsSPDisplayList(mat_wario_logo), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_0), - gsSPDisplayList(mat_wario_Wario_Cap), + gsSPDisplayList(mat_wario_cap), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_1), - gsSPDisplayList(mat_wario_Wario_Hair), + gsSPDisplayList(mat_wario_hair), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_2), - gsSPDisplayList(mat_wario_Wario_Eyes_Closed), + gsSPDisplayList(mat_wario_eyes_closed), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_3), - gsSPDisplayList(mat_wario_Wario_Sideburn), + gsSPDisplayList(mat_wario_sideburn), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_4), - gsSPDisplayList(mat_wario_Wario_Skin), + gsSPDisplayList(mat_wario_face), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_5), - gsSPDisplayList(mat_wario_Wario_Mustache), + gsSPDisplayList(mat_wario_mustache), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_6), - gsSPDisplayList(mat_wario_Wario_Nose), + gsSPDisplayList(mat_wario_nose), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_7), - gsSPDisplayList(mat_wario_Wario_Mouth), + gsSPDisplayList(mat_wario_mouth), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_8), gsSPEndDisplayList(), }; -Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_Wario_Eyes_Dead_3[] = { - gsSPDisplayList(mat_wario_Wario_Logo), +Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_right_3[] = { + gsSPDisplayList(mat_wario_logo), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_0), - gsSPDisplayList(mat_wario_Wario_Cap), + gsSPDisplayList(mat_wario_cap), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_1), - gsSPDisplayList(mat_wario_Wario_Hair), + gsSPDisplayList(mat_wario_hair), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_2), - gsSPDisplayList(mat_wario_Wario_Eyes_Dead), + gsSPDisplayList(mat_wario_eyes_right), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_3), - gsSPDisplayList(mat_wario_Wario_Sideburn), + gsSPDisplayList(mat_wario_sideburn), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_4), - gsSPDisplayList(mat_wario_Wario_Skin), + gsSPDisplayList(mat_wario_face), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_5), - gsSPDisplayList(mat_wario_Wario_Mustache), + gsSPDisplayList(mat_wario_mustache), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_6), - gsSPDisplayList(mat_wario_Wario_Nose), + gsSPDisplayList(mat_wario_nose), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_7), - gsSPDisplayList(mat_wario_Wario_Mouth), + gsSPDisplayList(mat_wario_mouth), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_8), + gsSPEndDisplayList(), +}; + +Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_left_4[] = { + gsSPDisplayList(mat_wario_logo), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_0), + gsSPDisplayList(mat_wario_cap), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_1), + gsSPDisplayList(mat_wario_hair), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_2), + gsSPDisplayList(mat_wario_eyes_left), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_3), + gsSPDisplayList(mat_wario_sideburn), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_4), + gsSPDisplayList(mat_wario_face), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_5), + gsSPDisplayList(mat_wario_mustache), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_6), + gsSPDisplayList(mat_wario_nose), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_7), + gsSPDisplayList(mat_wario_mouth), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_8), + gsSPEndDisplayList(), +}; + +Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_up_5[] = { + gsSPDisplayList(mat_wario_logo), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_0), + gsSPDisplayList(mat_wario_cap), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_1), + gsSPDisplayList(mat_wario_hair), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_2), + gsSPDisplayList(mat_wario_eyes_up), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_3), + gsSPDisplayList(mat_wario_sideburn), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_4), + gsSPDisplayList(mat_wario_face), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_5), + gsSPDisplayList(mat_wario_mustache), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_6), + gsSPDisplayList(mat_wario_nose), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_7), + gsSPDisplayList(mat_wario_mouth), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_8), + gsSPEndDisplayList(), +}; + +Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_down_6[] = { + gsSPDisplayList(mat_wario_logo), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_0), + gsSPDisplayList(mat_wario_cap), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_1), + gsSPDisplayList(mat_wario_hair), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_2), + gsSPDisplayList(mat_wario_eyes_down), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_3), + gsSPDisplayList(mat_wario_sideburn), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_4), + gsSPDisplayList(mat_wario_face), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_5), + gsSPDisplayList(mat_wario_mustache), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_6), + gsSPDisplayList(mat_wario_nose), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_7), + gsSPDisplayList(mat_wario_mouth), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_8), + gsSPEndDisplayList(), +}; + +Gfx wario_000_displaylist_head_cap_mesh_layer_1_mat_override_eyes_dead_7[] = { + gsSPDisplayList(mat_wario_logo), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_0), + gsSPDisplayList(mat_wario_cap), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_1), + gsSPDisplayList(mat_wario_hair), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_2), + gsSPDisplayList(mat_wario_eyes_dead), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_3), + gsSPDisplayList(mat_wario_sideburn), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_4), + gsSPDisplayList(mat_wario_face), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_5), + gsSPDisplayList(mat_wario_mustache), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_6), + gsSPDisplayList(mat_wario_nose), + gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_7), + gsSPDisplayList(mat_wario_mouth), gsSPDisplayList(wario_000_displaylist_head_cap_mesh_layer_1_tri_8), gsSPEndDisplayList(), }; Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Eyes), + gsSPDisplayList(mat_wario_eyes_center), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_0), - gsSPDisplayList(mat_wario_Wario_Sideburn), + gsSPDisplayList(mat_wario_sideburn), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_1), - gsSPDisplayList(mat_wario_Wario_Hair), + gsSPDisplayList(mat_wario_hair), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_2), - gsSPDisplayList(mat_wario_Wario_Skin), + gsSPDisplayList(mat_wario_face), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_3), - gsSPDisplayList(mat_wario_Wario_Mustache), + gsSPDisplayList(mat_wario_mustache), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_4), - gsSPDisplayList(mat_wario_Wario_Nose), + gsSPDisplayList(mat_wario_nose), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_5), - gsSPDisplayList(mat_wario_Wario_Mouth), + gsSPDisplayList(mat_wario_mouth), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6), gsSPEndDisplayList(), }; @@ -3837,102 +4025,134 @@ Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_meta gsSPEndDisplayList(), }; -Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Half_Closed_1[] = { - gsSPDisplayList(mat_wario_Wario_Eyes_Half_Closed), +Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_half_closed_1[] = { + gsSPDisplayList(mat_wario_eyes_half_closed), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_0), - gsSPDisplayList(mat_wario_Wario_Sideburn), + gsSPDisplayList(mat_wario_sideburn), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_1), - gsSPDisplayList(mat_wario_Wario_Hair), + gsSPDisplayList(mat_wario_hair), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_2), - gsSPDisplayList(mat_wario_Wario_Skin), + gsSPDisplayList(mat_wario_face), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_3), - gsSPDisplayList(mat_wario_Wario_Mustache), + gsSPDisplayList(mat_wario_mustache), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_4), - gsSPDisplayList(mat_wario_Wario_Nose), + gsSPDisplayList(mat_wario_nose), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_5), - gsSPDisplayList(mat_wario_Wario_Mouth), + gsSPDisplayList(mat_wario_mouth), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6), gsSPEndDisplayList(), }; -Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Closed_2[] = { - gsSPDisplayList(mat_wario_Wario_Eyes_Closed), +Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_closed_2[] = { + gsSPDisplayList(mat_wario_eyes_closed), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_0), - gsSPDisplayList(mat_wario_Wario_Sideburn), + gsSPDisplayList(mat_wario_sideburn), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_1), - gsSPDisplayList(mat_wario_Wario_Hair), + gsSPDisplayList(mat_wario_hair), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_2), - gsSPDisplayList(mat_wario_Wario_Skin), + gsSPDisplayList(mat_wario_face), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_3), - gsSPDisplayList(mat_wario_Wario_Mustache), + gsSPDisplayList(mat_wario_mustache), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_4), - gsSPDisplayList(mat_wario_Wario_Nose), + gsSPDisplayList(mat_wario_nose), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_5), - gsSPDisplayList(mat_wario_Wario_Mouth), + gsSPDisplayList(mat_wario_mouth), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6), gsSPEndDisplayList(), }; -Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_Wario_Eyes_Dead_3[] = { - gsSPDisplayList(mat_wario_Wario_Eyes_Dead), +Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_right_3[] = { + gsSPDisplayList(mat_wario_eyes_right), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_0), - gsSPDisplayList(mat_wario_Wario_Sideburn), + gsSPDisplayList(mat_wario_sideburn), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_1), - gsSPDisplayList(mat_wario_Wario_Hair), + gsSPDisplayList(mat_wario_hair), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_2), - gsSPDisplayList(mat_wario_Wario_Skin), + gsSPDisplayList(mat_wario_face), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_3), - gsSPDisplayList(mat_wario_Wario_Mustache), + gsSPDisplayList(mat_wario_mustache), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_4), - gsSPDisplayList(mat_wario_Wario_Nose), + gsSPDisplayList(mat_wario_nose), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_5), - gsSPDisplayList(mat_wario_Wario_Mouth), + gsSPDisplayList(mat_wario_mouth), gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6), gsSPEndDisplayList(), }; -Gfx wario_000_displaylist_right_wing_mesh_layer_4[] = { - gsSPDisplayList(mat_wario_wing_tip), - gsSPDisplayList(wario_000_displaylist_right_wing_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_wario_wing_tip), - gsSPDisplayList(mat_wario_wing), - gsSPDisplayList(wario_000_displaylist_right_wing_mesh_layer_4_tri_1), - gsSPDisplayList(mat_revert_wario_wing), +Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_left_4[] = { + gsSPDisplayList(mat_wario_eyes_left), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_0), + gsSPDisplayList(mat_wario_sideburn), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_1), + gsSPDisplayList(mat_wario_hair), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_2), + gsSPDisplayList(mat_wario_face), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_3), + gsSPDisplayList(mat_wario_mustache), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_4), + gsSPDisplayList(mat_wario_nose), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_5), + gsSPDisplayList(mat_wario_mouth), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6), gsSPEndDisplayList(), }; -Gfx wario_000_displaylist_right_wing_mesh_layer_4_mat_override_metal_0[] = { - gsSPDisplayList(mat_wario_wing_tip), - gsSPDisplayList(wario_000_displaylist_right_wing_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_wario_wing_tip), - gsSPDisplayList(mat_wario_wing), - gsSPDisplayList(wario_000_displaylist_right_wing_mesh_layer_4_tri_1), - gsSPDisplayList(mat_revert_wario_wing), +Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_up_5[] = { + gsSPDisplayList(mat_wario_eyes_up), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_0), + gsSPDisplayList(mat_wario_sideburn), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_1), + gsSPDisplayList(mat_wario_hair), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_2), + gsSPDisplayList(mat_wario_face), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_3), + gsSPDisplayList(mat_wario_mustache), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_4), + gsSPDisplayList(mat_wario_nose), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_5), + gsSPDisplayList(mat_wario_mouth), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6), gsSPEndDisplayList(), }; -Gfx wario_000_displaylist_left_wing_mesh_layer_4[] = { - gsSPDisplayList(mat_wario_wing_tip), - gsSPDisplayList(wario_000_displaylist_left_wing_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_wario_wing_tip), - gsSPDisplayList(mat_wario_wing), - gsSPDisplayList(wario_000_displaylist_left_wing_mesh_layer_4_tri_1), - gsSPDisplayList(mat_revert_wario_wing), +Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_down_6[] = { + gsSPDisplayList(mat_wario_eyes_down), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_0), + gsSPDisplayList(mat_wario_sideburn), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_1), + gsSPDisplayList(mat_wario_hair), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_2), + gsSPDisplayList(mat_wario_face), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_3), + gsSPDisplayList(mat_wario_mustache), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_4), + gsSPDisplayList(mat_wario_nose), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_5), + gsSPDisplayList(mat_wario_mouth), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6), gsSPEndDisplayList(), }; -Gfx wario_000_displaylist_left_wing_mesh_layer_4_mat_override_metal_0[] = { - gsSPDisplayList(mat_wario_wing_tip), - gsSPDisplayList(wario_000_displaylist_left_wing_mesh_layer_4_tri_0), - gsSPDisplayList(mat_revert_wario_wing_tip), - gsSPDisplayList(mat_wario_wing), - gsSPDisplayList(wario_000_displaylist_left_wing_mesh_layer_4_tri_1), - gsSPDisplayList(mat_revert_wario_wing), +Gfx wario_000_switch_000_displaylist_head_capless_mesh_layer_1_mat_override_eyes_dead_7[] = { + gsSPDisplayList(mat_wario_eyes_dead), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_0), + gsSPDisplayList(mat_wario_sideburn), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_1), + gsSPDisplayList(mat_wario_hair), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_2), + gsSPDisplayList(mat_wario_face), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_3), + gsSPDisplayList(mat_wario_mustache), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_4), + gsSPDisplayList(mat_wario_nose), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_5), + gsSPDisplayList(mat_wario_mouth), + gsSPDisplayList(wario_000_switch_000_displaylist_head_capless_mesh_layer_1_tri_6), gsSPEndDisplayList(), }; Gfx wario_000_offset_left_upper_arm_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Cap), + gsSPDisplayList(mat_wario_cap), gsSPDisplayList(wario_000_offset_left_upper_arm_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -3945,7 +4165,7 @@ Gfx wario_000_offset_left_upper_arm_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_offset_left_lower_arm_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Cap), + gsSPDisplayList(mat_wario_cap), gsSPDisplayList(wario_000_offset_left_lower_arm_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -3958,7 +4178,7 @@ Gfx wario_000_offset_left_lower_arm_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_displaylist_left_hand_fist_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Gloves), + gsSPDisplayList(mat_wario_gloves), gsSPDisplayList(wario_000_displaylist_left_hand_fist_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -3971,7 +4191,7 @@ Gfx wario_000_displaylist_left_hand_fist_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_001_switch_000_offset_left_hand_open_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Gloves), + gsSPDisplayList(mat_wario_gloves), gsSPDisplayList(wario_001_switch_000_offset_left_hand_open_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -3984,7 +4204,7 @@ Gfx wario_001_switch_000_offset_left_hand_open_mesh_layer_1_mat_override_metal_0 }; Gfx wario_000_offset_right_upper_arm_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Cap), + gsSPDisplayList(mat_wario_cap), gsSPDisplayList(wario_000_offset_right_upper_arm_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -3997,7 +4217,7 @@ Gfx wario_000_offset_right_upper_arm_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_offset_right_lower_arm_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Cap), + gsSPDisplayList(mat_wario_cap), gsSPDisplayList(wario_000_offset_right_lower_arm_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -4010,7 +4230,7 @@ Gfx wario_000_offset_right_lower_arm_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_displaylist_right_hand_fist_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Gloves), + gsSPDisplayList(mat_wario_gloves), gsSPDisplayList(wario_000_displaylist_right_hand_fist_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -4023,7 +4243,7 @@ Gfx wario_000_displaylist_right_hand_fist_mesh_layer_1_mat_override_metal_0[] = }; Gfx wario_001_switch_000_offset_right_hand_open_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Gloves), + gsSPDisplayList(mat_wario_gloves), gsSPDisplayList(wario_001_switch_000_offset_right_hand_open_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -4036,7 +4256,7 @@ Gfx wario_001_switch_000_offset_right_hand_open_mesh_layer_1_mat_override_metal_ }; Gfx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Gloves), + gsSPDisplayList(mat_wario_gloves), gsSPDisplayList(wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -4049,13 +4269,13 @@ Gfx wario_001_switch_000_offset_right_hand_peace_mesh_layer_1_mat_override_metal }; Gfx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Gloves), + gsSPDisplayList(mat_wario_gloves), gsSPDisplayList(wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_tri_0), - gsSPDisplayList(mat_wario_Wario_Logo), + gsSPDisplayList(mat_wario_logo), gsSPDisplayList(wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_tri_1), - gsSPDisplayList(mat_wario_Wario_Cap), + gsSPDisplayList(mat_wario_cap), gsSPDisplayList(wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_tri_2), - gsSPDisplayList(mat_wario_Wario_Hair), + gsSPDisplayList(mat_wario_hair), gsSPDisplayList(wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_tri_3), gsSPEndDisplayList(), }; @@ -4076,6 +4296,34 @@ Gfx wario_001_switch_000_offset_right_hand_cap_mesh_layer_1_mat_override_metal_0 gsSPEndDisplayList(), }; +Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1[] = { + gsSPDisplayList(mat_wario_gloves), + gsSPDisplayList(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_0), + gsSPDisplayList(mat_wario_logo), + gsSPDisplayList(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_1), + gsSPDisplayList(mat_wario_cap), + gsSPDisplayList(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_2), + gsSPDisplayList(mat_wario_hair), + gsSPDisplayList(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_3), + gsSPEndDisplayList(), +}; + +Gfx wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_mat_override_metal_0[] = { + gsSPDisplayList(mat_wario_metal), + gsSPDisplayList(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_0), + gsSPDisplayList(mat_revert_wario_metal), + gsSPDisplayList(mat_wario_metal), + gsSPDisplayList(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_1), + gsSPDisplayList(mat_revert_wario_metal), + gsSPDisplayList(mat_wario_metal), + gsSPDisplayList(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_2), + gsSPDisplayList(mat_revert_wario_metal), + gsSPDisplayList(mat_wario_metal), + gsSPDisplayList(wario_001_switch_000_offset_right_hand_wing_cap_mesh_layer_1_tri_3), + gsSPDisplayList(mat_revert_wario_metal), + gsSPEndDisplayList(), +}; + Gfx wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4[] = { gsSPDisplayList(mat_wario_wings_half_1), gsSPDisplayList(wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4_tri_0), @@ -4097,7 +4345,7 @@ Gfx wario_001_switch_000_displaylist_right_hand_cap_wings_mesh_layer_4_mat_overr }; Gfx wario_000_offset_left_upper_leg_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Overalls), + gsSPDisplayList(mat_wario_overalls), gsSPDisplayList(wario_000_offset_left_upper_leg_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -4110,7 +4358,7 @@ Gfx wario_000_offset_left_upper_leg_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_offset_left_lower_leg_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Overalls), + gsSPDisplayList(mat_wario_overalls), gsSPDisplayList(wario_000_offset_left_lower_leg_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -4123,7 +4371,7 @@ Gfx wario_000_offset_left_lower_leg_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_offset_left_foot_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Shoes), + gsSPDisplayList(mat_wario_shoes), gsSPDisplayList(wario_000_offset_left_foot_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -4136,7 +4384,7 @@ Gfx wario_000_offset_left_foot_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_offset_right_upper_leg_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Overalls), + gsSPDisplayList(mat_wario_overalls), gsSPDisplayList(wario_000_offset_right_upper_leg_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -4149,7 +4397,7 @@ Gfx wario_000_offset_right_upper_leg_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_offset_right_lower_leg_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Overalls), + gsSPDisplayList(mat_wario_overalls), gsSPDisplayList(wario_000_offset_right_lower_leg_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -4162,7 +4410,7 @@ Gfx wario_000_offset_right_lower_leg_mesh_layer_1_mat_override_metal_0[] = { }; Gfx wario_000_displaylist_right_foot_mesh_layer_1[] = { - gsSPDisplayList(mat_wario_Wario_Shoes), + gsSPDisplayList(mat_wario_shoes), gsSPDisplayList(wario_000_displaylist_right_foot_mesh_layer_1_tri_0), gsSPEndDisplayList(), }; @@ -4185,3 +4433,134 @@ Gfx wario_material_revert_render_settings[] = { gsSPEndDisplayList(), }; +static const Vtx wario_wings_half_1_dl_vertex[] = { + {{{ -105, 212, 0}, 0, { 0, 0}, {0x00, 0x00, 0x7f, 0xff}}}, + {{{ -105, 0, 0}, 0, { 0, 2012}, {0x00, 0x00, 0x7f, 0xff}}}, + {{{ 0, 0, 0}, 0, { 990, 2012}, {0x00, 0x00, 0x7f, 0xff}}}, + {{{ 0, 212, 0}, 0, { 990, 0}, {0x00, 0x00, 0x7f, 0xff}}}, +}; + +static const Vtx wario_wings_half_2_dl_vertex[] = { + {{{ 0, 0, 0}, 0, { 0, 2012}, {0x00, 0x00, 0x7f, 0xff}}}, + {{{ 106, 212, 0}, 0, { 990, 0}, {0x00, 0x00, 0x7f, 0xff}}}, + {{{ 0, 212, 0}, 0, { 0, 0}, {0x00, 0x00, 0x7f, 0xff}}}, + {{{ 106, 0, 0}, 0, { 990, 2012}, {0x00, 0x00, 0x7f, 0xff}}}, +}; + +const Gfx wario_wings_half_1_dl[] = { + gsSPVertex(wario_wings_half_1_dl_vertex, 4, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSPEndDisplayList(), +}; + +const Gfx wario_wings_half_2_dl[] = { + gsSPVertex(wario_wings_half_2_dl_vertex, 4, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSPEndDisplayList(), +}; + +const Gfx wario_cap_wings[] = { + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + 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), + gsSPLight(&wario_white_lights_group.l, 1), + gsSPLight(&wario_white_lights_group.a, 2), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_texture_wings_half_1), + gsDPLoadSync(), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), + gsSPDisplayList(wario_wings_half_1_dl), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_texture_wings_half_2), + gsDPLoadSync(), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), + gsSPDisplayList(wario_wings_half_2_dl), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +const Gfx wario_cap_wings_transparent[] = { + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_DECALFADEA, G_CC_DECALFADEA), + gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + 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), + gsSPLight(&wario_white_lights_group.l, 1), + gsSPLight(&wario_white_lights_group.a, 2), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_texture_wings_half_1), + gsDPLoadSync(), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), + gsSPDisplayList(wario_wings_half_1_dl), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_texture_wings_half_2), + gsDPLoadSync(), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), + gsSPDisplayList(wario_wings_half_2_dl), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +const Gfx wario_metal_cap_wings[] = { + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + 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), + gsSPLight(&wario_white_lights_group.l, 1), + gsSPLight(&wario_white_lights_group.a, 2), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_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_wings_half_1_dl), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_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_wings_half_2_dl), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +const Gfx wario_metal_cap_wings_transparent[] = { + gsDPPipeSync(), + gsSPClearGeometryMode(G_TEXTURE_GEN), + gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_DECALFADEA, G_CC_DECALFADEA), + gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + 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_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_wings_half_1_dl), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wario_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_wings_half_2_dl), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPPipeSync(), + gsSPSetGeometryMode(G_TEXTURE_GEN | G_CULL_BACK | G_SHADING_SMOOTH), + gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE), + gsDPLoadTextureBlock(wario_texture_metal, 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), + gsSPEndDisplayList(), +};