From 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 4 Nov 2020 00:06:44 -0600
Subject: Sync with pokered

---
 scripts/RocketHideoutElevator.asm | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'scripts/RocketHideoutElevator.asm')

diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm
index 9525db3a..8c51294e 100755
--- a/scripts/RocketHideoutElevator.asm
+++ b/scripts/RocketHideoutElevator.asm
@@ -41,31 +41,30 @@ RocketHideoutElevatorScript_45741:
 	ret
 
 RocketHideoutElavatorFloors:
-	db $03 ; num elements in list
+	db 3 ; #
 	db FLOOR_B1F
 	db FLOOR_B2F
 	db FLOOR_B4F
-	db $FF ; terminator
+	db -1 ; end
 
-RocketHideoutElevatorWarpMaps:
-; first byte is warp number
-; second byte is map number
 ; These specify where the player goes after getting out of the elevator.
-	db $04, ROCKET_HIDEOUT_B1F
-	db $04, ROCKET_HIDEOUT_B2F
-	db $02, ROCKET_HIDEOUT_B4F
+RocketHideoutElevatorWarpMaps:
+	; warp number, map id
+	db 4, ROCKET_HIDEOUT_B1F
+	db 4, ROCKET_HIDEOUT_B2F
+	db 2, ROCKET_HIDEOUT_B4F
 RocketHideoutElevatorWarpMapsEnd:
 
 RocketHideoutElevatorScript_4575f:
 	call Delay3
-	callba ShakeElevator
+	farcall ShakeElevator
 	ret
 
 RocketHideoutElevator_TextPointers:
 	dw RocketHideoutElevatorText1
 
 RocketHideoutElevatorText1:
-	TX_ASM
+	text_asm
 	ld b, LIFT_KEY
 	call IsItemInBag
 	jr z, .asm_45782
@@ -80,6 +79,6 @@ RocketHideoutElevatorText1:
 	jp TextScriptEnd
 
 RocketHideoutElevatorText_4578b:
-	TX_FAR _RocketElevatorText_4578b
-	TX_WAIT
-	db "@"
+	text_far _RocketElevatorText_4578b
+	text_waitbutton
+	text_end
-- 
cgit v1.3.1-sl0p