From a3c6931fa8edd09fcea678fd8d2e9988951380de Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 18 Jul 2015 22:01:59 -0700 Subject: [PATCH] Use pngs for some misc graphics. --- engine/pack.asm | 2 +- gfx/misc/badges.png | Bin 0 -> 517 bytes gfx/misc/badges.w16.2bpp | Bin 704 -> 0 bytes gfx/misc/font.png | Bin 0 -> 770 bytes gfx/misc/font.w128.1bpp | Bin 1024 -> 0 bytes gfx/misc/font_battle_extra.2bpp | Bin 512 -> 0 bytes gfx/misc/font_battle_extra.png | Bin 0 -> 280 bytes gfx/misc/font_extra.2bpp | Bin 512 -> 0 bytes gfx/misc/font_extra.png | Bin 0 -> 293 bytes gfx/misc/font_inversed.png | Bin 0 -> 736 bytes gfx/misc/font_inversed.w128.1bpp | 1 - gfx/misc/footprints.png | Bin 0 -> 3012 bytes gfx/misc/footprints.w128.1bpp | 1 - gfx/misc/pack.png | Bin 0 -> 282 bytes gfx/misc/pack.w40.2bpp | Bin 960 -> 0 bytes gfx/misc/pack_f.png | Bin 0 -> 356 bytes gfx/misc/pack_f.w40.2bpp | Bin 960 -> 0 bytes main.asm | 12 ++++++------ 18 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 gfx/misc/badges.png delete mode 100644 gfx/misc/badges.w16.2bpp create mode 100644 gfx/misc/font.png delete mode 100644 gfx/misc/font.w128.1bpp delete mode 100644 gfx/misc/font_battle_extra.2bpp create mode 100644 gfx/misc/font_battle_extra.png delete mode 100644 gfx/misc/font_extra.2bpp create mode 100644 gfx/misc/font_extra.png create mode 100644 gfx/misc/font_inversed.png delete mode 100644 gfx/misc/font_inversed.w128.1bpp create mode 100644 gfx/misc/footprints.png delete mode 100644 gfx/misc/footprints.w128.1bpp create mode 100644 gfx/misc/pack.png delete mode 100644 gfx/misc/pack.w40.2bpp create mode 100644 gfx/misc/pack_f.png delete mode 100644 gfx/misc/pack_f.w40.2bpp diff --git a/engine/pack.asm b/engine/pack.asm index e765bab7e..fb19d385c 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1688,4 +1688,4 @@ PackMenuGFX: INCBIN "gfx/misc/pack_menu.2bpp" PackGFX: -INCBIN "gfx/misc/pack.w40.2bpp" +INCBIN "gfx/misc/pack.2bpp" diff --git a/gfx/misc/badges.png b/gfx/misc/badges.png new file mode 100644 index 0000000000000000000000000000000000000000..4e5820da8e54dce2a6789c999c826570a326e57d GIT binary patch literal 517 zcmV+g0{Z=lP)lxwO?g)&G;1svG zaEc~AO1Xt0Wd^x#OO#Tejf3z9$Wzlro-|yrq~U?3CgFPMq04(8u;aZB^6Q~n2JeO6 zhHMRGr79f4VL-@l2y7`)h}5BAL1rOtz=T+q(7*aXhv?uk?Q!s|$_x^)l@?5q-_IAw z<9Gqaqvc!GYhR>%zeuoNDAgrFW=`poY(>&IB77Vta&ts9r`nLQ%GhRr+HW%LOhv_M3%L|VB9@Lee)aBiiI8xs~0DX{lMKF|9LHyNrhOv~zUijotD}6n%T+ves13%-}n3TAk^dQZ(cr~ z%g>J&@`XGht~}U1dTu;XoJ%Lt3EwN^KTRx*Ig@x8W8X_BdV6Xk(R#2806~CI*LAJ$ z_@xu>RoZXc-V3hiUZFGeIqPQ|1D|v4t=*?|O^-ua5Du{nyGR?T=*n)K*f!4#As|92 zs_2?!Focj{4<~2itLmm)3YP_jEJN3#3Y35t5_rBWl){_xsyZ7VP8v2s07O+?yWEsH zxqh1=hA?(iSA5o#>$ufj7RrKU{L6=Vp5sbkKc6*87uLv-X#xPHn!OFN&a~h`Av1`3m+mYhOQRfC3Y;QeqG_p^E0L0#(dHDErNAAUutf>%;A+*fCmJ4lL zOIy=EgwXx;%XeC2KPuSM%mXi3Z7r5*K^S9?ysI2$CHjk2Q$lzigrjOEwVhoYc{TZN z0-+>Uom6hmTJu!>*Pfg6V~Zmn9<1EWq@pVDHi#6Pr#kP|tfX?Plf($=dgDR!ytg>Z zZVzl+|LwZ&GX2JUt+BW4K4M)~qh41l@0OwH{T5@Cx~{W8W{EewZF3yYhe9HdU;xK? zKVWE@GSpRJ#}|QreU1xUg=pBnKIh5L`w}VydBc-kA#j7DpAX!i_&+a-QdM<@zx}a7 Q0s>d^W)J%B_&fdo0Lh>-6#xJL diff --git a/gfx/misc/font.png b/gfx/misc/font.png new file mode 100644 index 0000000000000000000000000000000000000000..7119c06913d39f507dc7f6ab81cf1b71496c0487 GIT binary patch literal 770 zcmV+d1O5DoP)_^sBPQaKPaI;|G3xLB9&#zr_ z^|p{MR7LZ-@oVA7=NRt3NQgR8+YCl{<0a#dTg z0fr;+hM^d-c90qbm>uq$614aRfD74x)^cqSkS-F?5Gu)GwG3BIZ@_5*F&Nof0u25w zo?@7d+*eGB3>Ns5EEZx(7M~SZTZe#29B>&nbNZOuWt-J~NKf0wSr{ zp$P#>SQkRfJ5QyB8?F!yyKG*j;1--FRniOvhX(-SCxCuo$DS>~#jIUs<-pWwfiVyO z>(4rL;dOrdV*ima-&MQLsA`pbnJU-|Tzh>2nBP)A0+=w&s29Kps<;8XFMV|pkrSvC zRNEAP2@(>4o}5-jyv7jE3!>`_3)jcEq=_9+^&f;HF;*dTw@W})mXpK>K=udEthfeb zJ)Y+W0Q@r_pu`Wm`2!1aQ3!dC_u|23p*SOlz6UY0Kj<-zdDO4k-URCvyNQ}Tma*jh z4S)uX83J_GD?tATU_83)B8Jli>vM!&u=rJnr8WNO-6QjHVl0>&+rmQgZzrI3$~_?5 z(p#YYRJ7TE1w8>$Hvqj`Oxb^LhK$NaxI@x(!J+~W8RT68|Iq3F0>zj%RTW_L4*&oF07*qoM6N<$f}sph AqyPW_ literal 0 HcmV?d00001 diff --git a/gfx/misc/font.w128.1bpp b/gfx/misc/font.w128.1bpp deleted file mode 100644 index ff8d2d4fe255e3fb51948d454202e2b84d98475e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmb7Cv1;5v5PcDc5k`c?n6LyBgh`=vB9#c@5MnV`gy15DNu?r%ixgKLVG&|Eg1E{k zkkW;#;3{8W4ikh6lRBllH2DA*V#yo%a1}6~Lz;Utqc^i}MH;GD24@XafpM)wdJR%jx zv5HWsFbq`%Xnp@^9jd*NcMtQ?&jDnU+)Pmvg)K`GARF57(cOuJ86m>A??L zp*ozI*E;A;}U*_?gKi;ogg|Ll$!MM-O2C7(UWhIck?fZ`z wcRJHrb3)rcwKtx_M%h-+z1hn@U3>1$&!Fvp?<37QS#L+ocfDot4{Dy+C;$Ke diff --git a/gfx/misc/font_battle_extra.2bpp b/gfx/misc/font_battle_extra.2bpp deleted file mode 100644 index 77c2f3576f794e5dbfd90c62e117b9ff52419d00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmZ9Ju?oU45I_%vj!nmckcvx-NOg3O=r=ey6kPoW7e7H<{F3g)srUn~869sCI)uht zW3=fDDfcc(@7e%ptsiFG&D3BpKGp}F=#zEIS$ckkGwpOMP?^zp3DR=}^t^$_a|O!t z7Fy3Wm|C_T_MrNRO`}xX!Fe`-cEs_1Pm^=9(TK6l#`QikOeX8~wnK;@2t&?=;5-b2 z06>W8G|%a!s}-FlielGM6xJ`7=kxt8%iGPmdtR?DqULP;kK9^SAu8qip)6xjl%|Wt qe4b_Gv}SJQ_qU~tqPl*)j>o~rel<;(%Oqip&Qhwb;}}s&@*y9Z>5O3j diff --git a/gfx/misc/font_battle_extra.png b/gfx/misc/font_battle_extra.png new file mode 100644 index 0000000000000000000000000000000000000000..15e25a40c4290400d490e83ffaaf8dac99e048a8 GIT binary patch literal 280 zcmV+z0q6dSP)SO2JnMIYFUoK&LPnbCh)KIXdMSfvkpJ#h}%oO1ASiG&Y1!PfwPufYb%H zGThp!sqj{1RQOC4+E=rgw~DM>z#zSN@#7AsrkCfy0sP>5?~kyh)>DqxaAQ&qwBId#Kb8v@lz3P3o z*t&-bk5E(H-0`2Ox^0Gej;J4(G)@-rtP$A|ER{k13)QhO0h4We&H-juAWABb@}E)2 e_sUS3uJ8k16=I?SHrO2i0000kV?rJxSm8?fZRSvk?*mn~l&YB?Qs*y%1PXc+TrO*VHxV@LgAyNXxS8 z;FZerzDI>pgCB0-<5uZXo0&(5=`)H6gzWcUKZGG1v~52$Q6%N*B<1m#B#y?i()4mE%QVfh@t9J}ava7! zHRuBy4P(otaf9LmhVy$*5_9&vu48Ps%d+hjH&KMYNa<>IKEr$7He$Vk}$3x diff --git a/gfx/misc/font_extra.png b/gfx/misc/font_extra.png new file mode 100644 index 0000000000000000000000000000000000000000..7ca840c3aef83de4e6c8e9efe6b471a2b49bb82a GIT binary patch literal 293 zcmV+=0owkFP)nnb_*4D?2*jlYRLZLAE)}gvVZ2kZ8*+*N_vx@}5Yx((3q(%DyT0KzZE%@%b@|fA z@_@#ytHdIt?NJK`h@VQ?U~M3{flKNo=Ea$zc=5^{1@$JqBL_?`-Z2cXymVR2obrY< zMnCm2&jYe8ruCTI(0y0RZMLR+$Jmka`nK@wm(*0iXw$07kzQLjII~lR%d*A@!?0`< rLs~9;fa`{vbHfCdh4msf9Mc28Lb6p;Lyoj%00000NkvXXu0mjfd(wo0 literal 0 HcmV?d00001 diff --git a/gfx/misc/font_inversed.png b/gfx/misc/font_inversed.png new file mode 100644 index 0000000000000000000000000000000000000000..519339f39d7e75e5cde08e64bad0a59745badf45 GIT binary patch literal 736 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 gZWk07*qoM6N<$f@&Fg_y7O^ literal 0 HcmV?d00001 diff --git a/gfx/misc/pack.w40.2bpp b/gfx/misc/pack.w40.2bpp deleted file mode 100644 index 22be550812c2f47168017d53597dad29c7bda96d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 960 zcmc(eL2ANK5QhKsEnXH1Ie}h5D(KGi0F_)s$hHfi0WT!IfKS{CUf~@;5F*4Z(oWyZ zi}n?4vvg*W3?X0U%byTgYl0#IG=@>y_suhbf&wh+qFMVU(pm*&%+~CJrvAp0dSCG@ zPU9O0T#mf{^rX>yvP_ypsg>G=-LkfBM{9{@LP>k1hkU==j!QP=BQ1r}jL6n9Us)@+ zqt^WNd%goax9xqI>5FHJH@vpp;A|yd$8eOt^Zf>x{gDU& diff --git a/gfx/misc/pack_f.png b/gfx/misc/pack_f.png new file mode 100644 index 0000000000000000000000000000000000000000..fbe120bd108c63e6ac27439b9c7257527cc111d9 GIT binary patch literal 356 zcmV-q0h|7bP)-=R zZQ6)0z(x@DBhEHuE^HU^$@|M1Lj$LX-aazFS~&p;a##%Ma8!G=%|?KBSRVVuTEJ&dlNq_bn^LsG;ND6N+$D;|tvu4Q5~dOxiZ zJ%|T0Ft_5NM1pz%{&f!nhTqE-0&_u>&E-A7gOQuZKx;$~M&1KF7&!q6`9Jf}E*_f2 zL$i3$4R|NIT_bi=_u|OB*S$c3z6YRsI1p`rcrPcJL>;*(s2vHa7 z;xRnuaBDvA*}ZciG>ye7vTAXuVsbaRrggNAah7W8O`ROB$xD_TghBhO{pt4IzW(%a(GFS=Y1^IvlEYg%2Byoc|QWS4E z@4NkGcdar;@owM(^W^!Lyd^xKjXms>hVjlSX~j@()huZo?;#FwM{hWacT>Gov&#SA vb(q8AymGtZ|Lbv&kK=U`&cr?2V#P$b&tyS67F4jmUd>y5<}Z9u8@|uqs>f;k diff --git a/main.asm b/main.asm index 7a8862f27..8e98c2c4e 100644 --- a/main.asm +++ b/main.asm @@ -27686,8 +27686,8 @@ CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp" LeaderGFX: INCBIN "gfx/misc/leaders.w24.2bpp" LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp" -BadgeGFX: INCBIN "gfx/misc/badges.w16.2bpp" -BadgeGFX2: INCBIN "gfx/misc/badges.w16.2bpp" +BadgeGFX: INCBIN "gfx/misc/badges.2bpp" +BadgeGFX2: INCBIN "gfx/misc/badges.2bpp" CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp" @@ -40845,7 +40845,7 @@ PackFGFXPointers: ; 48e93 ; 48e9b PackFGFX: ; 48e9b -INCBIN "gfx/misc/pack_f.w40.2bpp" +INCBIN "gfx/misc/pack_f.2bpp" ; 4925b Function4925b: ; 4925b @@ -79966,7 +79966,7 @@ INCLUDE "gfx/pics/kanto_frames.asm" SECTION "bank36", ROMX, BANK[$36] -FontInversed: INCBIN "gfx/misc/font_inversed.w128.1bpp" +FontInversed: INCBIN "gfx/misc/font_inversed.1bpp" SECTION "Pic Animations 3", ROMX, BANK[$36] @@ -88988,7 +88988,7 @@ FontExtra: INCBIN "gfx/misc/font_extra.2bpp" Font: -INCBIN "gfx/misc/font.w128.1bpp" +INCBIN "gfx/misc/font.1bpp" FontBattleExtra: INCBIN "gfx/misc/font_battle_extra.2bpp" @@ -89063,7 +89063,7 @@ INCBIN "gfx/unknown/0f9424.2bpp" ; f9434 Footprints: ; f9434 -INCBIN "gfx/misc/footprints.w128.1bpp" +INCBIN "gfx/misc/footprints.1bpp" ; fb434 Unknown_fb434: