diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-03 03:33:22 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-03 04:41:05 -0400 |
| commit | 3d651a7c49317e9c2b55bffcb589bf2e1e2b4ccd (patch) | |
| tree | 9fb82a85f77b36b0cfe6b530747a831cf1e647a1 /engine/menus | |
| parent | a594f5e55749adf6c55b981b1d570e1df65a1879 (diff) | |
Add Makefile option for verbose sym/map; fix some label names.
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/menu_2.asm | 10 | ||||
| -rw-r--r-- | engine/menus/scrolling_menu.asm | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 50214545..2fd65e2b 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -28,17 +28,17 @@ PlaceMenuItemQuantity: ret PlaceMoneyTopRight: - ld hl, MenuHeader_0x24b15 + ld hl, MenuHeader_0x24a3d call CopyMenuHeader jr PlaceMoneyTextbox PlaceMoneyBottomLeft: - ld hl, MenuHeader_0x24b1d + ld hl, MenuHeader_0x24a45 call CopyMenuHeader jr PlaceMoneyTextbox PlaceMoneyAtTopLeftOfTextbox: - ld hl, MenuHeader_0x24b15 + ld hl, MenuHeader_0x24a3d lb de, 0, 11 call OffsetMenuHeader @@ -52,13 +52,13 @@ PlaceMoneyTextbox: call PrintNum ret -MenuHeader_0x24b15: +MenuHeader_0x24a3d: db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, 2 dw NULL db 1 ; default option -MenuHeader_0x24b1d: +MenuHeader_0x24a45: db MENU_BACKUP_TILES ; flags menu_coords 0, 11, 8, 13 dw NULL diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index 6b0572a6..f051e71c 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, .string_24787 call PlaceString ret -.string_2485f +.string_24787 db "CANCEL@" .call_function |