From d001ced41b53271373753de835a9c3b3413dc318 Mon Sep 17 00:00:00 2001
From: vulcandth <vulcandth@gmail.com>
Date: Thu, 13 Jul 2023 20:27:56 -0500
Subject: Add macros, constants, and labels for map scripts and text (#367)

This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
---
 scripts/RocketHideoutElevator.asm | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'scripts/RocketHideoutElevator.asm')

diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm
index 8c51294e..9352a518 100644
--- a/scripts/RocketHideoutElevator.asm
+++ b/scripts/RocketHideoutElevator.asm
@@ -3,26 +3,26 @@ RocketHideoutElevator_Script:
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
-	call nz, RocketHideoutElevatorScript_4572c
+	call nz, RocketHideoutElevatorGetWarpsScript
 	pop hl
 	bit 7, [hl]
 	res 7, [hl]
-	call nz, RocketHideoutElevatorScript_4575f
+	call nz, RocketHideoutElevatorShakeScript
 	xor a
 	ld [wAutoTextBoxDrawingControl], a
 	inc a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-RocketHideoutElevatorScript_4572c:
+RocketHideoutElevatorGetWarpsScript:
 	ld hl, wWarpEntries
 	ld a, [wWarpedFromWhichWarp]
 	ld b, a
 	ld a, [wWarpedFromWhichMap]
 	ld c, a
-	call RocketHideoutElevatorScript_4573a
+	call .SetWarpEntries
 
-RocketHideoutElevatorScript_4573a:
+.SetWarpEntries:
 	inc hl
 	inc hl
 	ld a, b
@@ -31,7 +31,7 @@ RocketHideoutElevatorScript_4573a:
 	ld [hli], a
 	ret
 
-RocketHideoutElevatorScript_45741:
+RocketHideoutElevatorScript:
 	ld hl, RocketHideoutElavatorFloors
 	call LoadItemList
 	ld hl, RocketHideoutElevatorWarpMaps
@@ -55,30 +55,31 @@ RocketHideoutElevatorWarpMaps:
 	db 2, ROCKET_HIDEOUT_B4F
 RocketHideoutElevatorWarpMapsEnd:
 
-RocketHideoutElevatorScript_4575f:
+RocketHideoutElevatorShakeScript:
 	call Delay3
 	farcall ShakeElevator
 	ret
 
 RocketHideoutElevator_TextPointers:
-	dw RocketHideoutElevatorText1
+	def_text_pointers
+	dw_const RocketHideoutElevatorText, TEXT_ROCKETHIDEOUTELEVATOR
 
-RocketHideoutElevatorText1:
+RocketHideoutElevatorText:
 	text_asm
 	ld b, LIFT_KEY
 	call IsItemInBag
-	jr z, .asm_45782
-	call RocketHideoutElevatorScript_45741
+	jr z, .no_key
+	call RocketHideoutElevatorScript
 	ld hl, RocketHideoutElevatorWarpMaps
 	predef DisplayElevatorFloorMenu
-	jr .asm_45788
-.asm_45782
-	ld hl, RocketHideoutElevatorText_4578b
+	jr .text_script_end
+.no_key
+	ld hl, .AppearsToNeedKeyText
 	call PrintText
-.asm_45788
+.text_script_end
 	jp TextScriptEnd
 
-RocketHideoutElevatorText_4578b:
-	text_far _RocketElevatorText_4578b
+.AppearsToNeedKeyText:
+	text_far _RocketHideoutElevatorAppearsToNeedKeyText
 	text_waitbutton
 	text_end
-- 
cgit v1.3.1-sl0p