From 7bcb4b19c77eee2b8d2c3e769d25e7e4d7d028a7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 16 Jul 2020 19:56:52 -0400 Subject: [PATCH] Un-deduplicate gfx/intro_credits/gengar.png's tiles --- Makefile | 2 ++ engine/movie/intro.asm | 1 + gfx/intro_credits/gengar.png | Bin 1082 -> 1089 bytes 3 files changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 8b00cde9..bef635ae 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,8 @@ gfx/intro_credits/blue_jigglypuff_3.2bpp: rgbgfx += -h gfx/intro_credits/red_nidorino_1.2bpp: rgbgfx += -h gfx/intro_credits/red_nidorino_2.2bpp: rgbgfx += -h gfx/intro_credits/red_nidorino_3.2bpp: rgbgfx += -h +gfx/intro_credits/gengar.2bpp: rgbgfx += -h +gfx/intro_credits/gengar.2bpp: tools/gfx += --remove-duplicates --preserve=0x19,0x76 gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$< diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 215b54ae..c5896ecb 100755 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -445,6 +445,7 @@ GameFreakIntroEnd: FightIntroBackMon: INCBIN "gfx/intro_credits/gengar.2bpp" + ds 16, $00 ; blank tile FightIntroBackMonEnd: FightIntroFrontMon: diff --git a/gfx/intro_credits/gengar.png b/gfx/intro_credits/gengar.png index 99fcda8d31fc49e2aef68b9d9497aba99eb91675..9558d1a18ea132a44885283cd3adc7c12898a8e9 100644 GIT binary patch literal 1089 zcmV-H1it%;P)oxy4}OJYX0oRa<$JHHdjtn*upor0`qe+L{_oWb*wzF7Ct6Kfqno5P zdf9J{{?Q)&^;?X$9crFfd-boY0o(%1V|(>m(gxj{WBdF3;iLsx8Dsz4JAB;&U5lPw zmCuqE=u#9QBk(w|hqox|t1#Js&-FE9or9sI;h2 zOkIsu;j+Mu&*LR9R7+D8(VYOiiv*5Q4R^xK?sD`);z_*LQ(ZF3VDjn6I&p4gNNS zDWeZ?cUTnT^pisMabcMnLsIS*V3bM&!3qDRmsn{=V zJbi3&Z;T&QA~YgV75HSSELR6HqaT%hd=VrhM2AsnBr17yu5lxFs+rLnMlrlDqbQG~ z<6lcgGhlRK^2nfjM#qpi6!nF;>(C3s7BD)Of)ouMp8Rpw-3 z=y17+a!NDdsv;^4`46-?7lC0JfG(lyuZkS!>9Fq})|j$|Re-8zDk#5aQ4AH)SEi)! zg3%LKo>Qs;99WYph&VWxI%HKd=G0QBDWIg=pLGZs$x`fza+m| z^@y@8S(QVzP>slAQavGbe}JOw0PmWS(R7q2o7^Q%$ecnw)!tR!O*!St2e9^uQ!2+Q zd{d?_RSrFOvEdBs9xgPiVlk7kmt(i%(M7Eqq!SAZkz>|VdUt5gB2S$G*kGuAYbo4W zvoitA9ovB`y$R*V$4X{ZE?0C^>c2ol&SaF$9$UJ;SEc^LntW8`T?jLG=K$sU7PICJ zpu|=z%16WO7y{`gAt?2^4bwn{jD{F_rE5`a4DV1B9C#3e7+6|^MsTt;rH1zbOQwbvoE*SQ%B{8DgxZMitxJMV$^B zKS5PLrGVbZ_C^)k+oBP{@c=3xDvd|h4nlRKx~M}9u@Sz8O=CwK-N#EyxKYi$aRE0_ zSb5d(V4mLLKP@kWs*UIYqib&fcAEQF^e^F6NvXbKz&+w`JpBSEZvPy<00000NkvXX Hu0mjf-0}bL literal 1082 zcmV-A1jYM_P)Bx?WoVJOz|y4B|ElVhCExf@17uV7>sbPi(7!mZZz1~9bP$y!1z2nFvR~d zNI5oc74Bs#Rt@;t9I*2LF>Eq&Ys*#v$`C(KRRcueFn@v@UT*XkLA}V=NrI@^gd$uQ zDf9|eA0nbIVv!eh2?L_XLXK575kwn1Hbxn?04M}n+C!n)FQG0Ncv@hfX#b|) z0pN**F!x^xy__}-X>7aJnb@|z==W8mkd^x*p(B<2TI5}EhUlK(j-}dzHdboX1+9>3k=>9$Oz)&-C}&7Y3q)N7R8r1uMgB`ld1{nl z{ZbiH7~+vs+U_-cI4ZvPA!9HES)OKtra<>)GXvl)e7MQ)%u{A#9m%{%IaLC>BV_@= z9^zJ0w;qg8(4Mb)@PoF9=vw3+vOHDerS1}8mEi*S8%rX-JMskkUk{zy{r4ng>QX15 zAt=$gw)-e1OY+BIPYX1E7?@hru~t1H52&0ldjtFbMHmyf_rS90(lCT`0DkMyCb7Lb z)XHQ!XT@{0`M_-3I04|{DO~{@_Q7yvkdr#pTC+`uAxvZsP(<%NA zP1n{v7%;v4!5cM1vM}gODLO9Hi4LNmZC)_(Q)(C%YPV~o93twNu89>ecl1e+i*>4G zdKY^;D~F+}=YA-&8O^OM)_5?C4jneD-T84Avf8|dlIL_5#9i7%Op!XRLxu7EsWzd= zk&FvkQOS$&SlYST16}#w+y~(kf{)z74okHf>hNo6nWwH{h!bWism!vFZd@LazI;=L z_Y8gu0HG4T$l5%vZ+&(XqtU6oeZ3q2ev?Jsss@kE-Id4d6(Tq#k&kEStd5PykCW!T zTJE9MeO;w+vu%Mz2T$Zg9~*3co}-GsRxre5V+L;-rfK7@VoC{dqhM=7uNnrZhiPhn z7L#19K+?bILBoI!aEf!hNETr+v`dkeWS!3Wdxnh202q8n6e!Y>!IAz`TKh;DqJ2b0 zUiySAJ9xxCssUQGZPCh^t}KaKHA5Sw504b^4{!&BdYg}%82|tP07*qoM6N<$g1rFo AeE