Elevator floor menu, clear save

3 files changed, 59 insertions, 8 deletions

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 "@"
diff --git a/main.asm b/main.asm
index b8d32069..972d5d94 100755
--- a/main.asm
+++ b/main.asm
@@ -231,7 +231,45 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm"
 INCLUDE "engine/menu/pc.asm"
 
 SECTION "bank06",ROMX,BANK[$06]
-	dr $18000,$1a4ea
+
+	dr $18000,$18dee ; headers, objects, blocks
+; INCLUDE "data/mapHeaders/celadoncity.asm"
+; INCLUDE "data/mapObjects/celadoncity.asm"
+; CeladonCityBlocks: INCBIN "maps/celadoncity.blk"
+
+; INCLUDE "data/mapHeaders/pallettown.asm"
+; INCLUDE "data/mapObjects/pallettown.asm"
+; PalletTownBlocks: INCBIN "maps/pallettown.blk"
+
+; INCLUDE "data/mapHeaders/viridiancity.asm"
+; INCLUDE "data/mapObjects/viridiancity.asm"
+; ViridianCityBlocks: INCBIN "maps/viridiancity.blk"
+
+; INCLUDE "data/mapHeaders/pewtercity.asm"
+; INCLUDE "data/mapObjects/pewtercity.asm"
+; PewterCityBlocks: INCBIN "maps/pewtercity.blk"
+
+; INCLUDE "data/mapHeaders/ceruleancity.asm"
+; INCLUDE "data/mapObjects/ceruleancity.asm"
+; CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk"
+
+; INCLUDE "data/mapHeaders/vermilioncity.asm"
+; INCLUDE "data/mapObjects/vermilioncity.asm"
+; VermilionCityBlocks: INCBIN "maps/vermilioncity.blk"
+
+; INCLUDE "data/mapHeaders/fuchsiacity.asm"
+; INCLUDE "data/mapObjects/fuchsiacity.asm"
+; FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk"
+
+	dr $18dee,$1a4ea ; map scripts
+
+; INCLUDE "scripts/pallettown.asm"
+; INCLUDE "scripts/viridiancity.asm"
+; INCLUDE "scripts/pewtercity.asm"
+; INCLUDE "scripts/ceruleancity.asm"
+; INCLUDE "scripts/vermilioncity.asm"
+; INCLUDE "scripts/celadoncity.asm"
+; INCLUDE "scripts/fuchsiacity.asm"
 
 INCLUDE "engine/overworld/npc_movement.asm"
 INCLUDE "engine/overworld/doors.asm"
@@ -239,9 +277,12 @@ INCLUDE "engine/overworld/ledges.asm"
 
 SECTION "bank07",ROMX,BANK[$07]
 
-	dr $1c000,$1c21e
-DoClearSaveDialogue: ; 1c21e (7:421e)
-	dr $1c21e,$1e2ae
+	dr $1c000,$1c21e ; headers, objects, blocks
+
+INCLUDE "engine/clear_save.asm"
+INCLUDE "engine/predefs7.asm"
+
+	dr $1c2c2,$1e2ae ; map scripts
 OpenOaksPC: ; 1e2ae (7:62ae)
 	dr $1e2ae,$1e321
 SafariZoneCheck: ; 1e321 (7:6e21)