From a3c2ecf4d698bf91db425c57b6f2f9ea4e8017e6 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Sun, 1 Nov 2015 12:21:01 -0800
Subject: [PATCH] Meowth Bonus gameboy gfx.

---
 gfx/stage/meowth_bonus/meowth_1.png           | Bin 0 -> 562 bytes
 gfx/stage/meowth_bonus/meowth_2.png           | Bin 0 -> 180 bytes
 gfx/stage/meowth_bonus/meowth_3.png           | Bin 0 -> 380 bytes
 gfx/stage/meowth_bonus/meowth_4.png           | Bin 0 -> 637 bytes
 .../meowth_bonus_base_gameboy.png             | Bin 0 -> 903 bytes
 gfx/tilemaps/stage_meowth_bonus_gameboy.map   | Bin 0 -> 1024 bytes
 main.asm                                      |  63 ++++++++----------
 7 files changed, 26 insertions(+), 37 deletions(-)
 create mode 100644 gfx/stage/meowth_bonus/meowth_1.png
 create mode 100644 gfx/stage/meowth_bonus/meowth_2.png
 create mode 100644 gfx/stage/meowth_bonus/meowth_3.png
 create mode 100644 gfx/stage/meowth_bonus/meowth_4.png
 create mode 100644 gfx/stage/meowth_bonus/meowth_bonus_base_gameboy.png
 create mode 100755 gfx/tilemaps/stage_meowth_bonus_gameboy.map

diff --git a/gfx/stage/meowth_bonus/meowth_1.png b/gfx/stage/meowth_bonus/meowth_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..872a578809022c1260f31b7ba9ede00aced412a8
GIT binary patch
literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq000mG005W*00000g3B(c0005`Nkl<Zc-nQ6
zPiqrV6vdB@is0fcOg8-l8W$;wASLwqkFJU>B!akeSKRm!8pu|dMT_f5EDY(U{RX3P
zKuX*B3N1wl+2rZljFZP4@12US-28ZV-ktN#x$gnADH>#sUP+H@V>&o617m?}OBuIF
zoOzZQM+#FG=pVqMT|FUKH4kuBH4RLa61k0u4y{6d^SUyMSj&I#vW??NFmVF%Kd|=b
zCQ`ahunaF@#=N2a9P)3vI}og@%Ee?<B6(nDVzLADhmN>aP1RpS6qU9pLU*8Oh=aIk
z;q%PGSZRK*rw#u4Bi)9=Dx`!<5thA2SogU=zPa^WoWM*FzS06&h)`q_wU>!Nk-C6h
zo<=eQ+!mE7VClR}BbQmx89WndfvhB4j3H++mMv2$*?>1};`kmvWAcRoOx2ZDtO%}j
zCD!%seIk4Dw1R8BljQs2;_mjTMPEIC)Eu+N=Wmd#CWqK5lYs5vpaW;_h}(_!cVykk
zFPv`%J+Uj}WbY5i=ZXd|H%Oz`SkL8TOK`d)$VP&nGA0u&!iC=IE5)a}FP!KNE`fm$
zLC+P9a0EV*&~<ZItNY&Sh<8;!Ax3(dzCBF!(Y)5Yd-hUq4GR^Wg~bvUk%)$ZE%*;2
z`eRE({iyESvxro*nD44Uq5|DHuG)BCMd!8XZ)n%DL2Dmc2mk;807*qoM6N<$g6M$;
AtN;K2

literal 0
HcmV?d00001

diff --git a/gfx/stage/meowth_bonus/meowth_2.png b/gfx/stage/meowth_bonus/meowth_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7af9baef3f8d700a626678656fa7065a19e7e207
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm1SA;dR9h7SscKIb$B>F!qCFcq4+TiD+4H2Z
zaGPJax266$Q<<MazNGX<4{4@F&Jo%-qAVJ39QokD^z-r0OEHBq>K~>Gz57*ZFMP9F
z^Zl>ZM~$;@>B=AFatWTjso0?OtX%G!j;!c-lZ~=fiHoJJ+Z5R9)eJ-}TmPJn+4y9Y
d*^>K@S?U`(+~$<KRh<So$J5o%Wt~$(69AbOLY4pk

literal 0
HcmV?d00001

diff --git a/gfx/stage/meowth_bonus/meowth_3.png b/gfx/stage/meowth_bonus/meowth_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..817eb4692d0c37f08e99ac086b8765558708085b
GIT binary patch
literal 380
zcmV-?0fYXDP)<h;3K|Lk000e1NJLTq000mG003wL00000msvNk0003)Nkl<Zc-m#q
zK}y3=5XSLOf-ba}h3yHvfTcSLPN6P^3Qg}5aVz8sf*a{2jHUq>g`A;uQ@VQkHWFSP
zzp1q-68I6CnZD!?RTXGUBWO3ww#<rzBqg*cly^Z8yI9ema&E9667)J=(5}d`3IS=w
z2lKUZSTlj>3paF?BhvF613f!MU$rDIApxA*47-?ABhpF#P+i*7HhjXlS;Upnk?q=l
zL=Iah^ty&NV;(*^aNxB>{mNI9TaH{rWKljec<jY1Orj=3b`QbPr~QlZVJwU=ddkW1
z2tIcye64N7!cVxf(=sEM@52QlF`h$g{X8jx_0ykz{OC=;!IT?Ul@{#BrY9Y*?8o0y
zW4;!#eqHO=wSG73*W9t6i>zO;en3B{RU6BWAxVur<88>b_aRcP1?&+}wCqjYE?6-9
aZ@vIWog)W!%jLBI0000<MNUMnLSTZm<ERV(

literal 0
HcmV?d00001

diff --git a/gfx/stage/meowth_bonus/meowth_4.png b/gfx/stage/meowth_bonus/meowth_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..73ada98987b2b9335eab2bcc4dca4ad5c1df02ab
GIT binary patch
literal 637
zcmV-@0)qXCP)<h;3K|Lk000e1NJLTq001xm002k=00000->5NG0006+Nkl<Zc-mEx
zv1?jU6vmHz2E@?Zgco;97ICT6siknG$<U$DQtgtZT?$1C`4f_op`iqXj$JB9K++-o
z0}4J&gb;_fb#M~1IbACeEBE>Jock2%lMDBE&pF?BzxO2IOe4BG2cjx@_{M-LuO3ZN
z0Ve1%OlV(!5O6<wugl<bfr!598sZ6tGib0@6jcE_e+%rh@NZrOnZV?beH=_=BacA5
za}fOxSixk~M=LD`G3$K??ha!$1AH6+pC3C2Y|Cm-&jtP@i$<SrA_iZDs(&Rj7F~Z$
z7hf%*taP#72`#afSLuXdIWrzJ7*s-|8yUO70t#Vb+k+jzfiayINIVj#!Kl$sbOte8
z8T&BZNnMae1AY>Lc|bP~HY>=aKDGL!aD+?+TZ3N*w+t<{RYuSTDbn-#acRu2m@`pn
zHa}HLLo!kM$E;@bC6YzH_3Qeu;OTAnis89xY}{9S@YfigW!Iyr+68ACQ~soDru>a0
z6V1LDwZp=aiNb{4l`P^%#@Kg~Mf`}fJ;i8%m+VK@;4*Df7f<R#P2)8Lr99m<RfEX9
z;Veh3{=Mw_oJNwRb#Oa8>HejWA7^1dqBsi>czidPB>>WOh60~nr+{3Jp{Rj&mNx>0
z(1SVV18JM8imRka0DEpG-(=W<=hR3lqHnwfh<>}VXcPT3LryBhm7G*WTFkQbg{ic~
z{R;tUb!{STMOs$CDr3HRDF4JX_h0iy-YSWHUN0&#C>0?mEi=;RK*%;1K1&7Xv()|v
X3NC4CmSPC=00000NkvXXu0mjfIXoEN

literal 0
HcmV?d00001

diff --git a/gfx/stage/meowth_bonus/meowth_bonus_base_gameboy.png b/gfx/stage/meowth_bonus/meowth_bonus_base_gameboy.png
new file mode 100644
index 0000000000000000000000000000000000000000..1662ec7866948506b0771e7aa6026cd67fb6b56d
GIT binary patch
literal 903
zcmV;219<$2P)<h;3K|Lk000e1NJLTq002+`004jj00000^Yp3z0009{Nkl<Zc-rlj
zzl#%F6vq!tr@~b4k9aFC0V`qNTpJq;QDGvP1-pohf~|#}*lgie5$t?f26j$hQ$3I+
znBaEXq_TgF@Jw|vmBS_1^F24&Y}^4CY+m6BH^Y2#ethpamrKZdB8q6!6kch9G-;X1
zA2(wgO=26{C2UO$Wp|S#o+M&RXeJ5W6&Ot@p_Qk%W@0U1WGOj?ku1QN&V*l)g(AjD
zp^IB&%`!-Xbx~{+Dc4HQ8YLn|eiIM88n}p$07#MDIOEhUA>&q%*5PEKFEj$-TIk|t
z95jahAYDsqQK+C0f}D}+7TSyhL{||RJY5h4&+AFz&V(oHoU#iFg;b|gcyU|x5IsfG
zp!2i~p;Rl88Lb$ag6H+H4UzApGfPoA&2<WGw8chrMzIg!Sf@Ju57rEkx&e|s2a)_7
z#NlgzNfT@+<Qwca{0;xFkb7-D53}r-U}MfQZ-8RW5MS+4+T&5m{NGjfv4{uEMro$-
z@t-`L16GB?Vw6^ZPn;1b)d2HRS_0<dsi&&jDUh@C;;$|rY;otA^;CAcIlQ`0Z*=(m
zHh1&dP?<}-6e*wH2+#cJrH120!|^Qmy@<CSxp)=_^>%<AO>0!;d_TaGQlK+m6t)ix
znA_?JoG(-#XT=n7UZJ1yH`T|z9lf;T&(cpfELERq@e=Pm`uXuN=oA|tdw;w@>$bV-
zF5y5fC^OT3zS;K!=8+buB|(~wiL(P=F5z@0UnyFb6{g4h0Yyxu&<f0_ndA{DiWL%Z
z?}2Sg`vr<(z$8NFea_{>JrBiz6k~8>QNA<vP%McTq|+2d)uVk6#RBWdlk7mGqjsBz
z{}NrUxkvsKW<18Fzu=7G86c!*?C@v72#jj<Na4WBL~K0E$R1VCuN8ppfnNC0tViw;
z!^K-ZJjUa=F3D}LAP;q(ww7_Et8g9%xCrMH=1<;8xs=~sdUt6Jw=#u${k^`PPb?>+
z_3i`Ty8r5)o=>cK3CMh>|N3t|U|8{|w!o@TPdR$S8ch>#|Mj2zc7L}|<+FNN55MJ@
zx1WE`rMfiv2(3BfnaX-w$oV`X=)z~?5`ZpzHXy2DZ9wS4`nl)s{)s5t-SpJIUO!e3
dDlzf3eFyN_!UU<u3@HEr002ovPDHLkV1jj_u>Al4

literal 0
HcmV?d00001

diff --git a/gfx/tilemaps/stage_meowth_bonus_gameboy.map b/gfx/tilemaps/stage_meowth_bonus_gameboy.map
new file mode 100755
index 0000000000000000000000000000000000000000..4b1692438a1d9e5946ee3043738009fac26fb4c8
GIT binary patch
literal 1024
zcmeHE*%E?43`6l&<d^kVSynty@BnY6V^OkQ-+Xe0_Jy4^NgMRY8=LKi8oJx-iy917
zP_^5hi0ZU}u2X^1a|?7exA6t~&ul!Z+*RP(_^<wrCLHj^|LMR1*PFG#{Q(D@&IfZK
z%P&AzI*iviut|VSd(f@B{YN6pk4UEP*Q##`NhT>CU$VtYkV%}~%D-SF&j@E-reGw`
K$h5A%PM`qsnP+wY

literal 0
HcmV?d00001

diff --git a/main.asm b/main.asm
index 2e2f8b0..3e4fc6d 100755
--- a/main.asm
+++ b/main.asm
@@ -18252,40 +18252,14 @@ StageMewtwoBonusGfx_GameBoyColor: ; 0xeaf8
     db $FF, $FF  ; terminators
 
 StageMeowthBonusGfx_GameBoy: ; 0xeb4e
-    VIDEO_DATA_TILES Alphabet1Gfx, vTiles0, $1a0
-
-    dw $41A0
-    db $33
-    dw $81A0
-    dw $0980
-
-    VIDEO_DATA_TILES PinballPokeballGfx, vTiles0 + $400, $320
-
-    dw $4400
-    db $33
-    dw $87A0
-    dw $0180
-
-    dw $7600
-    db $17
-    dw $8800
-    dw $2800
-
-    dw $4000
-    db $33
-    dw $8900
-    dw $0680
-
-    dw $4460
-    db $33
-    dw $8AA0
-    dw $0D80
-
-    dw $5800
-    db $33
-    dw $9800
-    dw $1000
-
+    VIDEO_DATA_TILES   Alphabet1Gfx, vTiles0, $1a0
+    VIDEO_DATA_TILES   MeowthBonusMeowth1Gfx, vTiles0 + $1a0, $260
+    VIDEO_DATA_TILES   PinballPokeballGfx, vTiles0 + $400, $320
+    VIDEO_DATA_TILES   MeowthBonusMeowth2Gfx, vTiles0 + $7a0, $60
+    VIDEO_DATA_TILES   MeowthBonusBaseGameBoyGfx, vTiles1, $a00
+    VIDEO_DATA_TILES   MeowthBonusMeowth3Gfx, vTiles1 + $100, $1a0
+    VIDEO_DATA_TILES   MeowthBonusMeowth4Gfx, vTiles1 + $2a0, $360
+    VIDEO_DATA_TILEMAP MeowthBonusTilemap_GameBoy, vBGMap0, $400
     db $FF, $FF  ; terminators
 
 StageMeowthBonusGfx_GameBoyColor: ; 0xeb88
@@ -51444,7 +51418,8 @@ BigReward9000000PointsOnPic: ; 0x5f300
 BigReward9000000PointsOffPic: ; 0x5f480
 	INCBIN "gfx/billboard/slot/9000000points_off.2bpp"
 
-INCBIN "baserom.gbc",$5f600,$60000 - $5f600 ; 0x5f600
+MeowthBonusBaseGameBoyGfx: ; 0x5f600
+    INCBIN "gfx/stage/meowth_bonus/meowth_bonus_base_gameboy.2bpp"
 
 
 SECTION "bank18", ROMX, BANK[$18]
@@ -53714,7 +53689,16 @@ MewtoBonusBottomTilemap2_GameBoyColor: ; 0xcbc00
 
 SECTION "bank33", ROMX, BANK[$33]
 
-INCBIN "baserom.gbc",$cc000,$cc800 - $cc000
+MeowthBonusMeowth3Gfx: ; 0xcc000
+    INCBIN "gfx/stage/meowth_bonus/meowth_3.2bpp"
+MeowthBonusMeowth1Gfx: ; 0xcc1a0
+    INCBIN "gfx/stage/meowth_bonus/meowth_1.2bpp"
+MeowthBonusMeowth2Gfx: ; 0xcc400
+    INCBIN "gfx/stage/meowth_bonus/meowth_2.2bpp"
+MeowthBonusMeowth4Gfx: ; 0xcc460
+    INCBIN "gfx/stage/meowth_bonus/meowth_4.2bpp"
+
+INCBIN "baserom.gbc",$cc7c0,$cc800 - $cc7c0
 
 StageMeowthBonusCollisionAttributesBallEntrance: ; 0xcc800
     INCBIN "data/collision/maps/meowth_bonus_ball_entrance.collision"
@@ -53724,7 +53708,12 @@ INCBIN "baserom.gbc",$ccc00,$cd000 - $ccc00
 StageMeowthBonusCollisionAttributes: ; 0xcd000
     INCBIN "data/collision/maps/meowth_bonus.collision"
 
-INCBIN "baserom.gbc",$cd400,$ce800 - $cd400
+INCBIN "baserom.gbc",$cd400,$cd800 - $cd400
+
+MeowthBonusTilemap_GameBoy: ; 0xcd800
+    INCBIN "gfx/tilemaps/stage_meowth_bonus_gameboy.map"
+
+INCBIN "baserom.gbc",$cdc00,$ce800 - $cdc00
 
 StageDiglettBonusCollisionAttributesBallEntrance: ; 0xce800
     INCBIN "data/collision/maps/diglett_bonus_ball_entrance.collision"