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/VermilionDock.asm | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'scripts/VermilionDock.asm')

diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm
index 94779798..041bf5b4 100644
--- a/scripts/VermilionDock.asm
+++ b/scripts/VermilionDock.asm
@@ -1,14 +1,14 @@
 VermilionDock_Script:
 	call EnableAutoTextBoxDrawing
 	CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK
-	jr nz, .asm_1db8d
+	jr nz, .walking_out_of_dock
 	CheckEventReuseHL EVENT_GOT_HM01
 	ret z
 	ld a, [wDestinationWarpID]
 	cp $1
 	ret nz
 	CheckEventReuseHL EVENT_SS_ANNE_LEFT
-	jp z, VermilionDock_1db9b
+	jp z, VermilionDockSSAnneLeavesScript
 	SetEventReuseHL EVENT_STARTED_WALKING_OUT_OF_DOCK
 	call Delay3
 	ld hl, wd730
@@ -26,7 +26,7 @@ VermilionDock_Script:
 	dec a
 	ld [wJoyIgnore], a
 	ret
-.asm_1db8d
+.walking_out_of_dock
 	CheckEventAfterBranchReuseHL EVENT_WALKED_OUT_OF_DOCK, EVENT_STARTED_WALKING_OUT_OF_DOCK
 	ret nz
 	ld a, [wSimulatedJoypadStatesIndex]
@@ -36,7 +36,7 @@ VermilionDock_Script:
 	SetEventReuseHL EVENT_WALKED_OUT_OF_DOCK
 	ret
 
-VermilionDock_1db9b:
+VermilionDockSSAnneLeavesScript:
 	SetEventForceReuseHL EVENT_SS_ANNE_LEFT
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wJoyIgnore], a
@@ -77,7 +77,7 @@ VermilionDock_1db9b:
 	ld [wUpdateSpritesEnabled], a
 	ld d, $0
 	ld e, $8
-.asm_1dbfa
+.shift_columns_up
 	ld hl, $2
 	add hl, bc
 	ld a, l
@@ -90,19 +90,19 @@ VermilionDock_1db9b:
 	call VermilionDock_EmitSmokePuff
 	pop de
 	ld b, $10
-.asm_1dc11
+.smoke_puff_drift_loop
 	call VermilionDock_AnimSmokePuffDriftRight
 	ld c, $8
-.asm_1dc16
-	call VermilionDock_1dc7c
+.delay_between_drifts
+	call VermilionDock_SyncScrollWithLY
 	dec c
-	jr nz, .asm_1dc16
+	jr nz, .delay_between_drifts
 	inc d
 	dec b
-	jr nz, .asm_1dc11
+	jr nz, .smoke_puff_drift_loop
 	pop bc
 	dec e
-	jr nz, .asm_1dbfa
+	jr nz, .shift_columns_up
 	xor a
 	ldh [rWY], a
 	ldh [hWY], a
@@ -129,12 +129,12 @@ VermilionDock_AnimSmokePuffDriftRight:
 	swap a
 	ld c, a
 	ld de, 4
-.loop
+.drift_loop
 	inc [hl]
 	inc [hl]
 	add hl, de
 	dec c
-	jr nz, .loop
+	jr nz, .drift_loop
 	pop de
 	pop bc
 	ret
@@ -161,22 +161,22 @@ VermilionDockOAMBlock:
 	db $fe, $10
 	db $ff, $10
 
-VermilionDock_1dc7c:
+VermilionDock_SyncScrollWithLY:
 	ld h, d
 	ld l, $50
-	call .asm_1dc86
+	call .sync_scroll_ly
 	ld h, $0
 	ld l, $80
-.asm_1dc86
+.sync_scroll_ly
 	ldh a, [rLY]
 	cp l
-	jr nz, .asm_1dc86
+	jr nz, .sync_scroll_ly
 	ld a, h
 	ldh [rSCX], a
-.asm_1dc8e
+.wait_for_ly_match
 	ldh a, [rLY]
 	cp h
-	jr z, .asm_1dc8e
+	jr z, .wait_for_ly_match
 	ret
 
 VermilionDock_EraseSSAnne:
@@ -209,8 +209,9 @@ VermilionDock_EraseSSAnne:
 	ret
 
 VermilionDock_TextPointers:
-	dw VermilionDockText1
+	def_text_pointers
+	dw_const VermilionDockUnusedText, TEXT_VERMILIONDOCK_UNUSED
 
-VermilionDockText1:
-	text_far _VermilionDockText1
+VermilionDockUnusedText:
+	text_far _VermilionDockUnusedText
 	text_end
-- 
cgit v1.3.1-sl0p