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, 50 insertions, 48 deletions

diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm
index be3b5b89..e90fcdd0 100644
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@@ -4,26 +4,27 @@ PokemonTower2F_Script:
 	ld a, [wPokemonTower2FCurScript]
 	jp CallFunctionInTable
 
-PokemonTower2Script_604fe:
-	xor a
+PokemonTower2FResetRivalEncounter:
+	xor a ; SCRIPT_POKEMONTOWER2F_DEFAULT
 	ld [wJoyIgnore], a
 	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 PokemonTower2F_ScriptPointers:
-	dw PokemonTower2Script0
-	dw PokemonTower2Script1
-	dw PokemonTower2Script2
+	def_script_pointers
+	dw_const PokemonTower2FDefaultScript,       SCRIPT_POKEMONTOWER2F_DEFAULT
+	dw_const PokemonTower2FDefeatedRivalScript, SCRIPT_POKEMONTOWER2F_DEFEATED_RIVAL
+	dw_const PokemonTower2FRivalExitsScript,    SCRIPT_POKEMONTOWER2F_RIVAL_EXITS
 
-PokemonTower2Script0:
+PokemonTower2FDefaultScript:
 IF DEF(_DEBUG)
 	call DebugPressedOrHeldB
 	ret nz
 ENDC
 	CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
 	ret nz
-	ld hl, CoordsData_6055e
+	ld hl, PokemonTower2FRivalEncounterEventCoords
 	call ArePlayerCoordsInArray
 	ret nc
 	ld a, SFX_STOP_ALL_MUSIC
@@ -37,19 +38,19 @@ ENDC
 	cp $1
 	ld a, PLAYER_DIR_UP
 	ld b, SPRITE_FACING_DOWN
-	jr nz, .asm_60544
+	jr nz, .player_below_rival
 ; the rival is on the left side and the player is on the right side
 	SetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
 	ld a, PLAYER_DIR_LEFT
 	ld b, SPRITE_FACING_RIGHT
-.asm_60544
+.player_below_rival
 	ld [wPlayerMovingDirection], a
-	ld a, $1
+	ld a, POKEMONTOWER2F_RIVAL
 	ldh [hSpriteIndex], a
 	ld a, b
 	ldh [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
-	ld a, $1
+	ld a, TEXT_POKEMONTOWER2F_RIVAL
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	xor a
@@ -57,39 +58,39 @@ ENDC
 	ldh [hJoyPressed], a
 	ret
 
-CoordsData_6055e:
+PokemonTower2FRivalEncounterEventCoords:
 	dbmapcoord 15,  5
 	dbmapcoord 14,  6
 	db $0F ; end? (should be $ff?)
 
-PokemonTower2Script1:
+PokemonTower2FDefeatedRivalScript:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, PokemonTower2Script_604fe
-	ld a, $f0
+	jp z, PokemonTower2FResetRivalEncounter
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
-	ld a, $1
+	ld a, TEXT_POKEMONTOWER2F_RIVAL
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	ld de, MovementData_605b2
+	ld de, PokemonTower2FRivalDownThenRightMovement
 	CheckEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
-	jr nz, .asm_60589
-	ld de, MovementData_605a9
-.asm_60589
-	ld a, $1
+	jr nz, .got_movement
+	ld de, PokemonTower2FRivalRightThenDownMovement
+.got_movement
+	ld a, POKEMONTOWER2F_RIVAL
 	ldh [hSpriteIndex], a
 	call MoveSprite
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
 	farcall Music_RivalAlternateStart
-	ld a, $2
+	ld a, SCRIPT_POKEMONTOWER2F_RIVAL_EXITS
 	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-MovementData_605a9:
+PokemonTower2FRivalRightThenDownMovement:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -100,7 +101,7 @@ MovementData_605a9:
 	db NPC_MOVEMENT_RIGHT
 	db -1 ; end
 
-MovementData_605b2:
+PokemonTower2FRivalDownThenRightMovement:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_RIGHT
@@ -111,7 +112,7 @@ MovementData_605b2:
 	db NPC_MOVEMENT_DOWN
 	db -1 ; end
 
-PokemonTower2Script2:
+PokemonTower2FRivalExitsScript:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
@@ -121,30 +122,31 @@ PokemonTower2Script2:
 	xor a
 	ld [wJoyIgnore], a
 	call PlayDefaultMusic
-	ld a, $0
+	ld a, SCRIPT_POKEMONTOWER2F_DEFAULT
 	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 PokemonTower2F_TextPointers:
-	dw PokemonTower2Text1
-	dw PokemonTower2Text2
+	def_text_pointers
+	dw_const PokemonTower2FRivalText,     TEXT_POKEMONTOWER2F_RIVAL
+	dw_const PokemonTower2FChannelerText, TEXT_POKEMONTOWER2F_CHANNELER
 
-PokemonTower2Text1:
+PokemonTower2FRivalText:
 	text_asm
 	CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
-	jr z, .asm_16f24
-	ld hl, PokemonTower2Text_6063c
+	jr z, .do_battle
+	ld hl, .HowsYourDexText
 	call PrintText
-	jr .asm_41852
-.asm_16f24
-	ld hl, PokemonTower2Text_6062d
+	jr .text_script_end
+.do_battle
+	ld hl, .WhatBringsYouHereText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, PokemonTower2Text_60632
-	ld de, PokemonTower2Text_60637
+	ld hl, .DefeatedText
+	ld de, .VictoryText
 	call SaveEndBattleTextPointers
 	ld a, OPP_RIVAL2
 	ld [wCurOpponent], a
@@ -165,28 +167,28 @@ PokemonTower2Text1:
 .done
 	ld [wTrainerNo], a
 
-	ld a, $1
+	ld a, SCRIPT_POKEMONTOWER2F_DEFEATED_RIVAL
 	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
-.asm_41852
+.text_script_end
 	jp TextScriptEnd
 
-PokemonTower2Text_6062d:
-	text_far _PokemonTower2Text_6062d
+.WhatBringsYouHereText:
+	text_far _PokemonTower2FRivalWhatBringsYouHereText
 	text_end
 
-PokemonTower2Text_60632:
-	text_far _PokemonTower2Text_60632
+.DefeatedText:
+	text_far _PokemonTower2FRivalDefeatedText
 	text_end
 
-PokemonTower2Text_60637:
-	text_far _PokemonTower2Text_60637
+.VictoryText:
+	text_far _PokemonTower2FRivalVictoryText
 	text_end
 
-PokemonTower2Text_6063c:
-	text_far _PokemonTower2Text_6063c
+.HowsYourDexText:
+	text_far _PokemonTower2FRivalHowsYourDexText
 	text_end
 
-PokemonTower2Text2:
-	text_far _PokemonTower2Text2
+PokemonTower2FChannelerText:
+	text_far _PokemonTower2FChannelerText
 	text_end