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, 86 insertions, 84 deletions

diff --git a/scripts/Route21.asm b/scripts/Route21.asm
index c4267816..91840b8f 100644
--- a/scripts/Route21.asm
+++ b/scripts/Route21.asm
@@ -8,201 +8,203 @@ Route21_Script:
 	ret
 
 Route21_ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
+	def_script_pointers
+	dw_const CheckFightingMapTrainers,              SCRIPT_ROUTE21_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE21_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_ROUTE21_END_BATTLE
 
 Route21_TextPointers:
-	dw Route21Text1
-	dw Route21Text2
-	dw Route21Text3
-	dw Route21Text4
-	dw Route21Text5
-	dw Route21Text6
-	dw Route21Text7
-	dw Route21Text8
-	dw Route21Text9
+	def_text_pointers
+	dw_const Route21Fisher1Text,  TEXT_ROUTE21_FISHER1
+	dw_const Route21Fisher2Text,  TEXT_ROUTE21_FISHER2
+	dw_const Route21Swimmer1Text, TEXT_ROUTE21_SWIMMER1
+	dw_const Route21Swimmer2Text, TEXT_ROUTE21_SWIMMER2
+	dw_const Route21Swimmer3Text, TEXT_ROUTE21_SWIMMER3
+	dw_const Route21Swimmer4Text, TEXT_ROUTE21_SWIMMER4
+	dw_const Route21Swimmer5Text, TEXT_ROUTE21_SWIMMER5
+	dw_const Route21Fisher3Text,  TEXT_ROUTE21_FISHER3
+	dw_const Route21Fisher4Text,  TEXT_ROUTE21_FISHER4
 
 Route21TrainerHeaders:
 	def_trainers
 Route21TrainerHeader0:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_0, 0, Route21BattleText1, Route21EndBattleText1, Route21AfterBattleText1
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_0, 0, Route21Fisher1BattleText, Route21Fisher1EndBattleText, Route21Fisher1AfterBattleText
 Route21TrainerHeader1:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_1, 0, Route21BattleText2, Route21EndBattleText2, Route21AfterBattleText2
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_1, 0, Route21Fisher2BattleText, Route21Fisher2EndBattleText, Route21Fisher2AfterBattleText
 Route21TrainerHeader2:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_2, 4, Route21BattleText3, Route21EndBattleText3, Route21AfterBattleText3
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_2, 4, Route21Swimmer1BattleText, Route21Swimmer1EndBattleText, Route21Swimmer1AfterBattleText
 Route21TrainerHeader3:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_3, 4, Route21BattleText4, Route21EndBattleText4, Route21AfterBattleText4
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_3, 4, Route21Swimmer2BattleText, Route21Swimmer2EndBattleText, Route21Swimmer2AfterBattleText
 Route21TrainerHeader4:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_4, 4, Route21BattleText5, Route21EndBattleText5, Route21AfterBattleText5
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_4, 4, Route21Swimmer3BattleText, Route21Swimmer3EndBattleText, Route21Swimmer3AfterBattleText
 Route21TrainerHeader5:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_5, 4, Route21BattleText6, Route21EndBattleText6, Route21AfterBattleText6
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_5, 4, Route21Swimmer4BattleText, Route21Swimmer4EndBattleText, Route21Swimmer4AfterBattleText
 Route21TrainerHeader6:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_6, 3, Route21BattleText7, Route21EndBattleText7, Route21AfterBattleText7
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_6, 3, Route21Swimmer5BattleText, Route21Swimmer5EndBattleText, Route21Swimmer5AfterBattleText
 Route21TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_7, 0, Route21BattleText8, Route21EndBattleText8, Route21AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_7, 0, Route21Fisher3BattleText, Route21Fisher3EndBattleText, Route21Fisher3AfterBattleText
 Route21TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_8, 0, Route21BattleText9, Route21EndBattleText9, Route21AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_8, 0, Route21Fisher4BattleText, Route21Fisher4EndBattleText, Route21Fisher4AfterBattleText
 	db -1 ; end
 
-Route21Text1:
+Route21Fisher1Text:
 	text_asm
 	ld hl, Route21TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text2:
+Route21Fisher2Text:
 	text_asm
 	ld hl, Route21TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text3:
+Route21Swimmer1Text:
 	text_asm
 	ld hl, Route21TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text4:
+Route21Swimmer2Text:
 	text_asm
 	ld hl, Route21TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text5:
+Route21Swimmer3Text:
 	text_asm
 	ld hl, Route21TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text6:
+Route21Swimmer4Text:
 	text_asm
 	ld hl, Route21TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text7:
+Route21Swimmer5Text:
 	text_asm
 	ld hl, Route21TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text8:
+Route21Fisher3Text:
 	text_asm
 	ld hl, Route21TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21Text9:
+Route21Fisher4Text:
 	text_asm
 	ld hl, Route21TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route21BattleText1:
-	text_far _Route21BattleText1
+Route21Fisher1BattleText:
+	text_far _Route21Fisher1BattleText
 	text_end
 
-Route21EndBattleText1:
-	text_far _Route21EndBattleText1
+Route21Fisher1EndBattleText:
+	text_far _Route21Fisher1EndBattleText
 	text_end
 
-Route21AfterBattleText1:
-	text_far _Route21AfterBattleText1
+Route21Fisher1AfterBattleText:
+	text_far _Route21Fisher1AfterBattleText
 	text_end
 
-Route21BattleText2:
-	text_far _Route21BattleText2
+Route21Fisher2BattleText:
+	text_far _Route21Fisher2BattleText
 	text_end
 
-Route21EndBattleText2:
-	text_far _Route21EndBattleText2
+Route21Fisher2EndBattleText:
+	text_far _Route21Fisher2EndBattleText
 	text_end
 
-Route21AfterBattleText2:
-	text_far _Route21AfterBattleText2
+Route21Fisher2AfterBattleText:
+	text_far _Route21Fisher2AfterBattleText
 	text_end
 
-Route21BattleText3:
-	text_far _Route21BattleText3
+Route21Swimmer1BattleText:
+	text_far _Route21Swimmer1BattleText
 	text_end
 
-Route21EndBattleText3:
-	text_far _Route21EndBattleText3
+Route21Swimmer1EndBattleText:
+	text_far _Route21Swimmer1EndBattleText
 	text_end
 
-Route21AfterBattleText3:
-	text_far _Route21AfterBattleText3
+Route21Swimmer1AfterBattleText:
+	text_far _Route21Swimmer1AfterBattleText
 	text_end
 
-Route21BattleText4:
-	text_far _Route21BattleText4
+Route21Swimmer2BattleText:
+	text_far _Route21Swimmer2BattleText
 	text_end
 
-Route21EndBattleText4:
-	text_far _Route21EndBattleText4
+Route21Swimmer2EndBattleText:
+	text_far _Route21Swimmer2EndBattleText
 	text_end
 
-Route21AfterBattleText4:
-	text_far _Route21AfterBattleText4
+Route21Swimmer2AfterBattleText:
+	text_far _Route21Swimmer2AfterBattleText
 	text_end
 
-Route21BattleText5:
-	text_far _Route21BattleText5
+Route21Swimmer3BattleText:
+	text_far _Route21Swimmer3BattleText
 	text_end
 
-Route21EndBattleText5:
-	text_far _Route21EndBattleText5
+Route21Swimmer3EndBattleText:
+	text_far _Route21Swimmer3EndBattleText
 	text_end
 
-Route21AfterBattleText5:
-	text_far _Route21AfterBattleText5
+Route21Swimmer3AfterBattleText:
+	text_far _Route21Swimmer3AfterBattleText
 	text_end
 
-Route21BattleText6:
-	text_far _Route21BattleText6
+Route21Swimmer4BattleText:
+	text_far _Route21Swimmer4BattleText
 	text_end
 
-Route21EndBattleText6:
-	text_far _Route21EndBattleText6
+Route21Swimmer4EndBattleText:
+	text_far _Route21Swimmer4EndBattleText
 	text_end
 
-Route21AfterBattleText6:
-	text_far _Route21AfterBattleText6
+Route21Swimmer4AfterBattleText:
+	text_far _Route21Swimmer4AfterBattleText
 	text_end
 
-Route21BattleText7:
-	text_far _Route21BattleText7
+Route21Swimmer5BattleText:
+	text_far _Route21Swimmer5BattleText
 	text_end
 
-Route21EndBattleText7:
-	text_far _Route21EndBattleText7
+Route21Swimmer5EndBattleText:
+	text_far _Route21Swimmer5EndBattleText
 	text_end
 
-Route21AfterBattleText7:
-	text_far _Route21AfterBattleText7
+Route21Swimmer5AfterBattleText:
+	text_far _Route21Swimmer5AfterBattleText
 	text_end
 
-Route21BattleText8:
-	text_far _Route21BattleText8
+Route21Fisher3BattleText:
+	text_far _Route21Fisher3BattleText
 	text_end
 
-Route21EndBattleText8:
-	text_far _Route21EndBattleText8
+Route21Fisher3EndBattleText:
+	text_far _Route21Fisher3EndBattleText
 	text_end
 
-Route21AfterBattleText8:
-	text_far _Route21AfterBattleText8
+Route21Fisher3AfterBattleText:
+	text_far _Route21Fisher3AfterBattleText
 	text_end
 
-Route21BattleText9:
-	text_far _Route21BattleText9
+Route21Fisher4BattleText:
+	text_far _Route21Fisher4BattleText
 	text_end
 
-Route21EndBattleText9:
-	text_far _Route21EndBattleText9
+Route21Fisher4EndBattleText:
+	text_far _Route21Fisher4EndBattleText
 	text_end
 
-Route21AfterBattleText9:
-	text_far _Route21AfterBattleText9
+Route21Fisher4AfterBattleText:
+	text_far _Route21Fisher4AfterBattleText
 	text_end