summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-02-23 20:40:47 -0500
committeryenatch <yenatch@gmail.com>2014-02-23 20:40:47 -0500
commit85698ddbdb959f06594d8fa6a431d261b1a698a5 (patch)
treeb4f72bee460f25bc4b96226377172776a9697d11
parent229da909638fe6538294b4d4e2ec2cd9fc8f9b08 (diff)
Trainer card gym leader and badge graphics.
-rw-r--r--gfx/misc/badges.2bppbin0 -> 704 bytes
-rw-r--r--gfx/misc/leaders.2bppbin0 -> 1376 bytes
-rw-r--r--main.asm24
3 files changed, 15 insertions, 9 deletions
diff --git a/gfx/misc/badges.2bpp b/gfx/misc/badges.2bpp
new file mode 100644
index 000000000..52cf24e1b
--- /dev/null
+++ b/gfx/misc/badges.2bpp
Binary files differ
diff --git a/gfx/misc/leaders.2bpp b/gfx/misc/leaders.2bpp
new file mode 100644
index 000000000..fecae45db
--- /dev/null
+++ b/gfx/misc/leaders.2bpp
Binary files differ
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