Celadon Mart Roof and Elevator

5 files changed, 43 insertions, 47 deletions

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index dfec41e4..4408d4dd 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -124,10 +124,10 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(UndergroundPathWE_h)
 	db BANK(CeladonMart1_h)
 	db BANK(CeladonMart2_h)
-	db $12 ; db BANK(CeladonMart3_h)
-	db $12 ; db BANK(CeladonMart4_h)
-	db $12 ; db BANK(CeladonMartRoof_h)
-	db $12 ; db BANK(CeladonMartElevator_h)
+	db BANK(CeladonMart3_h)
+	db BANK(CeladonMart4_h)
+	db BANK(CeladonMartRoof_h)
+	db BANK(CeladonMartElevator_h)
 	db $12 ; db BANK(CeladonMansion1_h)
 	db $12 ; db BANK(CeladonMansion2_h)
 	db $12 ; db BANK(CeladonMansion3_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 62a1f30b..d5af332a 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -124,10 +124,10 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw UndergroundPathWE_h
 	dw CeladonMart1_h
 	dw CeladonMart2_h
-	dw $4157 ; dw CeladonMart3_h
-	dw $4251 ; dw CeladonMart4_h
-	dw $42d0 ; dw CeladonMartRoof_h
-	dw $44ff ; dw CeladonMartElevator_h
+	dw CeladonMart3_h
+	dw CeladonMart4_h
+	dw CeladonMartRoof_h
+	dw CeladonMartElevator_h
 	dw $4593 ; dw CeladonMansion1_h
 	dw $465a ; dw CeladonMansion2_h
 	dw $46b0 ; dw CeladonMansion3_h ;id=130
diff --git a/main.asm b/main.asm
index 5b84e777..e59996c5 100755
--- a/main.asm
+++ b/main.asm
@@ -880,7 +880,31 @@ INCLUDE "scripts/redshouse1f.asm"
 INCLUDE "data/mapObjects/redshouse1f.asm"
 RedsHouse1FBlocks:
 INCBIN "maps/redshouse1f.blk"
-	dr $48157,$492a9
+
+INCLUDE "data/mapHeaders/celadonmart3.asm"
+INCLUDE "scripts/celadonmart3.asm"
+INCLUDE "data/mapObjects/celadonmart3.asm"
+CeladonMart3Blocks:
+INCBIN "maps/celadonmart3.blk"
+
+INCLUDE "data/mapHeaders/celadonmart4.asm"
+INCLUDE "scripts/celadonmart4.asm"
+INCLUDE "data/mapObjects/celadonmart4.asm"
+CeladonMart4Blocks:
+INCBIN "maps/celadonmart4.blk"
+
+INCLUDE "data/mapHeaders/celadonmartroof.asm"
+INCLUDE "scripts/celadonmartroof.asm"
+INCLUDE "data/mapObjects/celadonmartroof.asm"
+CeladonMartRoofBlocks:
+INCBIN "maps/celadonmartroof.blk"
+
+INCLUDE "data/mapHeaders/celadonmartelevator.asm"
+INCLUDE "scripts/celadonmartelevator.asm"
+INCLUDE "data/mapObjects/celadonmartelevator.asm"
+CeladonMartElevatorBlocks:
+INCBIN "maps/celadonmartelevator.blk"
+	dr $48593,$492a9
 
 INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
 INCLUDE "scripts/mtmoonpokecenter.asm"
diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm
index c6c6ecc7..49e5e84b 100755
--- a/scripts/celadonmart3.asm
+++ b/scripts/celadonmart3.asm
@@ -22,41 +22,9 @@ CeladonMart3TextPointers: ; 48228 (12:4228)
 
 CeladonMart3Text1: ; 4824a (12:424a)
 	TX_ASM
-	CheckEvent EVENT_GOT_TM18
-	jr nz, .asm_a5463
-	ld hl, TM18PreReceiveText
-	call PrintText
-	lb bc, TM_18, 1
-	call GiveItem
-	jr nc, .BagFull
-	SetEvent EVENT_GOT_TM18
-	ld hl, ReceivedTM18Text
-	jr .asm_81359
-.BagFull
-	ld hl, TM18NoRoomText
-	jr .asm_81359
-.asm_a5463
-	ld hl, TM18ExplanationText
-.asm_81359
-	call PrintText
+	callab Func_f1e30
 	jp TextScriptEnd
 
-TM18PreReceiveText: ; 48278 (12:4278)
-	TX_FAR _TM18PreReceiveText
-	db "@"
-
-ReceivedTM18Text: ; 4827d (12:427d)
-	TX_FAR _ReceivedTM18Text
-	db $0B, "@"
-
-TM18ExplanationText: ; 48283 (12:4283)
-	TX_FAR _TM18ExplanationText
-	db "@"
-
-TM18NoRoomText: ; 48288 (12:4288)
-	TX_FAR _TM18NoRoomText
-	db "@"
-
 CeladonMart3Text2: ; 4828d (12:428d)
 	TX_FAR _CeladonMart3Text2
 	db "@"
diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm
index 439ab62e..b129753d 100755
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -1,5 +1,6 @@
 CeladonMartRoofScript: ; 483d5 (12:43d5)
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ret
 
 CeladonMartRoofScript_GetDrinksInBag: ; 483d8 (12:43d8)
 ; construct a list of all drinks in the player's bag
@@ -71,7 +72,7 @@ CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c)
 	ld hl, wd730
 	res 6, [hl]
 	call HandleMenuInput
-	bit 1, a ; pressed b
+	bit BIT_B_BUTTON, a ; pressed b
 	ret nz
 	ld hl, wFilteredBagItems
 	ld a, [wCurrentMenuItem]
@@ -125,13 +126,16 @@ CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c)
 	ret
 .bagFull
 	ld hl, CeladonMartRoofText_48526
-	jp PrintText
+	call PrintText
+	ret
 .alreadyGaveDrink
 	ld hl, CeladonMartRoofText_4852c
-	jp PrintText
+	call PrintText
+	ret
 
 RemoveItemByIDBank12: ; 484e6 (12:44e6)
-	jpba RemoveItemByID
+	callba RemoveItemByID
+	ret
 
 CeladonMartRoofText_484ee: ; 484ee (12:44ee)
 	TX_FAR _CeladonMartRoofText_484ee