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

1 files changed, 31 insertions, 31 deletions

diff --git a/text/Route14.asm b/text/Route14.asm
index 9a9de78c..2d4c290a 100644
--- a/text/Route14.asm
+++ b/text/Route14.asm
@@ -1,147 +1,147 @@
-_Route14BattleText1::
+_Route14CooltrainerM1BattleText::
 	text "You need to use"
 	line "TMs to teach good"
 	cont "moves to #MON!"
 	done
 
-_Route14EndBattleText1::
+_Route14CooltrainerM1EndBattleText::
 	text "Not"
 	line "good enough!"
 	prompt
 
-_Route14AfterBattleText1::
+_Route14CooltrainerM1AfterBattleText::
 	text "You have some HMs,"
 	line "right? #MON"
 	cont "can't ever forget"
 	cont "those moves."
 	done
 
-_Route14BattleText2::
+_Route14CooltrainerM2BattleText::
 	text "My bird #MON"
 	line "should be ready"
 	cont "for battle."
 	done
 
-_Route14EndBattleText2::
+_Route14CooltrainerM2EndBattleText::
 	text "Not"
 	line "ready yet!"
 	prompt
 
-_Route14AfterBattleText2::
+_Route14CooltrainerM2AfterBattleText::
 	text "They need to learn"
 	line "better moves."
 	done
 
-_Route14BattleText3::
+_Route14CooltrainerM3BattleText::
 	text "TMs are on sale"
 	line "in CELADON!"
 	cont "But, only a few"
 	cont "people have HMs!"
 	done
 
-_Route14EndBattleText3::
+_Route14CooltrainerM3EndBattleText::
 	text "Aww,"
 	line "bummer!"
 	prompt
 
-_Route14AfterBattleText3::
+_Route14CooltrainerM3AfterBattleText::
 	text "Teach #MON"
 	line "moves of the same"
 	cont "element type for"
 	cont "more power."
 	done
 
-_Route14BattleText4::
+_Route14CooltrainerM4BattleText::
 	text "Have you taught"
 	line "your bird #MON"
 	cont "how to FLY?"
 	done
 
-_Route14EndBattleText4::
+_Route14CooltrainerM4EndBattleText::
 	text "Shot"
 	line "down in flames!"
 	prompt
 
-_Route14AfterBattleText4::
+_Route14CooltrainerM4AfterBattleText::
 	text "Bird #MON are"
 	line "my true love!"
 	done
 
-_Route14BattleText5::
+_Route14CooltrainerM5BattleText::
 	text "Have you heard of"
 	line "the legendary"
 	cont "#MON?"
 	done
 
-_Route14EndBattleText5::
+_Route14CooltrainerM5EndBattleText::
 	text "Why?"
 	line "Why'd I lose?"
 	prompt
 
-_Route14AfterBattleText5::
+_Route14CooltrainerM5AfterBattleText::
 	text "The 3 legendary"
 	line "#MON are all"
 	cont "birds of prey."
 	done
 
-_Route14BattleText6::
+_Route14CooltrainerM6BattleText::
 	text "I'm not into it,"
 	line "but OK! Let's go!"
 	done
 
-_Route14EndBattleText6::
+_Route14CooltrainerM6EndBattleText::
 	text "I"
 	line "knew it!"
 	prompt
 
-_Route14AfterBattleText6::
+_Route14CooltrainerM6AfterBattleText::
 	text "Winning, losing,"
 	line "it doesn't matter"
 	cont "in the long run!"
 	done
 
-_Route14BattleText7::
+_Route14Biker1BattleText::
 	text "C'mon, c'mon."
 	line "Let's go, let's"
 	cont "go, let's go!"
 	done
 
-_Route14EndBattleText7::
+_Route14Biker1EndBattleText::
 	text "Arrg!"
 	line "Lost! Get lost!"
 	prompt
 
-_Route14AfterBattleText7::
+_Route14Biker1AfterBattleText::
 	text "What, what, what?"
 	line "What do you want?"
 	done
 
-_Route14BattleText8::
+_Route14Biker2BattleText::
 	text "Perfect! I need to"
 	line "burn some time!"
 	done
 
-_Route14EndBattleText8::
+_Route14Biker2EndBattleText::
 	text "What?"
 	line "You!?"
 	prompt
 
-_Route14AfterBattleText8::
+_Route14Biker2AfterBattleText::
 	text "Raising #MON"
 	line "is a drag, man."
 	done
 
-_Route14BattleText9::
+_Route14Biker3BattleText::
 	text "We ride out here"
 	line "because there's"
 	cont "more room!"
 	done
 
-_Route14EndBattleText9::
+_Route14Biker3EndBattleText::
 	text "Wipe out!"
 	prompt
 
-_Route14AfterBattleText9::
+_Route14Biker3AfterBattleText::
 	text "It's cool you"
 	line "made your #MON"
 	cont "so strong!"
@@ -150,23 +150,23 @@ _Route14AfterBattleText9::
 	line "And you know it!"
 	done
 
-_Route14BattleText10::
+_Route14Biker4BattleText::
 	text "#MON fight?"
 	line "Cool! Rumble!"
 	done
 
-_Route14EndBattleText10::
+_Route14Biker4EndBattleText::
 	text "Blown"
 	line "away!"
 	prompt
 
-_Route14AfterBattleText10::
+_Route14Biker4AfterBattleText::
 	text "You know who'd"
 	line "win, you and me"
 	cont "one on one!"
 	done
 
-_Route14Text11::
+_Route14SignText::
 	text "ROUTE 14"
 	line "West to FUCHSIA"
 	cont "CITY"