Celadon Mart Roof and Elevator

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 "@"

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