From 85698ddbdb959f06594d8fa6a431d261b1a698a5 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sun, 23 Feb 2014 20:40:47 -0500
Subject: [PATCH] Trainer card gym leader and badge graphics.

---
 gfx/misc/badges.2bpp  | Bin 0 -> 704 bytes
 gfx/misc/leaders.2bpp | Bin 0 -> 1376 bytes
 main.asm              |  24 +++++++++++++++---------
 3 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 gfx/misc/badges.2bpp
 create mode 100644 gfx/misc/leaders.2bpp

diff --git a/gfx/misc/badges.2bpp b/gfx/misc/badges.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..52cf24e1b63654cb6d8352128b62ae120a43d0b5
GIT binary patch
literal 704
zcmYL`Pe>F|9LHyNrhOv~zUi<rrnW<uP79kSp+7Sj<|XK~hk|q!+zxvY#F));o<+5g
zrQL#H6NQqMgrI{Y<RnFhpp0-e$b6Ngw3N>jotD}6n%T+ves13%-}n3TAk^dQZ(cr~
z%g>J&@`XGht~}U1dTu;XoJ%Lt3EwN^KTRx*Ig@x8W8X_BdV6Xk(R#2806~CI*LAJ$
z_@xu>RoZXc-V3hiUZFGeIqPQ|1D|v4t=*?|O^-ua5Du{nyGR?T=*n)K*f!4#As|92
zs_2?!Focj{4<~2itLmm)3YP_jEJN3#3Y35t5_rBWl){_xsyZ7VP8v2s07O+?yWEsH
zxqh1=hA?(iSA5o#>$ufj7RrKU{L6=Vp5sbkKc6*87uLv-X#xPHn!OFN&a<zd%#Z!N
zgE3Le>~h`Av1`3m+mYhOQRfC3Y;QeqG_p^E0L0#(dHDErNAAUutf>%;A+*fCmJ4lL
zOIy=EgwXx;%XeC2KPuSM%mXi3Z7r5*K^S9?ysI2$CHjk2Q$lzigrjOEwVhoYc{TZN
z0-+>Uom6hmTJu!>*Pfg6V~Zmn9<1EWq@pVDHi#6Pr#kP|tfX?Plf($=dgDR!ytg>Z
zZVzl+|LwZ&GX2JUt+BW4K4M)~qh41l@0OwH{T5@Cx~{W8W{EewZF3yYhe9HdU;xK?
zKVWE@GSpRJ#}|QreU1xUg=pBnKIh5L`w}VydBc-kA#j7DpAX!i_&+a-QdM<@zx}a7
Q0s>d^W)J%B_&fdo0Lh>-6#xJL

literal 0
HcmV?d00001

diff --git a/gfx/misc/leaders.2bpp b/gfx/misc/leaders.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..fecae45db02ac89f2315f600268e8ade7f047871
GIT binary patch
literal 1376
zcmbW1UuYCZ9LHz>@8;s}-X)Z~symm)*0iMLpq5_hc^hNSO3~&B6nxNVjED%Wsd?z8
zx$JIfj1`2aPp!x$lu&#OYKvCw9yV?ArVoV*TC;G$XtCT{18#J><E$5a_r5>o;rB2z
zAHLuD4FD*GVk<=h6TG5$K~$oU*1N22*4ug%>Ua;{gop7n{FtnNpA2}OPlOOEpiJ;<
z&;TP!L=gm<27sbu8JGX6T>A~%<0refJC70*PlJP*ovk-prt|JV$@P5z&;X%3f;!2n
zfsdjXnqdV|i)zs~H#X_rm&S%hhdc1pyf^Wme*SQ&lyp^3^+aFvyHFQOz!+@KzLSk>
ztiUh;{NH_fb|g2F(}51;Q|5sg#3DMNgGLnhQ(md`k}qVeg^v+fS*mYnj3w5$x2@Km
zeemf&KkNn=I1*0aUn&6Db_ZdsQmWo-aFxVy^4j=1O_LOs$GHcqm+J;alhXUn96M-C
zy6#>#iL$dp#X$5ukMQMD4`B;4u7NL13D68Nk>h!e;q4g!`uo={o;#d(Y)g4$mr|*@
zxfY)#zOd*PVmXdw7~(p^vZBcIXw2MabvOV{-agyg_x_cx(ft>_mOopUHcaimex2@l
z;a`|-jsB5)`0ys8dIHEz;N9kzX^R+$K?Tge<$68}OjNjJpp2jP(;USSGF}jbjUUd>
z^3?K~2d`Ve0>fwV;{2d~VcNKv_ei;uB_gBx{zAUc!y5cM)cdj7tbb&->M<f&(Xz|4
zo|3`%n~>2smTtRT>BDc3tbe>WweX!0kt6k@To;xiDL`;KhDOoRJ4Ydaz&v$(ai*}4
zS=x1R*HZ7k;B?Rvth~Q4-5T>{1W{!9cs!X@RY|hPwWjQ5m{e3U*s1T&sVCJ`%g(}y
zr*#k6ha}=ioxn4+zzJlR7*W-qKly2gFIe`_*ps=;6<8>+_rG;h(<x7N_a@zy`3SwM
z(LaiU@ZI;s^-XQfdV?m(JQnxZ)^R+JZy1#{Ru2SGyv@0KW8v@LgFmcJ%<-%sksql^
zZ`Bi!=gqIb+WL8?0u<Ys`)m-xvfl4(aY~kJeSuGmlL^P+hqq=;ECyjT3SqTxZ_g2p
rjO23FzFcm6p>ny}7mKQT_ijF4ELMBNux;NLMKW*XymUIgqD<yFZ#RhK

literal 0
HcmV?d00001

diff --git a/main.asm b/main.asm
index d3decdea9..9ed91b472 100644
--- a/main.asm
+++ b/main.asm
@@ -31023,13 +31023,13 @@ Function251f4: ; 251f4 (9:51f4)
 	ld d, $6
 	call Function253b0
 	call WaitBGMap
-	ld de, $5583
+	ld de, LeaderGFX
 	ld hl, $9290
-	ld bc, $956
+	lb bc, BANK(LeaderGFX), $56
 	call Request2bpp
-	ld de, $6043
+	ld de, BadgeGFX
 	ld hl, $8000
-	ld bc, $92c
+	lb bc, BANK(BadgeGFX), $2c
 	call Request2bpp
 	call Function2536c
 	call Function251ab
@@ -31066,13 +31066,13 @@ Function2524c: ; 2524c (9:524c)
 	ld d, $6
 	call Function253b0
 	call WaitBGMap
-	ld de, $5ae3
+	ld de, LeaderGFX2
 	ld hl, $9290
-	ld bc, $956
+	lb bc, BANK(LeaderGFX2), $56
 	call Request2bpp
-	ld de, $6303
+	ld de, BadgeGFX2
 	ld hl, $8000
-	ld bc, $92c
+	lb bc, BANK(BadgeGFX2), $2c
 	call Request2bpp
 	call Function2536c
 	call Function251ab
@@ -31398,8 +31398,14 @@ Function2547b: ; 2547b (9:547b)
 	jr .asm_2548a
 ; 254a7 (9:54a7)
 
-INCBIN "baserom.gbc",$254a7,$265d3 - $254a7
+INCBIN "baserom.gbc", $254a7, $25583 - $254a7
 
+LeaderGFX:  INCBIN "gfx/misc/leaders.2bpp"
+LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp"
+BadgeGFX:   INCBIN "gfx/misc/badges.2bpp"
+BadgeGFX2:  INCBIN "gfx/misc/badges.2bpp"
+
+INCBIN "baserom.gbc", $265c3, $265d3 - $265c3
 
 ProfOaksPC: ; 0x265d3
 	ld hl, OakPCText1