Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 122 insertions, 120 deletions

diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm
index 0b90383c..5162d3bc 100644
--- a/scripts/ViridianGym.asm
+++ b/scripts/ViridianGym.asm
@@ -24,13 +24,14 @@ ViridianGymResetScripts:
 	ret
 
 ViridianGym_ScriptPointers:
-	dw ViridianGymScript0
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
-	dw ViridianGymGiovanniPostBattle
-	dw ViridianGymScript4
+	def_script_pointers
+	dw_const ViridianGymDefaultScript,              SCRIPT_VIRIDIANGYM_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VIRIDIANGYM_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_VIRIDIANGYM_END_BATTLE
+	dw_const ViridianGymGiovanniPostBattle,         SCRIPT_VIRIDIANGYM_GIOVANNI_POST_BATTLE
+	dw_const ViridianGymPlayerSpinningScript,       SCRIPT_VIRIDIANGYM_PLAYER_SPINNING
 
-ViridianGymScript0:
+ViridianGymDefaultScript:
 	ld a, [wYCoord]
 	ld b, a
 	ld a, [wXCoord]
@@ -44,9 +45,9 @@ ViridianGymScript0:
 	set 7, [hl]
 	ld a, SFX_ARROW_TILES
 	call PlaySound
-	ld a, $ff
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $4
+	ld a, SCRIPT_VIRIDIANGYM_PLAYER_SPINNING
 	ld [wCurMapScript], a
 	ret
 
@@ -113,7 +114,7 @@ ViridianGymArrowMovement12:
 	db D_LEFT, 12
 	db -1 ; end
 
-ViridianGymScript4:
+ViridianGymPlayerSpinningScript:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	jr nz, .ViridianGymLoadSpinnerArrow
@@ -121,7 +122,7 @@ ViridianGymScript4:
 	ld [wJoyIgnore], a
 	ld hl, wd736
 	res 7, [hl]
-	ld a, $0
+	ld a, SCRIPT_VIRIDIANGYM_DEFAULT
 	ld [wCurMapScript], a
 	ret
 .ViridianGymLoadSpinnerArrow
@@ -131,27 +132,27 @@ ViridianGymGiovanniPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, ViridianGymResetScripts
-	ld a, $f0
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 ; fallthrough
 ViridianGymReceiveTM27:
-	ld a, $c
+	ld a, TEXT_VIRIDIANGYM_GIOVANNI_EARTH_BADGE_INFO
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
 	lb bc, TM_FISSURE, 1
 	call GiveItem
-	jr nc, .BagFull
-	ld a, $d
+	jr nc, .bag_full
+	ld a, TEXT_VIRIDIANGYM_GIOVANNI_RECEIVED_TM27
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_GOT_TM27
-	jr .gymVictory
-.BagFull
-	ld a, $e
+	jr .gym_victory
+.bag_full
+	ld a, TEXT_VIRIDIANGYM_GIOVANNI_TM27_NO_ROOM
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
-.gymVictory
+.gym_victory
 	ld hl, wObtainedBadges
 	set BIT_EARTHBADGE, [hl]
 	ld hl, wBeatGymFlags
@@ -167,42 +168,43 @@ ViridianGymReceiveTM27:
 	jp ViridianGymResetScripts
 
 ViridianGym_TextPointers:
-	dw GiovanniText
-	dw ViridianGymTrainerText1
-	dw ViridianGymTrainerText2
-	dw ViridianGymTrainerText3
-	dw ViridianGymTrainerText4
-	dw ViridianGymTrainerText5
-	dw ViridianGymTrainerText6
-	dw ViridianGymTrainerText7
-	dw ViridianGymTrainerText8
-	dw ViridianGymGuideText
-	dw PickUpItemText
-	dw GiovanniEarthBadgeInfoText
-	dw ReceivedTM27Text
-	dw TM27NoRoomText
+	def_text_pointers
+	dw_const ViridianGymGiovanniText,               TEXT_VIRIDIANGYM_GIOVANNI
+	dw_const ViridianGymCooltrainerM1Text,          TEXT_VIRIDIANGYM_COOLTRAINER_M1
+	dw_const ViridianGymHiker1Text,                 TEXT_VIRIDIANGYM_HIKER1
+	dw_const ViridianGymRocker1Text,                TEXT_VIRIDIANGYM_ROCKER1
+	dw_const ViridianGymHiker2Text,                 TEXT_VIRIDIANGYM_HIKER2
+	dw_const ViridianGymCooltrainerM2Text,          TEXT_VIRIDIANGYM_COOLTRAINER_M2
+	dw_const ViridianGymHiker3Text,                 TEXT_VIRIDIANGYM_HIKER3
+	dw_const ViridianGymRocker2Text,                TEXT_VIRIDIANGYM_ROCKER2
+	dw_const ViridianGymCooltrainerM3Text,          TEXT_VIRIDIANGYM_COOLTRAINER_M3
+	dw_const ViridianGymGymGuideText,               TEXT_VIRIDIANGYM_GYM_GUIDE
+	dw_const PickUpItemText,                        TEXT_VIRIDIANGYM_REVIVE
+	dw_const ViridianGymGiovanniEarthBadgeInfoText, TEXT_VIRIDIANGYM_GIOVANNI_EARTH_BADGE_INFO
+	dw_const ViridianGymGiovanniReceivedTM27Text,   TEXT_VIRIDIANGYM_GIOVANNI_RECEIVED_TM27
+	dw_const ViridianGymGiovanniTM27NoRoomText,     TEXT_VIRIDIANGYM_GIOVANNI_TM27_NO_ROOM
 
 ViridianGymTrainerHeaders:
 	def_trainers 2
 ViridianGymTrainerHeader0:
-	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, 4, ViridianGymBattleText1, ViridianGymEndBattleText1, ViridianGymAfterBattleText1
+	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, 4, ViridianGymCooltrainerM1BattleText, ViridianGymCooltrainerM1EndBattleText, ViridianGymCooltrainerM1AfterBattleText
 ViridianGymTrainerHeader1:
-	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1, 4, ViridianGymBattleText2, ViridianGymEndBattleText2, ViridianGymAfterBattleText2
+	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1, 4, ViridianGymHiker1BattleText, ViridianGymHiker1EndBattleText, ViridianGymHiker1AfterBattleText
 ViridianGymTrainerHeader2:
-	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2, 4, ViridianGymBattleText3, ViridianGymEndBattleText3, ViridianGymAfterBattleText3
+	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2, 4, ViridianGymRocker1BattleText, ViridianGymRocker1EndBattleText, ViridianGymRocker1AfterBattleText
 ViridianGymTrainerHeader3:
-	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3, 2, ViridianGymBattleText4, ViridianGymEndBattleText4, ViridianGymAfterBattleText4
+	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3, 2, ViridianGymHiker2BattleText, ViridianGymHiker2EndBattleText, ViridianGymHiker2AfterBattleText
 ViridianGymTrainerHeader4:
-	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4, 3, ViridianGymBattleText5, ViridianGymEndBattleText5, ViridianGymAfterBattleText5
+	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4, 3, ViridianGymCooltrainerM2BattleText, ViridianGymCooltrainerM2EndBattleText, ViridianGymCooltrainerM2AfterBattleText
 ViridianGymTrainerHeader5:
-	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5, 4, ViridianGymBattleText6, ViridianGymEndBattleText6, ViridianGymAfterBattleText6
+	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5, 4, ViridianGymHiker3BattleText, ViridianGymHiker3EndBattleText, ViridianGymHiker3AfterBattleText
 ViridianGymTrainerHeader6:
-	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 3, ViridianGymBattleText7, ViridianGymEndBattleText7, ViridianGymAfterBattleText7
+	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 3, ViridianGymRocker2BattleText, ViridianGymRocker2EndBattleText, ViridianGymRocker2AfterBattleText
 ViridianGymTrainerHeader7:
-	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8
+	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymCooltrainerM3BattleText, ViridianGymCooltrainerM3EndBattleText, ViridianGymCooltrainerM3AfterBattleText
 	db -1 ; end
 
-GiovanniText:
+ViridianGymGiovanniText:
 	text_asm
 	CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
 	jr z, .beforeBeat
@@ -210,11 +212,11 @@ GiovanniText:
 	jr nz, .afterBeat
 	call z, ViridianGymReceiveTM27
 	call DisableWaitingAfterTextDisplay
-	jr .done
+	jr .text_script_end
 .afterBeat
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, GiovanniPostBattleAdviceText
+	ld hl, .PostBattleAdviceText
 	call PrintText
 	call GBFadeOutToBlack
 	ld a, HS_VIRIDIAN_GYM_GIOVANNI
@@ -223,15 +225,15 @@ GiovanniText:
 	call UpdateSprites
 	call Delay3
 	call GBFadeInFromBlack
-	jr .done
+	jr .text_script_end
 .beforeBeat
-	ld hl, GiovanniPreBattleText
+	ld hl, .PreBattleText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, ReceivedEarthBadgeText
-	ld de, ReceivedEarthBadgeText
+	ld hl, .ReceivedEarthBadgeText
+	ld de, .ReceivedEarthBadgeText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
@@ -239,186 +241,186 @@ GiovanniText:
 	call InitBattleEnemyParameters
 	ld a, $8
 	ld [wGymLeaderNo], a
-	ld a, $3
+	ld a, SCRIPT_VIRIDIANGYM_GIOVANNI_POST_BATTLE
 	ld [wViridianGymCurScript], a
-.done
+.text_script_end
 	jp TextScriptEnd
 
-GiovanniPreBattleText:
-	text_far _GiovanniPreBattleText
+.PreBattleText:
+	text_far _ViridianGymGiovanniPreBattleText
 	text_end
 
-ReceivedEarthBadgeText:
-	text_far _ReceivedEarthBadgeText
+.ReceivedEarthBadgeText:
+	text_far _ViridianGymGiovanniReceivedEarthBadgeText
 	sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
 	text_end
 
-GiovanniPostBattleAdviceText:
-	text_far _GiovanniPostBattleAdviceText
+.PostBattleAdviceText:
+	text_far _ViridianGymGiovanniPostBattleAdviceText
 	text_waitbutton
 	text_end
 
-GiovanniEarthBadgeInfoText:
-	text_far _GiovanniEarthBadgeInfoText
+ViridianGymGiovanniEarthBadgeInfoText:
+	text_far _ViridianGymGiovanniEarthBadgeInfoText
 	text_end
 
-ReceivedTM27Text:
-	text_far _ReceivedTM27Text
+ViridianGymGiovanniReceivedTM27Text:
+	text_far _ViridianGymGiovanniReceivedTM27Text
 	sound_get_item_1
 
-TM27ExplanationText:
-	text_far _TM27ExplanationText
+ViridianGymGiovanniTM27ExplanationText:
+	text_far _ViridianGymGiovanniTM27ExplanationText
 	text_end
 
-TM27NoRoomText:
-	text_far _TM27NoRoomText
+ViridianGymGiovanniTM27NoRoomText:
+	text_far _ViridianGymGiovanniTM27NoRoomText
 	text_end
 
-ViridianGymTrainerText1:
+ViridianGymCooltrainerM1Text:
 	text_asm
 	ld hl, ViridianGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText1:
-	text_far _ViridianGymBattleText1
+ViridianGymCooltrainerM1BattleText:
+	text_far _ViridianGymCooltrainerM1BattleText
 	text_end
 
-ViridianGymEndBattleText1:
-	text_far _ViridianGymEndBattleText1
+ViridianGymCooltrainerM1EndBattleText:
+	text_far _ViridianGymCooltrainerM1EndBattleText
 	text_end
 
-ViridianGymAfterBattleText1:
-	text_far _ViridianGymAfterBattleText1
+ViridianGymCooltrainerM1AfterBattleText:
+	text_far _ViridianGymCooltrainerM1AfterBattleText
 	text_end
 
-ViridianGymTrainerText2:
+ViridianGymHiker1Text:
 	text_asm
 	ld hl, ViridianGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText2:
-	text_far _ViridianGymBattleText2
+ViridianGymHiker1BattleText:
+	text_far _ViridianGymHiker1BattleText
 	text_end
 
-ViridianGymEndBattleText2:
-	text_far _ViridianGymEndBattleText2
+ViridianGymHiker1EndBattleText:
+	text_far _ViridianGymHiker1EndBattleText
 	text_end
 
-ViridianGymAfterBattleText2:
-	text_far _ViridianGymAfterBattleText2
+ViridianGymHiker1AfterBattleText:
+	text_far _ViridianGymHiker1AfterBattleText
 	text_end
 
-ViridianGymTrainerText3:
+ViridianGymRocker1Text:
 	text_asm
 	ld hl, ViridianGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText3:
-	text_far _ViridianGymBattleText3
+ViridianGymRocker1BattleText:
+	text_far _ViridianGymRocker1BattleText
 	text_end
 
-ViridianGymEndBattleText3:
-	text_far _ViridianGymEndBattleText3
+ViridianGymRocker1EndBattleText:
+	text_far _ViridianGymRocker1EndBattleText
 	text_end
 
-ViridianGymAfterBattleText3:
-	text_far _ViridianGymAfterBattleText3
+ViridianGymRocker1AfterBattleText:
+	text_far _ViridianGymRocker1AfterBattleText
 	text_end
 
-ViridianGymTrainerText4:
+ViridianGymHiker2Text:
 	text_asm
 	ld hl, ViridianGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText4:
-	text_far _ViridianGymBattleText4
+ViridianGymHiker2BattleText:
+	text_far _ViridianGymHiker2BattleText
 	text_end
 
-ViridianGymEndBattleText4:
-	text_far _ViridianGymEndBattleText4
+ViridianGymHiker2EndBattleText:
+	text_far _ViridianGymHiker2EndBattleText
 	text_end
 
-ViridianGymAfterBattleText4:
-	text_far _ViridianGymAfterBattleText4
+ViridianGymHiker2AfterBattleText:
+	text_far _ViridianGymHiker2AfterBattleText
 	text_end
 
-ViridianGymTrainerText5:
+ViridianGymCooltrainerM2Text:
 	text_asm
 	ld hl, ViridianGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText5:
-	text_far _ViridianGymBattleText5
+ViridianGymCooltrainerM2BattleText:
+	text_far _ViridianGymCooltrainerM2BattleText
 	text_end
 
-ViridianGymEndBattleText5:
-	text_far _ViridianGymEndBattleText5
+ViridianGymCooltrainerM2EndBattleText:
+	text_far _ViridianGymCooltrainerM2EndBattleText
 	text_end
 
-ViridianGymAfterBattleText5:
-	text_far _ViridianGymAfterBattleText5
+ViridianGymCooltrainerM2AfterBattleText:
+	text_far _ViridianGymCooltrainerM2AfterBattleText
 	text_end
 
-ViridianGymTrainerText6:
+ViridianGymHiker3Text:
 	text_asm
 	ld hl, ViridianGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText6:
-	text_far _ViridianGymBattleText6
+ViridianGymHiker3BattleText:
+	text_far _ViridianGymHiker3BattleText
 	text_end
 
-ViridianGymEndBattleText6:
-	text_far _ViridianGymEndBattleText6
+ViridianGymHiker3EndBattleText:
+	text_far _ViridianGymHiker3EndBattleText
 	text_end
 
-ViridianGymAfterBattleText6:
-	text_far _ViridianGymAfterBattleText6
+ViridianGymHiker3AfterBattleText:
+	text_far _ViridianGymHiker3AfterBattleText
 	text_end
 
-ViridianGymTrainerText7:
+ViridianGymRocker2Text:
 	text_asm
 	ld hl, ViridianGymTrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText7:
-	text_far _ViridianGymBattleText7
+ViridianGymRocker2BattleText:
+	text_far _ViridianGymRocker2BattleText
 	text_end
 
-ViridianGymEndBattleText7:
-	text_far _ViridianGymEndBattleText7
+ViridianGymRocker2EndBattleText:
+	text_far _ViridianGymRocker2EndBattleText
 	text_end
 
-ViridianGymAfterBattleText7:
-	text_far _ViridianGymAfterBattleText7
+ViridianGymRocker2AfterBattleText:
+	text_far _ViridianGymRocker2AfterBattleText
 	text_end
 
-ViridianGymTrainerText8:
+ViridianGymCooltrainerM3Text:
 	text_asm
 	ld hl, ViridianGymTrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianGymBattleText8:
-	text_far _ViridianGymBattleText8
+ViridianGymCooltrainerM3BattleText:
+	text_far _ViridianGymCooltrainerM3BattleText
 	text_end
 
-ViridianGymEndBattleText8:
-	text_far _ViridianGymEndBattleText8
+ViridianGymCooltrainerM3EndBattleText:
+	text_far _ViridianGymCooltrainerM3EndBattleText
 	text_end
 
-ViridianGymAfterBattleText8:
-	text_far _ViridianGymAfterBattleText8
+ViridianGymCooltrainerM3AfterBattleText:
+	text_far _ViridianGymCooltrainerM3AfterBattleText
 	text_end
 
-ViridianGymGuideText:
+ViridianGymGymGuideText:
 	text_asm
 	CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
 	jr nz, .afterBeat