From 68f97d02f4c855520ccdc82a75c7a3364a5dafe6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 12 Jan 2023 13:17:31 -0500 Subject: [PATCH 01/18] Colorize menu_info.png --- graphics/interface/menu_info.png | Bin 1904 -> 1976 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/interface/menu_info.png b/graphics/interface/menu_info.png index a04c981d5d4b4abc92491723d7f17d38186e8628..031611a2a6c74783fd1fd6dfe93bade9dd3c4f91 100644 GIT binary patch delta 1925 zcmV;02YUGM4!94H7#auz0002=;F0+N0004VQb$4nuFf3k0001xktH;Ldz^#r?(P5p z0M*sKtfYJYgM02V0NybW#W5)W0000000000000000000000000bIqjx|NmlQV%62n z|NsBy=H>tZ0PgPY#l^*xl$8Gf0JH!A|HZ{pQvWeAw8h2$s|-4A000KoNklrxnKtB>#2I^dpmmtna z*}kznJv}`?Kfk=rwQnsiXz%$&ESBxt13Z(6*UR>I*nfOH=_!}(?*MpwdkYp5K-Rvw z1XG#8vVD7iU@aOvonBw3+TTNPI=zLsPq)7VAjqQy$lAA;)9EpPnmf(4zXc&TSGHGK z<+ie~igR~Wac)-?=kBZ0vcKQg?cd$i?eBJV`+;EZ0Shi%=O!2cA2-TEtpwl!3oiHz z`dI=9jr-U`HKPz9{5t%p!riH90U(M8{UwwDK5dp?3V=C!t}MV_m1$Z4)>!29bAX+e zovs;xRQwSsAjKhn@M2Lzz;4Jx00iJgl>q2<4#O@B0h!=9#50W6QwS1(Ir*s&um?B< zV-Khk0M%>=?vo;bA_V)(LqHCzg&=u9sC!ZAE&%jQ0e~T~0A%NmH(3vW1xPpyz(*GV zY@$K{04lOFDy|s-T~1xRG62Elv12C%q$RguXx?MdHT5BXz@Hw7{`gS5$||m_igSmm zIJd2ebA44>_Pefb|8S_=-)`&n13}mE$klPJqlL1E0K|IKtf(+R=-9^XT#JPi_Nk@V z>}iSG0#N?$v}TI{l*v2+j5cjKyo^Qq2n2v*p#U7NjKa?Wa4gCYbQ%H!Fb;tNBo7>lz_9WXrxJid zkOOpO2z)&RZ0|6$>0o�VeMPRhXzJ0a6|}7vUjw6x;D&2|$lMx(gte*p8iC*a}dA z11c&)pdI;kz-GD&qUU+Z?}F<(uG+DrTLI%*Q(sRdZ@&K?7g+0K13^1?4i}Aj=Z5DPwn>_0tOHl=KyI+ zfbQV+q7dxKHoXjpnjhDJUsH`jz}G+#g5>?6xMw~DQvmvYM&6fT?zR9ap_c&MJJ>0~ zR0zyw3jpYSFmDLbD+30=3qJO5XyKx_Vdx!yq`)951BiR0W@P~Ca`Sd?)bsN|12ZG}$5kUD8AqU`7lLBl&0cg7*==NA+fW4&AeU{t|zyq6q zWhM3{1PK7t#fZQm0FV$!7uOIVZrn>I(=R_`0GZffECc|vxz6Y?iD+t#6AKJMFqOQV zq7nh{C;$>zP?cS3eBL&e7C=%umLcVKV1Q`ycr;NmQNzQt1u~n|2p}mX5CC~{&mQuJ z1b{sfBC<_g=zv&zpiA7|3I>4o$|w|nfD$*QbeqwsMCV6Wa~!B51vCT@)kE>BApu~E zf1nKks7q@gstqzrq@B;}_S-{kYx^pzG(S51_E$`wLE`!=NYnmq_uF4`ef|s*2)=#= z2?X|AbFQfL^a4R%GZ&R~TpfK}HWp3T|0j6h=jYe2e}e}C!EThQv-!X-y{Np{X%_ILvfdBx1u-&pU2GBsvcpz8~V%GfFuV(FhV6(sjZW+M*Z7Gla zcD*sL0a_lg_W`iR+RR-r253kt8yf&TPoR-NJkthfKL0PZzsf4BTqktT%BZz$2+Mbm z%I@gwffgLWn-Q2ZI;ZtT_ERPX&SF`+ee!ualw9i5fL`Cx!FZIBT`~89#W&k`X`(4*S!vS&>%;0<%fZher zx`K6Y-H~1IZQqhZNG=E0oY_zA4ZQD2+_FQgvdSudja+p5PwX`ZPr_!BLg`~*;)3}=3!s$^XVijhRsxKl?3VzTckQbFCxG4QS`U~IERMk( zKz;vfu7Toc^kjcw0+rc=vu_6QF1Ywuz)$uU0;rork1$&%%IwP3wsM00000 LNkvXXu0mjfhs%0X delta 1853 zcmV-D2g3Nc5AY6<7!3pi0000n5PbLm001zNGBkfMk0p5k00#R>L_t(&f$f+(ZyQGt z$1hJia6*J|F9rGlRsyQF6M#r*rBO=BK!CG>0G2DumF3D{8YyLn08;NXt^y{G$!z{JyLaU6iFRl=LBJtzANTm(%hOYti|!xlW{#eAdcg^561P(@-QxadH2z{o*nQ_aYX^Xo>^A>g)6TM`0RRdrCb@; zGs`>0l`l%4kL%X}6t6pgt7n&TsZ^ey5Og(zsL$^l)Sf}+4$<|pXjKLc_(i^+-T#(L78Ts^DEhEq0EobEO_v4J*iAsUg z0x1U)2NIRwVQmy`{E!3$V7X>54*7rZf(2mDEu-L7bB^N**tA{zY}Wx0=k1aPyZqa@ zCJA^2tR}I)Y9w=<%SHF)RHg(_y4BW#ZngQA0uFI4AAlf$^RnLD0ag_d^JbSgH33(- z;#NB`0orrzP!y=)I*aQBU?u^vn3x4gxd`tuKx5qv;(?`c-|~f<1?)&?ft<9deX~tB1waQEba5c13<6z@ z`$RRJ1?u9L%)%=iDU_Tey~>rte$JKW5=G&lyj9G|$5$&Ec@pM_D4dpJAeBJE{1C

K7fu*=OW* zeU}pqIRHB6k{diA-V^|CZ%kJ;IK`hAu%RV@9caM2rcb+l56}d0J28Ph0MC7+8rV}& zA0g%e(&SyT{RH3=gmoHJnf3=&gMwv|Qxy{gAS!!+X0+WtajL> ze}#n8+zceDTdv!o<%WM$+!(q(qu&_H&T3U&C-mWE1`c4kX-Ae%MyvoI>F%Y$3|(Je zB7iZ&YE=)Cyf1h_vVKSa4I_8vBUB1NUkK9YBLVEm>x>IJ2ROmCD9p&4pa3HfwqgQ_ z30!X=zGMsxSLK~ZA}$3;);nPxg9?+Ry#9_RF59m&)zzeWg9LxjY#!r&Cp2O@8M$!- zKuvHORJfvmzclI%0QE*)2T)9C44cirFo z0Qc6WN@Errzzt#rnU?zG0v?fHr+S@+N5dmJ8qyJo3Dl%xzlu-*(eVfyjYt83gpL$C zPR^0Scn@7UblrcPE6*j0!k4P-dg0FW3v0C~B9hOLSqWEh)8yK-XU_}GW-Hp3Zv$Jl zw=D%;P_YcfD#2nYtqna{T&U$dsg(eJ{jK&B;^R2lPQL|cKIp~b)v}iDO2YvR+_+_o zEN{nvpTDh*y7wu<8?}BQ;Kyhw0D-Z|1^_hTs37+>^3#8pj8uys?>+rx@7~ja0OZR6 z%f%>qF`k-qAA!}CMy%?SBqUA&B!KVkJ^ewp2v73F1hnjFy^cg!M_P1^Nr0%70x!o(ANtINcjROD~aqa3fP~OKn2PJD0^J4F$qS`$^oou zXwrZW0M-LoTbBXI1Ey*)X#fX+LIRK%mVYq@0OWth8G#P Date: Thu, 12 Jan 2023 13:37:59 -0500 Subject: [PATCH 02/18] Colorize cable_car/bg.png --- graphics/cable_car/bg.pal | 67 -------------------------------------- graphics/cable_car/bg.png | Bin 4982 -> 5151 bytes 2 files changed, 67 deletions(-) delete mode 100644 graphics/cable_car/bg.pal diff --git a/graphics/cable_car/bg.pal b/graphics/cable_car/bg.pal deleted file mode 100644 index d543b4cce9..0000000000 --- a/graphics/cable_car/bg.pal +++ /dev/null @@ -1,67 +0,0 @@ -JASC-PAL -0100 -64 -0 0 0 -230 106 189 -230 106 189 -230 106 189 -230 106 189 -230 106 189 -230 106 189 -255 230 139 -238 205 123 -222 189 115 -205 172 106 -189 156 98 -180 139 90 -230 106 189 -230 106 189 -230 106 189 -0 0 0 -189 255 148 -156 222 98 -131 197 74 -106 164 49 -82 115 24 -57 82 0 -230 106 189 -230 106 189 -230 106 189 -230 106 189 -230 106 189 -230 106 189 -230 106 189 -230 106 189 -230 106 189 -0 0 0 -213 238 255 -189 230 255 -164 222 255 -139 213 255 -115 205 255 -98 205 255 -197 205 222 -189 189 197 -180 164 164 -156 131 131 -131 90 90 -123 65 65 -230 106 189 -230 106 189 -230 106 189 -0 0 0 -197 205 246 -172 189 238 -156 172 238 -131 156 230 -115 139 230 -98 123 230 -65 74 106 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/cable_car/bg.png b/graphics/cable_car/bg.png index f268ea9904e86f2b1ea298836a94fd7f687b4f93..6a21ca3542e74b01481f2ce45543d6bc6dc736a1 100644 GIT binary patch literal 5151 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 AQUCw| From 863779afbb7513f38864db73f33705d57b21e15d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 12 Jan 2023 14:55:14 -0500 Subject: [PATCH 03/18] Colorize rayquaza_scene/scene_1/clouds.png --- graphics/rayquaza_scene/scene_1/clouds.pal | 35 --------------------- graphics/rayquaza_scene/scene_1/clouds.png | Bin 964 -> 1076 bytes 2 files changed, 35 deletions(-) delete mode 100644 graphics/rayquaza_scene/scene_1/clouds.pal diff --git a/graphics/rayquaza_scene/scene_1/clouds.pal b/graphics/rayquaza_scene/scene_1/clouds.pal deleted file mode 100644 index 4b1a354ce6..0000000000 --- a/graphics/rayquaza_scene/scene_1/clouds.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -164 205 180 -82 82 90 -255 0 255 -205 115 0 -156 98 16 -98 82 32 -49 65 49 -0 49 65 -24 57 65 -49 65 74 -49 49 57 -74 74 82 -98 98 106 -115 115 131 -139 148 148 -0 0 0 -32 90 115 -131 131 131 -148 148 148 -172 172 172 -197 197 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/rayquaza_scene/scene_1/clouds.png b/graphics/rayquaza_scene/scene_1/clouds.png index a253f47ccdb36e4d9e4d1e641fe07d8d48916ae2..be49741039c54d7224b4ada639570575e58eca48 100644 GIT binary patch delta 1018 zcmVPIO;@vXN2Yqa)? zQ8DYiimMNkt3C~XE;EE;3CvIMHE|};l|^D9t;ixt&w?wMOfP$u6%$DCmD4U1FlOjli{bJ3yY+Gfi5J`Jb@P3chnR`kt&cv zilhqTtWzD0+mf$-S44{cJ!SwOcXr@XPOEn*S?&b;SjYb7s(I?iLx z7T%LeC!~#ku-lLSL(o}W&B}e6E9eUa+9~*C;q2HjQy^2eOj%iW16f2Diq*kJPoOO^(LnA<^a> z+)E%%B#!JqWFcy%AA@!Uxt&Ey-5uU5$o7ZXb|buhShbOkb1MfR9M6pjy*=EUMfmH- z)?VgFgFXjgKj#G-!`t6W5(R6<5*Rv5kd8sS%Q}@f>^Y-a)Ij5hyvfra3^GtcWYyqy zeHx2yPJ6MxGl-HkQqls==KZYz*@BnWktt}9T=S-M}lOdZFq8WSje^05R_ zh@RI~iwAX{a~3fNoZs2^w{igbJ;(|qf}j>_v52#6%ba}Q0X;ff29SCV*!lebiqhAQ of_@D$fqKqt(No`_f^JLDUt??Y02A01^8f$<07*qoM6N<$f(fC{*Z=?k delta 905 zcmV;419tqh2*d}F7!3pi0000F?;;2Q001zNGBkff?H7Ll00U1+L_t(YiKUg%k<%~` zhIJPgaC)|xxe{&$3h)fj0nh=^0kl91v;a?eMaqMoB|qGAELRYz1^9PYa%?BZF~iPX zoY?zmSO2coO2K}^%ri!QH~9YwQ~w18SDp^z*)u!?bs@CI?1#8u>@eCTbial6px8Y7 z>^XnXl)U$Ufhb5$(O5~TBW9SggtAXX3hWcSb*<3|YY{c#w>O@`!EL85)zc-vpv$+I zB3NT##;+jGc|QXINoJ&30)&-w^-)&zL3V9d5MpQ}7E)UH_oOyMk>ZCzRdux1m0;Cr z0ou|E!Ywj27lNX7Slj7RSTehcWCI~Nt4)8mXezOYTih*p zX`cmyIIKq+rLH7$h*L@_ROl0o_Cc-0+r&2&C#p>l30TmaskX9}o*@yRWWXQNQS5&t zN^y%~jdU^_Xh2(eX~`);JwoaMMT;Xv%SUPnO&ND^;Gpz$@;0b?>MB=%@|FO8fXS*_ zDru3PdBQ665k?E~o@7=3Ec6~mD$rSRoCP9r>NIG2aiFp~cYjUz%C&8 zyRP#=DhH)_G?2TvUWMSS9iN+#tG$1PUcuxi9?%_v;5-ayikK3$%0;Btuod(c2520o zJi+J`2cE0Vye0J#wu0WlLQcbw6B$~PM%NWcY&R=|u}ZCoi7Zq7-=J;1W_OXDp{qqL z4nJTKn~Qmz;xwz-sM6jvFkAZALYT7&Jv~s)Lq2(i?7q`DM?tqVkGml0-_L)L>F_YL zmODA{OmCEXd_)2#9gmjEdAxuw_t>i!u#`PbBm^A&0%{22sUdFxzB0sb%~6Iu9lu_h zYKFY0@vL>dGSs=2ryYinrKGn|&>c>=v-Qd%mG=w(<1;Rxo*^<WDG~ zzIm&Z95*s=O9$LhXOvSR5R`FkJ0#5_REV~UVY-A$uQn@bm(T&T&H8v0zgx9}e!*7I zol=|H2-Gj2pRmB$BmWyUL*I)np<)jl3Cc|)PVLjs!y2MUXd-{e$rrg9`c|y^HEI)S fo&N=Nw}k!x<@mnLz0${a00000NkvXXu0mjfYKN-X From 12cbb0b30f790b18aef98078b804d2cda76c55b3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 12 Jan 2023 15:15:48 -0500 Subject: [PATCH 04/18] Colorize and combine birch_bag/birch_grass --- graphics/starter_choose/birch_bag.png | Bin 1304 -> 0 bytes graphics/starter_choose/birch_grass.png | Bin 691 -> 0 bytes graphics/starter_choose/tiles.png | Bin 0 -> 1928 bytes graphics_file_rules.mk | 3 --- include/starter_choose.h | 4 ++-- src/credits.c | 4 ++-- src/save_failed_screen.c | 4 ++-- src/starter_choose.c | 13 ++++--------- 8 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 graphics/starter_choose/birch_bag.png delete mode 100644 graphics/starter_choose/birch_grass.png create mode 100644 graphics/starter_choose/tiles.png diff --git a/graphics/starter_choose/birch_bag.png b/graphics/starter_choose/birch_bag.png deleted file mode 100644 index 86bfbbbc0a3aae8d4bf4b8ba8f716030c82606fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1304 zcmV+z1?T#SP)3j1-8jW1bWru}qWPLyLd2gPSq|>oimo_f_ zuhl(v!`GjaKXP5S{}~d;u2>C;9_N4UlaE}rED64%bliq;QoeGlWk~cmWl0jZAd;BH zM+Tsj=)v}hSi2Aohnpg|zEA?=EYWL9Uh(bu6*^jZmkenwE)nTAK#ZRqTlv20j>3AJ zbN=@>f`hl&1-M6UKk$dtjN`otY4!mH8U^$b;rqUpNOkqes|H{NdAk7b2oW9-q(s$! zXWCF$HyZ%E1400VgxUP*56u=(GT2gp27pBEe!GSqi(M}oSOR_V)mJOr3BUq88Z-qe zfJtyds|h`E0^TTS3RD39^$vjSpf@VZCL^NU3e5`(e; z!yv2x5v67qPkdSSL7wN}kY8K{ZaEW!K`Bs%oUjJy`o6fm|6QJ6=J^dEuBxFb4UAB? z4mg2N#l7Fc=Hg$T-|C?nXaf)^LsMDO{D zrhpDjsRal%;lNOkz4Wv}ScPKzzj2HXi6Tu{nhMxUUl|Ai35W?CqB%%T7!pbX*~x{e z0A)ng5hy@RXb9h#@6~BULmCA_;y@~tgbQ(92>`%>d=%9Wp)*CIB=}gw!YCr2$9Vl4 zk%xC{MBr;!9|L$9h>s<~U*wlJMiF-e2t!8Yj}#)difH{&=$)B_Lotq8VIKG-##bsK zQz9E73~CQ!Z}XrCco_cD=;I|`c@a?t;aJ6mLG6XqW12vTEJ7dU#hs8Ml)>gDfLa2b z9<37&ONBe4&X7?PUcxsKmY~$d&<|wajNGyML^17^BsBkRTKc%u*uKAnFM@}ITVrN<~#G9-Z`b$pn3Xa z5<+Y*rHRTn`)>d?oZdsJr%xpzkOFHwy0$n1GLH4Xdk+NNN+AGOQDA3U0y2((84w<; zx#ep{#~`rn^y_Prog?AhtVS5~n9;P=Up0XP;dEva7<7Qq=RGRuh`&jI@Xt&Ueh~$5 zco4>ueJap|%}f#=vjj&Mj)48NpMW9=z*CkL#XWq-afn-5h$s9tEJfJN-alq%1*`{| zr{fj@695yv!OaT=z&r}w`J$N5F`i{=AbDF0ZNPF_6d$v!e1T2cTG%wmvR@}$ zO%fK+a)uV*t1Rn$`R8QvHdb%2mJT!kaslEkj=(-cycGbeDEMA~F8>SG>pV$S634y( O00003>oKi}AK{;A6AUPoa{{a900RR60|Nj90{{a9008(>7qZZ)T0006$ zNklPzh`p7x#jll-CY4tT=+^YL1v@9 z?E<2_`^Yr`4pYD>_iwoX`me46V2rCT$pN@hh7AB6l6#h?Vpqa`0LEUjFOLHr%`w3J zRHl!BPZP3{%_f7NsvZOnYHFt2T*n0<1$gz9R+WVA^>Xj4c5 z-M${8McP_vnZd65XTa!O+2s{r9LP({VkiJyzpsw~LJIJNfHd2=0{qtfUjU3mibopQ zv`fDLD1LLKp8!mNjGC=p0Z@o|V89#DDyA2El<`TT8h%N~>u>>(QypN46-S$G&<(rC zgC5;~1B^~Ndl*x9D}e4k-VgON0PQOQ0(i(NPzR4={R|KvFx5j@h&Dukf%`ImWR3E{ zDqy3&AWbQl`_&A@7(e(H(CV+sQ~+)RpqN=tn( zTS;}mcB3!{d3(9aLngZc!j6G4<_Gx=pahX?1Xz_%k2=770%nM0VlarA`UD_vdyk|A zP%UAM`6sUc5G#;1J2{2T4ghulAsRvQ@cWYhO2-)bXHe$=69t3(->L$xxZ;W{uDD_q Z{{ZqzPeUcM&X@oI002ovPDHLkV1hGXF^~WN diff --git a/graphics/starter_choose/tiles.png b/graphics/starter_choose/tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..175b30f9d16529927759e4b1ea91987dda8981dd GIT binary patch literal 1928 zcmV;32Y2|1P)C00001b5ch_0Itp) z=>Px#U{Fj{MRUcZ|J9WL#aiC1TD_cFlyg#pQc5{mVoEVN0Ah;(F+tVU-khA2Vq$Xu zQgZ+R0E^yp#paZY-gE!|0CT-!Vw_S+dqFu`F(5f0|Nj90{{a900RR60|Nj90{{T{R zL23^eRR916)=5M`RCt{2nCo_^^mJI?yGQ0n=7w*QPlwNH+J!=Rorb}$SSx5>B9G*%fvT2Wkv&>DwOnfw}q zQ`Z#NAZP&i&C{=ahaFv=R97C<=b*ne@sRBwtVRzb}0yu{H_*)iW1u%VR?KOm0KP5nh z(*VK#M%5Wo{S2Urpj)+0Fo^OuH5)Sh0svfm4nW1@mTcIk-!!Fu1Az55OxwR{OoGtl z`W1qb60VwS7C`&QBb)xa@1+e+K5?Zf5tPgZ1J(dk(_n@RLu0-%dJ`B*>6ZzLsS-f7 z2Bhy?<^`^2eS9H?=7@d)04q?n0Q47UvC=O6Z~l)M(1v_sG&w<8hzzI!D7tVNwQc)F zzxNE~#i6X93#kkQN@vA$=K)oRl$v z(ZPmR3w_>Ow>)gSwhBCGCm=#*vH1l^#E&46Wy2uwTy^)|rze$-z(m|8QKh`?wa zEkK(9TVIZc}<60RV}u>k9%nc_{6ADn@lfFP0+#@I5 zL9-(=l7 zLKnPb9G6Fej)vOGl8Ub>IHrCfm!(S6;fUaBmPk((e zLdqcY`KhcEzo5MUbe(_f4FHUg*q}uI`bK?h0@U{i1W-qC{^P&ly7_^CCITbqpRYQC z=KACM@w&?ZhcI}A!2<+@PNvWOce8$k(0zSH2v8sGyWTI?THmd|AS?i+-5Cu36x`n~ z^rZ%zIYy2Ip^LRCV)@VjCsVBgIEF6PUI4^x@7e@d1AqYW9)5ffPc#*Vs|~mb;Ppv6 zTZw%Coo~QB4v;p8q`Q=0|CI@_0YLo+{~P0kB!WJ1}+Ql5zU>jpM zfEQoUP64i#z-Fm$i8H{S({=$^nfl&Q=lR$?r~+6R$fEoabp|+MK^*|bamgQYbfhb9 z0hr$J!|DXEX+hMC6#(l14$BjO>w?&Z>eR>pT<1-we_TBPz_m8|IDRKEasW#soJl?a zkOlK3O_;^;S_#nlEAkA01hWlk1IlbG=cfSB!k~XzJ^(--kPUwZDDzwyGzEaC`#?05B7P9VcQzKai$ShsV|j|{2<@q=Z5kZ0VZCX_yx|e zvJ>os3lBG*@ech2fcnr1fGKGNECJ*WM;B*b1;8oW~{dj9YpS*cMMeV27?yNg$eyD0CNDCD0N=iTpiX6aVG%& z)j9ymenyJ1Qi$mUfUWib1$E!d!hB*Sh^i6vRU|a=2!C;0vCJJ5?l2+I)8~~DAP!Yfi5bF=< zJHW`ht?3HDxCxMg(81*TFTnn!-306dm_2~o>r6`>P5_K&0jBU` z-JO2^%K&zHL4XO@h3Rhs2o&1UQ5**N#3w%SiBEju6QB6RCqD7NkN*HHZ{Wd!Af%!I O0000$@ - $(NAMINGGFXDIR)/cursor.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 5 -Wnum_tiles diff --git a/include/starter_choose.h b/include/starter_choose.h index 7a4f6e967b..1bee42a2e8 100644 --- a/include/starter_choose.h +++ b/include/starter_choose.h @@ -1,10 +1,10 @@ #ifndef GUARD_STARTER_CHOOSE_H #define GUARD_STARTER_CHOOSE_H -extern const u16 gBirchBagGrassPal[2][16]; +extern const u16 gBirchBagGrass_Pal[]; extern const u32 gBirchBagTilemap[]; extern const u32 gBirchGrassTilemap[]; -extern const u32 gBirchHelpGfx[]; +extern const u32 gBirchBagGrass_Gfx[]; extern const u32 gPokeballSelection_Gfx[]; u16 GetStarterPokemon(u16 chosenStarterId); diff --git a/src/credits.c b/src/credits.c index 4156e45ba4..94bc0c4a6c 100644 --- a/src/credits.c +++ b/src/credits.c @@ -547,9 +547,9 @@ static void Task_LoadShowMons(u8 taskId) ResetAllPicSprites(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 8; - LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); + LZ77UnCompVram(gBirchBagGrass_Gfx, (void *)VRAM); LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7))); - LoadPalette(gBirchBagGrassPal[0] + 1, 1, 31 * 2); + LoadPalette(gBirchBagGrass_Pal + 1, 1, 31 * 2); for (i = 0; i < MON_PIC_SIZE; i++) gDecompressionBuffer[i] = 0x11; diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 877482728f..d632c553a8 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -196,7 +196,7 @@ static void CB2_SaveFailedScreen(void) DmaFill16(3, 0, VRAM, VRAM_SIZE); DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); - LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); + LZ77UnCompVram(gBirchBagGrass_Gfx, (void *)VRAM); LZ77UnCompVram(gBirchBagTilemap, (void *)(BG_SCREEN_ADDR(14))); LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(15))); LZ77UnCompVram(sSaveFailedClockGfx, (void *)(OBJ_VRAM0 + 0x20)); @@ -214,7 +214,7 @@ static void CB2_SaveFailedScreen(void) ResetSpriteData(); ResetTasks(); ResetPaletteFade(); - LoadPalette(gBirchBagGrassPal, 0, 0x40); + LoadPalette(gBirchBagGrass_Pal, 0, 0x40); LoadPalette(sSaveFailedClockPal, 0x100, 0x20); LoadPalette(gTextWindowFrame1_Pal, 0xE0, 0x20); LoadPalette(gStandardMenuPalette, 0xF0, 0x20); diff --git a/src/starter_choose.c b/src/starter_choose.c index cbe0c7ee61..67f762d801 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -51,17 +51,12 @@ static void SpriteCB_StarterPokemon(struct Sprite *sprite); static u16 sStarterLabelWindowId; -const u16 gBirchBagGrassPal[][16] = -{ - INCBIN_U16("graphics/starter_choose/birch_bag.gbapal"), - INCBIN_U16("graphics/starter_choose/birch_grass.gbapal"), -}; - +const u16 gBirchBagGrass_Pal[] = INCBIN_U16("graphics/starter_choose/tiles.gbapal"); static const u16 sPokeballSelection_Pal[] = INCBIN_U16("graphics/starter_choose/pokeball_selection.gbapal"); static const u16 sStarterCircle_Pal[] = INCBIN_U16("graphics/starter_choose/starter_circle.gbapal"); const u32 gBirchBagTilemap[] = INCBIN_U32("graphics/starter_choose/birch_bag.bin.lz"); const u32 gBirchGrassTilemap[] = INCBIN_U32("graphics/starter_choose/birch_grass.bin.lz"); -const u32 gBirchHelpGfx[] = INCBIN_U32("graphics/starter_choose/birch_help.4bpp.lz"); // Birch bag and grass combined +const u32 gBirchBagGrass_Gfx[] = INCBIN_U32("graphics/starter_choose/tiles.4bpp.lz"); const u32 gPokeballSelection_Gfx[] = INCBIN_U32("graphics/starter_choose/pokeball_selection.4bpp.lz"); static const u32 sStarterCircle_Gfx[] = INCBIN_U32("graphics/starter_choose/starter_circle.4bpp.lz"); @@ -402,7 +397,7 @@ void CB2_ChooseStarter(void) DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); - LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); + LZ77UnCompVram(gBirchBagGrass_Gfx, (void *)VRAM); LZ77UnCompVram(gBirchBagTilemap, (void *)(BG_SCREEN_ADDR(6))); LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7))); @@ -421,7 +416,7 @@ void CB2_ChooseStarter(void) ResetAllPicSprites(); LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20); - LoadPalette(gBirchBagGrassPal, 0, 0x40); + LoadPalette(gBirchBagGrass_Pal, 0, sizeof(gBirchBagGrass_Pal)); LoadCompressedSpriteSheet(&sSpriteSheet_PokeballSelect[0]); LoadCompressedSpriteSheet(&sSpriteSheet_StarterCircle[0]); LoadSpritePalettes(sSpritePalettes_StarterChoose); From a12432a0f328cc649eebf8271b73e87e3aad86a0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 12 Jan 2023 15:26:53 -0500 Subject: [PATCH 05/18] Colorize crusher.png --- graphics/berry_crush/crusher.pal | 147 ------------------------------- graphics/berry_crush/crusher.png | Bin 2151 -> 2496 bytes 2 files changed, 147 deletions(-) delete mode 100644 graphics/berry_crush/crusher.pal diff --git a/graphics/berry_crush/crusher.pal b/graphics/berry_crush/crusher.pal deleted file mode 100644 index 13ea34e59e..0000000000 --- a/graphics/berry_crush/crusher.pal +++ /dev/null @@ -1,147 +0,0 @@ -JASC-PAL -0100 -144 -98 172 180 -255 213 156 -255 197 139 -255 164 106 -238 131 82 -222 123 74 -213 98 49 -197 82 41 -156 213 189 -123 180 156 -222 156 255 -172 123 222 -255 0 255 -255 0 255 -230 230 255 -65 74 90 -156 148 172 -255 213 156 -255 197 139 -255 164 106 -238 131 82 -222 123 74 -213 98 49 -197 82 41 -255 238 0 -230 189 0 -180 180 180 -139 139 139 -255 0 255 -255 0 255 -230 230 255 -65 74 90 -156 148 172 -255 213 156 -255 197 139 -255 164 106 -238 131 82 -222 123 74 -213 98 49 -197 82 41 -197 213 246 -255 255 255 -238 238 246 -205 205 213 -255 0 255 -255 0 255 -230 230 255 -65 74 90 -255 180 255 -164 172 172 -98 106 115 -123 131 139 -139 148 156 -148 222 164 -156 189 222 -197 213 246 -180 164 115 -205 189 148 -213 205 172 -230 222 189 -246 238 205 -139 123 74 -74 131 189 -65 74 90 -0 0 0 -148 222 164 -164 230 172 -180 238 189 -197 246 205 -213 255 222 -238 255 238 -255 255 255 -65 180 238 -255 255 255 -0 197 57 -255 255 255 -246 213 0 -255 0 255 -246 238 205 -139 123 74 -255 164 106 -164 172 172 -98 106 115 -123 131 139 -139 148 156 -115 156 189 -156 189 222 -197 213 246 -180 164 115 -205 189 148 -213 205 172 -230 222 189 -246 238 205 -139 123 74 -74 131 189 -65 74 90 -0 0 0 -148 222 164 -164 230 172 -180 238 189 -197 246 205 -213 255 222 -238 255 238 -255 255 255 -189 65 255 -255 255 255 -123 123 123 -255 0 255 -246 238 205 -139 123 74 -180 189 189 -255 255 255 -0 0 255 -164 172 172 -98 106 115 -123 131 139 -139 148 156 -115 156 189 -156 189 222 -148 222 164 -180 164 115 -205 189 148 -213 205 172 -230 222 189 -246 238 205 -139 123 74 -74 131 189 -65 74 90 -98 172 180 -41 41 57 -213 213 222 -205 205 205 -238 238 238 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/berry_crush/crusher.png b/graphics/berry_crush/crusher.png index 6e43adb27bf0226c4d175b9dee89bb4b0566856b..03c23f8b57ce792562a425a3bb29a7b84da5ee97 100644 GIT binary patch literal 2496 zcmbW2Yfw{37RUSE8wd%K1dM{pBRoVN3iue2@Jdhw5fK;_bP*yW;3@)+utpQ%5>OeV z0xA#(1awdVF~%`GH4sF6K{SdfK#-^if(${30vUptSW~q%TeZ8jwO!rk^oM`{&i{0O z=%0dv{0#65@c;mW4gTvwwHf`k^bl?Q{3chWP0+zmKOewIH;iq>?k^4^>6hW1sD_op-{-> za{m{7t87xE(I^y?5{c}udW}$1R#g?f_aG~S%ROIozOSrE)Tb2-%MMCJ=Vg+r!9LNX zLc(PQ1Z0S`ezZ+#HD!ZULWQVxQp@U7XcSs9UHC16RyS>&lmTstKTm1f{44)pk?8;9 zi|AUghQ(t2lPna8zEuSO;{Q*+*5QBhuf2bJdpDV^Pa=^h6bfxS|9xN!Cbch%ZQQVq zzJ*!T+TD|XnM%@S=qx;PwewZ))4RWog6ZH^%*#C36WI3z-+V87Jftl_CAg( zH-l}x@gy_-{%YEYN?lpGFJHQ~4&pnQOH;lakqkUTFzF*cA6&&;BCsk}uo5kJJ4sMd zCO=>09qsr&MUJyNK{1lfO1D}?&MAa)3QHc?rB5np*Rl%<-n4Mv? z)%f;T?RiWXnm)bHo1IX}+#pVT4qGsER+r${&}Qx54Ovo}0?ay7_Cu#=Q{Ib65BB*i z48D!N8i*U?e0&x=cQA2vnvqJ8X{5K8t)8_}dC-b&TGX2yq;;_cmZ>{?7*|?R zcy)FF^44*z3bkV86vBG(~dx%X870Yc%S+6=IUA&6vc}E&qpy~s4Oeb$#-6QpLy|U&T zQ#vsibM$>-OdBvBzc!IetAWVIDJQ9fEVy z#4yff8Ly2nk{kdyXVC+GPL5Nz_tQhZ;wnifpRen(klsDn6M}_@BB84yUtS95LZ^C>@EPDf~zy zG()924s!D=`cNfya9oH%G4&X8!RSoSb5E-eP_llY*Y7u+AUl{J2#nYt7F-60ZF&a{ zOiD3)L~d>w>kszK4POh^G!WP=D)?f38!%0$dH}s3e-g>g+8}uD?pwpwiFhoi9bcmx z*3orkl|CsEflN!HI_}GNR$Q(f*^CVg^hkZlTuv!&%s4`Jx$uO$WH=j8Ith|x_a64d zr>tzyb6M{Gk5uIWk6t`cpDI3f5Tq(Md9-(ArL}?FPo$izf?MyP&B)};DvIZsJ#U%` zyET5P_}G&z-TPJ=2GkzNDlCMSAe#IDX{=^dtpSY%-b*~pE< zX=4RMJvnhHkTQwV4l5K52L4UXJmh{Kkql8vN|uJ96bop23h4&UA*)&<&bABH$&KB9 zU&qE$do2i0298UeDZi~W?gg(NnoP$7Rwy~i0E+v(d&yI&F5L35_^t(Ky2$* zw!ge_A;0AP=e(l=a?^c(Y%$>RK^+G4MCmi>*yP3pk)1M9j1)z7LAS;X-o%4Ac+JJg zPAHEEsxKdQMnSZ&AcbZ=bFO>JL3-CX3AlA#r_pneJbfJ2xr z=pX(Vb>`YWQF@ld^)Jps5<8gy7=?6?|lJZ~o-B;BzVYo0@| zIS;8Mz9Hyc77l_rF=kmebKwXh^en-q(+>8h@4|9sGT#vbUFX!zOJO|hUDBTN#yi7Z VzcTf}`n+#{{RZElb$lNN=MON2m%IP~ delta 2102 zcmV-62+8-r6Xy_+7!3pi0000n5PbLm001zNGBkf5kx1zP00;6(L_t(&fu)(xZxcrp z$M@8nklDymudqgG;1YG$3gSc)uX5qg3r6LTsEWe|T&abmcrWBoq@wkul|VvSSE^Kc z%39)7QI++nm6}7$Kae=RfzlpK)u=||5cj?LwKKc3jzizYWM|%IzVG?X>>FbkS@Unx z&k28DGYGcs%z9|c7MRA}H{bV(-7$R~V#1ld8K6B_)&RiWoSY`(!F?F_JPqI$9Sw-Pdi1paSM-GZTbvKpxfZSshM)6FqQdaeZ3eKZfPTLp zMJYh(yO`%7{zXlmV#GfgnEBO%}N6< zL>$22DFBl&`<(he(EuWv#ApPdTwaJ}e;EL~Gireeb=*p%-UlRxiu+j{N757lfC(Nh zP=*Pyq`?^ait*`WqeDd_>_;FI04z~iAf=SVV5A5ffd38vKypR^5Txf&0dee#ePg5u zqX9Li!T>Hu;N;<(aR3;Dw^DyDqyJB?%MoODVK@!|C3uy}6#;PF3K<|GhT{QNJ=eWL zBA|duMSM#`$`}E_7#fW)k-!0Nxok)VjNvE%NLXE6y?fP73>6fH{gm;f1l4Ml0C=tj zprGL^1edOy1~3I_Kmir_DuIh13t$XTfl83#KRO;zc!LVSsu=*O24;Wx0He@gU-#W= z7GN0vp!?s(2!K@gcdJ*kfXNI1KV^Wjb6~ux01DO&uLRuAU&A;*T;S2ExXTPX{L{>5 zx6_pjk_@Wm*?RcoH%FBFsgCf6Uf<9HeqQxfFfdDm(Mr)0T2Ok{LB*~6aZF%FM^QjpxsdfZ~__u@G2xJkN{>Hzy!#IEP#dp zxsU)+tO|&E9&`Y-d!!gl^CK0I2uMUI0Q|mjeO66ov3Q09I&^>ioj6V*GJq~F&vw(C zJI?@^1Z8>ILKVPm+iw)vj(Hok<8FF+?hTd)Sj8_IgBU~*LyiEP`l~q7VPYI>7mC>z zGPr>USd%udaF7Y(fOg#02g(42Yj6Z^Zt~_cL2y9yJQ@iw{;gK8Qw1D>4HXBF?oBU& z17_e1{A4o-6a;@58GH`_tw=AykR()_fox3yC_uZkl|wKj2}?^s#sr{+X&D7T3G@!3 z1JvOXrza$U!po(lEWzMeY|*Ta0DuI1yXpZRD$o)nK;dW!2?rVgB%#H>*>)}f2=o=N z1JqH$CM~dBfKgyg!a*7UF%Sg-CA9MZhG?Owz7(e322J8!e`UW{EU|(Jye=Il- zu(%JV@uzRE;{f1G1SdGjAH65Z4*_|AeX*SI?3y3diXchtAN|^&pYd8i#5r99dIRrrZ zg_&^xs(|?f0Dpcw24Jxx03ZN=*-HS$q9j4OHzinai- ze&INP5I`cZ92r3Rg_+TSMdiLA18^d}Cu9NQZY6(3;L{>tfZ>n;*gatsK)o+8fWsZc zJz-`vK-?DyV8$6HfaIQ_2P~@h1q8@RlkW-n0AB%I9;yIA&;wHUg)~6EC*%Os`vQE8 zO6AG-1TBC%Zp65su*KhfiSO}XP@XeQG6OCa_!|2P&LVu@{9w|C-eJZ89RYYsUVTFV z6rq2N-AcuA$aNPSNsp)nZ0vQh<;50%ck6q6bsowJjtBGr5OV-&2oF!BVB-ZyhnFed z5h$Q}G6g*ZLXgwaV9Y;<45Dxlel z4)J$fUNky@_}P#EIs(uZ0NWlH(31htJ1BpU0Cfp4wt|f=twM18w*D>(7~m}eymwL1 zqky9{K%)RZa{+@t5m47EVB5LJwsTJbY;+mmbJ&BB#WF2E&QmbQ&xTwDe^4I4 gE4_l`Y)C8k4;`7^UT|+M;s5{u07*qoM6N<$f`>qh_W%F@ From 3a253ece0f93a34c41b2b4af001888b902df2c37 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 12 Jan 2023 19:04:49 -0500 Subject: [PATCH 06/18] Fix some colors in crusher.png --- graphics/berry_crush/crusher.png | Bin 2496 -> 2502 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/berry_crush/crusher.png b/graphics/berry_crush/crusher.png index 03c23f8b57ce792562a425a3bb29a7b84da5ee97..6a57360a7198fa6c05d0b7b7a6eae754c4d11618 100644 GIT binary patch delta 1980 zcmV;t2SfP46UGy;?E!zpNkl_ww@6c?Dk-(@}f^AS%5x!h9`A z0ciRJKp7GMkzWMR@gzaz%CS5kPSE-85HR^sfaq8luLWAq=T}u-vxKg~4RBTQfUc`w zUby^efFN*P===tF@c}@@(|zyl1G5Vv0FKbrGXG0#KwkHqAaV#I0o@N>CE~?uGXQe) z6Zw{qSU?Lpf1`h7ew_i3=gV08ORDyoAU3L&-%SH#etP?72|D#nMh703?+ZGeU&oex zM!qNLRDN8r@P|QhOX90}?Gidze{>U}ma;yUACTbok&AC!KohL4ZNH&Xgw7shQFI_! zE@J>3&k($LQQun!NVP2_@BkgJ&cU*3N>KUoENB5%(C2>xbQA|r`PB!i$``bd&j|Xq zOrRHSdk@f%cpx-()Heno1XBQV{}~0;OuiD>ReqzpKmxP?0cslmRh3WR0FBCD{y?=< z0>1_1FtmV(0OA#a0$Lv+^SyW=RCpi*_})@LP4Z>a^gfz5xX0uE4rh&Xx($gfhzbzNHkBhdZN288jNkOtH&pmzD$yP*29T!#6}<&Q+Z zJD~)E8XtdONj?vdC&@5>nacM8zMy@N=f?q_L4TeDXzHeE-``{LF@O=kUw%HE39JC} z-yMMt3;?i#){L)V1+a=BSuEdoiK1&q59F$BXMmGr1QCB@V+a922|@s7^gaDP6MzNX>uZ>81uI#%+wD40YB|)Ix3^bS4nU5n-sB5Gg3zp> zZW9QzTsD8e2~U!?0f0*qu$}^h z`5YkwfOi2{cz`cp^Fu=p0Ht5hxp)j>*oW1l|K1NIfE;!u@ zME(v7B*3&_Dm$#>F#!ll0){oYtlUnv1x5Kss6qg`x*EV>1ZCTA*SaBq-mFlqGr#=b zMn4Su{a$b5;dn3we_MTGiU6eGR1i-At9~y9dp{o;0t5w|&bAM;079_m1qgv12rxL- z9e@o8_F+CnsIq_+0FH$M3a~wh35df1Obd=>gb)BdxbCkBfUN*IvN-~i_fbmlGta0Ke`03bLbK|r94 zG(b&|#iozEDI5S?hy4&-O=FkREI_;s1n}GAYaIEzD^>rHdN^QY;_;)#lL7JcHPpR; z(NtbMNxugGf4O$m+#-Cu%~m&~vj8KrW2ZMC$HT4gW=03Na1Ow4zKMr<8u4!#AQBz| z67e!tJm6`-cAEyI*CQIZvn#UyBR>T*#o_F=nF#%x)FLk*8o1qtfc0j>rV1xURwhycur@%w=sz+a>md;>mlJ^{%0qYmJ|AD9V9y)Phu zt$9U@0QCL9T>yOZLIJ&t_W|7dff7LSeSrn^e))j#{lE+WjrRaOEdmG#1%UMXf+;}k z{Xh`_fAaasas>$T5rBU`kPY}3muQB$B$;XX@pQG1{D(t7YA(X3 z;{^cc0ATxT0Z-_F&eyFMW!?*Tfa4Q8Aojfhf1C{9L;%O*^E#mN0iXt&_W}qY*7mdx z$YXyr`(6c__W}+eSN5z9==?N5%~kX&jJw$60{$SiAPpdZ69?FA9}Q3^A0BY}DIMSe zLk#fn4(R-o4=^qG86EHdHwPGgQU}J12e?iGvN~Wsmji~Y1q=lp@Gr;X#lIYnmpEX& zauC1(S3cc>t#`gN+aFf$a=(+}0B{4MTd?)ccV_#efXU?w0M{D={2v|AEx4}(;fMg> zZovY863pvBd_)RxP5??ekQ`A2kb=Sv1osKW9T=||a4qTpcb_oTf&T!;o19zKL$YfC O0000vsF;Az`mLL}yM$LB_4Vf!vFSQI z;_~CgJ+B9zKWt3+7{km>ppDKqJbHfZ;x7B#Y}s>pz2pX>@um#Z_uRVusV3n==H;*P zA#2K>?TQdqM%?wd`z}+gtvKNqLq7I?JbCxR_|n^sZniY#58>>stE7ynfS6lR5ccG0 zC5CR^z+Gqd2we$^UU*oy_lTKTaVPknB}CWw0<$2-E_rx9sfEl|nZdT+6uOz-P&sE@ zqb)0o&r|NMg5>t*%H*%dJ4QMYLfW{`M>jl^2CND{rzBcP_R}Fjx;#(g9px~btRh>T zVKI~o%H38GOA4Uu0_l^=^cHxZQnTVG_4pDL^Nf7_I&x=u58+-&xi-O^rS9%;@K=^5 zu47L<6h$h>wCsw%9cH|^H)n>#xed#il{WQ%^f+ESIsIpWZh6kvYE3$!GAmp(1pmRS zs#rJ`V8Bkv_U%gJ-TyBn@Z2;t=(~_$#(GtejU!19*`&6zRos!b`!Zq}S4vZcn4+AK zP-%&Mq|#@j^=SXPw1@{2UYt#XY0BR6)V07;f@IHk+R0*Pa&f9A^D|6V!i184YlC)g zOha7lQ8nq+7P59(cC!+;f-^!1l!GU*_SwO-;P*>S@X0**&_$;L+eP1@+XtUgN9WGR zdy5jvgj?~%F4%%cTrZ`#bI^rVgQJ$Lh5)mkeHQNJ5>3V`N!rLGi*|#-moS1)v&@ zz*Yf2Sriazq5uZ%yPv9$;B@X^VfB*?Uq3(Ea2Y=i<3oFRm-qyI)LV9rH$v8Gvx-Yk zZd;PHCO`;e#EqQ1EQN<-R2Zxf?=eGcq^zmNW|L)*mH0GsA7t`94rX(+AAN8L-;TI8 zt<8ft%BKyF=`hAf2koON-%r>Ay_(8O=YC4XU!P~^4;R1ut;A(=GO^4QGySFRsgam) zt50N?ahoZy6HrT(J ze%%O}`(3+Y&vj6Hz?`?y4@|eUuh?a(m^gDlrukROhSOii&Y#_J)iK|p)M>9rh)oQe zlv$I!MRQd7ldI6HRvD46c?+t9j^5;|C)zIE>y3BNSz-*q92+i(X#+;nH)nD<6%f;? zWCLy_XW+hz=dCS`eJMP3ga1;%T5O_3$AE((Ca%k`hY0BekP072-H4C;+9c7(wBX(l zdK$vpTH)vngpWwpD=-dch73J}bY{B&{xi9^18Ndo$cFG*u-X$hQfRJOl2Gi$-O+H7 zKU}0~p%Z&m<@p!DnKuV?fsvC}UY3CxbJ%ed&OvdQ?7T+OMjcNI0OE_-5kE(V+53mN zAwS4vbWASSabC{t`_>;qf=4^BL+#obbj51dLEkFjq{> z_jh?&eT0(q0yloY;|STo@<6~4eKaWo$7}{Zp!&u#f*etqTgLi>gN9+7fO`#9)U1K8 zR<{AuG`1(u-QiEC+ga-e8%Ez7vreRtK;^W%PH1=U4OcySA_AF8BfDEv`%8-|$Ad_L zfu5-^g=<-b^(T)roi9JjTsf8nSUuE^HBGJk{A8CJUFWqP|4CIJ@f@Jg^w{_*^mmY| z-tO7noq@K2oGE&CM*h7)C>xhK?M=XR`p|_C1lE~|7M5B;iwwkoM@$Oy@TRMihp>&-W+lEZB zPB*N%5SmkyXmFG0B|uF~A(`gn8BjV)G{8)Z8!Vnc$_>LyRhZM2ATYB~f}DFhpLPm+ zIS<3V1)&dgIVzeb0e5p^Dr_(sEDLCE7U=^{A+F8g7uz3blj{5YexQ?+sRI_&XCtSTPOQIOj0V8#R^vH7 zNZH90=tFT|qE|i#%LNK?-7<;gIoxafBVt?a(*E+!^@}gr-7>Ih1pUg3zztlI2+AAL# z3BZQlTWp!S8~hyFbt|_jbGsvtRc@uv!dytk-#T?lF41W2i@DS(Y^{#)I4S8zA4#%I zd!8!9YLRnjDboE48Hk1UnmJ3`prH=hc85 z;b^tlDk^Ye)euuAMR66oy(yCYav-R+#uvMwH{w<{U2Xsd)`Wpzag15U-5fZafnB89 x^w`1v+yf->eEJ|Y&}~W8(qvxiz{>XIcityG^vY6?Y{>=xx7ByYX1Nbf{0|_thw%Ua From 52e00ac60381154239ced10fe255764c573c5b05 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 12 Jan 2023 20:51:50 -0500 Subject: [PATCH 07/18] Correct colors in summary_screen/tiles.png --- graphics/summary_screen/tiles.pal | 131 ------------------------------ graphics/summary_screen/tiles.png | Bin 1633 -> 2213 bytes graphics_file_rules.mk | 3 - 3 files changed, 134 deletions(-) delete mode 100644 graphics/summary_screen/tiles.pal diff --git a/graphics/summary_screen/tiles.pal b/graphics/summary_screen/tiles.pal deleted file mode 100644 index badbfe53b3..0000000000 --- a/graphics/summary_screen/tiles.pal +++ /dev/null @@ -1,131 +0,0 @@ -JASC-PAL -0100 -128 -180 180 115 -74 65 57 -255 255 255 -222 230 246 -213 213 189 -246 255 255 -115 106 98 -98 156 222 -74 148 189 -57 148 164 -32 148 139 -16 148 115 -156 222 164 -98 180 139 -49 139 115 -0 106 98 -180 180 115 -74 65 57 -255 255 255 -90 106 0 -123 139 32 -255 246 205 -115 106 98 -90 222 123 -90 205 98 -90 189 74 -98 172 49 -98 156 24 -238 164 255 -189 156 164 -148 148 82 -106 148 0 -180 180 115 -74 65 57 -255 255 255 -172 180 172 -205 205 197 -246 255 238 -115 106 98 -238 222 24 -213 189 57 -189 164 98 -164 139 131 -139 115 172 -205 222 123 -172 172 148 -139 131 180 -115 90 213 -180 180 115 -74 65 57 -255 255 255 -0 0 0 -0 0 0 -246 255 246 -115 106 98 -222 24 238 -189 16 238 -164 8 238 -131 8 246 -106 0 246 -172 222 222 -139 148 230 -106 74 238 -82 0 255 -180 180 115 -74 65 57 -148 32 172 -189 106 213 -230 189 255 -255 255 255 -213 148 246 -189 139 205 -255 230 255 -230 180 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -115 98 90 -180 180 115 -74 65 57 -255 255 255 -222 230 246 -246 246 222 -246 255 255 -115 106 98 -255 205 74 -230 164 98 -205 123 123 -180 82 148 -156 41 172 -230 156 255 -197 98 238 -164 49 222 -131 0 205 -98 180 106 -0 0 0 -213 213 205 -255 255 255 -98 98 98 -230 8 8 -255 189 115 -65 205 255 -0 139 189 -255 156 148 -189 90 82 -139 246 255 -24 164 213 -255 189 180 -213 115 106 -0 0 0 -98 180 106 -0 0 0 -213 213 205 -255 255 255 -98 98 98 -230 8 8 -255 189 115 -238 238 172 -164 164 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 0 0 -164 0 0 -255 255 255 diff --git a/graphics/summary_screen/tiles.png b/graphics/summary_screen/tiles.png index 2f9f8db855b60a1e9702b81b5ab03768adb106d4..915742f1a7c33bee007aceb40e878185e45753ba 100644 GIT binary patch literal 2213 zcmZvddpOhWAIIr2U;hOJw-onM|Zc z5GI38=gR##A~z17%wZdHm|QuZE@V5hnSeoG;HeCdz$PPViH4`j6Q~k8Rpd_>IMTU9 z6(13C`5aC#g98?LflwfkG^!DmhF8gnGLf5zPv^5!*-U{%o*)o#*r`G$Rkpxuy45T- zqSo+oqDo|_;^S1QI5h*P1#&r?qh$E2f&uc2=a2;=hD<5a%z?-_Y7tw4C=sPl_RC}; zGU?O>f6csVwfxt-h{RvXr%MtNguxuHy+FxD8tE#&qdXNz=t733TqcufoauDB5{E-X z%uNymutf-$BccYg)d-O@F?*);#gga@#9{o9!oGADx_!EI~p4C6}^R`n&5p@$K?| z^GX4}_V-O&|7abbX=zTZcj%KY64(#rMxsJ1t{#8$$fjlJN1emh9G#jwMG4!IrUP=W~}O%dVA*J5se zVP(z{n(D;>Y4qbu?LBwfUNr2sf!kc^re#o`ue-PflVz$a4${}d62s81$Dg{qG*dK` zoY{q|A_bz~4U=%Ys_KCFo%miVcJ3Jd2o^oplzqQ>J~6V}+;%4BkO zq*k=@T;@AmR&n8h36N}OiB=3;D!TRD4?)`!#dDqu?|NEOr1MI>qBmtL2YRS?vFkH{HEnOE6{=2a{H@(YIdbY*H7^0ZlXo!$xEQ;*R6y~i*!M>R%23hP z(Tp(k=w}e)ku?>hGs+~3D@pK%rQo2gY7kXdU%ydQ*#5;Iz9EOQPIsn zX~k=i?5qd(p$%UR>|eWS8?Z$AE>i5NmtKcTE`+B@BPg|vb-r88f_t|+ga19g!|AWU zh-Z>bA#Z(3mlNmgZcog)k~BT14lH)vT0(SB+ezVyyjCjLHypgxw;~3l#Xa*N` zdt~aYp(tiAY6~xnpi68F;dKspQ0YVwVLL4@Yp-7R-KffP=y!@F|0>TIWQb~QqSrl% z)#(-mtZ$YAoq;HuTK}V^7#kO`JxnxDL%k0QwK|1<@c;-`z*6n7OZt+ z3_NkA1@{)ZI)Rg{%D5qic~3O=H;(1wFKa3|E&gK@Y@zWWz%+O;fKoR<{8YVe^}6JffMzf0$o z=1Eq`(q?GJGH9-&UHAJVP}(3zOvHmikYiZX>aw(K(7`Bc=k3vu;@RGNNdzlU zyb;ZlYhwW?Fyo>1Qn>wFNH*8yO}Go3)Y%TrCFi|IucM~uUIk^bDgjDNIEF5LY*DXu z<+L_%sA@@R3WvU}ORg`8K;^q{O*NJluD)_)1|8!OwApf(DUU69ygdr7vnmy{*S!8u{! z@%fjGuMo{KA1fFM>oU0$?z%((?Yw!IGF@L_!FhTavm0d6(EX3&b3a?{9TBO=F@5FOe&68$J z%f22+{q%DXNHY4nJzdwXA-`prtei8R08vU4F@UymUjXRWwMk2h{vqoGyEeAv9swMB!JczBYYJ916Mp`C Nep`0>RCv=;{tx$=2_ygj delta 1580 zcmV+{2GjYa5#bDw7!3pi0002U(dUc+001zNGBkf338W7I00rzxL_t(oh3%L~l#32sNuE@s?% zetv(E&gYBN8MX}^;1yV4emf_d6#)GH9Imh6bX5x&S`W^hH35DExOZU=-z$2s^ngVJ zU<~)>wE*kELjc=&5PYfA$-aS zX@sBwn|m(@@b#bon0E%OeF&?5fO`+PY6JxTIsgoZ@)xl80sMgHAZMKbSy?|{;TfL~ zzJc8VP)Kb6!*+E)8o7EH@VOJ<`t|ke+l$)^1l*n8ovv5w)mDK0%l*r<@!1#w$2)(= zJIlp#u^nJOzl5PhfFRge!u+-waPI+E{QzqZSY6NOdr)6Ktf1{K2;Rbw`@9*D`g)L> z{mU2TZ2Tfke;uXAJ1^7a;$;Vb8(FK=T<;lk`@y8pmfpRE)8{OWLuayRh316JHozHQ zcG}1QPg?*7Il%J_aP#iwT?QDo0Azm-FeCtK0X2~W#4Uhda)1K@z)A&E%77=YC$RTbM1KjOq1c?yIeag;P#Ulq+1#; zFmQ%*kU^@a)2W{R5q7X|0e~+T0n-!+)9@#-_pr}!hl|+^_xG^RaDNZ`EUX3S>7VI? z0Eg+}VRHBYKynC{KA;cSPC9>B+6L%q6#!I*lQ&0+KEcH!IAX8aDZJJ?IeK%#GY}g# z{tx(X0ia4K*d}<4V2iMBM7n5n%ib;BN(MTTk=vw%lZF;q0zf<7k}?!E03EqaYx{-r z_ia1hidp~=2t9=tbpU9$9+m)MC}Bf}WB^{&dLUJOAE-#Et|8O`pgDhz1UixRcIka= z!4PV*06i|XjHSX0XC(l(NPAby3cxBrc?HychO`oS#bgg8M@|Q%0M2&>zz;aZAR-5_ zIpprK{Uk&=1owbbOjH7R1rQ*P%4ww6DFg(FJOG211rMru1ff_R*bo2^m-|3(0Dw>m zA?Qj7GE+b;Af~&hS*w4TJiz8xWeTvmD4Ar1z+=iPMrMF6Mp}vdF^5hzzl{K|0~wVD zWLH353x(i10t5>Mf1*zavE zfJrgOEg?)`?vSeDVN%R-TNb1(+ckiEj;k{Q85Ihw6g2?&GL`zuSodbd^5GW*n*g*p5H#_}ykMu=kY5Tk188v&yNRDyiB5kOeksuALFE6vKve-t=tNCK z7z#B}ZrnF};1+=JgH&);m_(s~$pDW+wF9!wa%sn_i4gFjJx;a(h=^8#dID1sXjygx zP$Cczqb5)X*auSLv6BZvxp~2cAgB}h*aZ-C|ML;l=d&QgXcK@Y1Xh4sE5^$H*P4nI ePZdq?{|yvEohWR9rH1bS0000$@ -$(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 11 -Wnum_tiles - $(INTERFACEGFXDIR)/outline_cursor.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 8 -Wnum_tiles From ee3f5033b3471409f2de82f4c061ba2a015f6650 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 12 Jan 2023 22:30:06 -0500 Subject: [PATCH 08/18] Colorize contest/interface.png --- graphics/contest/interface.png | Bin 1680 -> 2573 bytes graphics/contest/interface_audience.pal | 259 ------------------------ src/graphics.c | 2 +- 3 files changed, 1 insertion(+), 260 deletions(-) delete mode 100644 graphics/contest/interface_audience.pal diff --git a/graphics/contest/interface.png b/graphics/contest/interface.png index 5e3b404621a04aae4ac2e18d06d2b1c363a86fda..f4ad5b8544c4c457bfff5d7d81605d181b74de6c 100644 GIT binary patch literal 2573 zcmd^AYfw{37VeuThDX9f-U@|c5uuO_tcoHgya@;~ix5yWgTup!NI-O)2wn+-435Ye z29Z}>!oUb30y>HWgJX=Z05S#@CB#7@J`fRzh=#k@nJTwxYpV9&{@Je6r@OvB=R04Y z{?Uc3h+t!qEeQZ%92ye9MpyXrG{B;MT2t}?U7$>Mupemdv3~&o7O=vj0#Oh_5Uo}# zm&-*W5tG3N2nqoPQ&1!jve|Men<-=_FquMOk(wuwpz)c4$~cC%NX`=^FoXh{S}KwV zd6^QnMC2XED{60Ivx{hmR;m_Kbvm_Dl!@>%5pVBG03>RJCqig!v|y%A&Cv2bmzGN9 zD0M=DfWhQZX>ot(K~Lk}NEvS=RIQNmIgAPr5t=6X>v$ngZcX_&xg0@?5EUpAArgkt z`%58|A2sw)r;Af683@we-foTF7v-$1tVHLZtw2N~M38{?0PO~f{14()h^kU8QX^V{ zH1oge0Zpj1Kc7tXS)N>u`u`Z{jZoQNKn4H;0HkP^0YDf45dcJrGN2~-%YJ@I{D0V3 zS}$D&0O3k#03+(#%JFh#+V3G0#jh;`%oNXFnY}hwcg^{IVeZNW6z_tPzI>T0?yIE* z(q|_}mb0rt@l&tfOYsgv@k8@RX+5vq4-V=R)Ad{8ReMFXOQIDG_%-t{UqtplsIVJy z#>dX}r6CzlOy>+d3qREEfpwEgr80nt4L1X4$)V$;D3SYkCCNy@yi-~9H z)_%mL7;aktM;Ae|E{ux}Ha#{*4*X1jIjlc+b>K2ku&eH0a3}V)ZaZj4=eLx9kY$w- z`*=X6D)BY79P6OhkoG*=aVE#JcI^Z38&%}dDLrhK-)1B7sO&v0k#|HTg3|AC9?sMe zmqh!zqqQ1$Y{w(nPX5+MV>24crsC%rP}K5^VVIU~I203>2U2eT>|0p9@@`p`4UqEl z0^qRpJ7FFp&MeYd;sKcZ4-?s{32-;bKbk}j(UpMBt;IM>-ic6;axp`7IiGd`>S^nh zn~90(J-}sZO^Pu{+z!Wjj2^i5URLz@%brk*$usT~8Y@;D`9!8j`r4Nw)KOiT8-5+b=V8$!oR&%J(hz zO&oPl@_O+NNF4DSI4~tucl`(|vo{!@IGOARFV>6>JJ6e#CwK3zwiK7T7X|+ESl@K4 z`6}(h3VWX*&PiQOPI>>nSy#jHo!($B`;eNP0S2#Nnxe^#swD$O@?^HvVhfITHuYpO zRueXp2FT<_g(5gbM7)_(Rug4F(L%@db3T3J|J1v$bFKfB>J`S_x_##4_ycR~AeNhb zJM#Jd6e!MwUN9a*n4^l3zt`WW#dfI^K@;7|w<`ep@ zX?}w%kzSFX;eN&zh-#g|v4-0inQ2UUnD{PLMWV0L6JUu$|90+if`{1COg7sMIC)Hv zbgwu3Ni6K?vk7qhxMZ4489{s71?smO`ERVPiNu3h&YFX;rwuqhV|{oe(+2zKqs%G< zQ}4U34#Lvs$vp(W)v!u&%Jz!s#-2=VMUKvwB}U%0X`~K{$jC@WOZv3&yslf#wi58p zTllNU)islM-c|@y(HPE?wSJfm-$np(kfu1?B^PHa&Ad7bqV$b!_*(b^y!|)?EW5h! zNzipCH^|MH`xM)dceRs+H+flMJD30`o+AEu$;$>D!m)zbcbqpRLY>wec6!I|@eg1- z8T5+cauYR3w%CHTceQR2m@Og5t_Z^N(moJ*+U~B{I%nuws0DnDTCb1EXl*P1>u8Hk;T8(13 zHZhoxq(g>|TcU8R9Sc4=hP!n)W^FW)&F4}Uv<+bgcXVnVj{z(qiB&3kClhQ!&w84)k%L&(}#)Rl)D z_u4O<1DbbRjruAV-yb>jkmFVQ>QL8a)gtUD^jazO=iSLog>ynxM3}}c*ga1iJqASc z6M)-Kx!QVhBp-accr5a^X}910<%~ox25T zaaOvBB0rioBJ<>JwWFG delta 1676 zcmV;726Oq16p#&&7=Hu+0000ZrPCGw00vh{L_t(&f$f;hYa2%t!1W&(l@LnOHZVpQ z1R>zHuQg2sz4Z{YITR|WA^8JLVH_O-%_UOlJ=sPWYA8x3m4gkXwWLdPiYnEI9F3z-Yt`h>pMt|Y_CDQ^|pJ#rMqc(F% zxw)$bKWtV^Kj8vA$$UzsAmA$l=(UZ60ggyUi(7+ob0`%r;HM;t3-Ba08{l`TmI81X zJR){xf)C2gs*;)?phN?@wtY2a8@s)LT_WX+KmeEHQvhR*!#>lB89;YtfR+Sa2%qo} zG53AUF9-#&27fDpytyQj$1u{LYx*P*kOaWMvaC1Yr(=j~KaogqzRmfeKC$1;b|F$w zWufN-wEvg@z=_+3>O?@c+vQoTWKRMxi6j6ML|7J>K){3~j3nmdBm*e90QL}&#Dp6G z29^+Sh!Dp~A^HiyY3UX(&Hj@rst{ zE1FYhsYKQ9W+B!}4I$3(Apm3P52FI;69HpUZ~-R8c{n*&qKD90J`u;CnOpyw4#-hy z!dn6?Teh_dM?`>(LXOHP95S{IfMsjdUXBisdBBH>qyQkX0jtZ)_UbGq95T)s)9Zn8 zYk3tln12D_lfWpLLHH@Du{aqel-WR_&2pZy{RxL6HOPaY&fstb!2JRC1rOjT3~>06 zee;kZ=J7zR4EkcO?*Tjs1vn4#55MClurvlj06=&Euv?DOtFs_=yXlBW;}_-H)w z{ybkDlb!eTWAgRe1H2?1RY*qy-Xm#vBtL>WO|}S0L-%_G+$I}jeE}XI>x68$0p!_5 zT{HmZrP&tN1R7=lID3785(-r~pt>sok9N~lFCb4gZZCLEAnkTE0Hsp^9qt9757HyR z7Jo@gCxYP`Ko)`l(g)y24X6<211!+|EIt4mc7lCyTEH{XR)vs@+6P-we@4=7z&Zqw zQ0W729`xEBRbVwD;2dM>CF&7lReT>~3UG&RK*?k6&4d4TEu4Bei<52jyRY$4)Z?9= zysGqMKzf~0ZW}hceI5WfQZIx16#(F-)_?H2(WJeB(-*J?HbfrNNOC=8fwt1cmO2{SWA(srr^iHB!Kb3b7nr3 zd;p>W*Va-KOlS>1uUZfh)#D0KZX>`B1Gqo&%%B1=cJ{_~Fg+Cv@S5WWNGIBIHh(BV zQUQRTN`wgjw-bW^oc~(@@PPqbO@*6)-vb7q6Unx(>rb-laLnSwsHqHqvI@Q{Clmnl zAQE7h1H+s^0JhVYb3~aAP@0Oc_Dp6>K9PXG)eSGEw_r`V{UQj!7~UwYE{`U*7%nQf z#&HC|d%+T!zdUd1AwbI3cynimkpA-nj&txoOEzT2J78ip6Q0umZZ3{x%LO_Nr zUDkjrZUEe+ZdAVnZA${tcG<$HACS510ho!ZZG+}zHBq$y@&m{s2>=YEpaEbJ8v_KG zV4OHKf#HZ3Fq0F(gE|i)0*n()7@5iw3AjS$Em=GOe@B?@RK*MpITCLf@w&(*$i^2ePn0UY8fFb~J9ODD%aZn(F1_*HK zI9F@HrQ*?jFcILuT<-8lQGf6N_ymar03S%ew2#eDC&F7}Y=8`71JVH7H~@$rK=Mwl z3ek)MfK+bo!AAj_QH=$t-7D@9^8}PwCCbfCo$+8gNsF@osd0HxKU8jUpsc{eMn;04)@ob#P=% zfDC~n>!^TpziE+Sd`gXcTa60X)1nhe&xb^c3iw6Kj!fktpb-;rPXh|k0Y7VzfNEV4 z3dL$nKur<~kPI;a@KA%@NIu|V0_3J5+o%AK6WtOKFnZp{1e{LZ0p0=L0sc3De*mR@ Wd1kL; Date: Fri, 13 Jan 2023 00:46:02 -0500 Subject: [PATCH 09/18] Correct colors for frontier_pass --- graphics/frontier_pass/bg.pal | 131 -------------------------- graphics/frontier_pass/bg.png | Bin 4011 -> 4506 bytes graphics/frontier_pass/map_screen.png | Bin 3333 -> 3655 bytes 3 files changed, 131 deletions(-) delete mode 100644 graphics/frontier_pass/bg.pal diff --git a/graphics/frontier_pass/bg.pal b/graphics/frontier_pass/bg.pal deleted file mode 100644 index 2bfcff098b..0000000000 --- a/graphics/frontier_pass/bg.pal +++ /dev/null @@ -1,131 +0,0 @@ -JASC-PAL -0100 -128 -57 74 74 -255 255 255 -205 205 205 -164 164 164 -123 123 123 -98 98 115 -57 74 74 -230 246 255 -98 41 65 -255 255 230 -230 230 197 -255 32 32 -98 164 222 -82 139 197 -74 115 172 -74 98 106 -139 98 115 -255 255 255 -230 255 222 -164 164 164 -123 123 123 -98 98 115 -41 57 65 -57 106 139 -65 139 197 -180 230 156 -148 238 131 -131 222 115 -82 172 74 -106 189 255 -205 205 205 -0 0 0 -139 98 115 -238 255 246 -213 238 230 -164 164 164 -123 123 123 -98 98 115 -41 57 65 -57 106 139 -65 139 197 -189 213 205 -148 180 164 -106 148 123 -65 115 90 -106 189 255 -205 205 205 -0 0 0 -139 98 115 -255 246 230 -246 230 213 -205 156 90 -180 131 65 -98 98 115 -41 57 65 -57 106 139 -65 139 197 -230 189 139 -205 156 115 -180 131 82 -156 106 41 -106 189 255 -205 205 205 -0 0 0 -139 98 115 -246 246 255 -230 230 238 -189 189 197 -156 156 156 -156 106 41 -41 57 65 -57 106 139 -65 139 197 -230 230 238 -189 189 197 -156 156 156 -123 123 123 -106 189 255 -205 205 205 -0 0 0 -139 98 115 -246 246 222 -246 238 172 -164 164 164 -123 123 123 -98 98 115 -41 57 65 -57 106 139 -65 139 197 -246 230 139 -230 213 49 -213 197 57 -156 115 57 -106 189 255 -205 205 205 -0 0 0 -0 0 0 -106 131 238 -139 164 213 -189 205 205 -213 197 131 -246 222 164 -172 131 131 -148 98 106 -115 106 148 -106 123 197 -197 230 230 -139 189 131 -106 156 74 -148 222 189 -238 156 131 -238 246 255 -0 0 0 -123 148 189 -65 74 106 -106 98 115 -82 90 180 -139 123 139 -164 172 189 -106 148 131 -180 205 213 -156 156 156 -213 238 230 -255 255 255 -213 180 172 -222 230 238 -213 205 156 -0 0 0 diff --git a/graphics/frontier_pass/bg.png b/graphics/frontier_pass/bg.png index 520c34b3dd9716fbe9b1632a26830aeb4241945a..9e7c59c97054b118279d7effd8831303a198a70c 100644 GIT binary patch literal 4506 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 R9P?`rERNfl)|q%D{0sTmG=KmA delta 3976 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 diff --git a/graphics/frontier_pass/map_screen.png b/graphics/frontier_pass/map_screen.png index 5d2b4467f9b6104ca53f28af43c733ddf488f001..64061d45a9649733f8d14f73c874f3f0aab120a1 100644 GIT binary patch literal 3655 zcmZXXc{tSF`^V2`7RHRdvL(qwl5MmxPh==rl59O>DKSYSOesAK`HV^1P_jOunl!Y@ zl2KH{h(Sb?OeGp)d8Uz?lnk z0HEUTw!>E*Vfm(Dkn(fr_<4~$K=Hn=&Y+@Oe@uRdy*>S12p%3wOG{l{T`U%hN~MN} z$ICNf*;2Tf)6$YyEaoj48iuokz6_p6e7Q$BnGqf@=fz9He|R&36M@WdV({4F;#?`6 zE{yjr_aJlruco}CoR==i1XA(;@*F`|E}KQpr8>n2{U^U96U)ScuHqmz-AS(JpZa1B zqpLWcP4_J(oBby*lgWijIUHWGe38xm&HsN=?(4sKp-fu-zj|b1hFD-D;1P=B3IFhN z3uL;K!4hz~x&%DBOvoyy({sbg@#I`GmB$l{85}yf*dtfSkrvaXvL!iB&E+_Gkjdfk zzCmmTmBA|KkaOwmE`eN~d=B#I3E1UAu~hC*4l|7(&;d|B>Au6sKZ@2>*mr!~LKD7r z?`~mH&Zw>mhNj*#H@Lg9bd84U_cTraoRi%h;-CEu)Y1JiS08vz8v=;pbj|tG#GcoSiJ|y_$Ksu_baz zGx0={DQ0l+hVg28a)Vh?gV2>;hG2f*yU>D58j7M_&DI?V2B~(WMfQ~qg;F8R3qnKiP}KU)sHFmM>Q^N;6(Jc7?_3>9 zaY%h8mCk4pS3JYvuPl%X9B}v3oqSB#ZdxOsBq9%uo_axt71wgLZ^|Vt(TW;!+{*r$!{dLzK4bUc=Y4N{Cnr&m))t zvsPTj*o>;^bJ~7kLQ_tQ&TL}Pj7_sm%HoO6;p^HqpFU^Su5CS^I-gX=euFewX`i0z znJ8$O`ZFl^YbomlylGnN1w!3f9Zostx8vdEuW-5Qoo7?Yr~m#KU7ViS9rc+4bI&{8sbECK68)0k7s;{>2RrtRT?VZ z$E_CU@v@~_A|iaN1_+ZkioM}xorJVqV+Mw`AQRoA=WDdkMl+7BeoHgqN0%JHgdB!? ztpSlzOT4inIre%WIMKZKK2otM^HOu4iUC}$4#p27-UTxi!*FNT7N^-KV}$25WcSg4 zyFIdLK?7W;#cy4OfLm`N^y%mjoaj9w_8Mc^xu{hb63yE(E1`EppIl<71()2wV8K2Z zk|;v$?WgYSZIg**ZxMQ6{>z6=FVD3Yx(qp)4MpQG15YBj zxdMX8i9tB`D2Q1LSAvG1u;vy;csmLb8SyWpsMhyQLCIQp^Ujsk_xf}K6kzPW4xbJl zqT5H|;yU23qpwDCvb<6DBC2H&x56_Hwi%RThN@r$g(z~V&| zRHILBi?HD#?6~U@#7k}>Tg>AY7bBkq=kzEV`)`>KsFJnMSSl}v?C!iq1lx31UqBQ0 zp5HUVbkof}Oae(>Is~TUkv!jpsHvJ14A*&zM4*H_=D*CNxahcQwP(4B?L=mzTG({~ zZ@5x5+Rq5lV+{_+l1(7yYte(NXswElz_d%vzDE>rcy8;|YE7kV_g&VIJ>9iHOd%DC zC}7>2JAirm;*$XfEVpE%vlcj2Sc72uLU(G36)9f)3{ArQsr;DTFGS>?%%2kc z@L#W^AbetnPe+6`#rO9jDnKBfSQSi$>{cu*ZTe$77_p9!iM}w6^p&gZejR}>Zu)q) zR~b;4sY(+PkR1py()J7t4f&LPpIZ?u-mqNCycHM1hx}Iy5`2#C1VyFL3Bbelp6re0 zB9wlfyRB4K$3>wqw&3ua(%47tM>5P%ZV5$5R*#&hlG3Mdygmu6mV-}b3M`YSXI2+B zM%LDG(cTDSB(WmYHK&nVpH{C3Nb3P(OD6!b2R%gZW|Q=&evBxb7V=cpqTViN1Ze>R zRDgka`QR@&lCuK%_Kz{O3)z}LlF#o8z>&WGzHYYm2bMd$M{NbaX`{}^TYK@{F=dKn zIurJPd=&-6l!o4oaEE#l$|t;Wxsz+CrQ_}7+ExVakjCRY1Ynql9vNNLRplV@;(O`R zKcYtLYC#A9=F8In_?*@eT_cW*hWdj5xQAwHYE3%7!&ttMarawoy9*^Fb}C0ZbRKj_ z^fgH{fTC@7`f7X=jP>suSG+X1k!U^<+hV&Cgh*p9-zMzYcg|;LD`su5huPV_zd+aq z<=`#bdeaFIJ4f1jZgfrEc@Ia=wB^y56*ilL07eZM3KXoi_|_l@7a=~dUwKeBYXnQV z>g04@Pk}L|(aFjo*Y5{aIqwbfe-04&S3zEH3CP4$IUTyHmhzY>$1 z-ah-lUh|LlkZvTlV#4S0A@|6up6Dbd`pYg4E1@0Ws z#?`eVPCo!8D$kvv5<9TpJ+B5^wT!5a1l%&01O+%n_!995?Hyy&5>8_%gTKoG&q-%m z33%C&pvV@h-DSOR5qm{n4j{R|CRj?5h_KQ$2hyV1G7Usa&9i-|&gl@=d49{l0rvI> zO_#nE*KyrlczLhy@=~`~v?4Z`mf%}FrKjFMLR8&8)?fmPUm57|o~zdOzs?{%nZt8; z#`XwyzvB#Iy&^H9H&YgX={^N*42SGk)XNL?o>?0!KZLw3`(+pVA#t;TuG``>#j1Uu zHNX6feTv`@`y`A#s=0Qqd&7hIqqld55N+g-K>vnAy#q>?!2XO<2xn-Sebj~Pbxy+9 z@$Zo@!LOTM;Yz-i6-MQFllJW7f z75{=eCU%6gb#@_W%8B87@rHy>x5w@Tj+^MMpr5{Vz zoVeh(fC^i)5)Iyf>CY2uC21s;n0j}VA+T&E?MB6If0|8+k7!f43_e$cx-a|UJtT`T zxDrZIIQmIzZ0nzGXKi~D%SYqd56%lw(r=;FT&sEtY8O6xx`6oaB8|DgAxs;doxuT$eZZyHz@l)*Q87 zf6z1*jfDk<8EcQ}afg3p9apc~lBGr&Td50*S427bHsVGN{rTz0#A_G#n4hjOHggV- z)^gLg9``t8c<_~eP2kF>jtZi^yKD|VH%6Vc1^83R&^jxf#}3Of9gJi9I`elxVWzn$ zvzo{g?1y7xDbr@pG^q!3D2j2hIf&79IzGYs@ z+1%E?<$NRpAK*26C2Gfy`_@LfZDZYmD$jpeEAaaX7D@QsZ)pW{Kf&YA)$F+o!R3ND z0fBv2b69eMk$KvSjJc_GXK8BMZ0XADvrQosMtjlKTum-Asa+x#aBM;+sYP0ud|Q+w zRBo>36-rSvG$vvWg}dt? jZk}pbTy30xWnNJu|6oveXxn!AKLohDcPx#1ZP1_K>z@;j|==^1poj5Fi=cXMF0Q*Xn^R5pwPI;$k4!m@YtZJfPj!-XmDtd zXn4TD;NXb3fM}RVkl48Bn1JZ;_>P1B_W%F@32;bRa{vGi!vFvd!vV){sAK>D3|>h@ zK~z}7t(gCB6XzYr{VzQ3q~Wa%io0&W)<(m8DTOH7uwyiuL|Wra-9)MmbB9Qph?U+2 zu~LQ7;Itc)Gb!ant7>IJovUy^poNgLhqh@T)ech&q14x_<&LBkZJ(%wbi=86_W3;b z+!qIvO5Hwo?DO3{ujl=FKA+F?JeL3({U7ZA2q+Um;0r$SsDa=?13%qhpT<)SctG*S zvbdub(7-=y0Q@ZVPT2yX4Nq~kN03%azMEO ztJNz)yyz(Kns~T6fWK0Duc&+>uf_%9T8#_D1&A1m_ICiv9-yHvK!l1qH!g9Z^tlIE zS@pT#0Z@XN%jy6a@foWN5Ju{|K>Yw(*9BqNpdP?EzZAe5`xh0wfH&83!MW~t!38)4 zA!fd!@&ILf!e4F-{2_L1DWJh0Z^sbePbLB2b4I{1;ewkm-vDyi=Yl_-g$oS7 zmjKEQ%K+ShS`I+`09xyUThhz9Pz#{7fWoo>G0)cmY!fcHfvxL8*;yz=xatE$%X)yN zvD9vtH6}F?MgV-Jp&(I000HLm0=mHq(kFMrNXR2 z!S>}8{iNh5xU8xQymuy=rxVsRw4Ln}fVWuHDpfLi6$7+c1WH(H(NzEd2_p4$Vuuar zp6#2l0XbF)&jH|e7<|~C^8*%b09RlR7_xfsBPIFRx}7_$Sb|CtO>_zc4>16+4_yT! z8gSNh6^tLS_R+c9bnA%|$%GZ_o|UA&nNFcV06@VuK2p2Eq|`4#L)KL=u9$yG%-v30 zAJe0W=@>--briI7z%@`1S3PS30OrA=)S>55fq79%wo2D43;^vEJEGSRFvThWU;rqx zitM$Q+H?+Bbx0dYA;8Fg-cVjS$rZHEN`3IYW{0s#8G1}Dc2bdjfFc40QrrNLHRd<$ zY?-tbNC=QP;4P~{Z$s(K(IS&&>DQui6sgVB0ibG|BAYh741j`xvU8~5a=V1pHj9Aw zr;62wc$z{KWJPfR=cOM*mS;=9dhpVgh!uX$000_SV71zLnFK&2VpSga7(^cZDJqcn zYiO?kKvjE~Y38ibBC||m{6K!pHUz{HeIQ_6v@0O1`-;^yy!>AW1=2wJJK+z*;Sc}{ z=X+SyFs%~IAci6L6f4}S0N7z!-LcM@X~@KbG-*{HJamYzTJ;VnkcNZV(?=sl<16QT z5x`8InwBxH9I!kEiGlRyqB==-nY`_6s->9lQtDwD-OmsaH zk0C&>B*#2J908Hk^KaS!2&9qA!62C9&lW9dAay7V28OoYI^T ztYk3W2)MM3e!N`(re?a?Og9g4@yy;)0f-NdBA|;;s@4gvfFm*)69#ee4f?U8U}{#1 zN_`cWZgf4qcSrzQ_m4_3bRimz2dpzZu3IB^yaAAFR}Z=hO0WT{j*S(;01)f%k9PF$ zYTY|3?QCvtUZ+UO08aLN!u|;oz=a{>)WL(O0MG9!MWjd-wQ&V8Njf|vAwaE6U)J-m3=(0B`~GW#<)$>{DF9C0oJa-=Tt+lYG{{ID0*yjihz< zhmqAs6a=)&gDZNk9!+f?2;r*$N`?B;9x=pMU(GnryhR`(96N;DRYs>=S507NT+m8`NR(*)^tq#pqTWJT{( z>P7hGfT!Hu$rWWdeMA|T_Cao{4j`W^2G%mxO`l*lexw0~X&M09tak@A5=`3wQN%aZ zL81-i+pIV9XSB2cOcpbN_E~7&Jxk-{0XUT=jVshP>#9ab2mz4hP>q+PE$oW{_&ro8 zX5K8waFGM5=Q5c<$2=;SXYnUdK{}*`j%~HxBe0VJdl@1DWBcj(IRL=#!?0?OnHOAu zQ7oc@4z57vfJQ=ACerMOwae0UIF80&smEOKGG08hqM2r%RW7 z+bD>_DT+6t6~4%vTyz1CLbe8yEg3k}H^^K8q?~0zb8mO*n=nB$0=_&g$`=5z;Z!>S zztA67IDp|c_R@*ElrN6NSsow<%8$&=E0PIeiWH&1JRI2Ttw2T=O>Ek);a%-{;Mk6#X z!$WqB3zap@4`}HCz-hKPb(1Z!#kI|)F&Kj5xkRS~%aS=k#(S~@8UXlq55rP?{f6$u zS!b}~=@ASg9&HA?&c;jt7_F_lx{^s$&|BC`LIHe;Q1C}luoZVCo~hzNdzA}LlO!w&OsF6Ykb>bNs4*~L(XnK3O7R(&W64Z zIq=azD2j=YWfbz#FaUyDs)s)z!XSdI^NB>O@2NpKvpom%FOU&HAP1e$kT<0)YQPP}4^2SNc^eEA=8kv;PATB;ixnqV$#qf`aK#qYLmgSCt-(;0yXo z|2`6lL$K^Y5PqN}m1QE5M P00000NkvXXu0mjfh_36A From 1707f82992c83b5662b22faa43cc44c29bf49585 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 13 Jan 2023 12:51:34 -0500 Subject: [PATCH 10/18] Combine/colorize status graphics --- .../battle_interface/ball_caught_indicator.png | Bin 103 -> 158 bytes graphics/battle_interface/status.png | Bin 0 -> 531 bytes graphics/battle_interface/status2.png | Bin 198 -> 531 bytes graphics/battle_interface/status3.png | Bin 199 -> 530 bytes graphics/battle_interface/status4.png | Bin 198 -> 530 bytes graphics/battle_interface/status_brn.png | Bin 176 -> 0 bytes graphics/battle_interface/status_frz.png | Bin 177 -> 0 bytes graphics/battle_interface/status_par.png | Bin 176 -> 0 bytes graphics/battle_interface/status_psn.png | Bin 176 -> 0 bytes graphics/battle_interface/status_slp.png | Bin 176 -> 0 bytes src/graphics.c | 12 ++++-------- 11 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 graphics/battle_interface/status.png delete mode 100644 graphics/battle_interface/status_brn.png delete mode 100644 graphics/battle_interface/status_frz.png delete mode 100644 graphics/battle_interface/status_par.png delete mode 100644 graphics/battle_interface/status_psn.png delete mode 100644 graphics/battle_interface/status_slp.png diff --git a/graphics/battle_interface/ball_caught_indicator.png b/graphics/battle_interface/ball_caught_indicator.png index 4eb765d280419817c27b4e149f4585257f9e152b..5473d53df88cda1e6ef5096507e75e2626a2f21f 100644 GIT binary patch delta 140 zcmYeF$2dWgsU@79T2!^XxyN9 rg!Ke}kQrY>f~i?*0>kMh28J1T*(#FzEG_{xF?hPN`MIofN@xNAH#9Z8 delta 84 zcmbQom_9+$j{yi&rtpLTDLqdY#}JO0$v^gI{jG0{zrOjOv5vlf^!W`{-&cL*$$md4 m^8AO_XIB2_Nx1pnfq~&ElVn!@@)ZX`CV0B~xvXJJgW!mrwI~dz z=c1>JV~EDY*8ZDg;5i6He;!Br@t37d4|0&(7U5tj>A0p~uCwU*=;@P! z{$}_k?`;Ux(p#{6@_Xs!^O%c1eEsoy$AW1(|1L_ktJxV%o-}FA+bRDU*D+1E%3qT$ zeStUS;`>5J+sHr7!42itSscBtOUXnyGg#X+)_H$*U&(sy@ugndYrl6an5gs5u+61# zo}}iTrbN9*6-?9E3#P7kF0J^i!Efc~kJk$wjU)dg`|&+2nR(^QV$0s*#;a>yFkIWS jL}&)*1>LRk_0r#&tCuEjE<9<-0}2pNS3j3^P6JJgW!mrwI~dz z=c1>JV~EDY*8ZDA0p~uCwU*=;@P! z{$}_k?`;Ux(p#{6@_Xs!^O%c1eEsoy$AW1(|1L_ktJxV%o-}FA+bRDU*D+1E%3qT$ zeStUS;`>5J+sHr7!42itSscBtOUXnyGg#X+)_H$*U&(sy@ugndYrl6an5gs5u+61# zo}}iTrbN9*6-?9E3#P7kF0J^i!Efc~kJk$wjU)dg`|&+2nR(^QV$0s*#;a>yFkIWS kL}&)*1>LRk_0r#&_n9W&Svc*K1}H#0UHx3vIVCg!0Nbs$<^TWy delta 182 zcmV;n07?Io1jYf77=Hu+00004mWYS|0050iL_t(2k&Tf%4#O}ELvt3+<^A{UT{xF_ zsr-?u0x422G9iJ_qK_B$dD_QGgCg_@fv6%SY(a!t!Wc3;ao^$$Q3hYuR~(~p%B>4W z8L$tBNX{I);lSb4IY{d$O>m8&jV%u53xL~w k@l2;ew0fed|M7KhZ{kGHh!0zlr2qf`07*qoM6N<$g7~vgH~;_u diff --git a/graphics/battle_interface/status3.png b/graphics/battle_interface/status3.png index 8a0db03219f68682e79489bcdf96576dcf1d7c14..d0febfb17c501b1f65d1e835c79d7dfede349004 100644 GIT binary patch literal 530 zcmeAS@N?(olHy`uVBq!ia0vp^5JJgW!mrwI~dz z=Ypq;V~EDY*8ZD<%nBSXbD!Q9(m4o3|4wr*4>w5^nb5AS7GT$-Fm1;<#qQ^8y**FW znJhQVKcFQkec|${=e?ol87+TQ{jt!l6TiaOUB5*wa8A0L z(Dns0yKm$j_{6YI=<8><4$B3hS+yWb4w0NScEf?(sdJFlUYcNxp^XIx>jl8=J|^EMbDQDxbTB~FK9gG=OHS;gKXTKL l|ItdPLX=%4I%4cQw-JJgW!mrwI~dz z=Ypq;V~EDY*8WaGW(5wGxr-URH?RQF@AqnZ>MphfI*9rEEU1xi)G3_nEOtJ6`lKm; zGyIb8HG~?OEm%JFy!7gM%tar*{wR(Ku+;e%$knc7XEb@zq%|+6{AXOpG(9T6CtLUe zU&_Vzg^pi0{9s?s@O~9%(~?!D78}|a%62sF^1izI3d7^Vm&asY+v=^575kszyU5~v zk4m1SvG~Tj4Nnb1cKNLOeR0k)y8{_vTNtwCg8nLP gWw^EU+2i$v_RbqK^w{H8oC1Z1r>mdKI;Vst0B7a3!2kdN delta 182 zcmV;n07?In1jYf77=Hu+00004mWYS|0050iL_t(2k&Tgo4TLZZ13duQf1NIXlmXtm zyxX)PFN%01lv=fX#NdPZoFtkN<_13`py_7rn8F|xLT|Ut8=a?U5*hFlz2gvtlWA2@ zqr)zaVR44-g##+7a*dsTU@yphIyY~8abh3-(HkHB k4@Wy$B7N6r3){W7FC06mXXsFlRR91007*qoM6N<$g7}6`umAu6 diff --git a/graphics/battle_interface/status_brn.png b/graphics/battle_interface/status_brn.png deleted file mode 100644 index 8f13fe6de2abe74b24c359a6d97cea8f0da4b004..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^5)79ueX>b%!%OSShwa kc$Y!;w*&20H{1PK&%c*ffBF|=r7n;~p00i_>zopr0Qc5ETL1t6 diff --git a/graphics/battle_interface/status_frz.png b/graphics/battle_interface/status_frz.png deleted file mode 100644 index ce10db3e4e87d50b5b1c888914653d28f262603b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^5);^_VN=d_!M1|*P78<9QIQ-ygVpcgQv((tj%7JqS lkH=lf4U7t@0n8J6*%(ygjI@8Sf0_ld$UffrqJv0mNwFwWTv!^)c43mh;Td9qf+kUQU diff --git a/graphics/battle_interface/status_psn.png b/graphics/battle_interface/status_psn.png deleted file mode 100644 index 700e7038a1a86d05fe6b88104f66e0bc4f1d3b7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^5{#)>t@Kn4H+ diff --git a/graphics/battle_interface/status_slp.png b/graphics/battle_interface/status_slp.png deleted file mode 100644 index bcbd16d1db11d28f3b458a3debf8747baa4933bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^521?gwMlXb$xwehLNa7bz@v k+#~(AY#~dK6X&j9480=8lP{FBCx9&SboFyt=akR{0G~)aRsaA1 diff --git a/src/graphics.c b/src/graphics.c index 9619e471f5..580fd31e90 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -356,19 +356,15 @@ const u16 gBattleInterface_BallDisplayPal[] = INCBIN_U16("graphics/battle_interf const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpbar.4bpp", "graphics/battle_interface/expbar.4bpp", - "graphics/battle_interface/status_psn.4bpp", - "graphics/battle_interface/status_par.4bpp", - "graphics/battle_interface/status_slp.4bpp", - "graphics/battle_interface/status_frz.4bpp", - "graphics/battle_interface/status_brn.4bpp", + "graphics/battle_interface/status.4bpp", "graphics/battle_interface/misc.4bpp", "graphics/battle_interface/hpbar_anim.4bpp", "graphics/battle_interface/misc_frameend.4bpp", "graphics/battle_interface/ball_display.4bpp", "graphics/battle_interface/ball_caught_indicator.4bpp", - "graphics/battle_interface/status2.4bpp", // these three duplicate sets of graphics are for the opponent pokemon - "graphics/battle_interface/status3.4bpp", // and are also for use in double battles. they use dynamic palettes so - "graphics/battle_interface/status4.4bpp", // coloring them is an extreme headache and wont be done for now + "graphics/battle_interface/status2.4bpp", // these three duplicate sets of graphics are for the opponent/partner pokemon + "graphics/battle_interface/status3.4bpp", + "graphics/battle_interface/status4.4bpp", "graphics/battle_interface/healthbox_doubles_frameend.4bpp", "graphics/battle_interface/healthbox_doubles_frameend_bar.4bpp"); const u32 gBattleInterfaceGfx_UnusedWindow3[] = INCBIN_U32("graphics/battle_interface/unused_window3.4bpp.lz"); From 387ea563fc81c643bf1807ead870272785da6c06 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 13 Jan 2023 13:40:13 -0500 Subject: [PATCH 11/18] Move FRLG trainer card gfx to own folder, fix tiles --- .../trainer_card/{one_star.pal => bronze.pal} | 0 graphics/trainer_card/card.png | Bin 970 -> 0 bytes graphics/trainer_card/card_fr.png | Bin 1467 -> 0 bytes .../{two_stars.pal => copper.pal} | 0 graphics/trainer_card/four_stars.pal | 51 -------------- .../{back_fr.bin => frlg/back.bin} | Bin .../{badges_fr.png => frlg/badges.png} | Bin .../trainer_card/{bg_fr.bin => frlg/bg.bin} | 0 .../{0star_fr.pal => frlg/blue.pal} | 0 .../{two_stars_fr.pal => frlg/bronze.pal} | 0 .../{female_bg_fr.pal => frlg/female_bg.pal} | 0 .../{front_fr.bin => frlg/front.bin} | Bin .../front_link.bin} | Bin .../{four_stars_fr.pal => frlg/gold.pal} | 0 .../{one_star_fr.pal => frlg/green.pal} | 0 .../{three_stars_fr.pal => frlg/silver.pal} | 0 .../{stickers_fr.png => frlg/stickers.png} | Bin .../{stickers_fr1.pal => frlg/stickers1.pal} | 0 .../{stickers_fr2.pal => frlg/stickers2.pal} | 0 .../{stickers_fr3.pal => frlg/stickers3.pal} | 0 .../{stickers_fr4.pal => frlg/stickers4.pal} | 0 graphics/trainer_card/frlg/tiles.png | Bin 0 -> 1629 bytes graphics/trainer_card/gold.pal | 56 +++++++++++---- .../trainer_card/{0star.pal => green.pal} | 0 .../{three_stars.pal => silver.pal} | 0 graphics/trainer_card/star.pal | 19 ++++++ graphics/trainer_card/tiles.png | Bin 0 -> 1139 bytes include/graphics.h | 4 +- src/graphics.c | 16 ++--- src/trainer_card.c | 64 +++++++++--------- 30 files changed, 105 insertions(+), 105 deletions(-) rename graphics/trainer_card/{one_star.pal => bronze.pal} (100%) delete mode 100644 graphics/trainer_card/card.png delete mode 100644 graphics/trainer_card/card_fr.png rename graphics/trainer_card/{two_stars.pal => copper.pal} (100%) delete mode 100644 graphics/trainer_card/four_stars.pal rename graphics/trainer_card/{back_fr.bin => frlg/back.bin} (100%) rename graphics/trainer_card/{badges_fr.png => frlg/badges.png} (100%) rename graphics/trainer_card/{bg_fr.bin => frlg/bg.bin} (100%) rename graphics/trainer_card/{0star_fr.pal => frlg/blue.pal} (100%) rename graphics/trainer_card/{two_stars_fr.pal => frlg/bronze.pal} (100%) rename graphics/trainer_card/{female_bg_fr.pal => frlg/female_bg.pal} (100%) rename graphics/trainer_card/{front_fr.bin => frlg/front.bin} (100%) rename graphics/trainer_card/{front_link_fr.bin => frlg/front_link.bin} (100%) rename graphics/trainer_card/{four_stars_fr.pal => frlg/gold.pal} (100%) rename graphics/trainer_card/{one_star_fr.pal => frlg/green.pal} (100%) rename graphics/trainer_card/{three_stars_fr.pal => frlg/silver.pal} (100%) rename graphics/trainer_card/{stickers_fr.png => frlg/stickers.png} (100%) rename graphics/trainer_card/{stickers_fr1.pal => frlg/stickers1.pal} (100%) rename graphics/trainer_card/{stickers_fr2.pal => frlg/stickers2.pal} (100%) rename graphics/trainer_card/{stickers_fr3.pal => frlg/stickers3.pal} (100%) rename graphics/trainer_card/{stickers_fr4.pal => frlg/stickers4.pal} (100%) create mode 100644 graphics/trainer_card/frlg/tiles.png rename graphics/trainer_card/{0star.pal => green.pal} (100%) rename graphics/trainer_card/{three_stars.pal => silver.pal} (100%) create mode 100644 graphics/trainer_card/star.pal create mode 100644 graphics/trainer_card/tiles.png diff --git a/graphics/trainer_card/one_star.pal b/graphics/trainer_card/bronze.pal similarity index 100% rename from graphics/trainer_card/one_star.pal rename to graphics/trainer_card/bronze.pal diff --git a/graphics/trainer_card/card.png b/graphics/trainer_card/card.png deleted file mode 100644 index eab827246486e0896e1a177031788aff632c844f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 970 zcmV;*12z1KP)V!Zn9;Bc000A3 zNkl7S z01L(%5EhikAQgU<`iT$VUbv{5hwtH>&U{-##rhH7z?fw;X@-p z(>OqCL4tC_=q%XhCFniq34{eZp9f`l7DiF$+3j3bms6IP@S>pgUq|kx`*a!$sESTXt3!pxVsQzOBIBCH~P{kIm?C_lgWJbYe&{+#4 zQCQ#RLsn<yv!rzZ+nQzbVCDgCP3&0M)@d5}JfMEMN7Fh5;2weMl)3fd zmr9AO1-@|0_C?Y^#sYM}n_MCR;D+@Bt{ea}B9{lSu3mfZJS?Nu0`$PiM4F!ieAjcL z-vVgiEkuCYS}>`Q1?+vU^WuW@Q2^rC1q_ixdk3&{pft0(7m$kcCnXCdYQxo&Y8b%y z+1tMhHZ!=?`BYAI*GvT5n$YdGN7T+=4Y#nH3fNDzkOjcwXbWl>O&*|?L4eOf3v&T; zVo;+#0NTKum;|`X<^K=>`oA5T|2e>J3Sb5L1m}wZD7^ps0P&JW{{gQIz(2t)jW6L`jZy;m_(A9SaD9m^TuM0&P{?Nhz<=uBq!dE7 zczb~BLCO|BLLA)tR^1BmHMa1K03pSp#Y3uFDG&m8s;z#n-r?I6fU*F*DnN@7+-rc) zr5Y-`790TLlNhwBts{`F0cbyG04@HcjsV;$z~QJZsM5m`-XBj|IO-qwohanJ&|Z`U s=;!+!V8SrI3Sd$yqb5xz)YR$x2Rd}Eei#`R>i_@%07*qoM6N<$f;4EoO8@`> diff --git a/graphics/trainer_card/card_fr.png b/graphics/trainer_card/card_fr.png deleted file mode 100644 index 2fea60d09bc33f50d0b67f27f8287ea270d00a0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1467 zcmV;s1w{IZP) zNklc!=;+G%3_xQu^^~f@^9$P`? z>Sa-stHPSrdgsdDx-#>{zEa1o(;th)7gv9))Nfuu4R=~8Q#uR$uGDvzr8T`H0S$qQ z0PU>;7nwC95E1yPA4ahI{{+r2A;GKMm=WMQoahN^qTmUj#C>uoyLv{0I0B{A&=p7U zfvk5+29Z4fU`*CALLC9MZ7=^R3Xt^HWYp(X&O^yM%=-ZIA6g$!o4$Cbbs%t+RRULK zWfcJnP`NC(Iwr_}s04hymS6~iclsh@0`@`fMv`@`1y4X3Xhbv!v_=UCE(C$ABa8uo zwgsbm0w*8|T$qAP459#nZ8L!saCMmnhyeUx1bF>75}=Ou9rg4CTM(3XIdkqe68uH~ zkM<$H&1=CD5P}q_BY+bjfOadOZ5~*HvXua90RjpWPYJSC0=x$ToQ)v(xf20dtq26a|&* z0wSi#6AZ%shT!XalXKZ6te=835pe% zIUfX37;r2`V(|JYOly1qkK5<{D0WG!fJ-^&dGCH>r&%CyGr6fJP#pUWp7)|Z9Su@I z=7A*WyVwu#9EkC=tWzes6}T}^IX(`j_O;M=v4@bz%44*(E@vL{w?mHBkS=% zZ$$dr$@5!`oCuuQ1bC>{A5Wg0kqA7O+p>HvH9n~3GVzVf|6{R4Q-STae8vaWbm{lR z2jPNKmz6Ny2Hcha0&NAJQ-T11c_velM^p?!$ryCglLVUp!1A1?0;L-~Az&B0&%};& zVgz_QFak*!-GDH0qlQH zfc(&ui9CLd0Iz-C4$@Q($4>=X*8=Z}T?K9$2vnm$>vGQXTVpF8f}Uqpo9!errF7H4 z(_A#&bwmg}#%-A}yw9b;Peme7#BCC}UO%+S~}>Ue#MgUtUG^eTKVY zAOOTzz+>0gRYdRzFGm88)!8slgm71s0%jwy0yccEjr$vcTVc2>3W2$g_3FGrl44Q}90ccd_h5 zP)$J+6o^8a2Z=!CMDGKi2Rh9IC$QJVTBs)&x0qN9^-eBrIG|9^>L VLWzQB#S#Dj002ovPDHLkV1j^0q>umr diff --git a/graphics/trainer_card/two_stars.pal b/graphics/trainer_card/copper.pal similarity index 100% rename from graphics/trainer_card/two_stars.pal rename to graphics/trainer_card/copper.pal diff --git a/graphics/trainer_card/four_stars.pal b/graphics/trainer_card/four_stars.pal deleted file mode 100644 index 4e1d56b549..0000000000 --- a/graphics/trainer_card/four_stars.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -139 98 115 -246 246 222 -246 238 172 -164 164 164 -123 123 123 -98 98 115 -41 57 65 -57 106 139 -65 139 197 -246 230 139 -230 213 49 -213 197 57 -156 115 57 -106 189 255 -205 205 205 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -106 180 213 -41 123 164 -0 0 0 -0 0 0 -98 98 115 -255 255 255 -230 230 238 -164 164 164 -123 123 123 -255 255 255 -230 230 238 -164 164 164 -123 123 123 -255 255 255 -230 230 238 -164 164 164 -123 123 123 -106 189 255 -205 205 205 -0 0 0 diff --git a/graphics/trainer_card/back_fr.bin b/graphics/trainer_card/frlg/back.bin similarity index 100% rename from graphics/trainer_card/back_fr.bin rename to graphics/trainer_card/frlg/back.bin diff --git a/graphics/trainer_card/badges_fr.png b/graphics/trainer_card/frlg/badges.png similarity index 100% rename from graphics/trainer_card/badges_fr.png rename to graphics/trainer_card/frlg/badges.png diff --git a/graphics/trainer_card/bg_fr.bin b/graphics/trainer_card/frlg/bg.bin similarity index 100% rename from graphics/trainer_card/bg_fr.bin rename to graphics/trainer_card/frlg/bg.bin diff --git a/graphics/trainer_card/0star_fr.pal b/graphics/trainer_card/frlg/blue.pal similarity index 100% rename from graphics/trainer_card/0star_fr.pal rename to graphics/trainer_card/frlg/blue.pal diff --git a/graphics/trainer_card/two_stars_fr.pal b/graphics/trainer_card/frlg/bronze.pal similarity index 100% rename from graphics/trainer_card/two_stars_fr.pal rename to graphics/trainer_card/frlg/bronze.pal diff --git a/graphics/trainer_card/female_bg_fr.pal b/graphics/trainer_card/frlg/female_bg.pal similarity index 100% rename from graphics/trainer_card/female_bg_fr.pal rename to graphics/trainer_card/frlg/female_bg.pal diff --git a/graphics/trainer_card/front_fr.bin b/graphics/trainer_card/frlg/front.bin similarity index 100% rename from graphics/trainer_card/front_fr.bin rename to graphics/trainer_card/frlg/front.bin diff --git a/graphics/trainer_card/front_link_fr.bin b/graphics/trainer_card/frlg/front_link.bin similarity index 100% rename from graphics/trainer_card/front_link_fr.bin rename to graphics/trainer_card/frlg/front_link.bin diff --git a/graphics/trainer_card/four_stars_fr.pal b/graphics/trainer_card/frlg/gold.pal similarity index 100% rename from graphics/trainer_card/four_stars_fr.pal rename to graphics/trainer_card/frlg/gold.pal diff --git a/graphics/trainer_card/one_star_fr.pal b/graphics/trainer_card/frlg/green.pal similarity index 100% rename from graphics/trainer_card/one_star_fr.pal rename to graphics/trainer_card/frlg/green.pal diff --git a/graphics/trainer_card/three_stars_fr.pal b/graphics/trainer_card/frlg/silver.pal similarity index 100% rename from graphics/trainer_card/three_stars_fr.pal rename to graphics/trainer_card/frlg/silver.pal diff --git a/graphics/trainer_card/stickers_fr.png b/graphics/trainer_card/frlg/stickers.png similarity index 100% rename from graphics/trainer_card/stickers_fr.png rename to graphics/trainer_card/frlg/stickers.png diff --git a/graphics/trainer_card/stickers_fr1.pal b/graphics/trainer_card/frlg/stickers1.pal similarity index 100% rename from graphics/trainer_card/stickers_fr1.pal rename to graphics/trainer_card/frlg/stickers1.pal diff --git a/graphics/trainer_card/stickers_fr2.pal b/graphics/trainer_card/frlg/stickers2.pal similarity index 100% rename from graphics/trainer_card/stickers_fr2.pal rename to graphics/trainer_card/frlg/stickers2.pal diff --git a/graphics/trainer_card/stickers_fr3.pal b/graphics/trainer_card/frlg/stickers3.pal similarity index 100% rename from graphics/trainer_card/stickers_fr3.pal rename to graphics/trainer_card/frlg/stickers3.pal diff --git a/graphics/trainer_card/stickers_fr4.pal b/graphics/trainer_card/frlg/stickers4.pal similarity index 100% rename from graphics/trainer_card/stickers_fr4.pal rename to graphics/trainer_card/frlg/stickers4.pal diff --git a/graphics/trainer_card/frlg/tiles.png b/graphics/trainer_card/frlg/tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..5d2b11467f5ebe70e0b4c78f90343c9d56821ffc GIT binary patch literal 1629 zcma)6e^gU-6#u@r_u>r{=Z2s-bL2Krz$lSlt-~{ZGn|76aiOk>iUm4A6BO|Q8X_ta zryx$5v6s!KKI<&`XP+D~8N8rL8=I_=)D~yZ@E|8=d&1S=Mve#&C zv$9LBQmG`8G;?pkr7rpBDuYPT<(H-)%?%_;<~A6uc@mKSg$6l|?2V4@y7Znx-qzM8 z5{dp#-YAdml`MIaH@AT<6|m~RVZGN{|LlL$TLV8XAFc!d<%b8Yj7iLHIA!;25yw-*Lew#9$pAql!+qE8flE9n#>G4~ZOI>mA=NpDVEcZi83B4SGhv|Qt^6e#0H zHFP18d6sBD;hb%^;vHf?St&&Z1+u-=?F`^K;a+@x9OCEpX?M2l_r?Y=q0UrRl zgg)d%MB;OpRkOfFOqET?E+B^U;&Eu|`ohIvIt=hmS~mj0N>DX!gQ;G$Waep%TcAa< ztOw{0y4I%X<=&FjsHz{-6SVdj_6(vHAig&r`e2<`2m$Q5&CaBzf7RGAgayrS&o(u5 zjB?>k_5<~RrzG~MTacjnAD-OFqKDn|x7B@To*G=^we#ge(syf5(!6U&DTHv5%|C`jaFF#`{z7Ef&%798`kH3o6ae!nT!bOW$F~2)K^{f5Oja=4JPZJ zS{{}gVUN&LtAc5v+P|{9`8VT#%=wZ|N z8KW@Ia()f<^x?}iAN1gTO$pGoxWAbss?*f3XrK7X!c@{1m0ROoJxTdN~~ zp}jbb>gVLCN18-qatS?>8@L45hdb3=_&&o?;)gm*2O^zP7JZCwTwfdo<=;*4laKs# zJt}wNKn1{cbfxk+qb7!$&T|=rM|s{l7tG+~439Fv99(loakKw;lFtl-(;#djOCLVh z@B4wQn{*eeM|?5|;oH+mR2h;WU^>VaExx4-RO-lziNs`B)fB;MtZn2>_;`I_8E6Vu za)@p>O~NKLhjd~bv~1TbgL{Uk31EahwJIQ#nz?u*BArfi)bVA9^&ab^m+!r?;q6St z?1Qton>oV_nu4d+keCjC+O6V@{Ms9Ol(^%Z* zAGlc%iq$t~vv@ z$s1y$@$<+~%oQ9YX3=oSnMi@Z?(<|w-658p*icDSY-9_kF0$d0Lfe7hLL~ke+}YfR zx-K!Tg*MqrZ9Jgj;@Nj0C8%=Pz|Ltwc7S9ky19}FC?Z_6{zoU8#41rtO^~@c$~vXFvdC0~IK{tdeG6 zU{3UOaSX|5d^T|uIDEGJpIyv;r^V!mO8%O|1NSS_-ox`5t#hAib1ew=hEVj-{a4> zGkTm~&n}@A9l)2cPL6%Th6dZVIJpMZcE%c?eG~X5$n!~Sh%ad?-Kf`@7hWN5@<`r^{s?R^a*AH;ldUww6dpm0ay~K`upQNs_&2S?_xQoIr)6HTh-V2{&=*acE8MA{y;m$n% zH-$cVN3Wc`r6TWl?bHSR+BbeztPWg%ovkV4z0>*1+Q<)4A;Jp`AD?GKfPqbeAB0#rl73n>FVdQ&MBb@0Nw8BE&u=k literal 0 HcmV?d00001 diff --git a/include/graphics.h b/include/graphics.h index 8bdc85dc4a..45dd9175de 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4949,9 +4949,9 @@ extern const u16 gContestResultsTitle_Tough_Tilemap[]; extern const u16 gContestResultsTitle_Tilemap[]; // Trainer Card. -extern const u16 gHoennTrainerCard0Star_Pal[]; +extern const u16 gHoennTrainerCardGreen_Pal[]; extern const u32 gHoennTrainerCard_Gfx[]; -extern const u16 gKantoTrainerCard0Star_Pal[]; +extern const u16 gKantoTrainerCardBlue_Pal[]; extern const u32 gKantoTrainerCard_Gfx[]; extern const u32 gKantoTrainerCardBg_Tilemap[]; extern const u32 gHoennTrainerCardBack_Tilemap[]; diff --git a/src/graphics.c b/src/graphics.c index 580fd31e90..eff0dc6fda 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1374,19 +1374,19 @@ const u16 gUsePokeblockNatureWin_Pal[] = INCBIN_U16("graphics/pokeblock/use_scre // trainer card -const u16 gHoennTrainerCard0Star_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal"); -const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz"); +const u16 gHoennTrainerCardGreen_Pal[] = INCBIN_U16("graphics/trainer_card/green.gbapal"); +const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/tiles.4bpp.lz"); const u32 gHoennTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg.bin.lz"); const u32 gHoennTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front.bin.lz"); const u32 gHoennTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back.bin.lz"); const u32 gHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link.bin.lz"); -const u16 gKantoTrainerCard0Star_Pal[] = INCBIN_U16("graphics/trainer_card/0star_fr.gbapal"); -const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_fr.4bpp.lz"); -const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg_fr.bin.lz"); -const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_fr.bin.lz"); -const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back_fr.bin.lz"); -const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link_fr.bin.lz"); +const u16 gKantoTrainerCardBlue_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/blue.gbapal"); +const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/tiles.4bpp.lz"); +const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/bg.bin.lz"); +const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front.bin.lz"); +const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/back.bin.lz"); +const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front_link.bin.lz"); // pokemon storage system diff --git a/src/trainer_card.c b/src/trainer_card.c index 04b8f686ab..ef7cf8fb3a 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -162,27 +162,27 @@ static bool8 Task_EndCardFlip(struct Task *task); static void UpdateCardFlipRegs(u16); static void LoadMonIconGfx(void); -static const u32 sTrainerCardStickers_Gfx[] = INCBIN_U32("graphics/trainer_card/stickers_fr.4bpp.lz"); +static const u32 sTrainerCardStickers_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/stickers.4bpp.lz"); static const u16 sUnused_Pal[] = INCBIN_U16("graphics/trainer_card/unused.gbapal"); -static const u16 sHoennTrainerCard1Star_Pal[] = INCBIN_U16("graphics/trainer_card/one_star.gbapal"); -static const u16 sKantoTrainerCard1Star_Pal[] = INCBIN_U16("graphics/trainer_card/one_star_fr.gbapal"); -static const u16 sHoennTrainerCard2Star_Pal[] = INCBIN_U16("graphics/trainer_card/two_stars.gbapal"); -static const u16 sKantoTrainerCard2Star_Pal[] = INCBIN_U16("graphics/trainer_card/two_stars_fr.gbapal"); -static const u16 sHoennTrainerCard3Star_Pal[] = INCBIN_U16("graphics/trainer_card/three_stars.gbapal"); -static const u16 sKantoTrainerCard3Star_Pal[] = INCBIN_U16("graphics/trainer_card/three_stars_fr.gbapal"); -static const u16 sHoennTrainerCard4Star_Pal[] = INCBIN_U16("graphics/trainer_card/four_stars.gbapal"); -static const u16 sKantoTrainerCard4Star_Pal[] = INCBIN_U16("graphics/trainer_card/four_stars_fr.gbapal"); +static const u16 sHoennTrainerCardBronze_Pal[] = INCBIN_U16("graphics/trainer_card/bronze.gbapal"); +static const u16 sKantoTrainerCardGreen_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/green.gbapal"); +static const u16 sHoennTrainerCardCopper_Pal[] = INCBIN_U16("graphics/trainer_card/copper.gbapal"); +static const u16 sKantoTrainerCardBronze_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/bronze.gbapal"); +static const u16 sHoennTrainerCardSilver_Pal[] = INCBIN_U16("graphics/trainer_card/silver.gbapal"); +static const u16 sKantoTrainerCardSilver_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/silver.gbapal"); +static const u16 sHoennTrainerCardGold_Pal[] = INCBIN_U16("graphics/trainer_card/gold.gbapal"); +static const u16 sKantoTrainerCardGold_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/gold.gbapal"); static const u16 sHoennTrainerCardFemaleBg_Pal[] = INCBIN_U16("graphics/trainer_card/female_bg.gbapal"); -static const u16 sKantoTrainerCardFemaleBg_Pal[] = INCBIN_U16("graphics/trainer_card/female_bg_fr.gbapal"); +static const u16 sKantoTrainerCardFemaleBg_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/female_bg.gbapal"); static const u16 sHoennTrainerCardBadges_Pal[] = INCBIN_U16("graphics/trainer_card/badges.gbapal"); -static const u16 sKantoTrainerCardBadges_Pal[] = INCBIN_U16("graphics/trainer_card/badges_fr.gbapal"); -static const u16 sTrainerCardGold_Pal[] = INCBIN_U16("graphics/trainer_card/gold.gbapal"); -static const u16 sTrainerCardSticker1_Pal[] = INCBIN_U16("graphics/trainer_card/stickers_fr1.gbapal"); -static const u16 sTrainerCardSticker2_Pal[] = INCBIN_U16("graphics/trainer_card/stickers_fr2.gbapal"); -static const u16 sTrainerCardSticker3_Pal[] = INCBIN_U16("graphics/trainer_card/stickers_fr3.gbapal"); -static const u16 sTrainerCardSticker4_Pal[] = INCBIN_U16("graphics/trainer_card/stickers_fr4.gbapal"); +static const u16 sKantoTrainerCardBadges_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/badges.gbapal"); +static const u16 sTrainerCardStar_Pal[] = INCBIN_U16("graphics/trainer_card/star.gbapal"); +static const u16 sTrainerCardSticker1_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/stickers1.gbapal"); +static const u16 sTrainerCardSticker2_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/stickers2.gbapal"); +static const u16 sTrainerCardSticker3_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/stickers3.gbapal"); +static const u16 sTrainerCardSticker4_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/stickers4.gbapal"); static const u32 sHoennTrainerCardBadges_Gfx[] = INCBIN_U32("graphics/trainer_card/badges.4bpp.lz"); -static const u32 sKantoTrainerCardBadges_Gfx[] = INCBIN_U32("graphics/trainer_card/badges_fr.4bpp.lz"); +static const u32 sKantoTrainerCardBadges_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/badges.4bpp.lz"); static const struct BgTemplate sTrainerCardBgTemplates[4] = { @@ -256,22 +256,22 @@ static const struct WindowTemplate sTrainerCardWindowTemplates[] = DUMMY_WIN_TEMPLATE }; -static const u16 *const sHoennTrainerCardStarPals[] = +static const u16 *const sHoennTrainerCardPals[] = { - gHoennTrainerCard0Star_Pal, - sHoennTrainerCard1Star_Pal, - sHoennTrainerCard2Star_Pal, - sHoennTrainerCard3Star_Pal, - sHoennTrainerCard4Star_Pal, + gHoennTrainerCardGreen_Pal, // Default (0 stars) + sHoennTrainerCardBronze_Pal, // 1 star + sHoennTrainerCardCopper_Pal, // 2 stars + sHoennTrainerCardSilver_Pal, // 3 stars + sHoennTrainerCardGold_Pal, // 4 stars }; -static const u16 *const sKantoTrainerCardStarPals[] = +static const u16 *const sKantoTrainerCardPals[] = { - gKantoTrainerCard0Star_Pal, - sKantoTrainerCard1Star_Pal, - sKantoTrainerCard2Star_Pal, - sKantoTrainerCard3Star_Pal, - sKantoTrainerCard4Star_Pal, + gKantoTrainerCardBlue_Pal, // Default (0 stars) + sKantoTrainerCardGreen_Pal, // 1 star + sKantoTrainerCardBronze_Pal, // 2 stars + sKantoTrainerCardSilver_Pal, // 3 stars + sKantoTrainerCardGold_Pal, // 4 stars }; static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY}; @@ -1425,19 +1425,19 @@ static u8 SetCardBgsAndPals(void) case 2: if (sData->cardType != CARD_TYPE_FRLG) { - LoadPalette(sHoennTrainerCardStarPals[sData->trainerCard.stars], 0, 96); + LoadPalette(sHoennTrainerCardPals[sData->trainerCard.stars], 0, 96); LoadPalette(sHoennTrainerCardBadges_Pal, 48, 32); if (sData->trainerCard.gender != MALE) LoadPalette(sHoennTrainerCardFemaleBg_Pal, 16, 32); } else { - LoadPalette(sKantoTrainerCardStarPals[sData->trainerCard.stars], 0, 96); + LoadPalette(sKantoTrainerCardPals[sData->trainerCard.stars], 0, 96); LoadPalette(sKantoTrainerCardBadges_Pal, 48, 32); if (sData->trainerCard.gender != MALE) LoadPalette(sKantoTrainerCardFemaleBg_Pal, 16, 32); } - LoadPalette(sTrainerCardGold_Pal, 64, 32); + LoadPalette(sTrainerCardStar_Pal, 64, 32); break; case 3: SetBgTilemapBuffer(0, sData->cardTilemapBuffer); From 9c34bc2385bcd4020e9161a13586fe0fcce28726 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 13 Jan 2023 14:43:36 -0500 Subject: [PATCH 12/18] Colorize picture_frame tiles --- graphics/picture_frame/beauty.png | Bin 1422 -> 2191 bytes graphics/picture_frame/cool.png | Bin 1920 -> 2746 bytes graphics/picture_frame/cute.png | Bin 1238 -> 2106 bytes graphics/picture_frame/lobby.png | Bin 719 -> 1520 bytes graphics/picture_frame/smart.png | Bin 2287 -> 3230 bytes graphics/picture_frame/tough.png | Bin 2030 -> 2746 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/picture_frame/beauty.png b/graphics/picture_frame/beauty.png index 72e9d0ab760a339fd6a24e812ed4f1a328325648..2a9c2d644c4e50641762c87b78707e402172e215 100644 GIT binary patch literal 2191 zcmeH|{Zms{8pqGQN#G^~xI_X0LBdO1S`b2IQ9#U#yc;lNs3|OkkY%j3qN!Px3M&_a z@)8wX(yA+^DH|0PD%HD4m0(=W0xPMkHM_XHn5spV+PDf!cv(3cr!$?M{S$Wf%$)Pg zJoA~)^PT6HQ!mXB%x@C7kyijN*J5M?J4Q3!;{#iNP0N2mBoX3Xn>2 zQ=Cl*;pF6`)oL}H%_K=030IY2AI4f(iH zjZf%eASr_r8fAxCXKtB*lTMq(Xdn$*gI29kW;%INXC)10(r6?tBstk(goX*IowJw2 zNhP#sA*r<+jFuKNoP+uCuX$K*fLaog7HD<40JO%#$#Q5nI?X?h{xAQJ&DTjLoT)X= zw9qM$$)Ldim1d~3Li1!M%-2Az5t@I>|DSxO&aNTtM(f;97=+HXlsn=7pa1O*)NStk z1pu_9jAT*n_A29p(LI0LfCEKT>45v7PPZ(Ny-}Ybv*^|ZhanR%(txV2vfaI(H3-5VAv`cD3iXtejthsCIg{vb)mCwGc=M&{VN-ye1Pu5id# z%e1N1PmN6Z`AEsR$bud&3 z1C>n0M~#nT+_p=q{}N{cK8rse-}R7UE6Gnr?`+n;pt!Zrh z9-PYH0It*xsH)aqw5oV|9;i(0Ivs10+pr{n3?T!Rz1_5_E97Y`@|=h$Vngdg`Y zx2Pzd{+-5k>h0}FAG$}tEc>f(o1-3-`Awf8E>XNyTrXrtbn=z+w+b493cRDt>(CDA zh6({uu`=)1iQE^5N?tYJJ_;gMdlQqcH`f41LAtOd=#dLi6_fXyRqPLBQKAQ$BU558QTX2Xm#>g3j%`W>T5_0^rPT*RW z1;kb9asqU(vdt{5x)1hUFY!!f>KA4}1c$*#r*>dd;b8yg{lqkDw!(9{iLvvl%dj7T zvv7%~uMsF`!}K2@NVf;>Lx6%6AtDw|Z~JE*_|SEPr6OutNU z7jC!cNrcqf+uciu9Y=C8rTAc8AFWzO;|L>dSa66A2d$J4^gjJ?NG}1VGfi&yj+_|b z0~6z|8beqtEa!5#r1n4Lr`a5wB{m+_$+AoIiBc z^zBD|a7*=Nz0X!UClr6ssk5C{?CR&4ru=VXkwW4*KHDNhu3`M~SOu2N$M~tHzyQWQ zf=;c!^{McLkaBJQ7_ltji}9IPFVb-o(|v0sab> zUL9x)Pmj6KyoBU>ZrhSW-$9kvMu|{9U1YHhwO^q6t3r{rJLda2;}m*0mi!N0;VT|L$rjGc|<-FSHR?6*7bGE(Ki8~LknI?fH| zY_qL|0*}b1BtWc~ePa{5dUU*`^5y6B?BNK)%XD?rpcg6})}LKE?4u(@%91npFs?;NX+`uj;nd8PFGGe0)q|fRRE!&0{M_SI zlrgK};H7425t@gvmy&XhWIo*6Gr#epdF>fidngY4;{HsYPjslPuRQM6-gtlt1FcB{ ZNMY_bvQM_J;JyATGE%aWzYr^`{|&Wh-zNY7 delta 1416 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 delta 1917 zcmV-@2ZH#z6@U+r7=Hu+0002p$W2rL00&1&L_t(og{7B2Z`(!~#`#$e1PBm;7NcK) zbwI!fywvL0Ez*{ORdt3S+!}ZB+;qr57!W|X_XV;A0aOSA=Pu45xS~QR_Z8Cj&)xB; z$hDguY*9zv^SkGHd8Ekb3pDdUlT%4;crm0Ve?IZ8vMoZuu7C3F?cYP+ej@dBI;P&m z#q%D(v{j`I1KKO!>TL&5ARm!~;qa6k`~n|8d^a4zU$uQ@%=Y?s23$MSpX%*Pr~gq+ z#|W5?FP5wwKyf~o@-@86;tLAcd{n`Wc9ksvu z00{%9m;eA!$A1&o$8EI(+dB{V<1^|%{&oPc&4rRdtKJ%@!Y2>-h!xl$0>)g0;d8En z>*Kb1`)Yi-{Zx4XZodM^(TD)U(^CYTfQOUeXhdsgt6pDjm3bTh9|VAp5U_64?z&Oy zM*v`%01$!Jf*hR;r(+!ZZYPZyU%z_<&@Unbq@)Ntuzz=X{a6G!wg7Z6#7hGJh0J8rcVcazVof#c9;Cq z0T12QpMM0%abzQ)rN)#(Xy~@k)9}5juv1lVjCS!M9w&rC+qJ(X&vpWaa^gOM3ph98@n!wK0io^l5^Th@*0N1{qL?R$q3#kLd49Fay zv<3pbh=e7aaR?aa-9qsRAcW7w24Luo)gyojiy4Q|Tq&+10#=o)As%Qs0FEX-0W3jL zh=0`h(F}lvn0h7}z;RyB087vmLUS2gJPos30u0<9G63H?y#){f>jEKCE@O+v&k%5f zVKkSp!~j%4t9JlPpb*vqe9&5kb>xU>00M-15y>nd%rHdi&UYVR4RBPak7Xp~q$5Bf zA%wOkT$cnWAd9vJAOIH7>2ryI9s$ZgBY!bNx=9EyC@BGQ6}b%b1duic5+sIzq3Ahn zV+3THduV_LSba>=$gFwDL%4`bBG~HsJJeH+>I4hzSwe zSyP~eQX_!Aw24}1(&wQZ0AUYvWJqXKgQ`X+x-D9T2-PUm$ANpA6K-kYo|Pwn1u$`= z+p`kCC0>6U&PTVjK6QmL@>$aqCVw@Hjcx}sQ<_An1@7v=4s7hfE)bN^w*Y8G zgZkX^yUF=-HsRIe&(VI70b!$c4S)gYW0tS{eD+#$>maL~U@e?0iiQY=V1z*H-I0c&~oAIehWPcSM1$0)RnF*f8 z+}Q5zv9U)1-U`fUH-{5<0RLEdbj(`H^}}@OZ>kTs^ZQ2z90gF=Rth7FMkUe+dKmDf zIR@za$B_ld8GpDvmg4AXoZxS8Ba3-)KG@tR%S7Uhwzqz|A|6c4YZ`xn zWsxk!hr#BBm=`d==4a7|7E-X3Sq@Vss)#qL8DvQV-y4VcdMU5`uY#Au(nF0n&vYB# z3k3uTb94y%%WzBUpu4vD`Dp?0wMb@d5jUdV3za2$Q3we(@yVnJhJWMbEDq(6a4$g* zBlCNBEEDGwIDiBNRXRijcO)-2%L4V_Ruu?H@Ea0fMSP8jLU~K|T?*90pt#9mW3pIf z^k4!iN#{z3h$xg}Wx+n_;VmO?aDO2bRB2`jiq2Soi28E0PkOK&gOHw$@+PB)DaPa&3kUlJ$oUeOrRKWvy}YC0&=StPEYA_r10}|Qcr|?&!ga$fQZP+ z$-dQNfOx*l+(SNp=QmADP!18Xob6jZ8=zV7ypkJl!4hl?Q+C;_aVY{lbtEPb*u?`i z`I`p>8^b=O$xzSN{TvGyV;{GQGH?h_P!7QMou1c6UN4<#?9VBK4dDnBBXah=-Wu3{ z5Z(K>cu|KI906lQUccgFduxEU&v4IsDuT689}@lnSuGR{*Ij9400000NkvXXu0mjf Dw`6rO diff --git a/graphics/picture_frame/cute.png b/graphics/picture_frame/cute.png index 38e6ba209a9fe52b8ce8eb197fc5788b9a062dc6..6d689c918d10b2613332589134a42ae0d808ab20 100644 GIT binary patch literal 2106 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 diff --git a/graphics/picture_frame/lobby.png b/graphics/picture_frame/lobby.png index 2f04105ff04345d802a975acd3ae6cb6d25a7418..bfa6c0dd9ed545053c8bafcd9c202df2eed52613 100644 GIT binary patch literal 1520 zcmeH`jZa%u7>Cbov4t|A3k7PY=dm*3GK=;? z3vLu;#KMX}EP6o@7#Us^-Kv*uSH4!VfVY_|cAb+>hA9h3MOHmtvScy-3C5GW=S|)` zdCo6ya?WOF?G4}wcmRNajD2Y;rejRS`LdbYy|ucYX$Y#?n+h&W3g-Y|gKXuYbY=)4 zbh%tKO;Z#_5Co3nMx#-u)1fG;R;yJil|rGAN~I!^h|lLUe114EDEN3j--7ZTMkypz z(4kZJqDHFK0bPvEYQYKIfE!SqI+NiEBTe8GVX+Waf^hX(Ant$$k6Qy>YG^e;!r;a& z)>aC7V1D8n4>dS65RkA!nsEV0CqkD7x-E?P(bNC(KN_wjaWJWMOj^iDR4Rz$P)$K2 z4JlV9%-2DK1yYam|C7%&x^;xxLVF%#5Hf4gF!2B9zrBGo`}>Xnz-r4#Qye;6Gi&^JPECa*tO}UX3Hk(obu+<$~M)V6UdN^HubZDPq=HgX5%vV`@Vf_l|>+jUSL z`z)d_*2iFR$HMD`S}pXFO&s&@4?i4`0cD5)EXNBlhdtEy7a>Rv5HqFZ4p~_h>-E7v z?_!C9NC|i4%}rdgXx)tC0ro-AaXVcZ7lENX&)8*Ah|J%-=S~{gMD`&7id-7|}bvAj5QYxu!$WY?$<-OwA3PeI2tv-d%aAe`IOQgzhZ3f_ulvx{87q zK=?Hi8Z)tNCZ3c;HwB%uFEP z;^A6(xGgXD4{lx$TNwD9x8s?T%7m58@AR<66Ry_M_a$9Ptcy7hE5b&DlTPev?$Y|m l7aBiFuA!0I#g##|bC;?8{Epa2>GNxUF(W-I?Luln_1|hr-k$&f delta 707 zcmV;!0zCcj3(p0R7=Hu<0000h+HZ{j001yhOjJex|Nrjp?%mzp%*@QYySu8Ys+pOY zh=_=HcXwuHW>r;HL_|b0GczJ0A`uZ00001QfV@Ef00LS`L_t(Y$HmsYZktdP2XOKR zy|!?tDvFm*84yF|bm)>7pweBuWohRw?JJmg^aAZujuK(I|Jpx=W2non5c+CZVF9W;+ z0{lFo=Ym?p=YL?U*6>pUIAfKU1boSU|0DEfp!x`a0QPaK0p1Si`m^^HAP+Z12b@s{ zhE*W%0)$x?8i6~wjR~NiYrxF+6#!90z>9bn*MQ%0dZz{OMFIHI2z>P=v;(e}0k{MW zuxtmOHnACyTENQzssK)t24F9zLR$gk6>M98biW*GntwQR6%awt2HY=&tp)rXh+2T% z%3ienA)RB>Xq(s<37xA0hID^gJ%DUPygC}l$H~X1xAOr&X`ld~a0u`?=Sm~(TQg7{ zX#@<$MXYPTNHb6!ssyx+^(LS;)_1U4a81AR3pTKhZGeP<(?4oU2{5X`c`)Ic83^Sx zzL3*y0Ds=jE3SashsSPd?+PsKO7Pg4b_V#J=0P2h4S+;I)`9aT0OvvR%`<@OPXYH% zz&${^PP1?`7jz7Qj=;kv=I(O^lQ;Wh^RP)e0sk)InPHrW9)RfxVLE*PX*%-%0)3Zo zf|pYxj|Utn%^m=LJ_1ht8L(??)1l4g$E|~bOFUBwA)QNpU_4?8^tpYOU=c7pehK3- pmf$?j_agxO2R-Nkh)TL%_ZOVP#WB{~cnSaj002ovPDHLkV1k%HK1=`r diff --git a/graphics/picture_frame/smart.png b/graphics/picture_frame/smart.png index 93fbf373f5857a31dcf694445fe08d4fb460c226..4c8c4fe60562999737e939a016bed82980d439ef 100644 GIT binary patch literal 3230 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 literal 2287 zcmV>($EJ4?$xCqF{uW1CZYdag`Tm9-{ds=-y!8L`%kD7&y2pq61UTI9J~sd~@yWhEuq!|r0Rot9 zjJ@nObqvoB_jC+@EI-q`__Tj>bXWndl(r9>fF2I)QUnOVJnogB>0R6$<@rqo7-r4LB~c(A+PwP=2O&@#gEV_OCyS3PA5WfF5HS(6ns= z?4gFeCS$sHt`83PuMhHv0eH~>ywm~k>EPz*(*ZmHK*<__A?RM{vAt&Zn8rpocAkHA z6g>dgOkx4(^>hd~_TJw9(L*8hjtzhmG-+udKr4Xxp}pT+Jrn|Y8wJ=4J)MI>fl|0? zj+A;RiM_4{*iGujo>ssN04tw82EYu!^g#(ISI=)Y(l3v&60ica`4<3QYm0w3z-%Yq z|878SLt$n6{6B!#mCbLDOF;MWfJ{|3zg;i+#{+(CTYnTleW4K`1^6-m=+}->Yt43V zr<-FDkk0Vt?#MI+ZJW*n-55&%HM<9ZchGr8_`0Zhwgt6tM5@Pb&9BIDhM2T=bH2(* zaXkvFn1ld}lNw-_E0y8xbQ6$jcas}^B>=tvA%l3h9y>?(Os65OGKB9XfFyvb0L6!X z?A8=$fP&IWKt^(ly3fiaD&2L9VPA6ErIOiFtD|U@$zh=ZWu{s#=BCP|rSx8uXW=j$ zdFQ!Gqj5z?%QF4K3+Mn!fXP6iKwHS8_}g=(5=dsX<*-~^QJl2`*aEoYxZPGNN|Ujf zIu&77nbOzPl$atb*02>t^d?m3j{*XWRT7anoN$;XA^lbpfq(_oYDwBCa%Dj@QR*jW zc;=6T7hSC|nk{L^PnWA`AtpwSDmRV5zj>>1?8^rHJ{txOyL8hhEa$ zc$&L~g3~8)e=5a0;kMmYRq-MkHBrSnEN+|+Cksr0a@ObcUVg}CtC+v)q~n5nh(MoC$)e zw*$!4a>ZNZ3Vx$4+!M2@0{1+5h70HkGih4tbzMZCWi?U?sGz|b05+{A%Z%rtkb(>L zZd@gCxnpH|0?s>PxjNHYSkaIW~vCBI%ro6Zam=-=P|w1eipSFs^wYpdXlp;^;y2dz(t4~#5~hN zwEfe@G@2ajR=oD`StP#*F2qb}LNXF9+XjC=YtOFdmA`D|xE&}1V zalHpK>_~g66I#PhBEec9CK)G|E{R?}s_+lDPu@ysnqNO3y zlAiEHfaT`YZPX?>WumVFpArWq3i?dz3E(GmlobHWD1tzYIwT%%L^OI_NEk#kca%^J zWM(}gKnaKbsFOkiWFWk8r93K(G>|_5MfI)u>qUa-YyczzA|t+TiJ_VMWPs{B#GCcuLvtn0tmf7|eB7^uZ*S4Qvg1H*sA{s)iuW>Sf}PICYN002ov JPDHLkV1jt$FA4wv diff --git a/graphics/picture_frame/tough.png b/graphics/picture_frame/tough.png index c7db2e3be6dbfde3f158230a05d18e7e0fefdb82..4efccc288e4e4ebe2c8ed483e4fd3c016cab4c23 100644 GIT binary patch literal 2746 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 KMNUMnLSTX%_kp+o From 9be0818b789daf2a31d6d8f2f7242941db5507dd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 13 Jan 2023 23:29:50 -0500 Subject: [PATCH 13/18] Fix intro/scene_1 tiles --- graphics/intro/scene_1/bg.pal | 259 ---------------------------------- graphics/intro/scene_1/bg.png | Bin 6611 -> 11311 bytes 2 files changed, 259 deletions(-) delete mode 100644 graphics/intro/scene_1/bg.pal diff --git a/graphics/intro/scene_1/bg.pal b/graphics/intro/scene_1/bg.pal deleted file mode 100644 index 95145b854d..0000000000 --- a/graphics/intro/scene_1/bg.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 0 -24 90 0 -49 115 0 -65 139 0 -90 172 0 -164 172 255 -164 197 255 -139 213 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -148 205 98 -180 255 131 -164 238 98 -0 0 0 -24 90 0 -49 115 0 -65 139 0 -90 172 0 -164 172 255 -164 197 255 -139 213 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -148 205 98 -180 255 131 -164 238 98 -0 0 0 -24 82 0 -32 90 0 -41 98 0 -49 115 0 -57 123 0 -65 139 0 -74 148 0 -82 156 0 -90 172 0 -0 16 0 -8 41 0 -16 57 0 -123 197 16 -180 255 131 -164 238 98 -0 0 0 -24 82 0 -32 90 0 -41 98 0 -49 115 0 -57 123 0 -65 139 0 -74 148 0 -82 156 0 -90 172 0 -8 24 8 -8 41 0 -16 57 0 -148 205 98 -98 172 74 -238 255 238 -0 0 0 -24 90 0 -49 115 0 -65 139 0 -90 172 0 -164 172 255 -164 197 255 -139 213 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -148 205 98 -180 255 131 -164 238 98 -0 0 0 -255 255 255 -246 246 238 -238 246 230 -230 246 222 -205 238 222 -180 230 230 -172 213 238 -131 205 238 -180 180 156 -213 213 230 -205 197 213 -189 230 115 -156 213 98 -222 230 222 -115 172 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -156 246 0 -65 90 156 -49 115 255 -82 82 82 -98 98 98 -115 115 115 -131 131 131 -148 148 148 -164 164 164 -180 180 180 -197 197 197 -213 213 213 -230 230 230 -255 255 255 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/intro/scene_1/bg.png b/graphics/intro/scene_1/bg.png index 0419014633adf519c21f104bd331389787d37570..df9f920ba5e37d6a4dbe1fd697e7a6a4ebc77a42 100644 GIT binary patch delta 10599 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 B^mYIM delta 5863 zcmXY#XFSx81INF&aA%x7vd*4KR>(MHDw!ugfmk{GD66u zjIu}B{C^MrPe0GzulJ+(r^b3zp2&$tA^-q*s~LoDXkunSfb1!TSF|hx^Vah1-FR&L zKUCa9A=B_LZ!l9S(6&8FH6upe8XtNuj(cZJoQ!n(R?fumkWZ2^zKc$m(}c_!{x#C z+6tG{mhtkP7Vykx{T=^bfn+CWiojq^JAhg-_(|ZKL~({a5T4@45JE#+o8G9DaA0sO#14qDLWlIi2tLN@qu6%yQM-iCV~o{Imlxq)w=@OpG6kK8SA zT}Ah3(h;KufaNm{;3*FM40v;UIh6bqBBD0aKLDnM%s+NaAhM&?CQ@-ztne-{Gk*@y zM_Dr#mcm&0^v;szt)oT1g|Tqk{5&)`Op8P@AR?`s-t0-ls0TF^Emm zSQOoQ)0_ZhKYPc;VSt7bR2V9XD`Z2F1iFusXceEKBmgJ!z6o2pUIGj*r1iqkoB6ph z)vh8hEvKfQUV1u=6sM}eUVq#Nrue|qHw{>gr0fi`{>9!?D)5ouj!t*+liHp0YjLdf zYZs?`JH__efpz$Al{n=>2$_R(@DNWP@ zQt03_t1!r2iR%)lS&+2Hw)@W4zw_LAP*6Gr#Qp{s&`*W=)qR9YwY8r$$gHdR~ zFBZqar%8uFG@E*Lx0x8vo|bA*uCsX`UCs8kHS-M6sm;||QA;zhHQMiGhkGU(cS6@H@DY;krzyVo~li8tzMcXs$Z>?b|>tF zgWLYSBQ`G%)=jBaW39n~Q@KCiXO~ofhkKq`Sh(-io|5m~t*+F{2tmJKK4^p26E*4^e(SR(vT!@QkiQvF zh!raoLrknuD-vzMp>TAZj;|s{3@+jc!f^`dYudgap|+9pc#HW{Pm(gCDow@Gs&*+H@v{ACC9OJx%c3}f8Xt(%G^=ukJ@a>q!>+YGU>|$ z=JBa1ummf(c97@u%Y;yTnM#Q+!c4L*q9o zZAeK^1SsO!zZb#bRxgjaSWwXARO-zMiQau3mr2xLo^UILrEk_pO1nKtnOY}R z0QkvbmFd)8e`cx` zio1m`jf{^>3Xpx4O)?L{Q;T>MCN2t2ZvT-_BlRCU1=Ts)C#( z(FUwp@JAYcM!0Vpkbl~jAR?Z)Cf;ZrVpF+eOYJKIiw5{lNTVIxd+&I_3g|0Vm7k5; zY()pqc>Yx)A_8JpIyHZYH?Et*QbuIX7bnv_bQ!K^?`bN3zV0SOUx6cej6Y~`8W&AY zXtfxd^Bgk?bd;bXQ?3>(pf^@P6d+8_6Nbzs;G};YjIwES{6aX;rT%sf3YosrIj8XA z$Y7|Ar|#y*xjY5>_dR(nd@G6rVe}{{TetEAhYTx?_>5C@q6!Hv0Jg-QD( zuEgvm7c}(!%~~_iXO#1L6qdSyfLO>xNOxCE+t)cBSRd8Qd!w9yZ}olBQs*|TXuI_{ zfe#w|1n&Plf&)t064~h!NdnYNWJ5<7cpS*W!~22=0&b)VY@Dyl=beHh;QJ$}fAS*l6vC6k_4vK^_ zlwUQ782uH@{l2wsqF`>;tz|7J#bqrTpb)a9?|o&5ljf`J@A6r0{`)HP%d2|uwK6pf zfKKJTQ=Q_rDy@cNenkc@$Eduv^2@Vd+-{ixi#jymR)jAyJ!9v+!Y;gJ@JFNw#-Yk1 zBuB}Bw??>bb2v;Gws_#lCP`A?qrkobeN%qx^@}t6w047SchA0c8pZ>4oL595Sen+H z{{TG!`J&xX)MU4|>|U!js!$svz^py-b&=F`<)=&K#BTf5-g`MLXhML==2K z_;2P<>w*5nP~PIKes*^PHoKcS4pHD&2&2G{i==8VkwTY}?7K`fQ~*}3WS z(LhpYHcL4X9;>D9koVByc2YaJAKVkEs7pARvNnO|h5Ifail#^UctzgK4{BR-aFH2< zeSLIqBto+DqoEFtjPi426N`47xm;|%P%oc_AlM~|iUZ|+4^8>+?UXlVeLH*bQkPo&&Dx14U=Ul$VG7RrUigKH+tjWfvSdFEJ_+Z1~eEYAN6) z7udRI>^bs{)*W%pjWMyxxR|D6)>&)EjM!op$I#+DAA%d=*v!AXT;exHE7L-{*NCpM zvg18)$?JO0;c9C_t)P;uaL%w5_h<59UWrcEwhVaod3__LxE-(_;}_bZ78D^=(>L9W z?n%DGvTRxEI&a^`G{=7fWM551qBJkvlPvRmyEe6Q6>n|4(YSv0`>1w87mOG%i%tIv zjOOJ`Kg!~iNNW88o}dQ8_OQZZ&DJ z14(t_-SOQIRPLz^u;-xKf4^6*bzLxdk@*_!V=!{?b2yNlQ8U%A@KA;IFJ`*HxV+eFb6-WRWO27&>~mdEkYh*0p)W}+PO`c z-`iy4YkTi0&r-AZ!+ z<;8*NZ#o~;-&_UC#0;eO$4OswR$hj@r_y`M?%f^G9@XTwGIuZ`(?B3J-Ca?#1;&Tl zRDKRx-#~$<6f}tssN&ICdw6=@F~{E7hu!675zv~|UqJnP%i-%yr~AFUUUJZ}3iZwX z#Gmj4?-F149`>@x*BhzE$@brVMNO0 z7T;SCem=N?D3v$G`}$uS7+FyLD{%3L@5s0~0D%B&8w9NcFamn5So_$g&(THdSWoJHC24Ec| zGc{y3@PrM_zjWg@@+uq};nTSQrTQGS;iMyjAGyedN_KWA_sqJ>tm)1DZz z0)uuin`%Ry8Y2+hU~SKCieaw=fVQS6fHxKQ2ukh1=fx}!z`WV&1sl>giAMU z1C^6I6{&@5{iba;TP`99;YQRdRqVc{0a1Rsz%9-ZKz~xz7Amt@DYOO841sPU$V=1I z^{fLkT!u-tUYY)ixcfuWQY36YA%W(PEP`BoNDW8UnPuqWWL`YW$T?vCpo78hlTB*h zQ33=Cs-G!mk-a&s}_*cIO5XKVc>VLrDH^A-K9{7dpL=nnvIBk~>P2Z;wDq0o^s+FF5npw2l?+ z7%OK2`nty_EP9^*MVg+<8xnuZ9B_C!$#7JSMit~l*DGg&$Mk571@T9<&y=SBc)Q0f zxhh72$l#pjS54x`1oapdZEb`b0$$apL1J%D=VBp5_c+Vk<|t|I&rN%6gu9)L<68fh zDFg(I?3)vPmo&&0vKf>WlVUuNz4TPOgVw@W?JnC_8IO|>(^JpUlWJ|=z{_ppTjMln+cWu1;zER4pOSk0L7kZ%M5yH zYS-a^vqCnU*)f#b>~`iJ67IP8{>d(C?d~7rhs2z)_N}wSLPy0)U-V@92H$r3N&Apy z2n%DHNH$xLk48B^umS3nw*9uh*Sj67(Jt4%=MG-R(fy&R0;W%MFL^C58Z}2*m_Q!m zFM?fvC;IXbVok365Jv1u#O3&i(VNBVG0G`lGNlug!kI^uBq%T`CwD7KW+L*TzrS=7 za;hZ&dn6*Wk2DK0A{403Kgo2Kqj!Q{zH`Y(GA>PF@M`HwlTk|(h2qF}W_Lo;`kj+( zK=5SFF-Bp`;bvo-jH?g(47*H^G;1T4VnLgR5Z}Y`pMi3iBrYxe3fP(>bxn?q|(JZ zYKP%vVZs@3zH}7sW~Tw&0%ba9^~xfMGaPPl=gOeLGqR$E{Kq;w(j}Q7+%C3utGVQ@ z@UpFXI+O5~TV^6jlc&w2nj~0>oXM=kFYx+Qt0c2Qq+n+f;`pKjUkP*6Jzeb=j>dO9 zR4_F?Oi`{qv_cWqK8?uuVVHM@6=%xN%KPZ3VZ^dHcq`#Td`a5S6*6AlN(zK8>kFK} zgfr^H#xahhUi$etZNZYz%k(ltzzsW)5t$}R$6vHZ9Nm5XxYDy~M023pA!Tz#I9`_I zC-vevtA%aK_S2kHMp4CMPQk?u76WY_epENM>{;f8qUS~WfOHtZpc?A&5PG>)Q?#2A zHFt>_W^KG5E@x{9lRXnwk$-%o8Pi;o~x^`!f;B5pa3nD^0jZIIrs-S~(C=qh<=h$E*Ih$@mDtHIE-sVL$3 z(~gAZT()<|s2hn#w&9ST0pQQy$bX}jHBlUm&(d*Arj;<8_lg2x`+<*z=DiO4Z8c#h zZ$2$)Vb0wG7YsyTf0ke*zJE8BLcbuRK0Z%kgEnif7}ak$riOHVb^=K6YV1-0IM`Id zO8$1M{Ve1;=B-71i*bZytqiC?2V4+- z?$Fo}4b}hLSPO-5okaHgOq?XYyMRj!X;xY^El+fUJv%AppjlBlo>-o0ss&YI+XMd% zenI!mw~L;*pM!CYTxiX|{G`I}uk_l{gQvlPxi_!v1%Rv-JxV!&e4_@Njy|3KrR;Nm zG8Io#zDuv&3BF=q#G^Vvv&)iUnMlEkM8 z-5u2cdN4MOuk$(|C<6}Pe;}$*)3miI#OoR&uK4mGE}9<$+mjB+@?&rD^ zM2iPBfYrZWfm)Dqz^j93A_rsMVV}_eEe#)fnBAqhr`PWqq}*e!E3BcOSE)IvyhMHF z8ZSaS1yBIwFXQ~z|J)U507Uh3RTOP$NI9>-UNa;A)in>SS?m)2(=9 zH;ryEbelm@#!g^fNigwZ;)y0ufTdkt&?$phupm|od-k$s8%Fx^^y&8Plvz>=)fP(*^|SVpp9L+)0Gi-Q4?S}VzgoXwBcl3<1}+M^l=vKIndb7&r^pG zkO0mC{QiURFBH+Lhl@*ffiQfu3|A09OjH)+2f*MUW?Y4z(5pTy*`Qem-fZN`idqeb zMdC{tXo*uia2)eRR+24}F@~OgnSp+ipIvqn419!s+i2XV32n?cb2kQi2)UBORqy}l2o!U7I zifB=g)`YXpiU|VUsSB{A_~wq0o?bN3y}}p}=dKJ@Yp2V1DN*_9#-#rj#`WfC{_d3S zr?Pd1-rnBF&tNVuY)V$~1zbz!xD#RgovQ&ceE!>x3}s_jS--NDOC?)lFot6el>%U+IW{03pY-E6 pgC0*a;lEVKb{#sxS;=Rx^8#{>Lm4Wn|2^7(q3*RS)!KxJ{{dJV#^wM3 From 71d4b1687a72a22a8e46fea6ea4c1385e2073120 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 14 Jan 2023 11:42:19 -0500 Subject: [PATCH 14/18] Fix party_menu/bg colors --- graphics/party_menu/bg.pal | 179 ------------------------------------- graphics/party_menu/bg.png | Bin 613 -> 1120 bytes 2 files changed, 179 deletions(-) delete mode 100644 graphics/party_menu/bg.pal diff --git a/graphics/party_menu/bg.pal b/graphics/party_menu/bg.pal deleted file mode 100644 index 0b4b30f81c..0000000000 --- a/graphics/party_menu/bg.pal +++ /dev/null @@ -1,179 +0,0 @@ -JASC-PAL -0100 -176 -123 156 115 -255 255 255 -106 106 106 -0 0 0 -65 205 255 -0 139 189 -49 189 238 -255 156 148 -189 90 82 -222 123 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -139 148 123 -74 74 98 -65 156 148 -139 156 41 -205 213 123 -180 180 90 -82 65 74 -32 16 24 -255 0 255 -255 0 255 -255 255 255 -230 238 139 -98 90 0 -255 0 255 -255 0 255 -115 90 180 -139 148 123 -255 115 49 -65 156 148 -139 156 41 -205 213 123 -180 180 90 -82 65 74 -82 82 90 -255 0 255 -255 0 255 -255 255 255 -123 205 180 -57 148 123 -255 0 255 -255 0 255 -164 115 246 -123 156 115 -74 74 98 -115 115 115 -255 255 255 -131 197 222 -57 148 222 -41 123 180 -131 197 222 -41 123 180 -115 255 172 -90 213 131 -65 205 255 -0 98 148 -82 82 82 -255 213 82 -255 180 65 -123 156 115 -74 74 98 -115 115 115 -255 255 255 -213 197 90 -197 164 24 -156 156 32 -213 197 90 -156 156 32 -255 230 57 -205 172 8 -255 156 148 -156 65 57 -82 82 82 -255 213 82 -255 180 65 -123 156 115 -74 74 98 -115 115 115 -255 255 255 -213 164 32 -197 106 16 -164 74 0 -213 164 32 -164 74 0 -255 115 49 -197 57 0 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 -123 156 115 -255 115 49 -115 115 115 -255 255 255 -180 255 164 -123 222 131 -123 156 98 -255 115 49 -255 115 49 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 -57 156 255 -255 115 49 -115 115 115 -255 255 255 -172 238 255 -123 213 238 -74 172 205 -255 115 49 -255 115 49 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 -57 156 255 -255 115 49 -115 115 115 -255 255 255 -246 246 148 -246 230 98 -222 197 32 -255 115 49 -255 115 49 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 -57 156 255 -255 115 49 -115 115 115 -255 255 255 -255 213 222 -255 189 148 -238 164 131 -255 115 49 -255 115 49 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 -57 156 255 -255 255 115 -115 115 115 -255 255 255 -180 255 164 -123 222 131 -131 172 106 -255 255 115 -255 255 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 diff --git a/graphics/party_menu/bg.png b/graphics/party_menu/bg.png index c58f3aae98d8e7eb47f33be3d95b71bd78570b98..21d1e5ef107bcf8857da77419d03ecbfd73e405d 100644 GIT binary patch literal 1120 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX=O&z$6gh6XIGu zr}+Q>|5;gCKv~DL{~5aX8t#4ff6kP>Q9<{ri-Ce@pnFQSmsgVGoGIONG|yhG-m)bs z$k9tdK;l2ce-Qfr|Jl3lq$mamw>WAGQ2qa6Lp1e4K~Zq^)n~U@0@Z-EFDd>8bPv${ z;$o1invdSIoN`aIdJB*NB#ZyAiMrYha%9q!prD}tSA+gQrIKzAOsgt{DAJy0Cto-O~ERNrf^o|6O= z0U?N&!6aP0<(&U;^=sb!ufF=uYt30A)qndo<=eBQdq)+BRR90#z5jcsyj#*tK>dH9 z^FiSWaewogET9uX2%GygCOKLF)5$+i7srr@*1OYA=QSG$xbA&*Z_{3{B{j{$9yccZ z`yYQb|JY}RHdpPhT#6DOW_H`obJ0|}d@}0riJMa8eEs2n3&b8QdUaOrz$b?5N6Q() zn0l-P7|!uoZ4gSh;>fR2xwf?ILgU-G5*OZt%FG3NG3)otpCppXo~a_RZoNsvLHWo_ z_h-%O6j9^*@aCD%c0bj8u5P{tR$sVjm%l1HxHa6m!RRsR7Zb}{rX~9v80Q5R9{9@2^x)X^u9V+Q%riD@ zvpx8QmCr!=qAjBi5A%|JAKdu@o;?QQ_>v7@TZ8%Dux(f_vtzCPj$%HY8|}Y}mi~Ie z@K2%JH}n?wq&@#%saQ>5%(&mh*J9WBSn0t26=LUR@*IdaJO5ww1J5DmN8Q;MZSIG! zsIGh$Z#jF_>t@FOMF#)=o^uaS(|J%EdOf^kgPFsQDEWR-%Z%bihVP3Qe)MTQpWINy z(#w26#(`l*Gk-(>>J2HK3{k8rYeo_l^XkzAB zA*mkZ(A===pRncvTi~wxRK>#xoahOUV=Fk8bY}PRc z<1T+%76GQ!T%(3`*8HSAZdclA1ZS=B3IR>Y$m<%VHF{;1%{$fdg60Jpc~%nM2;=Km{zcat2|QR6Sl`; zPNPiUSw9>g3;1ydODks~rMFIjLjdrIrGvB{#DMWLs}NQa@VBG?1-4uMpimXa-d2C4 z8+bp)8wggy0N!gJcZcKdc&t7UfU62?mJS;P4!h4gc0e(31={TE8XkSXsotNeI6yf# zz~yiboL6yKmSq6gKm`q~`M)US|3uzdv4Mq0$}8ln-l}E2TN{JH_$Xm q0wt-*ftw@&UQ*1#G*w&+;2Sr2H`x$PHX#Q90000 Date: Sat, 14 Jan 2023 15:59:58 -0500 Subject: [PATCH 15/18] Fix slot_machine/menu colors --- graphics/slot_machine/menu.pal | 83 --------------------------------- graphics/slot_machine/menu.png | Bin 2396 -> 2665 bytes 2 files changed, 83 deletions(-) delete mode 100644 graphics/slot_machine/menu.pal diff --git a/graphics/slot_machine/menu.pal b/graphics/slot_machine/menu.pal deleted file mode 100644 index 56a9d31d02..0000000000 --- a/graphics/slot_machine/menu.pal +++ /dev/null @@ -1,83 +0,0 @@ -JASC-PAL -0100 -80 -0 0 0 -57 57 49 -230 230 230 -255 255 255 -131 213 172 -49 123 74 -90 172 106 -255 0 255 -90 172 106 -255 164 41 -255 98 57 -255 197 156 -172 57 0 -0 65 24 -98 98 90 -0 0 0 -222 222 222 -255 255 255 -131 213 172 -255 90 0 -222 41 0 -255 90 0 -222 41 0 -255 90 0 -222 41 0 -255 90 0 -222 41 0 -255 90 0 -222 41 0 -255 0 255 -156 0 0 -0 0 0 -0 0 0 -255 255 255 -74 74 213 -115 172 255 -115 164 74 -156 238 74 -230 65 24 -255 164 41 -255 238 32 -131 213 172 -189 189 189 -156 156 156 -123 123 123 -90 90 90 -65 65 65 -0 0 0 -255 0 255 -255 255 255 -65 164 82 -139 230 139 -139 230 139 -148 238 148 -164 246 164 -180 246 180 -189 246 189 -205 255 205 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -0 0 0 -222 222 222 -65 90 213 -90 172 106 -255 255 255 -131 213 172 -0 98 115 -90 90 0 -90 90 0 -156 16 0 -156 16 0 -106 156 246 -205 205 0 -205 205 0 -246 106 74 -246 106 74 -0 0 0 diff --git a/graphics/slot_machine/menu.png b/graphics/slot_machine/menu.png index 08aa5989d66f9d6d13f9bcc69801542bffacfce8..035ec7fdfa783b51c904e99d37d24ac8e690fb76 100644 GIT binary patch literal 2665 zcmZ{mc{tSDAIHyk7BkGKF3=M@utM)1}B0ZI&F4Ia`Rjv9a#-^t4bYOzN-Fjj^Fu z`3r$?)7g833}fLR%qn95Xe0)ME`rC##{NqR>0oS+i2FYdgiI0rZ;5ytoBpsWVHn$n zxnMI*BW>QiKo-R{H8nAr%$S%MI-O3V(L}f?T2wT)WBPQuNO=o+Y(D!D|4|dasZ-dw zdHO#R@uGQX^#09h|D7K&!sv7$5|gkge!K^fG?o%uQ**#tZzTs@s2w0(CoY0&!eT`65}VozlB2EV9!O11L1n5Jj_0bXV*3# z_AI7Srps4VPqtC^htuSN?8ECPJcok7NIH94VtY2Uu-KB;iUq<{HZ}<{^6_K2ITk$L zE1A3#@?D9D&mPH^F*mLG`{sIZheR91nz97PsBbcXS)yA2TQCYf#fHKNazbQ@A`2V= zOOLHGz>x?qnwt`071luDBVhssHbv$-@%VY(vVRJN2eN9ts}L*0Jd zzc#t;^iBg?B~~pC&Q}5yNZS;F#qt3*0ey!=71zS{i*nc@pqTpHev1RV&jHaLrcfx{ z4x?K^)eddWdvVGwuYJ?BqZScoRETnQLN&xeP;m(4^77VW*q?OdQkPZa_6wYL9FNmq zMoA|#fLa|n1MdL3CmJfPXQpYxb*wFLt=*xo<|Tibbi~iDa+-;PFRQGNoo7|j$`wFJ zIBLnT;GqFJ1|@s6vj{B9B)Y)0cl6%`nKf=8fZ=vm>f4B-9UtrC4WxLevg;^{OvkNu zH}Y#IIXu1_Puz@?q-cSH7Sj~$pMm?aoJf2Os)z5cyeNEno7@vD-mb19fAYjaNwa%y zR{>n(sC?-w!PJWkOL$+3uj)e$$h3F^sLDmNU2zRKbMy0ob8|f!$W-g4+|kN}!)@AK#?#*!1 zI~M=GO*J+nXCs^BRr)x;9B0;Rs$d`EN{z$yw0Udar77oqquH!k$|op!;WY;`#js$= zEPw!8<0-!?D5^QyNyVOJJ;sr^$C7XUT0XcyXtXu5A{c>y{_#ee!nv!1XjO@<0c3R3 z^lk#J2F;PALa8)Qx(*o0?MdgsU@LBus|xo(6<| zWc1IcAmSJQ@11D}lk)ABu=yuh=gmPx)I^s~ZA}eK@Ot)JC95r4tN@cbmv9xwM3Xoj z!Fu_~kl@`R{td1l#-3E(mPEQ4!`jx8)8s?)@J8y}6*%bS>0Wd|a0c`~)6xj8PpZm= zx)E47ar#mdQ7%rv)l@-p%vBRts7LX2xNb~9=rY*h;eV_EH`1}VaH0}3+lsUWk6NHp z29e;$tlhnem%DOLNe3AzU~7C59af)VD1yqRb9rCx4Fr;c55gY96e~k1IPOB7UGzm?xeTIU(GBPRy27YKG+k-#9qNlO_~ zH|=JIl$R}dHM~Rxr!V6{091k@?rL4(09~%Bme?l~f-AWkvjtffSj+QLFS=-i?TzMA zVduhOO4VP(D4jUL6;IQatPl3@rdB5OqXbKNp7#5w`qZoB`LP?K=VLbh&RR+3hL8OX z4m5d;97UZKpKnL{#s}lP!8e_~E9RXFyKrzIlGKWbmb)?PaGv3h<_>UW$yXTSNPnpA z>m6-s6f7O4LV;NunMxK|?g&;wD+Ky%43>0RX8?jwVe38)GFZb1yLeghY=bKe(cQ59 z-G5lUh%%wci30eGJUT6cmLB~O5Z%IExryIO(qGa_l!t(w#Sg#lZdpeyKAUq1Pf=E; zNO>8qVx0@Mww_bXmJ=SkrQHi>|v?fB&#w(~9}K6&@~16|$@H zJGIsBc~F2-&D}D@udW+~={-gul%@pOIa850*DiHlG-_E&#DMu;$H91YOvr0cd-w$( zqaM2cY2|e&nkpqP+nvtP5QL)Y++LSFGuX=d-4yYHAETa){-*yB`uvoGSZh7&7oy!) z4GJ;KfQC;V`-SLd;KoX?4b-qajDsf=v_P=hDE8V;WUIMLQC;zu+f%PAXeKx*5lyh%>fAaq?Ktka zOw_(l+GNzx-TO&ojSedtkm}We`iS9dQ&d9wT`c|@OF%*|AmA>vWY>o8y^LxHOm@!P zyEmTz>@xbtY~WH76cIjECOeaw5DKTfqW;iHHFX?ISxj6k#tb>Hn30WDw{6kL1WhlL zpy=cuv}NIM@UtVUD;87y2kY#w#<7v(&0a7bS9A63^nsLP!|1w@yCb)oJ$q_X`}nAl z$qu;}S>N}@4yndf1i_6uL3cP030pb&FL4`s#oDst(#>s|n$W4#Ksf>QcfplgqxL5x zC?}s8LYK3=p}vWP?H4N;aMTwBuD)Vfw|fg$un>4+A<RoK@vH-i z9zb>>$C@BJkV8XQ4bTe1uZ8$k7)~)B z489WLmxIA{4Zz#(u?9qrbJaQ2fLE2VDF9$V*zJA|Ksbc~gHGow0F(*RhnU#(AhHyI z0MG&)rY!`37T^GYbRh{rdXO(jpdOvAk-mQr(DMCfLfrLzUf%2N3i0z^PsOG+52$kC zNB6DoLm{Q&^Vgvut9K2!w&O@js4Pb=e+8P}NLJmA4P0LCS25?y!zb>qUS zfHWx1e{~lA-hNc6R05Fn{GlSurEz}+fUgX0khJBP30(UaB`$69|r%KP)@ z1q+VD(aFx?;8l#{6^=D?rJIPKlRV(oaTpyAULL*0@g0seXIr%i&vid{oX4*FP4AnY z?{lv|g&^KKjt*ZQI8z+oy*y}X0K!6j5(207lH^c#rtVyn~o+ntc|Kz*2yb1n^NcV5c0QE!dj@ zJa2!?b?^VC-F|e5@sAk4!MNsNmQT&z5%fQ~+OD!-8?PmNO?ikV3u}MucUW`3MgRT2 z#vCX>>!0;{INi?NUIk$}z|{bcuLsicDq~RT0svezy*-xlwl{bGj0M#}GyqTAZtiSK zZ#e)$fawQ354DWKoZy*G$At4aQ2<}P2kCxb0G17aR1b0tO{H}4=y!3**SY9ROh=NN zTG|vK=?6SlcNoW`NQi$p^1L{j-sdgD3volfcJH^ssLfN!t>zd&(hrOULmL1&i6eO# zU&^gGYPaKy$;IYt*KPf)-TpETm0ghn@WuIaoyNxoU`x0VHF3#)C_VHe0>q8Y*NAV_ zMt{==NY#-DxWkv_aJrSoz=}uV1c1x^F!CQ?yPen1R*JE{_4I*=|0QwTAJdM)it~`xO5&-wLoFuSrrX)rQWD0;@7*+sq8{4rJ z4_PCql*EOVE#PL4$I`Y@BjHfmx(<@3XHN%ldkH{V~%@eAPn(5fa59)vH(7* z=ojH|JP+_lSj7T9smMfV&jUPV!b%oE5mqSB4B+W{Sjm3^)PZH8B$Nev+n&)UVDpDE z3qHNb0wiM~rH!TrfYvo`cy*dkupp{u0XmICsne*PPt#bZ33&@Xy{H?-1Tsn+igF>< z-}cb8e#l$!YxFW^pKHYoa3Zzi?yljwqgNCj;M=t^$2ZN5d!0qUDFC(y5} z?AbHG+irjNgj>y-uVnSlRGARK3QR4~24q^=3IG;P3V4ecU|R?Qk);k{C6sZAN3MAJ9^-UIlIv8(gAIBS=&d`670N{4K&Vs&WEU;+-0mHGS0Rz0* zsX7>M2qoiGbJCsxR2|F#R1CDk(7}Ce;{v8)^a0Yt8Gv<= z1z^R;ix~U8G<%hWNR9c9!S6L7;14n?h#Trhug-X*+g&G(8o)Hd0uAVNvP!vyr4-QP zAPawBwE58I0YhCE_%6ocr~&+UrU+oZZCL~`DKWpZbt|6-bUOSMkTGDzu?|WB$OIU8 zK_~#`Enpp#xS$FPEBnlXWSa*lKT9l-V++cvHplh?K$KKK9uURqwLm?zGO2?MU>1WF z(rBABW&n<3EMP^NRhn}z+?kkh9=;H8n;L)j21@bvK+9SH=Y;~iF#pL=N&vGMbTYy@ z2PWKmF&HcXxUOy}^*Sx!#r$PXSpXC64el)msFsGU2)IoT-Uk2^vc}-luj;ZS$2{nIz z_VF@+bv?P2h0(Qi$Gw{W+XBGT4B%-M;OR1euu{Oxg>?WK3#@BvT9A)HDPU0yO0$sc z6kur<-n$OoyAnTuhiPs3zyPIDUn2i!7fyxfpP%-HI2R4|^{F^-_zfZWr%&|^_LylD z0B8N6-#G0D0gmScGy+_OU4XyjG-!VSp$0(_;Gg3Dedyw-0X_lv_zis;a0bGGUk(UF zUo Date: Sun, 15 Jan 2023 00:05:42 -0500 Subject: [PATCH 16/18] Colorize pokemon storage tiles --- graphics/pokemon_storage/box_bg1.pal | 19 -------- .../box_selection_popup_center.png | Bin 107 -> 164 bytes .../box_selection_popup_sides.png | Bin 125 -> 185 bytes graphics/pokemon_storage/item_info_frame.png | Bin 170 -> 170 bytes graphics/pokemon_storage/menu.png | Bin 1242 -> 1336 bytes graphics/pokemon_storage/party_menu.pal | 19 ++++++++ .../{bg.pal => scrolling_bg.pal} | 0 graphics/pokemon_storage/scrolling_bg.png | Bin 168 -> 228 bytes ..._items.pal => scrolling_bg_move_items.pal} | 0 src/graphics.c | 2 +- src/pokemon_storage_system.c | 44 +++++++++--------- 11 files changed, 43 insertions(+), 41 deletions(-) delete mode 100644 graphics/pokemon_storage/box_bg1.pal create mode 100644 graphics/pokemon_storage/party_menu.pal rename graphics/pokemon_storage/{bg.pal => scrolling_bg.pal} (100%) rename graphics/pokemon_storage/{bg_move_items.pal => scrolling_bg_move_items.pal} (100%) diff --git a/graphics/pokemon_storage/box_bg1.pal b/graphics/pokemon_storage/box_bg1.pal deleted file mode 100644 index 52ac12110c..0000000000 --- a/graphics/pokemon_storage/box_bg1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 205 106 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon_storage/box_selection_popup_center.png b/graphics/pokemon_storage/box_selection_popup_center.png index f7ab30276eca5a315639cb5f69a0ea11785d0b93..d0b90c578008b0e133f439196365bfab9c77e450 100644 GIT binary patch delta 146 zcmc~^!Z<;)o|%DxA;LZ9Es!z@@CkAKfAs&9DQkj)qW(XN`gX7Q+p{fas~M`j82-b- zmaP9vK-_!x?g2GTzGZd?Na=gJIEHw1CVMC|NN{Lzs4_^za5Mz6F6MF*?a`75by&&N nzopr0EfLBd;kCd diff --git a/graphics/pokemon_storage/box_selection_popup_sides.png b/graphics/pokemon_storage/box_selection_popup_sides.png index a0140dc87b386d4acb48b15455ab0a3e616c8c6e..27b4dc10a81b396f6128c574f375af635709724b 100644 GIT binary patch delta 151 zcmb>3$v8pMg_(hY;ZmDkKaesA@CkAKfAs&9DQkj)qW(XN`gX7Q+p{fas~M`j82-b- zmaP9vK-_!x?g2GTzGZf2qN1>8=!O|L860P;En0f{*G5~nuKoWCJ(^~DI`uTX^L;V% w-lpEoCoTupD99@}9o@=l>AbHk+w`|MmqN|$^DEY90nK6XboFyt=akR{076GhH2?qr delta 106 zcmdnVSUW*7g#ic-7&j&YDHl%{#}J9Bch7HRY%t(qcI;i>XSQe|Ybx^|iIR=BZe9ET zee`acb-7K3@vQHQnfH`B*Ppn&T4IB|(xIcfIW3d#vt*lEi!GbQxJ|hEbsorEPgg&e IbxsLQ09pYlfdBvi diff --git a/graphics/pokemon_storage/item_info_frame.png b/graphics/pokemon_storage/item_info_frame.png index 743e5244145f79ad9a1dd88b66c72a5468e9a3f3..734101a55eaa17eb713911e92dffbc218396b017 100644 GIT binary patch delta 59 icmZ3*xQcOtj^Y3R|C5rEu3kOMKm@pa@a>F=vAzJ(p$#$s delta 59 zcmZ3*xQcOtj^UIkYl4EJ{{R1f_W%E=z3-xyoDFJT5|mX96l7pvxOeZ{k|kS!YKn_N NB5N7AgeS)O0sx-{9YO#A diff --git a/graphics/pokemon_storage/menu.png b/graphics/pokemon_storage/menu.png index 204c075048b0dde47dac3136c04e3178c3bb4fd1..0a1ca913b0803e2d4dcb8f3dbfbdbeb8889ba2e3 100644 GIT binary patch delta 1284 zcmV+f1^fEi3AhT77)}TS00009TMZxp0004VQb$4nuFf3k0001BP)t-s0001#l&o`e zds0$bl$5OYtWu<;v;Y7Aq|NqwwAKIKl-1_{wAJ>U&F=sI|62dE5kc}baob7My*oL4F3EN6qRXeL@ zHBD1@k<1_;mG`~vSJu8Ue>#Q5;mrUJyQp>mig_r9w-*Bh4mci9r>Go=Kmo9kvvJ~% z^oryzjQ2Y;e*%I4pq>GL^dNf`XhHEFD}&Pn+8+R4EWcynkjXT$(?iBTXXOHAU(6&_G->EDEknhb6LdO8~1VCM) zYN%jyUx4r58|w$`z)Q?nfW`qdX#g975Mc>`9yc~Z5;Fh;I84=lxaO_^&JXs|)R|2` zeIk~JKt84e_?KR_9IXIgRl%pXN&{F3!5m<_c@Lo+Kz5HRUNYm&;+v|bk@Ktb$5Z+T z0HP(c6hO{50MmBu0`P?Wsj9;egb71a7J_LS$8o}%TUg=W6daj&gj+OLH37iMrc9zj zfMLMvVudYJ!`~Et9>JGsg9aKKE6km|bfFj^41u}0t870!0x)25uy|Ni_1odlkq^3q z*q3=){0tNUz&(4uumDIPdV8y-nKC@f!|gM`o+Ufv>q(BV2Ta!|H2{Dh^4co_hQWH) z80TV-utn3I187PC*d;Uq@Vy-Z&|H`#IHNp{G`0?)P5~HyZ(}u3W%_1JYCDV`krtFB zz|zL&13a}7uH5x172uh@AZaQ8<h; z3cVL;MdnoztIDKl>5ne;HIlO)LEei zGywE~azAN*4^1QEa=P+ zF5Ko>FxQd?RDk3{OO z3pv+n53tKC%xm#oCW4$X(1LJV%mcFdK*j?p06F8f7GSLhAdyu8_?f$m^abg49+(UP z089jbAoD<;`hoO94~zmpo)7@ue%$mc_rQE1q?J&6rojWFf9DQh2m!7uJg_b+9(@3q zelic`;j{C<*aIsi9^mP30c85Q`TxJD?7v~jhJRX@12CC7e*zml zr|hk1r~q`$E^2qyPB0jZ>mlGwz4elH&L3r50cd9cZ34gzXG7515I6w)$wdGc0tt)f z`~?6BLF+=W0U#5CB>?vMJOsUc24DLOxJ+F_!09_SbO0^8eqt6BeDbC1K=BH;@JmN4 u@roL&Yzg0KFVKE|Ec}7A_{`<&g!&5*vyE{&U#7eO0000m0002YtKcC3001yhOjJdYW-x#8;fOQ<00d=8L_t(og|(Nz zZ{s!;#}(XP;0uuLioya41VvGwi42#)LviSu!Eo20!Bz2JAZgM{Y9Y{0(jCr=H+5>) z;I`{_OU4cw4j#lToGx?w9;qLcO#KLoKG`%W=za8keB_htI1_CSMwV%5F2Nywr}`tn z1^>J}<}H7~Y}~#^z^mFn|MljH0CmUn^e!)t`!f@O9fCtw|5!|2oaU8({-Ff86<{R~ zOBf!=VP4{hw#k5l#LMOCfKGrTDLx)2HJ?E7M+~1UGu>fc&3Qj}#4Wn`(B2h3F7MwXt6~c#^4N!(aMHo@= z!QXN~BNic#Qs_4zaaE0hccnE#B)IJ?2tbgs&|nuCy0#v>|ugadGc z3858W?t$H?wg*515rArm2M$n<2!a~WmJ65e3Ak)78^&;9G_ogsbuc>SriM+9up0I)Hv`zUv=-e#r!{^japeWR9wAH9FZ zPCC`rxo!ZD*MHSFYANtqfV5?k6nMs+t6149`AUf+IX4*-va>1@X8Rtdk27o?~)+}-{r~_0P2?yfHDNUy#ge1NI~8J zFnnmXRR}d89#HV22HY~71D}R8tU`a_8n7G6LcQ2dy}%D{)%Ui}!VU_H6cEByy(Hds z6c_+=At^wdvNTPgjg7tVu1^8^skIXCTGp??*s|tsJl+d^3XJO1+Kor`php2nUx;Y7 zz&zjypL(A4e?XrC6M!eYK0u!W`MCkW+`XZU`A|n5b#+8 zU=t{_E69wM*i81L(05mWKm&fUE9j}pOaV?8m@1q=Yeh!e^cX6@G$R00sMf&$Vz#H% zguihO!17|f=&pC$H8mhTG6dX>m;qo%_UGc{+vBrs`>g>84yA?Z7f5)OGyqUAREwQ7 zg>(8*6`X&^4IpN5T(;O@=n5a*Hvm}R8GB$4@L?h`0W5AXH9!gI zgdi}47y%E=0#G3&Dg+w0|-Kjb=d=coysH zn3094>%g|kx^E%2)jF^j+zETZZ2-1czp-~i^PTixW3-huG6%dX000UA07*qoM6N<$ Eg8Jkg&j0`b diff --git a/graphics/pokemon_storage/party_menu.pal b/graphics/pokemon_storage/party_menu.pal new file mode 100644 index 0000000000..a827cfd457 --- /dev/null +++ b/graphics/pokemon_storage/party_menu.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 172 180 +41 106 98 +82 98 115 +74 172 164 +57 139 139 +164 213 246 +115 189 98 +255 255 255 +123 189 255 +0 123 255 +41 90 164 +123 205 180 +8 74 65 +164 238 148 +65 82 90 diff --git a/graphics/pokemon_storage/bg.pal b/graphics/pokemon_storage/scrolling_bg.pal similarity index 100% rename from graphics/pokemon_storage/bg.pal rename to graphics/pokemon_storage/scrolling_bg.pal diff --git a/graphics/pokemon_storage/scrolling_bg.png b/graphics/pokemon_storage/scrolling_bg.png index 8be861a2670f9b9107292efd1963f4ef1ef94d86..228e9ce6f75cf88f302cee87367eb3f1842892ae 100644 GIT binary patch delta 195 zcmZ3%_=ItSqzf|x14FA`LKcuR2=EDU1=3Tdtoi@{Kaf$q_di4R|NqU+Ya}H8zkBxo z+13B|&H}}e!R0t9^NEVWC8yliF|0Tckov^8nUP$|_Vpo3q%|mjP_Pzz7GN1V8TyVS1JvVyu-V4vJSv+Vey|LFv=h#b@ mIV{(zS4v+I2%fWfMis+}6EiCVQV*^J+3o4-=d#Wzp$PzEJXA9P delta 151 zcmV;I0BHZ@0jL3x8Gir(005Vp&x8N~0B=b|K~xx(bboxOption != OPTION_MOVE_ITEMS) - LoadPalette(sBg_Pal, 0x30, sizeof(sBg_Pal)); + LoadPalette(sScrollingBg_Pal, 0x30, sizeof(sScrollingBg_Pal)); else - LoadPalette(sBgMoveItems_Pal, 0x30, sizeof(sBgMoveItems_Pal)); + LoadPalette(sScrollingBgMoveItems_Pal, 0x30, sizeof(sScrollingBgMoveItems_Pal)); SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_16COLOR | BGCNT_SCREENBASE(30)); CreateDisplayMonSprite(); From 0415cf73df1aff8820da7aeb8963d7cb05466bf7 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 15 Jan 2023 11:31:16 -0500 Subject: [PATCH 17/18] Fix results_screen/tiles.png colors --- graphics/contest/results_screen/tiles.pal | 259 ---------------------- graphics/contest/results_screen/tiles.png | Bin 1775 -> 2683 bytes 2 files changed, 259 deletions(-) delete mode 100644 graphics/contest/results_screen/tiles.pal diff --git a/graphics/contest/results_screen/tiles.pal b/graphics/contest/results_screen/tiles.pal deleted file mode 100644 index 869aef9e1f..0000000000 --- a/graphics/contest/results_screen/tiles.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -255 106 115 -255 57 57 -205 32 0 -246 213 0 -255 123 98 -156 180 90 -164 148 57 -90 106 139 -180 172 82 -0 0 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -164 222 255 -106 148 255 -24 57 205 -246 213 0 -255 123 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -255 197 255 -255 139 255 -213 0 139 -246 213 0 -255 123 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -180 255 197 -148 255 164 -65 172 57 -246 213 0 -255 123 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -255 255 164 -246 213 0 -230 106 0 -246 213 0 -255 123 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 255 255 -255 255 255 -213 213 213 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -164 222 255 -106 148 255 -49 82 255 -180 255 197 -148 255 164 -65 172 57 -0 0 0 -0 0 0 -0 0 0 -197 255 255 -255 255 255 -213 213 213 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -255 139 230 -255 139 230 -255 49 156 -255 255 0 -255 255 0 -189 172 0 -41 49 90 -41 49 90 -0 0 0 -197 123 131 -255 255 255 -230 246 255 -205 238 255 -180 238 255 -156 230 255 -139 230 255 -255 205 230 -255 255 139 -255 230 255 -255 255 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 255 255 -255 255 255 -213 213 213 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -255 172 197 -255 172 172 -255 180 148 -255 189 123 -255 197 98 -255 205 82 -156 156 156 -156 156 156 -156 156 156 -197 255 255 -255 255 255 -213 213 213 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -164 222 255 -106 148 255 -49 82 255 -180 255 197 -148 255 164 -65 172 57 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -164 222 255 -106 230 222 -49 238 189 -0 255 156 -0 255 156 -82 255 98 -164 255 49 -255 255 0 -255 172 16 -255 90 32 -255 8 57 -230 57 106 -205 115 156 -180 164 205 -164 222 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/contest/results_screen/tiles.png b/graphics/contest/results_screen/tiles.png index 106b975cf4f94382a83a1b1d044af3e43650cf5e..bb6aa701e8ff66233c116a2faa168c6e167cc924 100644 GIT binary patch literal 2683 zcmds(dpK148pq$6HDlZ_C6sB;&8@0af`RIW$R1R@HM4O6m_zV1jY1WE{)<7l;W4XErPmtp01|FE`(>pI?vV z=VK*lSQQtm_r(Oxng5CJ^8drXq|40P!EU4RD!?)&>5Td2U`8{}^OZ4ADkjYsWCRIz zWtQX!B;nncImJ<6QchpKHOZd?1_N8 zEXRTBBr6{$?0FhFN;%NlXgBYEvBA>^2^AK087f(n3ujUk21k$5cIXGpX%$cBN+;9i zw*8iV_R=;;MmW^%z1$(aye3buD=@%us7u4(m&GARW+^7O+HwvBE3oc5FC0U7q7J09 z(t`}YGFvH%9K}{8s^jVD+c?#jaJwO}g*Kn*3Eh)fdilIi5C1tK$wS(6mM{RaZ?!=dBB1iN7n zy*w<%_U9wKl6flBU?kbY>7Gv`5nV=~@Xy-091`Cr7_){o3p)07;OW=%cPgUOZyhaC zGNj9Y@*0Vhp+0(fJN+f%mvlWbwr#V&BU~<3-XyNEhpmrCD->UqqjL+M8xU%unLM|B z*N0EVSD>4pZLI3#He6;ZI4#Il5~V-F6%8E9cpYs=o?cygPyOn}q4OQIknGpO($wl- zb8@mD)%KAN%EotO%|~2=!LKDgNIkFqnAtRc3rEo;+4uNr-mR_{bzXiCk&|$J@-2|3 zT>;_BO6>uINS;bfplHv0G&`mh&l4q&}Mw%`;#$K zt2B|$RQJibby;^>*GunF3%g1Uf~pGi70M>2bhT1Ji(N|V92+*^`1lk(WGqE# zolH&CQWJ-x)qcJYsFtTY>La+xWI=PWAKcVIb)OhRpqG1%xL(V+=HX(8V@fogDce%G zZ=QG@|JjekT#VZw)+!zeugv&VY3(I zBVpCPMbSHpF0uG)5OV3%Qz=uj5J+R615r;@nV|r}MqvGjfIuFW&8~U4G_ta)|Bnym z%qGiv(9nIhJxwzV{)nqM7moal)22>`=3o(A^n#4l1H?=o*UPC(eg_1rm2%{fSuMDA zy^hvz>0xcTw1so7=_eDo^W)OweJ8<6*d4Gg#)6%svb9b_&5%HszY&O6OQ3C_3rW=D zL=B4;7Tc82g{M{9dm`KCqsNe<2vDt+vtJKZ>}ATTiWYS6PF6s%t~)Rkd@>M*-`x?J zDBkYA!K_O~7ukZC zfM%wZkCE{5ZxcbR5Y*Vw*3Fgf$0_4ptv|JI$#2wVn~Kd>&sSAfH#`x+=k{yu4iM<#LZAbBG#R0e*(H zP!*Rhd?piYtX1ui+{4j>ty1JI>+t7PDve_=RjRQbUzohooz(^|_pylOm9l9bytpW; zjxHf=-#$jwEF0!dua06@*;_G<0WN~)JNB`Ab|8~iiJ$y~Te9X(Zwx)-dl5J2tl(1F z*xo>Y|Jl>FY|o#i8T*gHnpc#ix&Y_ng&v#$Yx4{6_}Y**hzQFdACXQC|ZQE&<}nxvu8xY@F~GS7q6MrQsD>}{N^3oSXZe*tg( BKxY5| delta 1723 zcmV;s21NP$6z>g?7!3pi0000n5PbLm001zNGBkh6T_}+N00w$VL_t(&fyJ4=#Ip2e`)1aPzavKP|;otV2dzky>&;&d$sZ#oZ`EfgXt(vhn=x09g!~ij`JHjE8MN zrZa!7Vo-6W@Dkdz7mzE{1BkJfHdDk}8H0yj0AO>ut`DH`Dy3lnpkmzxC;^xN0A5N8 zcmddS7*OCz?FSgNBLUb>>+Y!mY8^ngSGo`z7}V4B0u0%}2S5wvwGnkMK=Y-6Ug!f9 zy>YM+K=$v8#Ml~<0URsqfZVWXEO|GOa(90Uk3gM9Uj&yZ3z@D&vhUUfOIvV@FIyXp)0RRV$uWk*XS^&OD5J33>F$4l) zKcEmJip?BA#YJJNx;8)=%dmjFs^+opG+>9BW5GGPKy^VA(CvS}4V?eM+Jf8)6SYFquh8@>Jizi1%W4Cl z;RUNn003{bF9E~{ymx2902^h{20lLzNekff^N>WzfGkin%0DRHq%s5`HFJNIzfpPs zhx0jKI-N{-f0U-YpDh*^P-}pXw9Nhw%wh*1TT%mZ8SSZOPWi3|?qSge7&Cu_2y8t$ zz^`<e^{-m}va4!_00D6CnQQVUk3_lj_3q`068UXnh;a(_eFC^9riS`*(`0%uMZnSW#giih%#zvZtRGNRae$HZXkKz89oR^Ek^)E4>6#6E zft1YO%^x#>O@M%l^ce%t1Ra2BzfjmNJbrgb0PMh&07uU*jtGDqn00>v{=sx#z`PW| zBoROg0$3yj_ygrHlpB=DCk$XCB7lvE05&25(1^dI{E6}jr58}L8?iCFF$G{ZVjQ3w zgET1HfdtS9q%aNM%@Z5S+y%Hu6C285HW0!j5ds33u;8>7paHr7h1@7<6kUKqZlqrU z8f*pxXuy3aZ8Av22mpU#1kr%b-=g#a9$SD_A$?{6qyoW)0Ecq{Osxt>sQ_k+Kmd+s z9*s1fMFkm+G@io%iG8#r_R*5qM+-e$!T`yk02;kW?BgvE&@Vd!(38>&s1n2X3M9wp z$L9$|W^}n$f&dRc&<94CXh+M}FGryB(YH5WM|W@k4Fs$nepr7IKp|j>06@Su1l)xJ zM1!bMm(lCxWu)OUdh_ivdV3ex1!sd1zDJH;V#%?5#S*4K1SiKQSLavg1-fCk1OXBp zNmt+R#`E&3EKkbgD7ud7vK`>$iU8vWQ8a#!#h-Y31x|1zmsc?UtZv6&%G>eH${+I^ z04NAh>cO}y-;aM+tL;>Pa{?Sg^jTd;U&`y~W_7(C0LTk~8hl0#zMuv-TWUb*55LB@ z^=DhaJ%{r>WVZlbI-u19`tv0-hHgf&IXhL?Rr87VL_LuN@^8*f<{4U0r~r*RGXT)` zVxXDm4uI?0UC3e+29W7ZAD~iVGeG9W1_3-tTLJPoUI%}m$v10Yw4FqwHZiPgV8Xiq zh4BEoUD)6S$aDqh_rg5^xx(n6jUudiHKK{eHb7<>*@*2(1ez(N4d2jcy3o!q=JZ2D zUIAp55$M}^)>yWb9}i&2P5@c8w!jN*Y%$tXc5vU|(naR7fvh|-pgFBfv))uEX@Iwa zqryc>X0v}m!7Gnu4FJ`|w62;o0aX}fvScLyW2!X*4N z0I6d@q4XvIo2(wMHXG!!^2h+Ult8Nq9)L4q6M)&EsBHkX5%mTm3ZNQ`dBccXcp=Vw zUbruyxxCN-)H#9xxjhtsax0Hw#K!Uh7z^OE(8wbZ?vPd+IUC5z Date: Sun, 15 Jan 2023 12:32:10 -0500 Subject: [PATCH 18/18] Colorize tourney_info_card.png --- .../battle_frontier/tourney_info_card.png | Bin 1606 -> 2461 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/battle_frontier/tourney_info_card.png b/graphics/battle_frontier/tourney_info_card.png index a3c225c89d2706063d62e497e5a6541e6e896385..e6fff76ae9f7c397533fa5937cb544726459f49c 100644 GIT binary patch literal 2461 zcmeHITU1kL7Cz^Y6G9RsqJS3$f&_!gRW1dk5{#j!sEBwWfCNxciV%enXri106hWwh zSQQ&2wOAKZc z1oXK6Uj+bAYxN3T+oF{U1cEfF=p!!eQq$9ljKdXLg%Qb>78%bXkulA!RTcTC zaa$D9e-G*E(yO&_J#_C5(?m3A}Z7eCc z@o8%9oTT43saAn^b#*Cl1&-_0RmSEPz2v_sM!|C+4pd1b_@=ov|L4AQbnSn{&oN|4 z#{NI;55Iwr@AdmKd^#Ov06^TlaYIl2@b*svi&ab-;vMXIY7LEIKrGCtHwkrE#${ zMQ4yfZ-uKciX`&8urWe`AcZ7f^yT4j-Y#N({gtKnVs^lUj{TTzYp~l(LLUtJQ_JJ8 z)A$yh@irl#WTd29=um7ECw#A6zul)0*>*f6ZqMUo1bGft!5~rJklbJR4ey8J&5O-S z#{W(?*9sdRJVXwby`wz}&dRQIK`O2T&l6hulh+8jH?d;sxl9f=Z#Ws;p4^Zh|E}w2 zBywQgy~>ylB%Jm<;c1>CUCSmLmf2bHFU*G?l|WkcxRL>8aQ?Ar_)I_rC*qfUz0li% zz;#0k45)km%N0?#-_=OD>)1%bxK^4_vT1SUMAC?u33{zLo%ky>`#MP_P zT{O=UzUFF`v{PsxG>t_0@11uIQv#_5?o(8kl|8pIZeJJLivt;sMP|HDXB{209AC=cQut3tVeZ7%i)ZjM$o2RtEqNl= z#*gc^6S|u^5pN))X)3<|n$j_usrNkFCOmy*OnYxRC2v&e^28#2zoz>vvc<$nQ@Mhd z`Y>i3*}n`h*+HUevUjT3Bwj&-?R-_9=S5d!S^H`$5|MewJ`Fo^3Ty9#X3s@n)NdYe zH>$!Gs>s)tfV&Tes~+9i*fn%QNcVcInJB`p|=N#<0^qv{{ zdE8$PuS(r;!-4R4Er}VQbCZY`i5WDen;TykiS5(9N$xvoR=C5mp3NJE+Bdhb{C1E# z;vqkav6H%?N|$=_@sytv1DDgiFjy~G&VyR$s_6hG-zfy7b|pGz2YBtZ*)z3n8(jOu z6I{r&@#CQ0xg78sKZH>GtLYGE!xCJrvPScrIckVNfpO4D;l>b8fa(ns)W%qI&`8_Y}|Ykl+61&b<8 zH$mw`!EnkW!n(^8O#@0#Dfa5?a2s5e62n_%H+ts7hh~Uij0Q{JKECG zXh_5CWQChFynO|ue$~9jUBJXuj7{n>OkO^BrxS{1+%NMfv7-Bw%%|5KOJHN4JCF*N zh>2AMk4cZ*2aqQJP~)3Jh((a{O;&-`Fx_Jyznb;v`)G-iHxaZKHH`>S#RYl=-!9bQ zSkRfrKY4xmkXF1++DvTAMY^YY>F4ifG|!|a@$}oQb(6BS;B4>Mx2ywT_H$oJRFR|Z zolkn)hvN-(3v~@_=xn=NMc#W4(@d~6mfSH(;%r~|fBS=Mbz1mn*!#C`b05z}&ejdJ I>v=i<1egGOA^-pY delta 1601 zcmV-H2EO^76UGdX7=Hu+0001+V$6B~00s?7L_t(|obA`YYa3Y*2k`qBwi85^TbE9E z?fM7^QstR|;&k4|!B?s|0tN>b1lODUE8^I~;Y9)$;fgF**|;#v5y<%tbZm9)p_}i_ zyxq5}T}g?rd}GVnmGnM4^L}al-GZW^NGXz*FcdGXwR$=$?tjhs%Sn>ZZ$dBI@74kM z5E?XrxxTO#K-7Tbfk1MwF_3XI0qT;CfLB@e5Fo4KTL8WKuOoy5^mrM-I4@!eK-ykf z|0LAF9GJ2b6$F5bGw{#AatMGXBfmWZn$B#bz`zIM3&X*{E3X4S3EGxH4H%eiK;Azv z+NCpeYYVW)e1BDfl=Oj)9Iz$>ZmT2lO0O*f8dMo%Go;Z19C?5%;#1kNOMtbLc^iPC zY)+&`CmwPMMKLb{NaeEhd|rL_ZdCRMnJ>PE|1s@nDRSA|0uzw!VF^nC+WlEPHrs>xKlM0~nFU)1F zgz4S%D*!5BOhf5L;SU06FDFrqV*~&2! zFL>bGV!)nYbVJz$z*^v$Y10$;9aH2K8v+ThMzp_7<8qV3ea42sUQ+G{CqI%f7Bppm~=51`ZW zC;`-Ps`2lOPo0461gr<#yvTgu)(2GhWq%p4)&YzBrncg4M*_GKd8k(ci~5SoZv}Ao zjx_)uxRIOc9381sAs1+|z;h-;TVCA(JdqrLNwM>|nsq*4WODJ{b0;wR^T!2GCJi6R zZ$~2qKDGiFcL!K6@E)G2{b~T?Ui?-ETm}jh0({tS2WZ?YV28s2@*h+I;C&~6aeps? zojQOHRp3-+pJrGCXxts}4nv`Pg1nRGm;*Hco$P>n`B$g_ptra8{v>i&bb#BP|39FR zTT>rMn!wrC*7ieyEkqNrCE#i(f%^uqwFJ~gVJ&dh1m^W&EL;r)$QGZ}fvpBGx7~nL zR|n3TKyxA?26z&4k$ z3eXzv{R({G>>&UuSPRVUOe(-EnAf*609zGcKehpd>jM9uO*aZ|Eo=Zp5&nMerN_Of zm%7(J_p_^h)X&_iM?cqqato$L{FJ80Q52=}T0e`j?26920e5}6GGDbPfPZAu&$7M% zkuLfIN-IEDPPKx_0d#c&xcyoH2{4eRk;?!HP()=0GX@S@``|4ym**Y>I7arA!)lD%M`a|Nim4&_=PqCSk=go1#>EA*e- zuv8^9r?U3J+lYFRCj_T({D@zpUVO_bTs>L|VAVybuE2;_1Fyu03Me984Tbyi!QQb9 zL_MmYTEa4o`d8=yckTeUSJZ%qL;wO1fB*y_009U<00Izz00bZa0Xhgk00Izz00bZa z0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKqLMG>Lg$p$Hw3400000NkvXXu0mjf0p#7j