From 00257be5a0df02839f8e25378c90b61b74f4e049 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 14 Jun 2020 19:42:17 -0400 Subject: [PATCH] Match mosh remaining .2bpp.lz files Still to go: - gfx/pokemon/alakazam/back_silver.2bpp.lz.bin - gfx/title/hooh_gold.2bpp.lz.bin - gfx/title/lugia_silver.2bpp.lz.bin --- Makefile | 6 ++++++ engine/movie/gold_silver_intro.asm | 14 +++++++------- engine/pokemon/bills_pc.asm | 2 +- gfx/font.asm | 5 ++++- gfx/font/unused_weekday_kanji.png | Bin 0 -> 142 bytes gfx/intro/charizard1.2bpp.lz.bin | Bin 1344 -> 0 bytes gfx/intro/charizard1.png | Bin 1203 -> 1219 bytes gfx/intro/charizard2.2bpp.lz.bin | Bin 896 -> 0 bytes gfx/intro/charizard2.png | Bin 809 -> 816 bytes gfx/intro/charizard3.2bpp.lz.bin | Bin 1200 -> 0 bytes gfx/intro/charizard3.png | Bin 1239 -> 1233 bytes gfx/intro/grass1.2bpp.lz.bin | Bin 480 -> 0 bytes gfx/intro/grass2.2bpp.lz.bin | Bin 1376 -> 0 bytes gfx/intro/water1.2bpp.lz.bin | Bin 1248 -> 0 bytes gfx/intro/water2.2bpp.lz.bin | Bin 896 -> 0 bytes gfx/lz.mk | 11 +++++++++++ gfx/pc/pc.2bpp.lz.bin | Bin 32 -> 0 bytes gfx/pokegear/town_map.2bpp.lz.bin | Bin 900 -> 0 bytes gfx/title/logo_bottom_gold.2bpp.lz.bin | Bin 1142 -> 0 bytes gfx/title/logo_bottom_silver.2bpp.lz.bin | Bin 1176 -> 0 bytes gfx/title/logo_top_gold.2bpp.lz.bin | Bin 416 -> 0 bytes gfx/title/logo_top_silver.2bpp.lz.bin | Bin 402 -> 0 bytes main.asm | 8 ++++---- 23 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 gfx/font/unused_weekday_kanji.png delete mode 100644 gfx/intro/charizard1.2bpp.lz.bin delete mode 100644 gfx/intro/charizard2.2bpp.lz.bin delete mode 100644 gfx/intro/charizard3.2bpp.lz.bin delete mode 100644 gfx/intro/grass1.2bpp.lz.bin delete mode 100644 gfx/intro/grass2.2bpp.lz.bin delete mode 100644 gfx/intro/water1.2bpp.lz.bin delete mode 100644 gfx/intro/water2.2bpp.lz.bin delete mode 100644 gfx/pc/pc.2bpp.lz.bin delete mode 100644 gfx/pokegear/town_map.2bpp.lz.bin delete mode 100644 gfx/title/logo_bottom_gold.2bpp.lz.bin delete mode 100644 gfx/title/logo_bottom_silver.2bpp.lz.bin delete mode 100644 gfx/title/logo_top_gold.2bpp.lz.bin delete mode 100644 gfx/title/logo_top_silver.2bpp.lz.bin diff --git a/Makefile b/Makefile index 546074a5..f197fde4 100644 --- a/Makefile +++ b/Makefile @@ -145,6 +145,9 @@ gfx/pokemon/%/back_silver.2bpp: gfx/pokemon/%/back.png gfx/trainers/%.2bpp: rgbgfx += -h +gfx/intro/charizard2.2bpp: tools/gfx += --trim-whitespace +gfx/intro/charizard3.2bpp: tools/gfx += --trim-whitespace + gfx/new_game/shrink1.2bpp: rgbgfx += -h gfx/new_game/shrink2.2bpp: rgbgfx += -h @@ -166,6 +169,9 @@ gfx/mystery_gift/mystery_gift.2bpp: tools/gfx += --remove-whitespace gfx/mystery_gift/mystery_gift_2.2bpp: tools/gfx += --trim-whitespace gfx/mystery_gift/question_mark.1bpp: tools/gfx += --remove-whitespace +gfx/title/logo_bottom_gold.2bpp: tools/gfx += --trim-whitespace +gfx/title/logo_bottom_silver.2bpp: tools/gfx += --trim-whitespace + gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace gfx/slots/slots_1.2bpp: tools/gfx += --trim-whitespace diff --git a/engine/movie/gold_silver_intro.asm b/engine/movie/gold_silver_intro.asm index 7f4be3bb..7195e7dc 100644 --- a/engine/movie/gold_silver_intro.asm +++ b/engine/movie/gold_silver_intro.asm @@ -1571,7 +1571,7 @@ Intro_ResetLYOverrides: ret Intro_WaterGFX1: -INCBIN "gfx/intro/water1.2bpp.lz.bin" +INCBIN "gfx/intro/water1.2bpp.lz" Intro_WaterTilemap: INCBIN "gfx/intro/water.tilemap" @@ -1580,10 +1580,10 @@ Intro_WaterMeta: INCBIN "gfx/intro/water.bin" Intro_WaterGFX2: -INCBIN "gfx/intro/water2.2bpp.lz.bin" +INCBIN "gfx/intro/water2.2bpp.lz" Intro_GrassGFX1: -INCBIN "gfx/intro/grass1.2bpp.lz.bin" +INCBIN "gfx/intro/grass1.2bpp.lz" Intro_GrassTilemap: INCBIN "gfx/intro/grass.tilemap" @@ -1592,13 +1592,13 @@ Intro_GrassMeta: INCBIN "gfx/intro/grass.bin" Intro_GrassGFX2: -INCBIN "gfx/intro/grass2.2bpp.lz.bin" +INCBIN "gfx/intro/grass2.2bpp.lz" Intro_FireGFX1: -INCBIN "gfx/intro/charizard1.2bpp.lz.bin" +INCBIN "gfx/intro/charizard1.2bpp.lz" Intro_FireGFX2: -INCBIN "gfx/intro/charizard2.2bpp.lz.bin" +INCBIN "gfx/intro/charizard2.2bpp.lz" Intro_FireGFX3: -INCBIN "gfx/intro/charizard3.2bpp.lz.bin" +INCBIN "gfx/intro/charizard3.2bpp.lz" diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 733c30b9..fa610df1 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -2185,7 +2185,7 @@ BillsPC_InitGFX: call EnableLCD ret -PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz.bin" +PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz" PCMailGFX: INCBIN "gfx/pc/pc_mail.2bpp" PCString_ChooseaPKMN: db "Choose a .@" diff --git a/gfx/font.asm b/gfx/font.asm index 6d21bd49..4d22efef 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -31,7 +31,10 @@ ExpBarGFX: INCBIN "gfx/battle/expbar.2bpp" TownMapGFX: -INCBIN "gfx/pokegear/town_map.2bpp.lz.bin" +INCBIN "gfx/pokegear/town_map.2bpp.lz" + +UnusedWeekdayKanjiGFX: +INCBIN "gfx/font/unused_weekday_kanji.2bpp" PokegearPhoneIconGFX: INCBIN "gfx/font/phone_icon.2bpp" diff --git a/gfx/font/unused_weekday_kanji.png b/gfx/font/unused_weekday_kanji.png new file mode 100644 index 0000000000000000000000000000000000000000..6eeb69b116d3d85a2cd065d76145877fd7dc44e7 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^4nWMo1SA;LcJ5mQq(VJi978H@h5ByfJix%g{e>Z3 z^Gn0NdCV<)luAU`cuiMp&hTma#mLY*&9ujwyG2T`OD$Elc)`w1S3fU`OcDuSvru=V q{NwL));J=d#Wzp$P!Vkuiz@ literal 0 HcmV?d00001 diff --git a/gfx/intro/charizard1.2bpp.lz.bin b/gfx/intro/charizard1.2bpp.lz.bin deleted file mode 100644 index dbcfd4b475d35c9981fa10129e73c1dd7b700e20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1344 zcmY+EU2GIp6oBuYJ3BMm-R?}gHM?Tzj9Y%HpdI217+|KIEmULDz9?!m-J%c)FEzxt z8p2GwyX<1XmLP3S8m6`tGz4jgi9a#UmKG?cvGqwvOgc*=#aLx3)ojb|9LGoRwW;PPj2!Ui^R`rs0t?(>VimoZh?`$k9%lZTudjJsvd3Ed)ZrJJTnoCZ*clUxpS;l+{UD#@P8EU*o0Wn+` z-o07be6-E&eGxtb_4-Yc@QN5UQS$un_M5dUb$=z>k{w+gj%iy3>;CtDe;M@tpMXL0 z+<-M&ikE18Su8e|BXAM+!R592wadnUu?0oY7Bqln5uh7;?>`Aq4-SUP1u}`syNV5~ zhs^W5z$0@A_M)Pyd`1&3X15s7O_!#}O5eHG<9ea9#T zPfF%%IFELyG%E^&1;pIDwoiNI8!ap-wkj6m3Nm!3N&Zv$)@jbwf}P zVUjdzT=6g=n5GZ;>Ov2e7o`-{AE>O1gzKu6#&5n}PP77Iva5q21Dd+JZohe2@dM{s zA@M<7Hj!!Qs`Xv=_++z|*8>Lh!JIy=&*<0nUc3zp&LsZyCY}xW5nmCZA_5=u`RXb9 z{){KVP{`00C&7(}&#yjFY|tE;*pioO zAx0KA+?Z-%X=+lR(DZyO7##L67hnhQaX?svOC2V^b|)06?-EsmfSbG}mA?Qy9V-tQNy>caXFcc6SBg@-CHm0wvMciNp{``}&2 zxkmS4$zuZr003$v}>4tN_T(&$?*1oHgLy(g_J z8Z=?RKluDKvXGliqbsAnLS)-)FiYLOoxHbNunf;68GeD7-UQmjJks`c0xRN2i~s-t diff --git a/gfx/intro/charizard1.png b/gfx/intro/charizard1.png index 79b8dfa0852baa5430fc380ac0779dbd20f57c4c..c8cbe6b1e6b113ad83d6aefb3c494db70737650d 100644 GIT binary patch literal 1219 zcmV;!1U&nRP)LUC-i56i9f-S(q09tGw>LE~n4pIPUt<8fM(4apLw&jWI`875npc{(-R)@{ODL@#` z!y5nr{#}S0NP{o= zSByxz#@7ry<9vsan}Bm0E5c-Q!1-gJr1-TfKUdJI@qM2pZH_ZHaUX-yHg^$9e7|tm zK%h%5cOx>W@zR!f1b#25aL(6Azs9*s8*x+*Sxp1q=3kfJcLntv1e@60skvLz7_5ih zHa?Ji!kvSa<@a3>H}G16`ygm;oyJg>fQuj$I{r%i1dd0J*3zBPX6bopP>c8FW-He!EkTyiBHPEU;M!hj2N?PkE7vmm3*At20}_M{v%7@ z-;IluEJ9iU12;tj=a7xK_)7;!N?Y6j>jrv&s2S)r^lgw7dsYLRfVy2N4lsZNKve*n zofETuPn|!LR+|$jW)H+$_7)J-O~g+Hz>7`+pW>S1ehc7;2HfX_f1@Fyt%*H=rwDs^ z(8Yw<4WJuVyGA&Z*W`Mm5vbdL-YzK^MzJ@=nuDLTw+UVj%$yIb<7-POLcmq)f{Nk@ ztX8C8Pfp(nfQCw&6@CeXPBhSf0TEEK2_dU0z)D<->N$9TRmxyYsw$Y~z$p?e zK%}6(uQno6JgtH%6KT6O*VKsMAO(DB1_cFp_3vxw6H*4sNM2~!F9a4fz;%?`HbwAn zL1j762qCK~UQLRrilLM*QlSV!!M;A&bVS1t3J5C|1K9Fb03;Pn#{@Kf(IZOIXUo#O zDS9-Z%p$#@DXD(nB!!mP2#J00Q3h$t5*A)47 z2@8L@Awp?aJt(kp@N|ZW$|MIzy=<(*bOx!Our`iwL8=(Mh2#WN4#W_$&67l@9JaZb zz4#IpYgh$CMD+@GyN8YZJOiC`>zHCW^mWcn!ITGTa1)XBatFF!{ h11iN{#5$v-{0}qqfl#X))k;sG&Obu9YZE zU&`jtOYts=NiN0>>qGy6?VgG#sVhS<-ig&WBgwx)9TLI^&FFdb-d9F)=VSaoweHYp zQeCFM$Kf*dL9iuy=tGMwQau3bEsz9&*2W?^KJ~kcWD-Y=7Wdi)pKdJ^5SJ~`IY1CB z(rW+#-dzfl;vB_T7&YaH&B#zht?|*Ut|3(`8C73CrQx4FB*J=dlv7pUX5k>|6+}jZ zariH&8oH~Lr9{A!DK+;zO%e)E^YBo(xy_TKP`dY25>1oLhHA(+- z{v}gn*7!zB&pF>ybnA0&;)$^&KIHtdha~ZzFOp9cwQBr8QGCpChi$B@SK8&arV>9W z95s;Wip}j1saNBr9q|afj$h%NZy#fz#;B;US%h0s`8oYaTfU~g^ z_^_hr>RR}#F2HF7q5>z1lD_G>NcagQc&dnGKxsfVRpX434pI_<<0nJ#uF~gt8EhsK z5Jg3K15_>&yv)P?&nb~eW9+6r^mCfv@7Nct0W7D1Vge_V8C~neQ8=E_C+eXmV*#gA zYT%;!)edZ#12be}4E8THycm&DT@v@9#hLjPmbSfAE|JjG48^VZXm_d^nvn z!zkJK$5{DxIjp2nTq0QjD5i8<%*!(hBBiUpbbLwL;<%$G*7o&90=w`@`m`H*&Jv0f z!1pz=F{lZa>LRXZD8Y+BoeqvrP94=ZEFm~1+|KH{MDpH%q9++u0G#j~)K>c`$u|I& zXu$nB3TbO>_TX7glVWU`4WL`(7+0zW7#X9jhOZLm^0<^zKa89SJ{$1j_anB9U;DAM!Qgl1%#6bVzPnb54s)f)$BXdZr$lf?0-nD+H&pI!A*s!#;{ zp@$W#r^iYTXb=DvOZ`1YQo;cuK7LC_6kffb4j&dnPjqx_!}lq5s81PDoiYJG9pt#s z5?cWtj~L+fnq-RzS440|$|NHkv%nQ?xOf``*+Oh3;=&DF2!hq5Bn^BAwbdnx{lX;XK7>m~tTcAZ9N^opRW&bEF~-&u5OLiZlmX zahf@4%57qP&8VwWZUS@~L&+vnizndDV(4S0ZZS_fzv7qexnxT7>qVrK=|7!4@Zd>h RUqb)@002ovPDHLkV1l(&MS1`L diff --git a/gfx/intro/charizard2.2bpp.lz.bin b/gfx/intro/charizard2.2bpp.lz.bin deleted file mode 100644 index 1fc35fd5084fb2d68c48b8307b935d16c0c86fb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 896 zcmWlXL1-Lh6vyB9&9^hNZrvH1YBxo9Hk%Dm2xclC_E2_0zD*j6nDitfxGo~~qAiM0 zFm5 z=LsQ;i!mxOCP`%t2|D%!{=D*e@!|3^V)=R3Juv%6P?^6HtcJ)9J<(K4a-h z^@FD?-`>q;5qXeG_@R61a(!_3N8*G~noegjqnQuo{KfC8<6tlR_4Omg zb$v5XLw5B?BGH@IRqLdEI#~5BFKaV&(DG&w5{?s|5)1R88t6XHc%Ojw(23h$fH3ljh)9COCWWNZCWWBDM_?yCv6z+11{BOC}opCqUc?M|>8)p!v2=WOx z=WN24FIoC5Z{2CtT2X#`ZhWljSb%wK!#im?NCg+e{hs+0a5x+j>Hbx_EefcjgszpJ zGIX#xLs`Wdmc=9wbEH!&?&a8%e_rcuaV@T{;1X8wGCIqo!l{Vg6Q79_f<%_iE2E>z zXzWE*JvSJHVZVO~TexbM>{;VDy6B;g0fr+e?YNlPf~e#1>EKoF>pW1S$q8d1JrLFL zOXtK76`Ir}(G1@^ynArA_x)}`cwY6E6ta0{$BY3jp&eOk#wYm&t-EO_!+ufPI=BzgGQ+(koTA<<{4&mV5 z$X*Upw_%$&&I-st%G{nLxNw8k*@QLJY86pBDq|80JMVWMbv96m*y(tzh&lRZccwxn z*-y?6G?(Z{&{?cPa-AwiccZLY@8rSnhtGwq&mz6YEuc2oMS{alw5l!5ei65AYup+( zbS=3EdZP0r!sQ_m$zE@m#=A3r%r$BkF5Ic{lnSSsBw3MeOHzTooK<5f{S`f}uhD;r z0aF@CC1}AKWD{aROp0un3y%e<{qg8Am&hBkti~0EkSkKr=koQNFjh|d>K>Yy zd=~eu0J)~J5^GAOHk>7aQiWN?e73puZoQ5-z=}?$G(K*8Q+Qp72jqn0hpvwR{{cZF BhAjX9 diff --git a/gfx/intro/charizard2.png b/gfx/intro/charizard2.png index e6ec213915f61e5c413f590ce1239bd685bf4b42..56cf3121b1486222bc1812d9b63885016769b384 100644 GIT binary patch delta 793 zcmV+!1Lpjx2CxQ@B!BlwL_t(|+FjH?Z__{&0Pt6vh{`H8sI?fWn4(*#fT60=x}Z)h zEi?wi!p@f@7}%l ze4vz)DD(|c#PmynzA+51Qi1%W%@DadC%M3Iw%2T8KA}IKzJFi?1$*^!LdP2$Z&L6c z_D9KENBuaiMs+b9cA;`UJpfb^(AVp8I=?y)U!guj9yNUwj7m2sTyos0{x;#l&hjbw4p|5R@AAI zEHZS=T?!FB5r3Hl7tJV&8pT*7hL#NdwDi=_vY~G+BGgpZNrw^r(L#&RIYT05GZM2@5r3HsDrm${_!WXX0nTC;YufZJ z-S9B8RQGM0G-hZ~B1-);VQB$?8Tx!Ha8v~dC^uA~_4{ZWvrGMAX#3{CQ9(o{ijUr{ zODdfv*#MXp7~kEVlcghWC}r0|D0ADZ3xZ7}<2Y55V@I@Ji*gunPX>-?fF{I`%}m(2 z3}}i`RDTVPGzbz_V|iD12=u9_n)Z&GUS3eFr|_GIQh^5}Ap|o`USw3C22tq=ffvN| z^e8+_ETe+pvTjZ)vnAbat$n(4=_o+%Wvw>7HcfqO=fWK#JrzDEZS(^XKIWEEw6q9e zk(veZqoWR7CsKOF%+Y`oMJMbL00Zt}?SD|I@q6mL+$9Hv{v6NlDe51aLJ$2V z{S+(A97&L86rns+x_{i~J~Xu7LvcZ4dX#%#FP%&Sv$#qB|k&M(pT=ey|jFxcIlytuNmf;E5-wbk1%9Cf5VBUnuie0^G(6{+j!YoWWZkFVc5LpyA{N z)UFyY-2D@l##2T1B zcN)ES)Z@HTuF1im1EtaQ08om+JX<3gJ#FCEsK-!*j(&6d69{0bi)*!Q2g#{u&5atI z(S~Rb^(czCCFSRKE0uB-)r#o{ns&^!5;W+gqns$#{q0Lq9#N{Z64Aye6DC!Pl_!W& zi0DZ}qv$DWlz&4RP0+7`o=?#CCJ`E{*%Y2~z1&2BAm<%H*j6Ht0gKsu+0rTU+zW-D zH{+~avUDPbC@zp;GtJ6RD0mHvC>W9=BigjIgbhqYfEDz!a;;=&nc_~u9&5;ya%IvH&meYhgdXbhx*0R_U*o-jEG9ak3Xy{DxD!! z2bh+~?{Ckk+>x*pvl}7gY0;|-l1(EMI8{|cN3>p(au^6t1&(NdA;jHAB8#~!7~&`^ zMbQjM5`R`@X~$BJifU;8xZ$Olt@a-xN(COCN-3G8ETQ_;iE>X;#A9M+dX!#4ETMwn zvT05jIx^kXJfOEwjsg^3(rnRZ)6~a?RE9f5W-5G?+vv~xGJGluim}+xB7|9N7sOph zZMaFK&5DVmK2>PvP-}`#Vv(G_@UVKM_3$HgUVrM6gVG$wiwBzer%0iP{*q~Rt}$_> zKwVJ%)R8v*(m@yHB@OAX+W$6jGxhELW79vrnM{aRiLw!PyXI_-Z>FALqSX>& zf_}W(L$8a$-ro4bm6a8&0(`2j-hJ(;t;`+4s;ck9mRpg!j!p}`{gVC<(X>$%yJ*Np Q01E&B07*qoM6N<$g4Y*^g8%>k diff --git a/gfx/intro/charizard3.2bpp.lz.bin b/gfx/intro/charizard3.2bpp.lz.bin deleted file mode 100644 index c4de8391b2966fda427146e7a53ff5c1c409c37a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1200 zcmWmDe@qi+9LMqJ>2ve}T6z^E6fIuIHupmqI5gDI-E|&p*^d~US+Zq`w(`eJW+o#h zHjeeq6)ZYpO-wdSh&92?ZCT?6XIfqaa#{miiweaa*7ydi`HUD7_n7@a>s3XygVf)5Z}HE2C2DW=F3zYvX9N#IK*|$BWe5+MtrQBaJib_ zWri`Jqo~2jBMHH((}Wps#3ou4btfR1bUJ8+bW)Qyh=th!-s!Eb-ub?N@Y3K{KfE4% z+7~X7q@Z#IqKYV`r1YM1$YWErpd8d}7N{TNkggQ1UsqMNrKTnz`DLlTSZKY?GMPw( zx!`N`mtLo#0ZpoRIL9WKG>YQ|^PUx&=KzD_aKdR-<_%-5li64np72$f`%8}p@XPvU zJLQY2%4!?LhTXf;(;xf^Cljc`v)-QUTbKj1fD*6v@2~>8+oXW^Ybx5D4_HHx1VwpvrNUUY?(O$l7R$QcN*+sTM^i0r8#j79;qp=0@EKE4>(nW? z`+0w4M@l>7=V@4P9Mu#!AP8uzv$=D=Z)Q!d1Ma8h;6*_q)P|Rg$-ol(O}Yy#yE2!3 z)Nx~W_pErZ|H`k&Q7OW)nBM5^KJ)qMcza?P_A32Jo=}yvBmRimX1Ia3E-vL?x-D*- zWF-rg(qg(b(Q{fESAI-gOv-)_%~%++v!z+Nc!iExHGvzf90qXX^=VGDKiQ@oM+uwH zr}ZMfa4>Q35Fr@bj{YRrfI=T+;EsRMC@Q4%1-Qn%R-f5Qu zgo(}0ZSXKa7`LNObfd>bgcs^j6*QSlr{DyZvomC8)@+)Dj!z5RMbetB2Gh8qs|w;%;c#qF>@fA|*G~P3>vU zP%8MXpsAXR-#;wNVr@wmJd`7&bS8#I9e-D!=;-aRIIAnNFNU`qv(3ivh+ex+fFKM@ zn_aHPMz{{obzVN1+$wF7vXD-u<1^EmzGiXIMTdgL2;Bgk>HY?x{A v%*M(}5d*vn7ZfYtHwTEvu?*ipE9l@AY$V2wkifE-mBo>Q9qikm84JUI#A+bs diff --git a/gfx/intro/charizard3.png b/gfx/intro/charizard3.png index ff4f656c319e297bd6eac20e504ef51b365307d6..031a08a3fc755270d5a7666b80b4f237d04d05df 100644 GIT binary patch literal 1233 zcmV;?1TOoDP)1_B99&h$ zQXsnJA9C$OL3Fj{eM6>W zkuxH5&t9k|B<)MZwHE1iU2u{d$W$ve@cL!Hh|)UkcI1_@igG_Z+W0D#bmUz9t0?(V zdH}+YfVPe?WcgqNe-K)?&2q+Y#&7q-oqN1SXY2iJzv)BHC=q={NuKK_kehv!Mv}X; zg0!BeE_B;dwk1oIa9JHIo0q2Q=LECMN_WqfCIWszcHVpfH?B>%hXvGX_F(to)8i$~ zkgqEw*w;PD_%3b59QbH6h z{hcjwqc-8s4wn3aQVt&gzaG7F$&i>XR6JXCcIGoT8N-+|%Pb*w$BE|cDWD&U4(s@SFxiubI(VuK`uvw_=IK-UZjr(c;ScJxI{DVTcaNj z@ciCiP^L6nl+?Lv_HRT^$p8sCVb9F|>l8Z0PfW2*vqd}$pG!prDS_1J&syX>+wpg6 zh{3xnq?ycKD+7;qH000D@NklP2?D3ws8vK-*Z0W~Hi ze1t$~se9-FoDT>4MZ$;^5<+>8%=b_TnN{NQnf8)(5n)Yc(uu53@VFuG4>@>|xjb z>FvCk*?BWSYt+0Nm}d94YAW0%7U+xYStB)sTFioSnmx(b4TO@){^n^psnXi<#S#KR zvjK|iS-Q9wL%6}9j19biG=_K+A%?V3W)U&0GaxF&k?P1Gj&&8Yu`F2m*D0YT!Xip> zF!R%OVgg!V=BI>#8Gt1flBxw`l*D<2*^e4Io~{uUtt>46?<_h?I9UBC5rSDeB5wAh z#sF($XhIC=eb`VSO@;Z}I5tZj#D)MGnTB{w4HxN1CwQgWqM;#69TArc;U zew-Y>o%#+2xl=|8R!3tm1LdYICz0s0XRSN;lWlAib}-SIhx z>WV=_;Q9=X&T=s1P5CxFI+1QW+VO5_Iad?nHZQ8}n*d$wfJ&SES_6%xs8$(v4=ph!BVQ8*&H?FgFk zXmWrkN|-}cKU1aqeIy$7a;T(&5-k)-NZe(=Vl8CN>rhzs}5lDW|+rTqapPI_CAH0pVlw8+m1Nl)cz@gHat9=0Q>#=jg*r&Z4`iI$z^u!i|*qEx8a1do`)AW;mQaw3e5j28CDfkbooT4vKjparNKqU6v- zht!NHJO@58Qc1~98{N+*KzL)d%Pyehxx~)XnCXKeU;IYb$!FUs+qfn~g>N~eBehpw zy5q+-UO<{hx$p@t4PL~Lcq;uuh_mO^ai0~ORlJDwA zzXsQWkJzQ|Q?rpiJqtq-2jY{F5I~nNV%PpMIp|Zv;V_BYaM=ew^(+WY5ZDnGOG$<} zWbY0^<(fz$GTq!4d>Tgtut!w5Qu=YK6DJeIRs8bJU6002ovPDHLkV1h{| BU}^vW diff --git a/gfx/intro/grass1.2bpp.lz.bin b/gfx/intro/grass1.2bpp.lz.bin deleted file mode 100644 index e10c760e64efee64462ad5187ae71b64990daf32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmWNNv1=1y0L9;>cbB%3ROq5B!9OgOx?Lc~^`r`aB@(e83=O#4ew5o=48VFcz^aCpv2mHqS++&%Kxl2b4IyLR~ z6m14;Ov*8_)zCI_;Iy3is)vSS%ADwGH=6jZe?c9t_bc2rKXRYn`D2sOTwX!)tf-$A z1*|O7yr-NVbG*T1?pnVni(Hncxui5KdYQ|}do?JhGE@OH?_gq$enN6W;6TFs1lsHexjKUf!!x3Y}g zXZPD%?Lh_OgkA$=f$EG)e=kNXkVLucx<<{&)&@weHc;E`REWXWustEi+51-%zAs;x zt#@6|<9yey!NKO{j*bWIC}!$$eMP#Ry};TJ@7s3Zb9gRT!Jp>~oN^Li@U?4)3+9&r zT?&@?VPEUZdQnsLO_`fpZMnxbm|?Nzx-MG=0vo}uz-bHC)r|BFXcpxpI1((uFcjgd z0Wa!J_&0-J9^HCW{^yLDVx*HL+04&U#*SveFry%;pkzS~M<51kpbrd~on01<#$u|P zN)-y*szovJX3Nf)1~a3&)X6*x^2iuPPsXh)4&mz}ZmwpoNo z#!fL+gE$NqDybeovdDpGjMM>`fE`>3!dYlETLP4^Y)g90?i!T{!XxM%DGIgfL&*X6 z+w$z}14dV~COxbvbRNB(GbIQOi{9n(PG^bM!3loTPbR0&N^Y_E9+v5)PlPj}BIIpN zJAXZ_!f_bkRc;Mc&=q-mFnuld6Gmo}E{C-cm8Q{tiI9v1h9kWgih%~6cd<--pj32z z17lnw7EUHx^C8b$y!`J|JHrhP>2whA6pue>t|x?2P19GfR(lIvbI{4ga{2moxCJy& zxQtLy#5h^^BdJ4bMXIY$B+_YqhesZ*2L(_G&4wst3@RpI94LdWoK`w}A`JIn9n#`zsH)9WgE6|y+Gs325=iS?o zhvZ@;NWh?=4KJWoBafGT=bz-0JRUq7G|iLVv5<`Iy;W(SR0Ld-zrc{N;3a7@jBEll zCEp=@FW*s-E-w!xz^v_VH5ld&uN1nNp~p->)GjiYxpr~Oli?0Cv`v9Dqhvpo zuM)c}-FBQDB&?ItZ_cW75P~s#f1+uIti^iF0YYU>EuFU@s?;DC%<&Ubq#yhJmng!C zCg;ky{1MR_ShCyBkW?y|>kTB#xpR6XWT`Rsa(eC1K`4uF0_97;wffle#_13tM30|W z{+yCmWB+KkuZr}Mv!)&m3v&K|BmPNm;v9Vj)p8;JtAF3~-WMS2v2JFNL;~*hKEW|? iPMcJ$Nkm_1e-Qi!3t3-9oh3CJ;vzinlzdeXh|vEi#y>g$ diff --git a/gfx/intro/water1.2bpp.lz.bin b/gfx/intro/water1.2bpp.lz.bin deleted file mode 100644 index b1d0c164e6046e4f1c2f5016e230f4c029d96a20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1248 zcmWlZdu&s66vxl+KKk0Dopf~6&D(XfECua?Jm%PX?{>REL|xUDl4xWOOq2kdiNvX+ zx7#gaPrHE2{=sa>W3`(M;~yqKxSfobh^=A6@Q3t@=q4ks0?Kuk{;YqVoSbt$-}7pI z2}5XL4W`dvFOFa_h|ah-VjzFAM!ZMc%?Obsr7mP#C2X<3TBwc>v&2&W z3M(l^k&}mIU)YOvcs=u^eyx7D>AwDVlQ(j*9qm7yukZ6w$-;j{eZ(Y>CbL8jL#VrjZ%P?F?Po4EOuHIcH?x>mh|{y%J=X1=~{Kb1X*phyjro#>N`TM9IlREk>66{=m<%H_)|-EF*3BLuNy-8zTWRpSr3 zQ_ImNrAfAu6a|{xyrL(b$}`&>!gnIaM%m*vB3vL^LPN@Maw5q~vRmMwn!i(781-NL z@Ye10q;!NWR#UoMtv-)2uB@{^W{3B9g`msdp}XOV zq{*}?^~Wi0M_w21#s~2$LW5Ano@5y4QZhy5Qj6@7!_(!_C~UA7*(+8&xAEQjXY0R; zjV79gZ3z)yz`fXqC7e(!C|X-tB3mnJ+j#R^-km*vk=T~lEDZ|v(vaZ9@8ek@P)HOlTUu&bW-nh+u;O-6+(7r(!CIvlO^T?F zN9k;}qE9li`PYwv4`8w>I}Tx(fq4kPG`u4cs(e781`Hf~Z;2mCkeNO#!kwT*cC>j$ z_$Uz5;0T5&3qz6U5NJpt%EDF*^b)x=?h72~Kl(X2MopFP?Ros&dc0bDx^bip#2mS<|NJXGf{og6m`aH zPoK)!L>Mv>zt4#Iv{4tPwi0%Tb^f-*0bW?0EkGKT=`GtbUa67clX?_o@3FKHa7|`E z=mEPL_I2zW%&?xIB>FMiULZ3waAD!xx2pY2bLL`^5CNdd%_8>9Sg#Q4v CZ|i>m diff --git a/gfx/intro/water2.2bpp.lz.bin b/gfx/intro/water2.2bpp.lz.bin deleted file mode 100644 index e6c594407d6394b965d03b20b3b99099adf96d4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 896 zcmWNPUuaup7{e}rO|9Ucn<^>W6fbtAy(p%v)s%teLPWu`b21An7~JVP*_Zn5yq>$4=Y8OL z`MuAOAd2nB{IW+%@j{08`J&1#4G>O4#yvh>WSkw@seJ2 zY-pocb6b{&^6YKR&Nq@vh~wSvSCv~SKqVw&kEFKAYDiHNy6dE#gMLu6_gYz*K0*-u zF9~5g$Wk6!Mi&|{BLDQCElGV6a!>*UqoC0m9rvj;SpPNjZW-+~ltqjRC@AC{ zPZmsA#z8)$bjZRt{|a{9CQM=nsaOP`h+Id12qClkA7#I?KY~S3J=TunVcnb5`xHqc z9LDc>*#W!9X4p~oml}(ZtQs;05*q~rDJ7#3jo=QBv`T)tt1teXY0`7-Nyf)^+wCQ| z33KR8*Kl@ccWrzAdl$x62gV0dbS7mmaF zsg}Jt-IQq+ZtB^>GT#Fta2j9&0;NN#1h`Cv>N7K|$i!w~75~NssQC$A+{Eu;rDx74 z^Pl-PD&`8?RC**I#vuq?!*zE~2f|qB4M-5PLZMK{Uz+pvRetL_U;UW;d}Iw+)p>OF zYOS|O{wC{N*@x=-7CC*nH%?XbYh$uCoxXJTME7f*S5E4K%CiM@x8;}H?4_NqA6~cb z!snSA%bc^C=FWSVJ#C-A^YWc=qax_1bX6aDe^BjIo@kRL3C=)^{l&zC*lz#csFlkV g-M8DG*ROmq*rRwPL8v6*0M1N(MaF5)DKJ9+1E>9v;Q#;t diff --git a/gfx/lz.mk b/gfx/lz.mk index 0469b3be..b0c67a06 100644 --- a/gfx/lz.mk +++ b/gfx/lz.mk @@ -10,9 +10,14 @@ gfx/diploma/diploma.2bpp.lz: LZFLAGS += --method 8 --align 1 gfx/dummy_game/dummy_game.2bpp.lz: LZFLAGS += --method 2 --align 4 +gfx/intro/%.2bpp.lz: LZFLAGS += --align 4 +gfx/intro/water1.2bpp.lz: LZFLAGS += --method 2 --align 4 + gfx/new_game/shrink1.2bpp.lz: LZFLAGS += --align 4 gfx/new_game/shrink2.2bpp.lz: LZFLAGS += --align 4 +gfx/pc/pc.2bpp.lz: LZFLAGS += --align 4 + gfx/player/chris_back.2bpp.lz: LZFLAGS += --align 4 gfx/pokedex/pokedex.2bpp.lz: LZFLAGS += --method 8 --align 1 @@ -22,6 +27,7 @@ gfx/pokedex/slowpoke.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1 gfx/pokegear/pokegear.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1 gfx/pokegear/pokegear_sprites.2bpp.lz: LZFLAGS += --align 4 +gfx/pokegear/town_map.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1 gfx/pokemon/hitmontop/back_gold.2bpp.lz: LZFLAGS += --method 4 gfx/pokemon/miltank/back_gold.2bpp.lz: LZFLAGS += --method 4 @@ -42,5 +48,10 @@ gfx/tilesets/radio_tower.2bpp.lz: LZFLAGS += --method 2 --align 4 gfx/tilesets/ruins_of_alph.2bpp.lz: LZFLAGS += --method 2 --align 4 gfx/tilesets/tower.2bpp.lz: LZFLAGS += --method 2 --align 4 +gfx/title/logo_bottom_gold.2bpp.lz: LZFLAGS += --method 9 --align 1 +gfx/title/logo_bottom_silver.2bpp.lz: LZFLAGS += --method 9 --align 1 +gfx/title/logo_top_gold.2bpp.lz: LZFLAGS += --method 9 --align 1 +gfx/title/logo_top_silver.2bpp.lz: LZFLAGS += --method 9 --align 1 + gfx/unown_puzzle/%.lz: LZFLAGS += --align 4 gfx/unown_puzzle/start_cancel.2bpp.lz: LZFLAGS += --method 8 --align 1 diff --git a/gfx/pc/pc.2bpp.lz.bin b/gfx/pc/pc.2bpp.lz.bin deleted file mode 100644 index c2cf84914a99d3ef2491500cbc0395a226f0ce82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ocmZSl|6jL(@&Eta_47aIu5F&rmXJ_UQCC-gtYLlse+C8y036g12LJ#7 diff --git a/gfx/pokegear/town_map.2bpp.lz.bin b/gfx/pokegear/town_map.2bpp.lz.bin deleted file mode 100644 index 9deac78d2afc3fede91d3eb7aca9a3a17a1690c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 900 zcmaiyv1;Q$5QaynaC5MNGd21H6>DUT7Q&PxOW8&cdA zfjmGA5(%73ZBQY{$ex>7MMO?JpPaUTSXz$Ukhf3E)zBb}zN$67p$miE|6_q0dU4WzymYoYzp z?~jM?o_m0MVPAdM4Se_91KbO&z4^`eUmEG=EJQ7+>kI=N9epu2o4GFkY#irgS66u+ z$INGEKgnKRcw}BKkKgU^kaILI3~& diff --git a/gfx/title/logo_bottom_gold.2bpp.lz.bin b/gfx/title/logo_bottom_gold.2bpp.lz.bin deleted file mode 100644 index eb9ff7f83bb5ef05223c58d3288f34aedd14155a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1142 zcmWMjT}T{P6h3$FuH)7^vw3K;>UIaIgc2xj2$XGIc3SQ%iG46W)a0RkFv?meD{cw2 znrt(pqi(InwKko6`NYN~if2$(Q7Ha2;q!F4^C z4=YMCnNB}?9wVhvDU(gAf@dHxF&2wQ;)%GBUV2bRrMlyF1INeVW0D-FFk{h+a(j^KKvk~kZn!9ZXl=`9nrYi(x zW|W!cFm;P69>5e77dMY&lR-B4*Z9)-%DAYV(%zG#GNhs=*rscH-j+Q9e>(7-XsYfw zA6eFGuFbu`M-3HReMzolESMytQ2sHZNQme&v>ScL-Lz3;^D9qdR!1#F5LhxvRaHHv z)eXFEFn-MXoKb6T_H*jYe6{CVUZz=gq}ZvD2wkxR@#y6(-3< zNiro7Q8Q{NOt1oVTl7;7Tyx}513D*wg#x#ibwr#$vL8+PW`%!^ZEfG&E+2?ydu;Ugg^eGVm8f?6OK7ol>ohzpGIvW^whe~ibdV?A}KG0S=6;O zDQdZ*5pvPp?G_24LX8>2WST7{w_7envo4eXMXP}V29D=|^6GLvy8Eb5 zc=2Lzuu#ZH+uI9;y}d$VXedvU$#~qdNIagW2M5)vfYoYVdi=PhWplHorCgB;g;Jqd zEEUR6Xm779=LQGY;g?8nZ-0MBM}IkTl=R$N93|$5S0gd_X*P1?G3lPG5ErjLiQMZ6 zzz4>m?lzo(CFmMp5=cqNLI4J^O{m|4b8r`QkSBkWZ-Mx2!QX-Va17|@e{E$fY5GX zb+S&fVQby28B2X|*@tzZ`cPXav>?{mW;NXh>$cR=Hzy>Tr3g+C%B+m}I>P1Se&^it z-OKM1y$zD}rruE7YD*}dkbTK3`JONQK&1LoqMzXG6Ze&M|BLMK@ZKFC?K~h9SylRd z-*30?+?koG)f7dM!^JJe*Z>X1ec$(vM@m!@C1;!CIKMiLhW@&F3eeT?7-LkTvuDpv z&24mD&-KR@C7sr^-ySE~#Kc4{pH@Sk%Z-ow{>PLQ$)V^_YAB3eycy$iY**~$t}?wt zGZwwSO_Aj=ugW>!$hHlvudnxdz4j7glgyZ$EX`cz0DK<&fZ=#9}AP{gi2MzaugOJV7zJ`1OdW3;Q zI?Yv8-CDrYgxAy_o$Nm9cDwC%yLVi8#c6hNVTGAyh5p{0NaRyNh{W?|liB2fY*s2} zi$z7q38till8UN1Ra0p#530~hO!fs21nWmU*AqowXn~aLr=SX56KZPn%juLdp$G6i zm|+pb%u<#TL6cl(6%QZGVC6EE< z96KB#);|}y$eY?yKD@d5wTv@ix&pfW4-aQG0iXFWTvaA`*+7F{iTq_<7sX=1^P*WV zi#!Ut#)`U8G$StDwb76e6mEWHmW1xe=~nWI2d`%M@*%5H1Se}-l z+4hAC&=zmS!XLa;uh)$_Zcp>OhOtlVL*z}|{eyc8e2%H^bd5cMsF)Oe0~AZ*dyFEv z_9{qWu$m(`#>S2w9UB|DVKvLrr}3GG4=cCl=E_qBz;>K6cJF?n;a-_H4jp=-0GFn6 zIg!bbRFO_^z}DAndvLH`x9zYOUtP8BWYV^0E7ExhtyZ^dS*+WAF}7(_CKH-WCN%Q! zaHq32ZRr5S&Z6afj+vx_*p;vMcOT|KQONAgwnKqNf}rvt}BWqOu@8iBM1i z-n^<1G9}m^JopWo2|XkyGoCV#>HO^JIXy&+&!A3-1S#&UU;fjY9)Q9M3VQJgMC>b# z+6){5@Yd`%I{;O?gXXG&fkQ7(IXwZjgNt;TBXiyF@;%F@g-7_O;hgV(yVhN~wZFjG zQPb2z`gxPDV#MpC7Z@v5%an`PFa@xAT5F-9#wrgW#e9nSfb9}1fj|a9aKK*Cq?Gb4 z`^YNs`we9U^2eZ-0T%Z_n<;XC*KN7%42ft&t*Yk-@5(s7yaAVkh%q)(MiM*YA_F6y3jKjbp#LL9*0}%x diff --git a/gfx/title/logo_top_silver.2bpp.lz.bin b/gfx/title/logo_top_silver.2bpp.lz.bin deleted file mode 100644 index 9620ec0c9a878c9622c8c8ea0798faa72f0339f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmWlUzl#$=97n&CS$8jI+(B!}`ez&{yTUH#4=nuy#4D||x zg`X7eGq&@&bz_Y?eIyEJ2*J71ZC&x#eaHLYyQzp}p<18raXw)m*v0we4Li{jb{Jb& L`AC}AGzI+w-!IJM diff --git a/main.asm b/main.asm index 1b420fd1..5adb78f5 100644 --- a/main.asm +++ b/main.asm @@ -255,15 +255,15 @@ SECTION "bank26", ROMX IF DEF(_GOLD) TitleScreenGFX1: -INCBIN "gfx/title/logo_bottom_gold.2bpp.lz.bin" +INCBIN "gfx/title/logo_bottom_gold.2bpp.lz" TitleScreenGFX2: -INCBIN "gfx/title/logo_top_gold.2bpp.lz.bin" +INCBIN "gfx/title/logo_top_gold.2bpp.lz" ELIF DEF(_SILVER) TitleScreenGFX1: -INCBIN "gfx/title/logo_bottom_silver.2bpp.lz.bin" +INCBIN "gfx/title/logo_bottom_silver.2bpp.lz" TitleScreenGFX2: -INCBIN "gfx/title/logo_top_silver.2bpp.lz.bin" +INCBIN "gfx/title/logo_top_silver.2bpp.lz" ENDC TitleScreenTilemap: