From b70d187627decfb897aec19fb1a31fbaee8414e6 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 22 May 2016 11:30:34 -0400 Subject: Elevator floor menu, clear save --- engine/clear_save.asm | 8 ++++++-- engine/predefs7.asm | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'engine') diff --git a/engine/clear_save.asm b/engine/clear_save.asm index adbef1a4..37d098e6 100755 --- a/engine/clear_save.asm +++ b/engine/clear_save.asm @@ -1,10 +1,12 @@ -DoClearSaveDialogue: ; 1c98a (7:498a) +DoClearSaveDialogue: ; DoClearSaveDialogue: ; 1c21e (7:421e) call ClearScreen call RunDefaultPaletteCommand call LoadFontTilePatterns call LoadTextBoxTilePatterns ld hl, ClearSaveDataText call PrintText + ld a, B_BUTTON + ld [wJoyIgnore], a coord hl, 14, 7 lb bc, 8, 15 ld a, NO_YES_MENU @@ -12,12 +14,14 @@ DoClearSaveDialogue: ; 1c98a (7:498a) ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID + ld a, 0 + ld [wJoyIgnore], a ld a, [wCurrentMenuItem] and a jp z, Init callba ClearSAV jp Init -ClearSaveDataText: ; 1c9c1 (7:49c1) +ClearSaveDataText: ; 1c25f (7:425f) TX_FAR _ClearSaveDataText db "@" diff --git a/engine/predefs7.asm b/engine/predefs7.asm index a2c08171..9138897f 100755 --- a/engine/predefs7.asm +++ b/engine/predefs7.asm @@ -1,6 +1,12 @@ -DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6) +DisplayElevatorFloorMenu: ; 1c264 (7:4264) + ld hl, wd730 + ld a, [hl] + push af + set 6, [hl] ld hl, WhichFloorText call PrintText + pop af + ld [wd730], a ld hl, wItemList ld a, l ld [wListPointer], a @@ -43,6 +49,6 @@ DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6) ld [hli], a ; destination map ID ret -WhichFloorText: ; 1ca14 (7:4a14) +WhichFloorText: ; 1c2bd (7:42bd) TX_FAR _WhichFloorText db "@" -- cgit v1.2.3