From 59748737f12728829099052f4210bc463087ad70 Mon Sep 17 00:00:00 2001 From: MysterD Date: Thu, 5 Aug 2021 18:30:56 -0700 Subject: [PATCH] Colorize cap logo according to player's palette --- actors/luigi/custom_luigi_logo.rgba16.png | Bin 390 -> 5647 bytes .../luigi_cap/custom_luigi_cap_logo.rgba16.png | Bin 316 -> 5647 bytes actors/mario/custom_mario_logo.rgba16.png | Bin 0 -> 6002 bytes actors/mario/model.inc.c | 2 +- .../mario_cap/custom_mario_cap_logo.rgba16.png | Bin 0 -> 6002 bytes actors/mario_cap/model.inc.c | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 actors/mario/custom_mario_logo.rgba16.png create mode 100644 actors/mario_cap/custom_mario_cap_logo.rgba16.png diff --git a/actors/luigi/custom_luigi_logo.rgba16.png b/actors/luigi/custom_luigi_logo.rgba16.png index 50466ed74c77d51633e34434b6a0b9572b044a43..37308b0f3407219f139bc091e01df3275ce8d66c 100644 GIT binary patch literal 5647 zcmeHKYg7~077kDfqM~RKi*g-Os#pkl2NH=O;T1H3KoKZfCX-1BB$+TX5J0J@6-5yh zty&+54^W_DwLb6(7Oh&X3fG0bfD{o+!Qun0;FEhMAjVs-y{>ipPgoOj&iVGY_xaA= z`!G3S(}RZEINH!?w4u^q|8VdZq8{t_!6%WC@qk9N&}BqMli{!d(&Ly?twA9&U5`R& znp#PtrPX(?`z-&K>yYeUVotl8NwZGj6;VIgDj(fn=oFg2dh)ed6G9`j@+$MGep{fN zF}+X4*FLZK`8$JiY0;+qGxqq|xXbK$ap=|7>hkW>ZNm%3wcd7&U-I7Wu`AYIeB>#d zWs_H2=y2zQm`PS0H+*e(elaJUbj-h5)3t5O(yo%=p3#L7Q-o`8MhK37?&lQLfVu6x zky@5`BU-e%u3*bTdWP7~^@0Qn{OS9}7W;H~_~pH`f~I|W{z0Mq8ZE-YWQR<3?g^nVYlo zj`p}K+KERO=h!>1dlu_AqtPz&+Q-}1OCAcKJ0~73t#ut~aejyIW*eE~QSFsxdGpDo zYY)#qlmE4=O4s7_^Ov6{>9#ioFC~3pIVh|J0^WiPUJ>TbuL%7S#aOofsb3&eg5OslA7g? zSa{O5*;nqCcE~Ju-*E9zLO;y+jdL(_;W3p>uJ5G|z9#>bi_G-TUYC5begBgA@uN>A z*Pg!ZgAZ$rvz~WqIo8_f*KLdIwm!*f+|xKa?AEP@;`HQ=m+Q0LcFq3wS#j+3KThuL z`J*ngd(pUnUS`1Rx?$Yb=2?d)Z-BL3dp#ATNb*3EB9XrKPDp)NC} zC8%?$Z)Zw{)6zN2?Q)_%^}(c!Ya7RwUQBg=YQKyj4yqi9b?>a&u=d1}o*$bYb>&R@ zDzHdCJFM~|ONE7WN@|YJyu`4*XLZu*>*skFnsjsRdfUcaJdU*Wx;~!qKoG#W_fMA_ z%&N-#xKktZqMu%&(agS7OC(`ZiR4A)fqL7Nxk?;d9rnSZ(1@waBFFv?wXED~v%qqO zT~LYK&V9{6zcSnL%x4S750x%mw!Jx4e^<4)qq*gqvV~=k_4BNX!@`M2f^)h*UNnk5 zx#HN0`%S_|!#IdnHjO`LJnhr(a!ITa*DWW`;M;>7KA3^bn_Ot-Y-bnGg$ z8O*Ndhfmwl?tT0EIQ;2E{9J2k)+)q|ziZ`KpPq3~3wFnB+CZ-UJ{h_zZy5KHuihbn zuX*z1=YyY3$m;#DqE_@gcI5hJF2`$Xwgvh23iQd>YFfq3xYg*nwI54x7oV@f+|BQ( z9>~(;n@9aNi)gExe5T!EWl;>{7n;@Ls)U?h4u6zDaJ8OPV>*c9gymQYDW=oGI@C`NR*`@-Fxl^b z8XM^eQo)ph0T1j40GJ#W%ZtI{FgQY{sXbVg$p)--M8AqaPi7jdXRNP2Zsm~MwrKXH=YZOW*2+HW$)FwzO3mdSZ zWK^lOdZPt}Hbp9s0h~Ss*BCJhgo$cUEeM1F%Ud6Dp~WAYmPXQdEH4Lk)No3I$hz@Vpp^7tCYu*a*Uad0bD1lC4ApFi*f&cqvRM zLUA>y1XyDl6-A{0RH&TK;tB;q1}v9@Xn0BiLoNW!N(E0KXR%=Lcp9mwa}Z4llZxpa z57x_>Fbzy9FPMWHwW(wt&t zvphI`D+)vu2smMoZfY&8LYaD<%4k9zj0kK8NDEWd0ho>RU^gNOj>05{M`D;pOsArS zC`w~dLEio4BASLFMnfYQRZtbzUvqx2ifJ5rGv5UM6H`P2X3+g_JTIXGEK_jOfZ<7@ zc&I!PMaVbvybe6T6b`x_LE`Dszu44&;Jo`1HW=7qc)E%I2sF8G)Yp z80nLrfK$=FR0BHpEg=c8PKAPg+h1%i=GCuBWF^;=g}_`PXi$6>gU40y88C~_Wgwnx z10Y$2O(Jm3L#0#lL(7)Ph5Kn{R&2E}DOXUMfb|0ceQHzc4`a5lFSVuZxCcGrE9(L#1<`EU_(66uW z4_&tM8dtuTX3m-&xxZc1@E8 LO!qJMi(l|>-UeaA delta 364 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 LO!qJMi(l|>-UeaA delta 290 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 FzX2UZ?jQgF literal 0 HcmV?d00001 diff --git a/actors/mario/model.inc.c b/actors/mario/model.inc.c index 1d9c8df7..7a37b734 100644 --- a/actors/mario/model.inc.c +++ b/actors/mario/model.inc.c @@ -48,7 +48,7 @@ ALIGNED8 static const u8 mario_texture_yellow_button[] = { // 0x04001890 ALIGNED8 static const u8 mario_texture_m_logo[] = { -#include "actors/mario/mario_logo.rgba16.inc.c" +#include "actors/mario/custom_mario_logo.rgba16.inc.c" }; // 0x04002090 diff --git a/actors/mario_cap/custom_mario_cap_logo.rgba16.png b/actors/mario_cap/custom_mario_cap_logo.rgba16.png new file mode 100644 index 0000000000000000000000000000000000000000..2d60a7ef732c958fbe0b3c075b5f37477f6232cc GIT binary patch literal 6002 zcmeHLcU%+M79N^L6hVULMj21n9va-y@-IIOeT{MNnioe0sx@L_45wH-tnqm+$ij?B0c>D0BBE1kBCCUKqX#|$OIxWj7QVtFdj}72>>9q zwP)_U4P7?l-UyANH7DX4kkpbQOaAM_CrHZmM>EoQI4xj8%{cArkD5>1?RHyC?l&R* ze(I>*=5X$rJNeU$t4#TeW0U*4?)3Jbx;L?#yhur;L}}11t`uK*qwgB0IX;Y9XzOvf zbZk%Z)|25`$H%aoM;|!dbZ1gTkjIiWIxL;5jl|N~*M%mn?E9&yg=^ZPO`cc&@}xWe zzTT3OdbXC%ni4ImQQAk(|NU)^SrOBX<5OJE4x-WWGq{yXRSZ5 zf7y;&9jJY88NA|gPxhi$z2-4HJ;y~E`%I1ywcI)wz9Mg}t%IFnbV$=#kHd2P4vnn| ztBe!vK!7~nvTv09b#-n{NAq_N;l2_czceSEC%-iqm=q1vvevGt_0;^6G1q`NDO-&o_3xSrH9*dg|&X%&w@P zzU>F=#dJYe$a;LJcVPwJJ}lgi%AL(EGOF9{QJ!xz=X}h;?gD5-adr1&-Ie7Kp-N=|8ztVpkeR1`W@P_}srM{*WhEwz`)7FLB z25!H+GF-5k_1y6QX?v@#11Vbcpt*8S`qo*!*)QV;(yrcLGFi4=Tt2_zx6o@VaMcK5 zxtYNoKlfNYjj42Vfou56$KzOy=S-UBS&wr#Rd2@sMx%j|2e;(5nE@4z4Z?%^|QB# zyH$W>&@v9aTxjJRKd?Eo-XUz~ROrILjt!ReUU+3J3Aen=)|s^TkAsxClE%4?(4kge z^B=b|#|3&E$Aw+CaS!osMpM^TUa(z zXQQKq6sJ{h?6v24t^MoY%=t1Fj&cR>zDf4Nqhu%atBrfIkD#aOa ziE!3Rae4{E({aO*s9s*AOGKxrvtrxAb>yztNQNvavNHL4Z&4j3_EID*cIV_-n*M$S zoe8vu6=k|(sjbdo0oxz2dw;V+2JMkEUAwc_LK@B$1r~0vtOiT=Mi*~Ji%ulr`*>|u zQ{3ey3C`kyftxk+Y_s2*)m~=(5o5UV&D5V-TDJMRzjcu(wYPL}ZX=^j7hRs_g-mr@ zAL6L_MED{wE&jIg{W!(F>#jdP&?@*on)oX)dPRLgUiA%5hvmbPwmN0&^8pQ~-;vc5 z>$*+?fPS$EYu{0U0W3%+A%T1u4<@Bb-b@E zY!&iJ#U_UxsK#n~1l?14+bF9C=>>fLL<_cGg$$vrqpqZ`2sQ) zl-l!18((f<$a@==j6#t_uC`F2MtQVq|TsIM^FSKBCHZX@yMuDRD6ue38qnb6p)Gqg7MMmSV%l3okkSUDSQD) zbK=u@Of{A299SM9Tn>RoqI{SM5re2ehDfmT5=r?orQ*XmD1^y!sZhP3Iv5tV9ZXtKRUH_! zdLG*i%L{=)RE9*zWMU3M6)j#xsV*u!d$?R!0WwH!s0PD)RmBb0oF^zGtA}jz=fHnr z3Qv$JrT-hx2k3hi4+K@pki=jln70sy(9iRH3jCfa4C{6Z6iMU$#isrP#~w;pKg?E! zq>b<&4krzbhFX$Xq?QVgSGNHc2o1@v08?PT`Uo%`hnAoOP%4D6emh)j@8(6HNMr^R z=FQ;2JR&Hd^0Dlr@QF;G03tG6oCJJ64Dnp(&L6WYWCBzPBCv-L%K_}1vEovnGv01E z|Li};D-&Q8}putM%XWf4SIK&Vjf?%ma_PNkU zLWX1+aS>rL56xj09Clxl-(Q%+S)wYWzwu`{`~F4`81+{tU!?C>xxUKvMGAZo_-l53 zmFtTX_#*Jv?E1gSrTgKL8TA;;8e$LQqj>(l-oRVctL&$pMcB+3xnHyb z0LEggV+}Qc&BdnJBq#BNyXo;F$M!+< zWVCV%`uO_l_J5gN-rLUV(&wL(`)Q4z7|WV!(6H4~)6630c8G^{j#tpQ7o)Ufwr7*P z6(+0Vo{9Uj*iVX%J;}sJlsCC)RoVc6#k7;Aa|vY?@@VVY{Lbl~^7W@+@A&nd>n^_* z9M}{-du~t4K$2_$>7NTko2v{wE3Pf%6hkfsUD^Eu$KPrK^``#$&t|{zSsTAUYEk#8 zaVr{a&7Q9Crt=3n9=(+Mn17Ete-~ug;=1L$D?e>NTE^4Y&)k3dN&y$OxF@@fvyMAk zEj_srj|<4^N$XJTikoxw=+o4}4Zg_f9qa<0e3Fk=htk-k%{$`0 z8xWkFGry6x)1IU#p8uF5-)(SrhWo0?b0l^C&m8WUtg4ft+eXd7zC;HAu1}D6m1lg; FzX2UZ?jQgF literal 0 HcmV?d00001 diff --git a/actors/mario_cap/model.inc.c b/actors/mario_cap/model.inc.c index 84a7a963..ee174479 100644 --- a/actors/mario_cap/model.inc.c +++ b/actors/mario_cap/model.inc.c @@ -25,7 +25,7 @@ ALIGNED8 static const u8 mario_cap_seg3_texture_0301CF50[] = { // 0x0301DF50 ALIGNED8 static const u8 mario_cap_seg3_texture_0301DF50[] = { -#include "actors/mario_cap/mario_cap_logo.rgba16.inc.c" +#include "actors/mario_cap/custom_mario_cap_logo.rgba16.inc.c" }; // 0x0301E750