From bac031156bc7170d690c6a2d90d8bafe181d14a7 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sun, 23 Feb 2014 20:58:38 -0500
Subject: [PATCH] Misc trainer card graphics.

---
 gfx/misc/card_right_corner.2bpp | Bin 0 -> 16 bytes
 gfx/misc/card_status.2bpp       | Bin 0 -> 96 bytes
 main.asm                        |  21 ++++++++++++---------
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 gfx/misc/card_right_corner.2bpp
 create mode 100644 gfx/misc/card_status.2bpp

diff --git a/gfx/misc/card_right_corner.2bpp b/gfx/misc/card_right_corner.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..8445737b6c93ef88bcb67b64d9059a09c4468c58
GIT binary patch
literal 16
XcmZSh&sWH2$S26a&%n;W%)kf$8UO+J

literal 0
HcmV?d00001

diff --git a/gfx/misc/card_status.2bpp b/gfx/misc/card_status.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..3234368a9381e17a6885cf00bb539b5f7d45576e
GIT binary patch
literal 96
zcmZSh&j18+ataD|c1%n*HVk0?&!0*_pscK<1mT}Q58^+11miDS1mY_x$;d$DD=Hcq
Re*ECz`0xQ_ngkHQNB~Oe7J2{x

literal 0
HcmV?d00001

diff --git a/main.asm b/main.asm
index 9ed91b472..b4967d068 100644
--- a/main.asm
+++ b/main.asm
@@ -30921,15 +30921,15 @@ Function2513b: ; 2513b (9:513b)
 	call ClearTileMap
 	call DisableLCD
 	callba Function8833e
-	ld hl, $65c3
+	ld hl, CardRightCornerGFX
 	ld de, $91c0
 	ld bc, $10
-	ld a, $9
+	ld a, BANK(CardRightCornerGFX)
 	call FarCopyBytes
-	ld hl, $5523
+	ld hl, CardStatusGFX
 	ld de, $9290
-	ld bc, $560
-	ld a, $9
+	ld bc, $60 + $500
+	ld a, BANK(CardStatusGFX)
 	call FarCopyBytes
 	call Function25299
 	ld hl, $c540
@@ -30992,9 +30992,9 @@ Function251b6: ; 251b6 (9:51b6)
 	ld d, $6
 	call Function253b0
 	call WaitBGMap
-	ld de, $5523
+	ld de, CardStatusGFX
 	ld hl, $9290
-	ld bc, $956
+	lb bc, BANK(CardStatusGFX), $6 + $50
 	call Request2bpp
 	call Function2530a
 	call Function251ab
@@ -31398,14 +31398,17 @@ Function2547b: ; 2547b (9:547b)
 	jr .asm_2548a
 ; 254a7 (9:54a7)
 
-INCBIN "baserom.gbc", $254a7, $25583 - $254a7
+INCBIN "baserom.gbc", $254a7, $25523 - $254a7
+
+CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp"
 
 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
+CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp"
+
 
 ProfOaksPC: ; 0x265d3
 	ld hl, OakPCText1