diff options
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/scrolling_menu.asm | 4 | ||||
| -rw-r--r-- | engine/menus/trainer_card.asm | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index 6b0572a6d..0574bc730 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -401,11 +401,11 @@ ScrollingMenu_UpdateDisplay: ld a, [wMenuDataFlags] bit 0, a ; call function on cancel jr nz, .call_function - ld de, .string_2485f + ld de, .CancelString call PlaceString ret -.string_2485f +.CancelString db "CANCEL@" .call_function diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 712032cbe..726148e20 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -356,7 +356,8 @@ TrainerCard_InitBorder: ld a, $23 ld [hli], a - ld e, SCREEN_HEIGHT - 1 + + ld e, SCREEN_WIDTH - 3 ld a, " " .loop2 ld [hli], a @@ -367,11 +368,12 @@ TrainerCard_InitBorder: ld [hli], a ld a, $23 ld [hli], a + .loop3 ld a, $23 ld [hli], a - ld e, SCREEN_HEIGHT + ld e, SCREEN_WIDTH - 2 ld a, " " .loop4 ld [hli], a @@ -380,6 +382,7 @@ TrainerCard_InitBorder: ld a, $23 ld [hli], a + dec d jr nz, .loop3 @@ -388,14 +391,16 @@ TrainerCard_InitBorder: ld a, $24 ld [hli], a - ld e, SCREEN_HEIGHT - 1 + ld e, SCREEN_WIDTH - 3 ld a, " " .loop5 ld [hli], a dec e jr nz, .loop5 + ld a, $23 ld [hli], a + ld e, SCREEN_WIDTH .loop6 ld a, $23 |