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

1 files changed, 98 insertions, 96 deletions

diff --git a/scripts/Route11.asm b/scripts/Route11.asm
index 724d8d89..e54a4a2d 100644
--- a/scripts/Route11.asm
+++ b/scripts/Route11.asm
@@ -8,227 +8,229 @@ Route11_Script:
 	ret
 
 Route11_ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
+	def_script_pointers
+	dw_const CheckFightingMapTrainers,              SCRIPT_ROUTE11_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE11_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_ROUTE11_END_BATTLE
 
 Route11_TextPointers:
-	dw Route11Text1
-	dw Route11Text2
-	dw Route11Text3
-	dw Route11Text4
-	dw Route11Text5
-	dw Route11Text6
-	dw Route11Text7
-	dw Route11Text8
-	dw Route11Text9
-	dw Route11Text10
-	dw Route11Text11
+	def_text_pointers
+	dw_const Route11Gambler1Text,         TEXT_ROUTE11_GAMBLER1
+	dw_const Route11Gambler2Text,         TEXT_ROUTE11_GAMBLER2
+	dw_const Route11Youngster1Text,       TEXT_ROUTE11_YOUNGSTER1
+	dw_const Route11SuperNerd1Text,       TEXT_ROUTE11_SUPER_NERD1
+	dw_const Route11Youngster2Text,       TEXT_ROUTE11_YOUNGSTER2
+	dw_const Route11Gambler3Text,         TEXT_ROUTE11_GAMBLER3
+	dw_const Route11Gambler4Text,         TEXT_ROUTE11_GAMBLER4
+	dw_const Route11Youngster3Text,       TEXT_ROUTE11_YOUNGSTER3
+	dw_const Route11SuperNerd2Text,       TEXT_ROUTE11_SUPER_NERD2
+	dw_const Route11Youngster4Text,       TEXT_ROUTE11_YOUNGSTER4
+	dw_const Route11DiglettsCaveSignText, TEXT_ROUTE11_DIGLETTSCAVE_SIGN
 
 Route11TrainerHeaders:
 	def_trainers
 Route11TrainerHeader0:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_0, 3, Route11BattleText1, Route11EndBattleText1, Route11AfterBattleText1
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_0, 3, Route11Gambler1BattleText, Route11Gambler1EndBattleText, Route11Gambler1AfterBattleText
 Route11TrainerHeader1:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_1, 2, Route11BattleText2, Route11EndBattleText2, Route11AfterBattleText2
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_1, 2, Route11Gambler2BattleText, Route11Gambler2EndBattleText, Route11Gambler2AfterBattleText
 Route11TrainerHeader2:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_2, 3, Route11BattleText3, Route11EndBattleText3, Route11AfterBattleText3
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_2, 3, Route11Youngster1BattleText, Route11Youngster1EndBattleText, Route11Youngster1AfterBattleText
 Route11TrainerHeader3:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_3, 3, Route11BattleText4, Route11EndBattleText4, Route11AfterBattleText4
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_3, 3, Route11SuperNerd1BattleText, Route11SuperNerd1EndBattleText, Route11SuperNerd1AfterBattleText
 Route11TrainerHeader4:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_4, 4, Route11BattleText5, Route11EndBattleText5, Route11AfterBattleText5
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_4, 4, Route11Youngster2BattleText, Route11Youngster2EndBattleText, Route11Youngster2AfterBattleText
 Route11TrainerHeader5:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_5, 3, Route11BattleText6, Route11EndBattleText6, Route11AfterBattleText6
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_5, 3, Route11Gambler3BattleText, Route11Gambler3EndBattleText, Route11Gambler3AfterBattleText
 Route11TrainerHeader6:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_6, 3, Route11BattleText7, Route11EndBattleText7, Route11AfterBattleText7
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_6, 3, Route11Gambler4BattleText, Route11Gambler4EndBattleText, Route11Gambler4AfterBattleText
 Route11TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_7, 4, Route11BattleText8, Route11EndBattleText8, Route11AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_7, 4, Route11Youngster3BattleText, Route11Youngster3EndBattleText, Route11Youngster3AfterBattleText
 Route11TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_8, 3, Route11BattleText9, Route11EndBattleText9, Route11AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_8, 3, Route11SuperNerd2BattleText, Route11SuperNerd2EndBattleText, Route11SuperNerd2AfterBattleText
 Route11TrainerHeader9:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_9, 4, Route11BattleText10, Route11EndBattleText10, Route11AfterBattleText10
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_9, 4, Route11Youngster4BattleText, Route11Youngster4EndBattleText, Route11Youngster4AfterBattleText
 	db -1 ; end
 
-Route11Text1:
+Route11Gambler1Text:
 	text_asm
 	ld hl, Route11TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText1:
-	text_far _Route11BattleText1
+Route11Gambler1BattleText:
+	text_far _Route11Gambler1BattleText
 	text_end
 
-Route11EndBattleText1:
-	text_far _Route11EndBattleText1
+Route11Gambler1EndBattleText:
+	text_far _Route11Gambler1EndBattleText
 	text_end
 
-Route11AfterBattleText1:
-	text_far _Route11AfterBattleText1
+Route11Gambler1AfterBattleText:
+	text_far _Route11Gambler1AfterBattleText
 	text_end
 
-Route11Text2:
+Route11Gambler2Text:
 	text_asm
 	ld hl, Route11TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText2:
-	text_far _Route11BattleText2
+Route11Gambler2BattleText:
+	text_far _Route11Gambler2BattleText
 	text_end
 
-Route11EndBattleText2:
-	text_far _Route11EndBattleText2
+Route11Gambler2EndBattleText:
+	text_far _Route11Gambler2EndBattleText
 	text_end
 
-Route11AfterBattleText2:
-	text_far _Route11AfterBattleText2
+Route11Gambler2AfterBattleText:
+	text_far _Route11Gambler2AfterBattleText
 	text_end
 
-Route11Text3:
+Route11Youngster1Text:
 	text_asm
 	ld hl, Route11TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText3:
-	text_far _Route11BattleText3
+Route11Youngster1BattleText:
+	text_far _Route11Youngster1BattleText
 	text_end
 
-Route11EndBattleText3:
-	text_far _Route11EndBattleText3
+Route11Youngster1EndBattleText:
+	text_far _Route11Youngster1EndBattleText
 	text_end
 
-Route11AfterBattleText3:
-	text_far _Route11AfterBattleText3
+Route11Youngster1AfterBattleText:
+	text_far _Route11Youngster1AfterBattleText
 	text_end
 
-Route11Text4:
+Route11SuperNerd1Text:
 	text_asm
 	ld hl, Route11TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText4:
-	text_far _Route11BattleText4
+Route11SuperNerd1BattleText:
+	text_far _Route11SuperNerd1BattleText
 	text_end
 
-Route11EndBattleText4:
-	text_far _Route11EndBattleText4
+Route11SuperNerd1EndBattleText:
+	text_far _Route11SuperNerd1EndBattleText
 	text_end
 
-Route11AfterBattleText4:
-	text_far _Route11AfterBattleText4
+Route11SuperNerd1AfterBattleText:
+	text_far _Route11SuperNerd1AfterBattleText
 	text_end
 
-Route11Text5:
+Route11Youngster2Text:
 	text_asm
 	ld hl, Route11TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText5:
-	text_far _Route11BattleText5
+Route11Youngster2BattleText:
+	text_far _Route11Youngster2BattleText
 	text_end
 
-Route11EndBattleText5:
-	text_far _Route11EndBattleText5
+Route11Youngster2EndBattleText:
+	text_far _Route11Youngster2EndBattleText
 	text_end
 
-Route11AfterBattleText5:
-	text_far _Route11AfterBattleText5
+Route11Youngster2AfterBattleText:
+	text_far _Route11Youngster2AfterBattleText5
 	text_end
 
-Route11Text6:
+Route11Gambler3Text:
 	text_asm
 	ld hl, Route11TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText6:
-	text_far _Route11BattleText6
+Route11Gambler3BattleText:
+	text_far _Route11Gambler3BattleText
 	text_end
 
-Route11EndBattleText6:
-	text_far _Route11EndBattleText6
+Route11Gambler3EndBattleText:
+	text_far _Route11Gambler3EndBattleText
 	text_end
 
-Route11AfterBattleText6:
-	text_far _Route11AfterBattleText6
+Route11Gambler3AfterBattleText:
+	text_far _Route11Gambler3AfterBattleText
 	text_end
 
-Route11Text7:
+Route11Gambler4Text:
 	text_asm
 	ld hl, Route11TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText7:
-	text_far _Route11BattleText7
+Route11Gambler4BattleText:
+	text_far _Route11Gambler4BattleText
 	text_end
 
-Route11EndBattleText7:
-	text_far _Route11EndBattleText7
+Route11Gambler4EndBattleText:
+	text_far _Route11Gambler4EndBattleText
 	text_end
 
-Route11AfterBattleText7:
-	text_far _Route11AfterBattleText7
+Route11Gambler4AfterBattleText:
+	text_far _Route11Gambler4AfterBattleText
 	text_end
 
-Route11Text8:
+Route11Youngster3Text:
 	text_asm
 	ld hl, Route11TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText8:
-	text_far _Route11BattleText8
+Route11Youngster3BattleText:
+	text_far _Route11Youngster3BattleText
 	text_end
 
-Route11EndBattleText8:
-	text_far _Route11EndBattleText8
+Route11Youngster3EndBattleText:
+	text_far _Route11Youngster3EndBattleText
 	text_end
 
-Route11AfterBattleText8:
-	text_far _Route11AfterBattleText8
+Route11Youngster3AfterBattleText:
+	text_far _Route11Youngster3AfterBattleText
 	text_end
 
-Route11Text9:
+Route11SuperNerd2Text:
 	text_asm
 	ld hl, Route11TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText9:
-	text_far _Route11BattleText9
+Route11SuperNerd2BattleText:
+	text_far _Route11SuperNerd2BattleText
 	text_end
 
-Route11EndBattleText9:
-	text_far _Route11EndBattleText9
+Route11SuperNerd2EndBattleText:
+	text_far _Route11SuperNerd2EndBattleText
 	text_end
 
-Route11AfterBattleText9:
-	text_far _Route11AfterBattleText9
+Route11SuperNerd2AfterBattleText:
+	text_far _Route11SuperNerd2AfterBattleText
 	text_end
 
-Route11Text10:
+Route11Youngster4Text:
 	text_asm
 	ld hl, Route11TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route11BattleText10:
-	text_far _Route11BattleText10
+Route11Youngster4BattleText:
+	text_far _Route11Youngster4BattleText
 	text_end
 
-Route11EndBattleText10:
-	text_far _Route11EndBattleText10
+Route11Youngster4EndBattleText:
+	text_far _Route11Youngster4EndBattleText
 	text_end
 
-Route11AfterBattleText10:
-	text_far _Route11AfterBattleText10
+Route11Youngster4AfterBattleText:
+	text_far _Route11Youngster4AfterBattleText
 	text_end
 
-Route11Text11:
-	text_far _Route11Text11
+Route11DiglettsCaveSignText:
+	text_far _Route11DiglettsCaveSignText
 	text_end