summaryrefslogtreecommitdiff
path: root/engine/menus/trainer_card.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menus/trainer_card.asm')
-rw-r--r--engine/menus/trainer_card.asm12
1 files changed, 7 insertions, 5 deletions
diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm
index 6f2ef316..de34057f 100644
--- a/engine/menus/trainer_card.asm
+++ b/engine/menus/trainer_card.asm
@@ -44,10 +44,10 @@ TrainerCard:
call ClearTilemap
call DisableLCD
- ld hl, ChrisCardPic
+ ld hl, ChrisPicAndTrainerCardGFX
ld de, vTiles2
- ld bc, 41 tiles
- ld a, BANK(ChrisCardPic)
+ ld bc, (35 + 6) tiles
+ ld a, BANK(ChrisPicAndTrainerCardGFX)
call FarCopyBytes
ld hl, CardStatusGFX
@@ -619,8 +619,10 @@ TrainerCard_JohtoBadgesOAM:
db $1c, $20, $24, $20 | (1 << 7)
db $1c | (1 << 7), $20, $24, $20 | (1 << 7)
-ChrisCardPic: INCBIN "gfx/trainer_card/chris_card.2bpp"
-CardGFX: INCBIN "gfx/trainer_card/trainer_card.2bpp"
+ChrisPicAndTrainerCardGFX:
+INCBIN "gfx/trainer_card/chris_card.2bpp"
+INCBIN "gfx/trainer_card/trainer_card.2bpp"
+
CardStatusGFX: INCBIN "gfx/trainer_card/card_status.2bpp"
LeaderGFX: INCBIN "gfx/trainer_card/leaders.2bpp"