summaryrefslogtreecommitdiff
path: root/engine/trainer_card.asm
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2017-12-11 17:37:34 -0500
committersurskitty <surskitty@gmail.com>2017-12-11 17:37:34 -0500
commit98128cd4d8457948e7136a16e08bacff0bc3529d (patch)
tree171c67509afba62571266bd6bebbfdb829d2a876 /engine/trainer_card.asm
parent069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff)
parent94c7def4883fbdbcd3987a067443a2069b8bb610 (diff)
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/trainer_card.asm')
-rwxr-xr-xengine/trainer_card.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm
index 23defe919..499891fb0 100755
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -448,7 +448,7 @@ TrainerCard_Page1_PrintGameTime: ; 25415 (9:5415)
ret nz
hlcoord 15, 12
ld a, [hl]
- xor %01010001 ; $7F <--> $2E
+ xor %01010001 ; $7F (space) <--> $2E (colon)
ld [hl], a
ret
@@ -606,11 +606,11 @@ TrainerCard_JohtoBadgesOAM: ; 254c9
db $1c | $80, $20, $24, $20 | $80
; 25523
-CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp"
+CardStatusGFX: INCBIN "gfx/trainer_card/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"
+LeaderGFX: INCBIN "gfx/trainer_card/leaders.2bpp"
+LeaderGFX2: INCBIN "gfx/trainer_card/leaders.2bpp"
+BadgeGFX: INCBIN "gfx/trainer_card/badges.2bpp"
+BadgeGFX2: INCBIN "gfx/trainer_card/badges.2bpp"
-CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp"
+CardRightCornerGFX: INCBIN "gfx/trainer_card/card_right_corner.2bpp"