From 05def441e89744ee4f1062955b5caa4080dfd60e Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Mon, 25 Feb 2013 14:16:59 -0500
Subject: [PATCH] Include some more gfx

---
 gfx/debug/color_test.2bpp    | Bin 0 -> 368 bytes
 gfx/evo/bubble.2bpp          | Bin 0 -> 16 bytes
 gfx/evo/bubble_large.2bpp    | Bin 0 -> 64 bytes
 gfx/misc/pack_f.2bpp         | Bin 0 -> 960 bytes
 gfx/misc/unown_font.2bpp     | Bin 0 -> 432 bytes
 gfx/ow/misc.2bpp             | Bin 0 -> 608 bytes
 gfx/special/celebi/1.2bpp    |   1 +
 gfx/special/celebi/2.2bpp    | Bin 0 -> 64 bytes
 gfx/special/celebi/3.2bpp    | Bin 0 -> 64 bytes
 gfx/special/celebi/4.2bpp    | Bin 0 -> 64 bytes
 gfx/special/celebi/leaf.2bpp | Bin 0 -> 64 bytes
 main.asm                     |  48 +++++++++++++++++++++++++++++++----
 12 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 gfx/debug/color_test.2bpp
 create mode 100644 gfx/evo/bubble.2bpp
 create mode 100644 gfx/evo/bubble_large.2bpp
 create mode 100644 gfx/misc/pack_f.2bpp
 create mode 100644 gfx/misc/unown_font.2bpp
 create mode 100644 gfx/ow/misc.2bpp
 create mode 100644 gfx/special/celebi/1.2bpp
 create mode 100644 gfx/special/celebi/2.2bpp
 create mode 100644 gfx/special/celebi/3.2bpp
 create mode 100644 gfx/special/celebi/4.2bpp
 create mode 100644 gfx/special/celebi/leaf.2bpp

diff --git a/gfx/debug/color_test.2bpp b/gfx/debug/color_test.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..113aa12563f0c032fd08d39740365ed4e6f3a896
GIT binary patch
literal 368
zcmZXOK?;K~5Jm0Lhgo<C2|0wTA|fG+o<UqFxCkP&NETg$beeGt#rpmxkNISVh+Zj=
z6im5&cAf{*boSx`73cgZU9q-3u$HIJy$|M@o#!DqH;w?=y^pbNrSJW^4nxxbguruv
zu0xCoMCr5h3h4vH7=o<G|H%z9m$xx7if`Mp^u00n1osi^8h|a|qm)i4CH=CjDzzi~
O0klTshV*}~HPIK9EEhTe

literal 0
HcmV?d00001

diff --git a/gfx/evo/bubble.2bpp b/gfx/evo/bubble.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..741ee9026389ecaee2acbbb9faf8d1541fda4276
GIT binary patch
literal 16
XcmZRuk#Uk~u4%4lFX(5eW3T}LCu{`q

literal 0
HcmV?d00001

diff --git a/gfx/evo/bubble_large.2bpp b/gfx/evo/bubble_large.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..a69044414a49f910ba5dfa4c509d04d43c43fbfc
GIT binary patch
literal 64
zcmZQzX69iwU{+vv;CHBRsBd66aKPXL&kvR#Y(U8VgB>Jh?_lpBufSl>z|X+^f&T;l
P1Gxis41a*|1H%CTct#b?

literal 0
HcmV?d00001

diff --git a/gfx/misc/pack_f.2bpp b/gfx/misc/pack_f.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..60d6b7f91c351a3fe541858e8776d5abbc992f78
GIT binary patch
literal 960
zcmd6ly-UMT6va<{F$uJgtSZ<HT|}`RT#C~AXLK`@;N((Jq12ZC34TPOeymQ;Zm&2w
z*+EcHXx1P|z$(=ipZ6s~GPHKod#20doqK-oT_IeT$4UrLF=z>crPcJL>;*(s2vHa7
z;xRnuaBDvA*}ZciG>ye7vTAXuVsbaRrggNAah7W8O`ROB$xD_TghBhO{pt4IzW<TS
zn|U*`YA~r*WXN4th*SMUf6^;@0S4U;(*;J9QuaIMmAPyd%nJOVZ$ySn)8yFUyed+d
z!t{@0o$gj~j7-o295!+|LW%m{d6!Vew$-zI>(%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

literal 0
HcmV?d00001

diff --git a/gfx/misc/unown_font.2bpp b/gfx/misc/unown_font.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..4ec0bbea6873363f6d841334b91e9967fc180a1d
GIT binary patch
literal 432
zcmY*WA&$c^5L^WnRMDz9z@Q*F$f^ns7@Z2O;yj=rDu@gg6b4iU0ewSdP+aW;{D6Y0
zuc<DpJu7!38H{!`v$F<3wAM|qwyqBc0Abz>mnYnN=KKBeP+nC{^F5(yilV9j%2Jg3
zy-dpzpzAJ|7|-XfGv@sUsO#+CwxV~AIi=StC1&T~H(wJG|K=mMEr2n7KMc3qF!a4K
z|L5u_8^#IaD1HFXCv%L<*Q+o|SDyQ5zYxAA$iC`+Jg!#D<?J8AZYT2)PABQU*%ZZg
z3qYh7(~VUx&fbqBk@O>4uXAVV=e@A3PibZ;i9Tz^*O>V~5El!*57FmCWG&(k7JzyI

literal 0
HcmV?d00001

diff --git a/gfx/ow/misc.2bpp b/gfx/ow/misc.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..8f9b3b96fbeb191bbc291697049a9301c94a11f5
GIT binary patch
literal 608
zcmZvZ!Ab&A7=^FbkwFU#7a_K|;sdmB5km-b)oLPyffhj&<|2B4USO<UL@(g7Wl!L8
zaNW9vixw`6KxQ?FcsiPn+IY|I{{MH+fBvh4t-K<t3x#4FP7FLo($k7pw3QMG3UXSR
z7~?SX{dQZZKi<VP#m+e&;E)=ySEG*l8s9@N#%nZiPU$%>QN|f1$shgWOB;9>m(&&9
z$iIUQ`UuD$!&&ox#USS2Kod9Ag1;yGg%Np&^RMO~ptm9aG^GPKnx8$KJ>UkatemX)
z&nhwhCR3hrhGl+<x7iDtThJ?f2{i;UUNfh|`Mqd=5*cO~@y=P}`@EM+-ZYi6ZI8$1
z7n`Q<4~LaXHk(X}*^$yrnW>lOpYP9)ZnxDE`NEx1+j_WoD(p9MmL-IgLL?GGWHLfn
Umfk7m%iFp4!fpB>y=(0K0!(o$IsgCw

literal 0
HcmV?d00001

diff --git a/gfx/special/celebi/1.2bpp b/gfx/special/celebi/1.2bpp
new file mode 100644
index 000000000..6379fc92f
--- /dev/null
+++ b/gfx/special/celebi/1.2bpp
@@ -0,0 +1 @@
+00.>	��d$6�����&�����_g?83<}__{jn�����@� ظ��00
\ No newline at end of file
diff --git a/gfx/special/celebi/2.2bpp b/gfx/special/celebi/2.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..f7c3294d3e17a66c10b8d70b7490a29b52075008
GIT binary patch
literal 64
zcmV-G0KfkL06aV+KM)@t9SIK%568z~V00Az;_u!3Ci({c0{#xV`(I~2I5RwbUtfD_
WZVU|k6de5U@W4ReAlSIb_%JXCARFfZ

literal 0
HcmV?d00001

diff --git a/gfx/special/celebi/3.2bpp b/gfx/special/celebi/3.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..00cac65a741ce8aa1562a8c3f9efff62575b3830
GIT binary patch
literal 64
zcmV-G0Kfk*FfKk79~d7N9SIN2&$stvBsLQB;m`g2Ci({c0{#wKYd<GHI5RwbUtfD_
WZVU|k6de5U@ZezBILP=gFaQ7}y&9PS

literal 0
HcmV?d00001

diff --git a/gfx/special/celebi/4.2bpp b/gfx/special/celebi/4.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..00cac65a741ce8aa1562a8c3f9efff62575b3830
GIT binary patch
literal 64
zcmV-G0Kfk*FfKk79~d7N9SIN2&$stvBsLQB;m`g2Ci({c0{#wKYd<GHI5RwbUtfD_
WZVU|k6de5U@ZezBILP=gFaQ7}y&9PS

literal 0
HcmV?d00001

diff --git a/gfx/special/celebi/leaf.2bpp b/gfx/special/celebi/leaf.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..1c8a3f9a884bccc8f6b132d5a98c2cf13453b647
GIT binary patch
literal 64
zcmZQzu(7FgdOY|3Lc2qMdOmz$WMpP$W8>qJ6S7gMs5o$d0SK6x`S|RN{v5He0P!H;
M|NlBC8yf}&0G1jN#Q*>R

literal 0
HcmV?d00001

diff --git a/main.asm b/main.asm
index 754b0917b..6be7dd7a0 100644
--- a/main.asm
+++ b/main.asm
@@ -6295,7 +6295,21 @@ INCBIN "baserom.gbc",$4456e,$44997 - $4456e
 
 SECTION "bank12",DATA,BANK[$12]
 
-INCBIN "baserom.gbc",$48000,$49d24 - $48000
+INCBIN "baserom.gbc",$48000,$48e9b - $48000
+
+PackFGFX:
+INCBIN "gfx/misc/pack_f.2bpp"
+
+INCBIN "baserom.gbc",$4925b,$49962 - $4925b
+
+SpecialCelebiGFX:
+INCBIN "gfx/special/celebi/leaf.2bpp"
+INCBIN "gfx/special/celebi/1.2bpp"
+INCBIN "gfx/special/celebi/2.2bpp"
+INCBIN "gfx/special/celebi/3.2bpp"
+INCBIN "gfx/special/celebi/4.2bpp"
+
+INCBIN "baserom.gbc",$49aa2,$49d24 - $49aa2
 
 ContinueText: ; 0x49d24
 	db "CONTINUE@"
@@ -6901,7 +6915,13 @@ EggALotMoreTimeString: ; 0x4e46e
 
 ; 0x4e497
 
-INCBIN "baserom.gbc",$4e497,$4f31c - $4e497
+INCBIN "baserom.gbc",$4e497,$4e831 - $4e497
+
+EvolutionGFX:
+INCBIN "gfx/evo/bubble_large.2bpp"
+INCBIN "gfx/evo/bubble.2bpp"
+
+INCBIN "baserom.gbc",$4e881,$4f31c - $4e881
 
 
 SECTION "bank14",DATA,BANK[$14]
@@ -8512,7 +8532,12 @@ BattleText_0x8188e: ; 0x8188e
 	db "left today!", $57
 ; 0x818ac
 
-INCBIN "baserom.gbc",$818ac,$823c8-$818ac
+INCBIN "baserom.gbc",$818ac,$81fe3-$818ac
+
+DebugColorTestGFX:
+INCBIN "gfx/debug/color_test.2bpp"
+
+INCBIN "baserom.gbc",$82153,$823c8-$82153
 
 
 SECTION "bank21",DATA,BANK[$21]
@@ -12665,7 +12690,11 @@ INCBIN "baserom.gbc",$100000,$10389d - $100000
 
 SECTION "bank41",DATA,BANK[$41]
 
-INCBIN "baserom.gbc",$104000,$105258 - $104000
+INCBIN "baserom.gbc",$104000,$104350 - $104000
+
+INCBIN "gfx/ow/misc.2bpp"
+
+INCBIN "baserom.gbc",$1045b0,$105258 - $1045b0
 
 MysteryGiftGFX:
 INCBIN "gfx/misc/mystery_gift.2bpp"
@@ -12693,7 +12722,16 @@ IntroLogoGFX: ; 109407
 INCBIN "gfx/intro/logo.lz"
 ; 10983f
 
-INCBIN "baserom.gbc", $10983f, $10aee1 - $10983f
+INCBIN "baserom.gbc", $10983f, $109c24 - $10983f
+
+CreditsGFX:
+INCBIN "gfx/credits/border.2bpp"
+INCBIN "gfx/credits/pichu.2bpp"
+INCBIN "gfx/credits/smoochum.2bpp"
+INCBIN "gfx/credits/ditto.2bpp"
+INCBIN "gfx/credits/igglybuff.2bpp"
+
+INCBIN "baserom.gbc", $10acb4, $10aee1 - $10acb4
 
 Credits:
 	db "   SATOSHI TAJIRI@"         ; "たじり さとし@"