diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-25 22:23:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 22:23:45 -0400 |
| commit | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch) | |
| tree | 3d747166409fdc94f0fd1aa760693a7ee5bd2156 /engine/menus/trainer_card.asm | |
| parent | 89681d231611938a791f4256e602c88c2f9aa3e1 (diff) | |
| parent | b2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff) | |
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'engine/menus/trainer_card.asm')
| -rw-r--r-- | engine/menus/trainer_card.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index a1b7fcd64..1d959ebce 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -24,7 +24,7 @@ TrainerCard: ld a, [wJumptableIndex] bit 7, a jr nz, .quit - ld a, [hJoyLast] + ldh a, [hJoyLast] and B_BUTTON jr nz, .quit call .RunJumptable @@ -251,7 +251,7 @@ TrainerCard_PrintTopHalfOfCard: hlcoord 14, 1 lb bc, 5, 7 xor a - ld [hGraphicStartTile], a + ldh [hGraphicStartTile], a predef PlaceGraphic ret @@ -442,7 +442,7 @@ TrainerCard_Page1_PrintGameTime: ld de, wGameTimeMinutes lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum - ld a, [hVBlankCounter] + ldh a, [hVBlankCounter] and $1f ret nz hlcoord 15, 12 @@ -452,7 +452,7 @@ TrainerCard_Page1_PrintGameTime: ret TrainerCard_Page2_3_AnimateBadges: - ld a, [hVBlankCounter] + ldh a, [hVBlankCounter] and %111 ret nz ld a, [wTrainerCardBadgeFrameCounter] |