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

1 files changed, 78 insertions, 76 deletions

diff --git a/scripts/RockTunnel1F.asm b/scripts/RockTunnel1F.asm
index cafdbe62..234a506d 100644
--- a/scripts/RockTunnel1F.asm
+++ b/scripts/RockTunnel1F.asm
@@ -8,159 +8,161 @@ RockTunnel1F_Script:
 	ret
 
 RockTunnel1F_ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
+	def_script_pointers
+	dw_const CheckFightingMapTrainers,              SCRIPT_ROCKTUNNEL1F_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROCKTUNNEL1F_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_ROCKTUNNEL1F_END_BATTLE
 
 RockTunnel1F_TextPointers:
-	dw RockTunnel1Text1
-	dw RockTunnel1Text2
-	dw RockTunnel1Text3
-	dw RockTunnel1Text4
-	dw RockTunnel1Text5
-	dw RockTunnel1Text6
-	dw RockTunnel1Text7
-	dw RockTunnel1Text8
+	def_text_pointers
+	dw_const RockTunnel1FHiker1Text,        TEXT_ROCKTUNNEL1F_HIKER1
+	dw_const RockTunnel1FHiker2Text,        TEXT_ROCKTUNNEL1F_HIKER2
+	dw_const RockTunnel1FHiker3Text,        TEXT_ROCKTUNNEL1F_HIKER3
+	dw_const RockTunnel1FSuperNerdText,     TEXT_ROCKTUNNEL1F_SUPER_NERD
+	dw_const RockTunnel1FCooltrainerF1Text, TEXT_ROCKTUNNEL1F_COOLTRAINER_F1
+	dw_const RockTunnel1FCooltrainerF2Text, TEXT_ROCKTUNNEL1F_COOLTRAINER_F2
+	dw_const RockTunnel1FCooltrainerF3Text, TEXT_ROCKTUNNEL1F_COOLTRAINER_F3
+	dw_const RockTunnel1FSignText,          TEXT_ROCKTUNNEL1F_SIGN
 
 RockTunnel1TrainerHeaders:
 	def_trainers
 RockTunnel1TrainerHeader0:
-	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0, 4, RockTunnel1BattleText1, RockTunnel1EndBattleText1, RockTunnel1AfterBattleText1
+	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0, 4, RockTunnel1FHiker1BattleText, RockTunnel1FHiker1EndBattleText, RockTunnel1FHiker1AfterBattleText
 RockTunnel1TrainerHeader1:
-	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1, 4, RockTunnel1BattleText2, RockTunnel1EndBattleText2, RockTunnel1AfterBattleText2
+	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1, 4, RockTunnel1FHiker2BattleText, RockTunnel1FHiker2EndBattleText, RockTunnel1FHiker2AfterBattleText
 RockTunnel1TrainerHeader2:
-	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2, 3, RockTunnel1BattleText3, RockTunnel1EndBattleText3, RockTunnel1AfterBattleText3
+	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2, 3, RockTunnel1FHiker3BattleText, RockTunnel1FHiker3EndBattleText, RockTunnel1FHiker3AfterBattleText
 RockTunnel1TrainerHeader3:
-	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3, 3, RockTunnel1BattleText4, RockTunnel1EndBattleText4, RockTunnel1AfterBattleText4
+	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3, 3, RockTunnel1FSuperNerdBattleText, RockTunnel1FSuperNerdEndBattleText, RockTunnel1FSuperNerdAfterBattleText
 RockTunnel1TrainerHeader4:
-	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4, 4, RockTunnel1BattleText5, RockTunnel1EndBattleText5, RockTunnel1AfterBattleText5
+	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4, 4, RockTunnel1FCooltrainerF1BattleText, RockTunnel1FCooltrainerF1EndBattleText, RockTunnel1FCooltrainerF1AfterBattleText
 RockTunnel1TrainerHeader5:
-	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5, 4, RockTunnel1BattleText6, RockTunnel1EndBattleText6, RockTunnel1AfterBattleText6
+	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5, 4, RockTunnel1FCooltrainerF2BattleText, RockTunnel1FCooltrainerF2EndBattleText, RockTunnel1FCooltrainerF2AfterBattleText
 RockTunnel1TrainerHeader6:
-	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6, 4, RockTunnel1BattleText7, RockTunnel1EndBattleText7, RockTunnel1AfterBattleText7
+	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6, 4, RockTunnel1FCooltrainerF3BattleText, RockTunnel1FCooltrainerF3EndBattleText, RockTunnel1FCooltrainerF3AfterBattleText
 	db -1 ; end
 
-RockTunnel1Text1:
+RockTunnel1FHiker1Text:
 	text_asm
 	ld hl, RockTunnel1TrainerHeader0
-	jr RockTunnel1TalkToTrainer
+	jr RockTunnel1FTalkToTrainer
 
-RockTunnel1Text2:
+RockTunnel1FHiker2Text:
 	text_asm
 	ld hl, RockTunnel1TrainerHeader1
-	jr RockTunnel1TalkToTrainer
+	jr RockTunnel1FTalkToTrainer
 
-RockTunnel1Text3:
+RockTunnel1FHiker3Text:
 	text_asm
 	ld hl, RockTunnel1TrainerHeader2
-	jr RockTunnel1TalkToTrainer
+	jr RockTunnel1FTalkToTrainer
 
-RockTunnel1Text4:
+RockTunnel1FSuperNerdText:
 	text_asm
 	ld hl, RockTunnel1TrainerHeader3
-	jr RockTunnel1TalkToTrainer
+	jr RockTunnel1FTalkToTrainer
 
-RockTunnel1Text5:
+RockTunnel1FCooltrainerF1Text:
 	text_asm
 	ld hl, RockTunnel1TrainerHeader4
-	jr RockTunnel1TalkToTrainer
+	jr RockTunnel1FTalkToTrainer
 
-RockTunnel1Text6:
+RockTunnel1FCooltrainerF2Text:
 	text_asm
 	ld hl, RockTunnel1TrainerHeader5
-	jr RockTunnel1TalkToTrainer
+	jr RockTunnel1FTalkToTrainer
 
-RockTunnel1Text7:
+RockTunnel1FCooltrainerF3Text:
 	text_asm
 	ld hl, RockTunnel1TrainerHeader6
-RockTunnel1TalkToTrainer:
+RockTunnel1FTalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
 
-RockTunnel1BattleText1:
-	text_far _RockTunnel1BattleText1
+RockTunnel1FHiker1BattleText:
+	text_far _RockTunnel1FHiker1BattleText
 	text_end
 
-RockTunnel1EndBattleText1:
-	text_far _RockTunnel1EndBattleText1
+RockTunnel1FHiker1EndBattleText:
+	text_far _RockTunnel1FHiker1EndBattleText
 	text_end
 
-RockTunnel1AfterBattleText1:
-	text_far _RockTunnel1AfterBattleText1
+RockTunnel1FHiker1AfterBattleText:
+	text_far _RockTunnel1FHiker1AfterBattleText
 	text_end
 
-RockTunnel1BattleText2:
-	text_far _RockTunnel1BattleText2
+RockTunnel1FHiker2BattleText:
+	text_far _RockTunnel1FHiker2BattleText
 	text_end
 
-RockTunnel1EndBattleText2:
-	text_far _RockTunnel1EndBattleText2
+RockTunnel1FHiker2EndBattleText:
+	text_far _RockTunnel1FHiker2EndBattleText
 	text_end
 
-RockTunnel1AfterBattleText2:
-	text_far _RockTunnel1AfterBattleText2
+RockTunnel1FHiker2AfterBattleText:
+	text_far _RockTunnel1FHiker2AfterBattleText
 	text_end
 
-RockTunnel1BattleText3:
-	text_far _RockTunnel1BattleText3
+RockTunnel1FHiker3BattleText:
+	text_far _RockTunnel1FHiker3BattleText
 	text_end
 
-RockTunnel1EndBattleText3:
-	text_far _RockTunnel1EndBattleText3
+RockTunnel1FHiker3EndBattleText:
+	text_far _RockTunnel1FHiker3EndBattleText
 	text_end
 
-RockTunnel1AfterBattleText3:
-	text_far _RockTunnel1AfterBattleText3
+RockTunnel1FHiker3AfterBattleText:
+	text_far _RockTunnel1FHiker3AfterBattleText
 	text_end
 
-RockTunnel1BattleText4:
-	text_far _RockTunnel1BattleText4
+RockTunnel1FSuperNerdBattleText:
+	text_far _RockTunnel1FSuperNerdBattleText
 	text_end
 
-RockTunnel1EndBattleText4:
-	text_far _RockTunnel1EndBattleText4
+RockTunnel1FSuperNerdEndBattleText:
+	text_far _RockTunnel1FSuperNerdEndBattleText
 	text_end
 
-RockTunnel1AfterBattleText4:
-	text_far _RockTunnel1AfterBattleText4
+RockTunnel1FSuperNerdAfterBattleText:
+	text_far _RockTunnel1FSuperNerdAfterBattleText
 	text_end
 
-RockTunnel1BattleText5:
-	text_far _RockTunnel1BattleText5
+RockTunnel1FCooltrainerF1BattleText:
+	text_far _RockTunnel1FCooltrainerF1BattleText
 	text_end
 
-RockTunnel1EndBattleText5:
-	text_far _RockTunnel1EndBattleText5
+RockTunnel1FCooltrainerF1EndBattleText:
+	text_far _RockTunnel1FCooltrainerF1EndBattleText
 	text_end
 
-RockTunnel1AfterBattleText5:
-	text_far _RockTunnel1AfterBattleText5
+RockTunnel1FCooltrainerF1AfterBattleText:
+	text_far _RockTunnel1FCooltrainerF1AfterBattleText
 	text_end
 
-RockTunnel1BattleText6:
-	text_far _RockTunnel1BattleText6
+RockTunnel1FCooltrainerF2BattleText:
+	text_far _RockTunnel1FCooltrainerF2BattleText
 	text_end
 
-RockTunnel1EndBattleText6:
-	text_far _RockTunnel1EndBattleText6
+RockTunnel1FCooltrainerF2EndBattleText:
+	text_far _RockTunnel1FCooltrainerF2EndBattleText
 	text_end
 
-RockTunnel1AfterBattleText6:
-	text_far _RockTunnel1AfterBattleText6
+RockTunnel1FCooltrainerF2AfterBattleText:
+	text_far _RockTunnel1FCooltrainerF2AfterBattleText
 	text_end
 
-RockTunnel1BattleText7:
-	text_far _RockTunnel1BattleText7
+RockTunnel1FCooltrainerF3BattleText:
+	text_far _RockTunnel1FCooltrainerF3BattleText
 	text_end
 
-RockTunnel1EndBattleText7:
-	text_far _RockTunnel1EndBattleText7
+RockTunnel1FCooltrainerF3EndBattleText:
+	text_far _RockTunnel1FCooltrainerF3EndBattleText
 	text_end
 
-RockTunnel1AfterBattleText7:
-	text_far _RockTunnel1AfterBattleText7
+RockTunnel1FCooltrainerF3AfterBattleText:
+	text_far _RockTunnel1FCooltrainerF3AfterBattleText
 	text_end
 
-RockTunnel1Text8:
-	text_far _RockTunnel1Text8
+RockTunnel1FSignText:
+	text_far _RockTunnel1FSignText
 	text_end