From 647f9b4452fb166fedbbb987808bb0dae9623db2 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 21 Jun 2017 23:45:01 -0400 Subject: [PATCH] pngs in gfx/title --- Makefile | 5 +++++ engine/title.asm | 6 +++--- ...terleave.2bpp.lz => crystal.2bpp.lz.cd5aabdd} | Bin gfx/title/crystal.png | Bin 0 -> 507 bytes ...ogo.w160.t4.2bpp.lz => logo.2bpp.lz.f22013e3} | Bin gfx/title/logo.png | Bin 0 -> 1044 bytes gfx/title/old_bg.2bpp | Bin 4096 -> 0 bytes gfx/title/old_bg.png | Bin 0 -> 1770 bytes gfx/title/old_fg.2bpp | Bin 4096 -> 0 bytes gfx/title/old_fg.png | Bin 0 -> 691 bytes ...une.w128.2bpp.lz => suicune.2bpp.lz.30e490d0} | Bin gfx/title/suicune.png | Bin 0 -> 809 bytes 12 files changed, 8 insertions(+), 3 deletions(-) rename gfx/title/{crystal.w48.interleave.2bpp.lz => crystal.2bpp.lz.cd5aabdd} (100%) create mode 100644 gfx/title/crystal.png rename gfx/title/{logo.w160.t4.2bpp.lz => logo.2bpp.lz.f22013e3} (100%) create mode 100644 gfx/title/logo.png delete mode 100644 gfx/title/old_bg.2bpp create mode 100644 gfx/title/old_bg.png delete mode 100644 gfx/title/old_fg.2bpp create mode 100644 gfx/title/old_fg.png rename gfx/title/{suicune.w128.2bpp.lz => suicune.2bpp.lz.30e490d0} (100%) create mode 100644 gfx/title/suicune.png diff --git a/Makefile b/Makefile index 380c61324..9227fc660 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,11 @@ gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace +gfx/title/crystal.2bpp: tools/gfx += --interleave --width=48 +gfx/title/old_fg.2bpp: tools/gfx += --interleave --width=64 +gfx/title/logo.2bpp: rgbgfx += -x 4 + + %.bin: ; %.blk: ; diff --git a/engine/title.asm b/engine/title.asm index 787872939..36e2851d3 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -387,15 +387,15 @@ AnimateTitleCrystal: ; 10ef32 ; 10ef46 TitleSuicuneGFX: ; 10ef46 -INCBIN "gfx/title/suicune.w128.2bpp.lz" +INCBIN "gfx/title/suicune.2bpp.lz" ; 10f326 TitleLogoGFX: ; 10f326 -INCBIN "gfx/title/logo.w160.t4.2bpp.lz" +INCBIN "gfx/title/logo.2bpp.lz" ; 10fcee TitleCrystalGFX: ; 10fcee -INCBIN "gfx/title/crystal.w48.interleave.2bpp.lz" +INCBIN "gfx/title/crystal.2bpp.lz" ; 10fede TitleScreenPalettes: diff --git a/gfx/title/crystal.w48.interleave.2bpp.lz b/gfx/title/crystal.2bpp.lz.cd5aabdd similarity index 100% rename from gfx/title/crystal.w48.interleave.2bpp.lz rename to gfx/title/crystal.2bpp.lz.cd5aabdd diff --git a/gfx/title/crystal.png b/gfx/title/crystal.png new file mode 100644 index 0000000000000000000000000000000000000000..6f430cf1f83d2c9b5b9b7e6f0d3976c7db301043 GIT binary patch literal 507 zcmVQW-p!N|qtilZ#3#FnVLOz8H=%MgR?p$Pd@wo62%q4OFBt+qA z8zdZo-~KbP6IVz{;rP=(^PUsWBd4FXvM;jhdpW>!F~F_tu%1Y{#mg)zws@G#rAIqE z52fnROulnec394stqy1ru+;(Y2$*$o;CZ6Z#ev&%MJS53wruJM+uOa?5w=H7Vv7^D zXTH3)#Ywm4t5oYsvX*#(%lt3p+CnLs!k;8}XrTp~E{G&Yi=U!t3P{57_;sNHkY7^J zq{-AE8CC7#3init#J+RsBav?yJNF8V3<3VSeX!nPJjBu0xK}JYWQt7D?hp*|!+-~^ z_kr7?QY;nsL{9Oji1$I=!yjU_LFC*)50UDFrXBuB`OoWOUzJ80e4bGrX{5o$DJG;q zgkUviT7^=!LctqnBWgI3s`fuIbjRe95Wfy{8hhABBhhI*)=f3CK%o)eAh5%fu*}Kp xj~R!t2Ak7}XY;m4vtbLmx}>a literal 0 HcmV?d00001 diff --git a/gfx/title/logo.w160.t4.2bpp.lz b/gfx/title/logo.2bpp.lz.f22013e3 similarity index 100% rename from gfx/title/logo.w160.t4.2bpp.lz rename to gfx/title/logo.2bpp.lz.f22013e3 diff --git a/gfx/title/logo.png b/gfx/title/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2bfff59c9d8d4a188e2df4c35c5bc066954e6237 GIT binary patch literal 1044 zcmV+v1nc{WP)002M&00000@=!a{000BqNkl7zgmjIF=%>lufbIZ;9O8N3hZ9`dMj)Eh3I@kW}b&)%v!iPn{8I&}>1KHt-En zA&OI!Yqp`HLAN5{$^RJ}uK`7|6m*B!@z2lO4BjQz@q8R&XEbx2@nt$p4J^5-#R$q3I2`PL~jizWf&oVe%}V{R<@Ws|5jGxdmCbsg_RR zf>#l8LxR5PxGzL=Kq0XbHsPKEt-1b9q(OhjT~`Y&g`9KX23(NF3!lCS!0ZM6VZviRe z22~)npLm1E0Lclm!~`=hVlfylY+E}*pyS(=r|+ARUP5F966WA(fkhx^a|Yx zBt9|`_sxX@-l675-Dtmq9_|<-qlbRaGQgnM;~G>0{>^*C2P*=^LBy%P1q_bxZT;n9 zNPHmBA#uFe2yAqQl^$vdYq;ZsTtVKZ*qT7)*Z_2P3H{L!(jp`vkqIQa;_j|%Sn!EA zao<-ZhKokEGII2Y0)vUwDda;gyAh8M(BPqA?F=1egyCwHp27r+ z-wL@y$O;BBF@UlGakorzqUjC6800Eu1%6J9xPU6268;hPY37S6EJGxhjmO>^1CFgl z3wSWvnJb~CbjnpWAO@+vv-WAtXjj80uHy{i8??4_4_ygS!zIKZB^S1yH6OCOC%l;; zJb~3i{PJa}37zF979C&dp5OfgJGJ>4Ox!++&E#=1P2zMv8BeD1IDULgt(`aFI<|9M z?M}vICS!)3aX0QxCTVd7apT^^-6YOym;hSdmF3`2!(9nY+%d+E!zy(J4~J0$&K#%i zl0n1}<#sqZf_wO94GWA6SG(Pq;jj2O87ICO4_{Lk$6s`QCShYzHGKZ5<)1TueeOU1 z*k8Kk#~&WP>chSM?R|eWTwTJCAGWK(XzPYsTpk`C2BX7hHFW*whco!$>(3qzM)&=D zA90|U^VMK=8F5%aT&yGF^Y#q>@>!$Cty}VC&2Zr1^XLq=?z-(?d;b7+heDS&6E152 O0000q881?;q$=4GsQRc$i@<*qaZR<)gnVo@PFyJO3y?pyjp zw*blA*@2R2>p+`O`Gw)GAO&YF*)LNSMtu=o^9x$D0Rpu`KB&4F#)unCeevDB@1FOZ z!$#`Rk8u z<+&HWclx~_9{C`CEF-A0QWVW?_$28k1#*$p2^4$03ZsLSF}=^c#<%&rez)K4^YU%f z=JL3ahw-?)tcRictGQ86)-{^TqAXR>w32&*&1JJJ!@BH_dnyKs%l76Q>v!&YXJ+u= z%fG$0X1X^w;;BD;<*6x`wS9b||A8AWi@{^ROclnrQ=eK3{*>s%B-rUgiXz(HLagR_ zQod(7gp{jYFHUEf>FgWRSG%ZfzjxHL&$Z7r>e=t5`Wu<)e3#fIPUrJ4QXK_@%B)z) z4~p@Kt>3Mv?~EODqYFG>h~$`uhOGT$4>27bA&l$ZI%ZuwF#qUd8z1TX=DH1`UM;K& zh%{virBDG~TI#^eDfC^&Vn5^m6aG+;VF_wbiFP;W=1AI72&uxpSxr8c*cj9M_2c>l zy}Rj;Wf`1hG`s-y@a6$eD;U1DAH^>OV%*~a_xAQy2NhO06 zgk(if!x=8Y`WY_*_K85kgd;2j?;;P#1vm>8Am}bFdWYT(i0DB*QhB}-#g<7dOl1)p zmSNf6gI_u^NF7&A%K#I&(@SuX3LKexiV$-o0t7IO9h6;3gt9PW%-0UqO7q2%TqH$O zYS=#@&;ugR`yh57&++UMn&TTSgcYe3FUcv{LC;8PZ!@w+tFpBc1w<+$g*IteHKPVT z%!3c5TG6PQ*B7rZT8&cy?pU%dzyXckuo`=7nx6&g*a8MPj&BP;7!J`W<+PlpG1;=@ zD4w@oum7xi)2!-My0yhq4j(b$=P;lV7t666W1}?|MN;HPMz-wsy|QID|1!mXLrZFh zY>1ko0Zz>Q^Y%YJE$ijU>dxwTz5f*1Ui$Tcm4VQGUtSgK_;zBkcIQSlT`QE6<=|{& zHe#jgZ@W!%g>y!M^CFQY@-BHn{+h5dOt5rEnvgC^C#7jAD`hQWNto)tI^C-#VF0Mk3&3DN+<^o|Uq1ZQIe^-I*8jqNs?95WXTzmFdB*0Pk6ov!iVA*X5oM}xt8bQ%Ln|`x_y$7h!m|Nh2P#R(nR#0cl1fSQGa!;?@-2F_?9&d7z+II|``Doz8z=<;- z?HHhXpuN5O;Z0rQgI@}?Q{9fkZZs-IhO7sBL~jgVHB?T))s-SWHYZjk zP`oqVzHt-n8`}3w&p`K%jl<~aKT&;f>yOaT*1vxLT)#d>^$+iS{iPrG3t~DGi~IZ@ zZz0t`Q4U@BYB@9;%co~!0^#lCX$EmkVhjd4mJ`6IrFubT^%o7!bHPUmbbilS-5 z<}rEKvCg>}eNblEhE-K{JxpeVNGVU^LTA{^QH!cN>(IMGBSXNRBMhX`wKVnV=7O$i zhg9H>alsK*=!`7GhvW&eopEtKfrqRM&*7{3tH5nu)zrKqHlFJh+IW_2-izyJX7mJ^ zBfI5rnBy4ci2e(FMR;iLnnino?zMKKW#otnd|Gsi3o{M6)^F#tt6I9{5j@ zar4RBzd83fDd6uI$8WBTp93zy#r*SXg#Q1pB0syP-P`yyu^)lEu^=Dj7oO-1@`yul zZ(wH8`>!t^8OR(#6{Jo+C%%KUMl5uIsA~DaWM|ZT54-RmGRf9;qKRPC?G1ckbw@lZ zZN>^-@OLDlt2v5bHey)~1X;_x)Wd@cRSY}|Ef&XU){tMX5IOG5T diff --git a/gfx/title/old_bg.png b/gfx/title/old_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..2b6d5db20b458dc000ed1b869946e6669c22f6aa GIT binary patch literal 1770 zcmV1YtBd{rx8>5xzjM~tSm*N@eZ(F5}LNcz=Kdda2{#G8qZD!%4GNG6X;}k58}R%xpaF#Za@gd~YU4 zfV%Ru+%5;||bY(jPy5Y%|c$ zUdMGF-fg}8Oba9^_7I>_=kSaKw5LFg>Rx{&UR4NyBn5F?HnAxSt04-Zr0YW1KJXKu z<=a6vsrxPk^$R$(onfFj2t5S!l{&GZD=L;I7Hg*%2m>ets6n#}uvF-Wq3zcQusI7r z9qCS>Ybl_@Pz_G$_?fUNzXWJ2-2n6wupL%)%-E$V3G~^|0R03s0Zz5__~eHY=njHo zP+`CggZkNcc6!HP0229UfF2ko1DqS2MVyj=mWMCH3v%XxrC7%R$N=NxR}nvyKwn;@ zgK0+U!cykm0APbMNG&(PPe36LC#_+zNC5Zzf@cW(*a_EYJS%xPYyq6~fF1&x1C*i3 zTZ2MC1wfFYhk(N&2`H9l$V{${6CkX9L55x~@c=&o*fEG}LKK{CpqKiIT?V=;4EQ5$ z;21q%q+=*Z!%-L*A)uy*l?(8dZbKy@M8c$MLkv)&)DZ@x;ZH9TFr$%yfe8jU)qU{V zzTqMPNm*!dQmU4!Dlb!Qs{6(Q4y_FWTn4IrLHW7_PFw2fpVp~%X7cx!0_dxKJFLdp z&<5PMEcLCSx-@+7s|EDAp>*OKP(aGu+u(y2T#K5RAmERlK?$|Kqs>5)0S$V^>vEt{ z43MGna~ySAXBQkYP!jvNn-a*^0N-cBOPHA0ov|G<_$-+|-)#m?+>%YOL7U%AmJvpA zV8qA3kO!=>LHA!I!_xgA0SVs-tsU^KaZTM{6yj$nmdav@XUlb76hk8rUa)!xRIYiH zayN!XIp+Z_%A`JF!OW;ON*#aSGpwMIGsJv*nu9nKR?aS*U6>igZNGlB$cEfpt^*(r zC^G>gkSHUq`4@|#vWnT8hV4w6W*b=ZebdgBjq<+X3_ieY8Si~}AE@~ZJGYcu!W}YP zW5Yl3!4lq!?*necu*>rg=GhRZ8M;cZcjximk38Tv&aQ(yv`pl-K1GH+wj4xbnf9b* zT3I)dPLFK>O9E{0R`SE+$4)lx5+I+*5a}{V;Jxo{-2J50Z z*=#lfdODdTK-ULZ?s8odpM34%*x#H#$K$g)#6T;w4b-u%J!#l;K7DU9w2`wjdL#{f z3lcatNV~b}Skhqr_4qrfJEAU=mEUxUl>C?(qn{QM_u5fM8bwJ z?a*5uKr!#Zm*_F#FZ!l;R`&{;mZLp}(&%SEr9rp`WN?*mG+p}PbwPp>%tc6Xivh~Y z6Hs}&RF5dJXjT-o;M6okGZg0*DbBBA(~@z};TiGU@kAn7Dk1b3=cy4z*TW{xjHur6 zRaL@NchOl{e`KYQQwV+_;nwS0?c`!zujg@Zw)cYc^8!>&?lQ zUa;p(Z19JHiA|eBZ7dE`>mRp2wC+c*P8ainVYtiiutQQi*kuQAJ?v1~a2Doh&~EM8G~Xo+OH!BrV0j-t;giqjz3_b>f>7uB zIGInU(|MlP*qIn_a!}&)Tz;a!f0%O0(9c(s&W_P|~Lcjbe#_>u_}Z^cn5dQB}0h z)a|E@dsh`5zf_C`L6Qz5oJm1Ih#)A^OZRk#Sy?t3@OT1#wvP?mh~X57fVCmima5;d zr&|Xb&ShX8c0ro}MBLud0tMzv$(>5yJHMZ%Nv9v~I8}VJH=W$b_`+=jdswS-O_k;H zz4BX)FUvt4KDpkJ(L3CvL%h`#Ngl&}vq)>py3rhTA=qiRZUB(2ENhChO1j+H6x^jxtdOtqbb{6EaO# axDB`sxDB`sxDB`sxDB`sxDEWL4g3K(*O7Jr diff --git a/gfx/title/old_fg.png b/gfx/title/old_fg.png new file mode 100644 index 0000000000000000000000000000000000000000..1a7351d58cdfeaf0901034c974e146cda7f650a7 GIT binary patch literal 691 zcmV;k0!;mhP)Xb6X4#uF9%^q)U@5kH4qg#@HX=6p}+8^2zsk`8_-d_<;+D1jfb+ zw|trN?03g-@*a9UV>>S(k#M=Y=|lDmzgNJgykoeV9t_W@jS6^c*pa%yk@XDwoq$@- z<#yH=i8sIf1=2@W1m;gC(YO7d43NOI)L8Hh(Y?7O*}HB@F4JG7O9gD29;?12;jpb^*ME!F5H6P%9a` zP!vvZyTvhy+?!phlX|Armkf3-e8AL!SnW(ZU8ffA48H*?L@qG~G-j=w!SgdU?;fLZofM_F84ePrJszDK}iwcNRVyFd4F(<97<5o(Olq0V}V`@|# z+Crd}$^xnYh1*LI#R(`u?0S1_4`Mim7F^YK;Ifyb?Kz5mOeH0YS3)D-sIX8c(y6X1 zQx^ZKPfqLlkp2XwKASpCiTIgxJf4bY@FJZNiOM~5flcWw2R>6!dk7f2&X#6P3%ug1 zrp4=QaaEmBm*~K_JHRq(W_($kpa%FOi`Gox;ame0#p3+I2(R$PYy%i0__4-a?pS~8 zXqP+7kJS8!>Yecmukt-L6ZRMT{O!+<^J`*o&05`h2Kt;Whu4>Cefc@7o3Fvn+Bt{2 zHwf+)24sR$_7=ej>hipBj-cFMUM}Z8)@abjFITpg@vr=)0tg_000IagfB*srAb|fE Z{s0udXnt0RzJUM$002ovPDHLkV1kUZKZ5`O literal 0 HcmV?d00001 diff --git a/gfx/title/suicune.w128.2bpp.lz b/gfx/title/suicune.2bpp.lz.30e490d0 similarity index 100% rename from gfx/title/suicune.w128.2bpp.lz rename to gfx/title/suicune.2bpp.lz.30e490d0 diff --git a/gfx/title/suicune.png b/gfx/title/suicune.png new file mode 100644 index 0000000000000000000000000000000000000000..074a8ebf7e6ce9a1c70122baffb8fc2b2ec743cc GIT binary patch literal 809 zcmV+^1J?YBP)M-iRfY1MM?CQUuW}7NM5*4t{C?c}%Zds6vWR zaRTVT2nVZ3rb?F7YT&ZN*}nq%2XM~84B(9%5U_||L7!#I*JcVvcA!Myea>VB^7~$b zV2_CXaR*puDCS^~A9n99m(&V>Jk%51OHtQGx;jrP?TXrLQDq&bdCp zB?3*nss&id(7xIL^}?9)wko!Q+P8V`G271^p~60F8a^^00kDbuvLb#C?2rajlAPiS z#IhYId6@B;UwR4WOe{ch(Dg*gDfk9hThE@Ay`=QYxi_!aqhVi+eFtm%_bJvJH30qY z2KwC*tpnsuLx(C3_jggM52&wpTD!O|fEwFxp|K`B!U8lQt__T{23#pLcjyXXr_U}Y zp(#vYOvH>J6gyMsFXd4aljC>{^yMoLfrigo@jnCgDL~KV;03&Z{{TpB;0kD40NmS2 zu0YqK(UvI3-Tql|>X7-`SW`c^WLj}jNj+94DD7J1^0XH~?f~rq>=dH& z5(Ky}x|#s}mWT?j!p_0uXqEkKhV2IG8RGW^=)Q{|26XuV8IE=bIL1;+DRil?8eo_U z4n^uaJx>ZbwDJ?<_7~Vj#qCR&sJ?V+0K8rfDTG>>D4rh?8>m=soesxlgSRcL<`1zD nAbToEg(rYA@Y0JH@HfC8Mz7U9oz$j&00000NkvXXu0mjfrXO+= literal 0 HcmV?d00001