From 8186190ef15043138d437302adbbdc6e687a1f32 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 18 Jul 2015 00:05:14 -0700 Subject: [PATCH] Fix filenames and use pngs for credits graphics. --- engine/credits.asm | 10 +++++----- gfx/credits/border.png | Bin 0 -> 139 bytes gfx/credits/border.w72.2bpp | Bin 144 -> 0 bytes gfx/credits/ditto.png | Bin 0 -> 377 bytes gfx/credits/ditto.w32.2bpp | Bin 1024 -> 0 bytes gfx/credits/igglybuff.png | Bin 0 -> 482 bytes gfx/credits/igglybuff.w32.2bpp | Bin 1024 -> 0 bytes gfx/credits/pichu.png | Bin 0 -> 348 bytes gfx/credits/pichu.w32.2bpp | Bin 1024 -> 0 bytes gfx/credits/smoochum.png | Bin 0 -> 409 bytes gfx/credits/smoochum.w32.2bpp | Bin 1024 -> 0 bytes gfx/credits/theend.png | Bin 0 -> 180 bytes gfx/credits/theend.w64.2bpp | Bin 256 -> 0 bytes main.asm | 2 +- 14 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 gfx/credits/border.png delete mode 100644 gfx/credits/border.w72.2bpp create mode 100644 gfx/credits/ditto.png delete mode 100644 gfx/credits/ditto.w32.2bpp create mode 100644 gfx/credits/igglybuff.png delete mode 100644 gfx/credits/igglybuff.w32.2bpp create mode 100644 gfx/credits/pichu.png delete mode 100644 gfx/credits/pichu.w32.2bpp create mode 100644 gfx/credits/smoochum.png delete mode 100644 gfx/credits/smoochum.w32.2bpp create mode 100644 gfx/credits/theend.png delete mode 100644 gfx/credits/theend.w64.2bpp diff --git a/engine/credits.asm b/engine/credits.asm index 727dbb9b0..5a6cf94fa 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -789,13 +789,13 @@ Function109c1c: ; 109c1c (42:5c1c) ; 109c24 (42:5c24) -CreditsBorderGFX: INCBIN "gfx/credits/border.w72.2bpp" +CreditsBorderGFX: INCBIN "gfx/credits/border.2bpp" CreditsMonsGFX: -CreditsPichuGFX: INCBIN "gfx/credits/pichu.w32.2bpp" -CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.w32.2bpp" -CreditsDittoGFX: INCBIN "gfx/credits/ditto.w32.2bpp" -CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.w32.2bpp" +CreditsPichuGFX: INCBIN "gfx/credits/pichu.2bpp" +CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.2bpp" +CreditsDittoGFX: INCBIN "gfx/credits/ditto.2bpp" +CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp" CreditsScript: ; 10acb4 diff --git a/gfx/credits/border.png b/gfx/credits/border.png new file mode 100644 index 0000000000000000000000000000000000000000..d93bddc8a6e6334c7243325e87134f84cb08bb40 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^9ze{&1SA+t^ZtbasUS}m$B>F!rssC^9#G(637BTH z^pwmxf#4vwc}#%|yLs<~UfcXf^NEQY&&=zMPIb1qUzaS;n{~0cXo+cFRKr&5SM7c) n!!F5QXi`{vb*6&sb>jp4<_F>&i-OiK1KHx~>gTe~DWM4fr|B`w literal 0 HcmV?d00001 diff --git a/gfx/credits/border.w72.2bpp b/gfx/credits/border.w72.2bpp deleted file mode 100644 index 32b3fead90ee246df3c774a8b5d53636e255f932..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmX|(OA){z3`E}yA~7t~0hfnd|5Gd;zBTB+mc< diff --git a/gfx/credits/ditto.png b/gfx/credits/ditto.png new file mode 100644 index 0000000000000000000000000000000000000000..17a1191b0c6552c049c2f03d3160cc1580d91b18 GIT binary patch literal 377 zcmV-<0fzpGP)aBB8Qo3vR$!s5!zGD`q_7B&!4pR=9eF zz3cxohM)^>g*C0kEq(mgX8LTGdkp%-+BWd<&o z)<~yf1{(e4UGN^LN7~#1C8=(2;};wi{=u}VD2M&yv*2`zj1H-?s$kF>qk^wGLmCrc z9Pldg8-tQIdy^2;98zO3Pv%bZ!w#tV9%`-^zyu3_3YbrM)Owu+428nSTHroV zaCZ^3G%gI^Xi}Fycb6g?eHRH)--W{krJ|R&<2JA9`dO{vw^O%$U-ekZf7!|d6ifDR XcL%}NH;X&c00000NkvXXu0mjfYu}=( literal 0 HcmV?d00001 diff --git a/gfx/credits/ditto.w32.2bpp b/gfx/credits/ditto.w32.2bpp deleted file mode 100644 index 59677a90fa1e52f357d683bbfe595a84a3a6a0dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmbtSK~4iP3=GacjGjnu{RC3Kvb=yV1ogl*+)^o8 zU9j=G=7b8X4P?t(R_~i=?TugbZz&(q@OiLB+QItSd@S1~fplGKuvu;+*aN9`(7JOS zf9tRME_4iC`Y)r#b?k!5^Y8tJhWRvWJW(EzM}0&w!PwX3HF47=^msJR1UYZW$lq9H r3T@Gb06k`sUaM}w#YR+mkC746>F4fOeeET^ytC8!)oG)a9Mb*(CSe}> diff --git a/gfx/credits/igglybuff.png b/gfx/credits/igglybuff.png new file mode 100644 index 0000000000000000000000000000000000000000..3a6d00194f345a1880b179fe85c7911e1209bb91 GIT binary patch literal 482 zcmV<80UiE{P)WHT4_Lf5j+%{QyOX6eoyBkI6FHF z{evJ{DEvs%?9A7%ol;*Ne%rpHSOwU`^##S;tpuiRT>ub}1JiJ2I}TT91EdU#dW=f2 ztOW(?8Y{tiEHDkB=RDpM_qC6SaVLTm;ld+Blb~S`wtRl-fw5o&eof?bgwtihN+*03 zl!?2PkIKBOo0=*jRpc>^@(7~{(wi+hrH0@yG435NDyNeo144$^fMjTEjjnjoQHuwK zd13fb%|el20txB{x3rHQx&aAh;U4PgrshL;H~uU+f}ht5KT7=JIH)$&2@`>(#)N!E z{rnI4{IfqhgCUNp{ZaTWv_A?1+2?o2JbZr!yfH8D`{P>ePupsL80p@qxog9OWpbKo z6OQ^*MA-Dle561EiqD}+8%0xX)cj3>VF2;Sk|D5&#oksL)aFsKeAJ-oXT{oupeEb^ z!5MuX;GCL(ncQO=j)y$voUZ>mcMDs=6@|bhO*wrK|7gQF;V{#x-{qZyCX_a!?C-|% Y4R%YP8b%rPS^xk507*qoM6N<$f~uX_-2eap literal 0 HcmV?d00001 diff --git a/gfx/credits/igglybuff.w32.2bpp b/gfx/credits/igglybuff.w32.2bpp deleted file mode 100644 index a626c758dcd77ecaa3011c7ef695276a47454d1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmbtTu~Hi`5Y_p>Hw+o8@CPVVDNRX{8C^riKj4{s0R8|bQfMeiNfr16%5-;u#@)de zpdtlbj-jw@%i8Sf@SVm(CIz$2O4@z<-maDb+pq*uFP!|XZdEC31|=Bjgdf5lBtF}W zrgMUp`qXDGb67N6HO9CzZGF*w}Af#xzp&T@c;k-sjsvjG1=2)6gQ+z>c{kbp*(8N;h#*4FJ zKLc*DK&>9sR2h2FP=mb)M0p(9_?>p{b{Ex6ksn`=?oYm7jUk)w_!Jp*NxH%7da%3T zo;%b|d{H!J@Kpw;7#DfS(^#HCKQws&3H8m$Mg=`=8faw%cCyvqgAcRMcddScdn>QQ zdEfk1xd9)m$07`$-<4a$1NhM_g9*+4+@HfC>_8ev#r}E+qzN6+Yu@v|PgcFxeV9~JQa{GwPOcDKJdJ2? zi0QgbuX+2B7A<0PzC2zeS=X@$L@KF~jiIgk(6a5?+&rClJrN*%8u{2Dy8 I#Ly@E3kMi9a{vGU diff --git a/gfx/credits/pichu.png b/gfx/credits/pichu.png new file mode 100644 index 0000000000000000000000000000000000000000..f98642ec87acb235cb5f72690d9afab878e8397e GIT binary patch literal 348 zcmV-i0i*tjP)1p=5QX8l0z=p;1k@*;nIoi93~5{~V)j1kfFbx4va4lsGatceqMaE9cS(w*iW_~P zk+u36Wc~39c11A2F*pEBZ6*P+Gz`?qO~Xb=YQtD&^lgSnrrvKUNT?zsvxtP;P)Uvr z<4L3{4h!V$c)J+*{bIxU@hp4AMqYab<31a@Y8Vd&jz|LH-UBEM4+Yb1(%1-PDjGq$uVZu?=(aVoYA_I+PR-H6Qv6wGGF+qapF?N1=ja(C^YQZ$(SjLP@w@Hu7REl)yuk@LQpV uB@}uOl?<}fSo_-W%ib}M{_oFM`||1wJOURA(5b3{>(Te zaik)#Czj$Fd&b}MJO<|Es9?bzJA(oh81e-;)E9_p1RFTK1{$&pi7R6n?VFV>)N<%K zE^#B4j{8`}QbLN3I@?)4YHCg~dIqi8nk(~Evm;QnJI#q@Sai33?a7aNlkWTkG+2r5 z@~~c|Q}-Ov@^N!~@Z>U`A^-Pz0fG(veknBMi}1Z4#FSwpPx(Co>#3!jKwrQ96M?V^ zqzt@3(pm4XkS0N*CCq2+4!CFER)X1?C3epAcr~Zk6_DoJ79hwoy h^-kH^GfIFP`$eB5^|y534>;@4uwLP>)&Gz8{{~OZR$l-B diff --git a/gfx/credits/smoochum.png b/gfx/credits/smoochum.png new file mode 100644 index 0000000000000000000000000000000000000000..415bac2685b4ffe4d3e12b1dc9b8b4827b8384d2 GIT binary patch literal 409 zcmV;K0cQS*P)2I#}UC@hNVc;(3ZbLLa4zd(R&! zm3D83hI_-uNeJhB{8W8f3V$60V(Sfqa+dZw!gdRWDh0TfkAlm(mI`nsWB{iT{651j zA-H{ZyG)g~qYA3@d&Ak_ijMBeRS%D1UY5(!8HDwCJ!Y7{UK|l>Tf2-KUN-%!NbgJ< zYpV`IrF>Eiy$ni0V!%ZZb^v?*wXu4-I6O(uI3j~LF$px4K(*;MGP{W~`=8VDc6rj` z6Kk=gh2TM38=mRG&Erj1Y;-qlqk`;!L`4UXxm8b|2sA+8DG~`egKVPX%XZSSeEFWg zGcDiYKR-X_=Ql)MALs8ZYBXMtSk$UqiKtIwvq5iomMCX#Us#kUQEa32sSq1VNk0@M zX%&~G1^bcwEDoF>vc%D<(c4s}&_SlC+TtWi2b}!_q10VFrJlSx00000NkvXXu0mjf DY>2Yx literal 0 HcmV?d00001 diff --git a/gfx/credits/smoochum.w32.2bpp b/gfx/credits/smoochum.w32.2bpp deleted file mode 100644 index 83926ec95658f1f8cce0fa3e09cdd76b1dedc8bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmd^8y-ve07<4cq9V*fh)C$865+g%|*?0_i1V)fRjRbpEx{w#3k5FWZp<`F14vpy0 zv8giDrB;v6`Jqi;0Y#Se#h>lF^Bn`rKBt%&>JTY3_MoJOVmQbB01Ow7>02~Jk>Yxv&vdj}oVu!|R%=I|`56=InP8lyz$P={jXEoeXZ$~CT` z)B2tcmxG77fk#(d#p6WGM(NvBBB6Rmhe<^Hq1v&GrTRl%;)1%?7V%?WP7Y`l{9Dv< zlwOWaR+oL%xn$3`*rQQpk6OMjDDG8T?1_JcJ@0R^A6MDykk~KWocqe6a1F6v%%89i z2SHoKlGsPn58RRD&WaQJD9*XJa}*9WmiQS4iPc4md32j$Og*cs(9^|UfjOXqO8l(& z$2Ly*kMD1FSZlbcfL+=2z*@1O(5{*Qs4@ZS^R;u@1uql8KM$#9)UfFRo0%*DPZza@?|YZPMaoLm#Gp Lk-dG1+}`&K@Aq4+ diff --git a/gfx/credits/theend.png b/gfx/credits/theend.png new file mode 100644 index 0000000000000000000000000000000000000000..165f8ba8edd2ccd26efeb6e9388914cd62097da5 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox1SA+v+Sr8vscKIb$B>F!spmKH9#P<7y`X<; zgNqu6cGZ+CeInaee$cuyQ(>2qOo1I|qqMibe6lisYkcywYeyci{+Vkp=*_+)lljVl zjR79B7k_A@mU3|a{b{?ub4G|WBhit;qA#*y})+2EeqLH7hc)7_CR4& ePE4)Uy4Ctd(JNM*Ydx?Z`U@_ZeoV3xCUPkFFbZWfJ_t%q7fWcr~@2G3x>G9l|6JD(#_&d% LO}W);2(kYKlW$z& diff --git a/main.asm b/main.asm index cd970f697..7a8862f27 100644 --- a/main.asm +++ b/main.asm @@ -79791,7 +79791,7 @@ Functioncbce5: ; cbce5 ; cbd2e TheEndGFX:: ; cbd2e -INCBIN "gfx/credits/theend.w64.2bpp" +INCBIN "gfx/credits/theend.2bpp" ; cbe2e