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.

1 files changed, 72 insertions, 70 deletions

diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm
index a65ffb54..01584f27 100644
--- a/scripts/RocketHideoutB4F.asm
+++ b/scripts/RocketHideoutB4F.asm
@@ -1,5 +1,5 @@
 RocketHideoutB4F_Script:
-	call RocketHideout4Script_45473
+	call RocketHideoutB4FDoorCallbackScript
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout4TrainerHeaders
 	ld de, RocketHideoutB4F_ScriptPointers
@@ -8,29 +8,29 @@ RocketHideoutB4F_Script:
 	ld [wRocketHideoutB4FCurScript], a
 	ret
 
-RocketHideout4Script_45473:
+RocketHideoutB4FDoorCallbackScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
 	CheckEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED
-	jr nz, .asm_45496
+	jr nz, .door_already_unlocked
 	CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 1
-	jr z, .asm_4548c
-	ld a, $2d
-	jr .asm_45498
-.asm_4548c
+	jr z, .unlock_door
+	ld a, $2d ; Door block
+	jr .set_block
+.unlock_door
 	ld a, SFX_GO_INSIDE
 	call PlaySound
 	SetEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED
-.asm_45496
-	ld a, $e
-.asm_45498
+.door_already_unlocked
+	ld a, $e ; Floor block
+.set_block
 	ld [wNewTileBlockID], a
 	lb bc, 5, 12
 	predef_jump ReplaceTileBlock
 
-RocketHideout4Script_454a3:
+RocketHideoutB4FSetDefaultScript:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wRocketHideoutB4FCurScript], a
@@ -38,20 +38,21 @@ RocketHideout4Script_454a3:
 	ret
 
 RocketHideoutB4F_ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
-	dw RocketHideout4Script3
+	def_script_pointers
+	dw_const CheckFightingMapTrainers,              SCRIPT_ROCKETHIDEOUTB4F_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROCKETHIDEOUTB4F_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_ROCKETHIDEOUTB4F_END_BATTLE
+	dw_const RocketHideoutB4FBeatGiovanniScript,    SCRIPT_ROCKETHIDEOUTB4F_BEAT_GIOVANNI
 
-RocketHideout4Script3:
+RocketHideoutB4FBeatGiovanniScript:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, RocketHideout4Script_454a3
+	jp z, RocketHideoutB4FSetDefaultScript
 	call UpdateSprites
-	ld a, $f0
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
-	ld a, $a
+	ld a, TEXT_ROCKETHIDEOUTB4F_GIOVANNI_HOPE_WE_MEET_AGAIN
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call GBFadeOutToBlack
@@ -67,44 +68,45 @@ RocketHideout4Script3:
 	ld [wJoyIgnore], a
 	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
-	ld a, $0
+	ld a, SCRIPT_ROCKETHIDEOUTB4F_DEFAULT
 	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 RocketHideoutB4F_TextPointers:
-	dw RocketHideout4Text1
-	dw RocketHideout4Text2
-	dw RocketHideout4Text3
-	dw RocketHideout4Text4
-	dw PickUpItemText
-	dw PickUpItemText
-	dw PickUpItemText
-	dw PickUpItemText
-	dw PickUpItemText
-	dw RocketHideout4Text10
+	def_text_pointers
+	dw_const RocketHideoutB4FGiovanniText,                TEXT_ROCKETHIDEOUTB4F_GIOVANNI
+	dw_const RocketHideoutB4FRocket1Text,                 TEXT_ROCKETHIDEOUTB4F_ROCKET1
+	dw_const RocketHideoutB4FRocket2Text,                 TEXT_ROCKETHIDEOUTB4F_ROCKET2
+	dw_const RocketHideoutB4FRocket3Text,                 TEXT_ROCKETHIDEOUTB4F_ROCKET3
+	dw_const PickUpItemText,                              TEXT_ROCKETHIDEOUTB4F_HP_UP
+	dw_const PickUpItemText,                              TEXT_ROCKETHIDEOUTB4F_TM_RAZOR_WIND
+	dw_const PickUpItemText,                              TEXT_ROCKETHIDEOUTB4F_IRON
+	dw_const PickUpItemText,                              TEXT_ROCKETHIDEOUTB4F_SILPH_SCOPE
+	dw_const PickUpItemText,                              TEXT_ROCKETHIDEOUTB4F_LIFT_KEY
+	dw_const RocketHideoutB4FGiovanniHopeWeMeetAgainText, TEXT_ROCKETHIDEOUTB4F_GIOVANNI_HOPE_WE_MEET_AGAIN
 
 RocketHideout4TrainerHeaders:
 	def_trainers 2
 RocketHideout4TrainerHeader0:
-	trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, 0, RocketHideout4BattleText2, RocketHideout4EndBattleText2, RocketHideout4AfterBattleText2
+	trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, 0, RocketHideoutB4FGiovanniBattleText, RocketHideoutB4FGiovanniEndBattleText, RocketHideoutB4FGiovanniAfterBattleText
 RocketHideout4TrainerHeader1:
-	trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 0, RocketHideout4BattleText3, RocketHideout4EndBattleText3, RocketHideout4AfterBattleText3
+	trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 0, RocketHideoutB4FRocket1BattleText, RocketHideoutB4FRocket1EndBattleText, RocketHideoutB4FRocket1AfterBattleText
 RocketHideout4TrainerHeader2:
-	trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1, RocketHideout4BattleText4, RocketHideout4EndBattleText4, RocketHideout4AfterBattleText4
+	trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1, RocketHideoutB4FRocket2BattleText, RocketHideoutB4FRocket2EndBattleText, RocketHideoutB4FRocket2AfterBattleText
 	db -1 ; end
 
-RocketHideout4Text1:
+RocketHideoutB4FGiovanniText:
 	text_asm
 	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
-	jp nz, .asm_545571
-	ld hl, RocketHideout4Text_4557a
+	jp nz, .beat_giovanni
+	ld hl, .ImpressedYouGotHereText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, RocketHideout4Text_4557f
-	ld de, RocketHideout4Text_4557f
+	ld hl, .WhatCannotBeText
+	ld de, .WhatCannotBeText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
@@ -112,81 +114,81 @@ RocketHideout4Text1:
 	call InitBattleEnemyParameters
 	xor a
 	ldh [hJoyHeld], a
-	ld a, $3
+	ld a, SCRIPT_ROCKETHIDEOUTB4F_BEAT_GIOVANNI
 	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	jr .asm_209f0
-.asm_545571
-	ld hl, RocketHideout4Text10
+.beat_giovanni
+	ld hl, RocketHideoutB4FGiovanniHopeWeMeetAgainText
 	call PrintText
 .asm_209f0
 	jp TextScriptEnd
 
-RocketHideout4Text_4557a:
-	text_far _RocketHideout4Text_4557a
+.ImpressedYouGotHereText:
+	text_far _RocketHideoutB4FGiovanniImpressedYouGotHereText
 	text_end
 
-RocketHideout4Text_4557f:
-	text_far _RocketHideout4Text_4557f
+.WhatCannotBeText:
+	text_far _RocketHideoutB4FGiovanniWhatCannotBeText
 	text_end
 
-RocketHideout4Text10:
-	text_far _RocketHideout4Text_45584
+RocketHideoutB4FGiovanniHopeWeMeetAgainText:
+	text_far _RocketHideoutB4FGiovanniHopeWeMeetAgainText
 	text_end
 
-RocketHideout4Text2:
+RocketHideoutB4FRocket1Text:
 	text_asm
 	ld hl, RocketHideout4TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout4BattleText2:
-	text_far _RocketHideout4BattleText2
+RocketHideoutB4FGiovanniBattleText:
+	text_far _RocketHideoutB4FGiovanniBattleText
 	text_end
 
-RocketHideout4EndBattleText2:
-	text_far _RocketHideout4EndBattleText2
+RocketHideoutB4FGiovanniEndBattleText:
+	text_far _RocketHideoutB4FGiovanniEndBattleText
 	text_end
 
-RocketHideout4AfterBattleText2:
-	text_far _RocketHide4AfterBattleText2
+RocketHideoutB4FGiovanniAfterBattleText:
+	text_far _RocketHideoutB4FGiovanniAfterBattleText
 	text_end
 
-RocketHideout4Text3:
+RocketHideoutB4FRocket2Text:
 	text_asm
 	ld hl, RocketHideout4TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout4BattleText3:
-	text_far _RocketHideout4BattleText3
+RocketHideoutB4FRocket1BattleText:
+	text_far _RocketHideoutB4FRocket1BattleText
 	text_end
 
-RocketHideout4EndBattleText3:
-	text_far _RocketHideout4EndBattleText3
+RocketHideoutB4FRocket1EndBattleText:
+	text_far _RocketHideoutB4FRocket1EndBattleText
 	text_end
 
-RocketHideout4AfterBattleText3:
-	text_far _RocketHide4AfterBattleText3
+RocketHideoutB4FRocket1AfterBattleText:
+	text_far _RocketHideoutB4FRocket1AfterBattleText
 	text_end
 
-RocketHideout4Text4:
+RocketHideoutB4FRocket3Text:
 	text_asm
 	ld hl, RocketHideout4TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RocketHideout4BattleText4:
-	text_far _RocketHideout4BattleText4
+RocketHideoutB4FRocket2BattleText:
+	text_far _RocketHideoutB4FRocket2BattleText
 	text_end
 
-RocketHideout4EndBattleText4:
-	text_far _RocketHideout4EndBattleText4
+RocketHideoutB4FRocket2EndBattleText:
+	text_far _RocketHideoutB4FRocket2EndBattleText
 	text_end
 
-RocketHideout4AfterBattleText4:
+RocketHideoutB4FRocket2AfterBattleText:
 	text_asm
-	ld hl, RocketHideout4Text_455ec
+	ld hl, .Text
 	call PrintText
 	CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY
 	jr nz, .asm_455e9
@@ -196,6 +198,6 @@ RocketHideout4AfterBattleText4:
 .asm_455e9
 	jp TextScriptEnd
 
-RocketHideout4Text_455ec:
-	text_far _RocketHideout4Text_455ec
+.Text:
+	text_far _RocketHideoutB4FRocket2AfterBattleText
 	text_end