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

1 files changed, 20 insertions, 21 deletions

diff --git a/text/Route10.asm b/text/Route10.asm
index a56018f0..9546d65b 100644
--- a/text/Route10.asm
+++ b/text/Route10.asm
@@ -1,97 +1,97 @@
-_Route10BattleText1::
+_Route10SuperNerd1BattleText::
 	text "Wow, are you a"
 	line "#MANIAC too?"
 	cont "Want to see my"
 	cont "collection?"
 	done
 
-_Route10EndBattleText1::
+_Route10SuperNerd1EndBattleText::
 	text "Humph."
 	line "I'm not angry!"
 	prompt
 
-_Route10AfterBattleText1::
+_Route10SuperNerd1AfterBattleText::
 	text "I have more rare"
 	line "#MON at home!"
 	done
 
-_Route10BattleText2::
+_Route10Hiker1BattleText::
 	text "Ha-hahah-ah-ha!"
 	done
 
-_Route10EndBattleText2::
+_Route10Hiker1EndBattleText::
 	text "Ha-haha!"
 	line "Not laughing!"
 	cont "Ha-hay fever!"
 	cont "Haha-ha-choo!"
 	prompt
 
-_Route10AfterBattleText2::
+_Route10Hiker1AfterBattleText::
 	text "Haha-ha-choo!"
 	line "Ha-choo!"
 	cont "Snort! Snivel!"
 	done
 
-_Route10BattleText3::
+_Route10SuperNerd2BattleText::
 	text "Hi, kid, want to"
 	line "see my #MON?"
 	done
 
-_Route10EndBattleText3::
+_Route10SuperNerd2EndBattleText::
 	text "Oh no!"
 	line "My #MON!"
 	prompt
 
-_Route10AfterBattleText3::
+_Route10SuperNerd2AfterBattleText::
 	text "I don't like you"
 	line "for beating me!"
 	done
 
-_Route10BattleText4::
+_Route10CooltrainerF1BattleText::
 	text "I've been to a"
 	line "#MON GYM a few"
 	cont "times. But, I"
 	cont "lost each time."
 	done
 
-_Route10EndBattleText4::
+_Route10CooltrainerF1EndBattleText::
 	text "Ohh!"
 	line "Blew it again!"
 	prompt
 
-_Route10AfterBattleText4::
+_Route10CooltrainerF1AfterBattleText::
 	text "I noticed some"
 	line "#MANIACs"
 	cont "prowling around."
 	done
 
-_Route10BattleText5::
+_Route10Hiker2BattleText::
 	text "Ah! This mountain"
 	line "air is delicious!"
 	done
 
-_Route10EndBattleText5::
+_Route10Hiker2EndBattleText::
 	text "That"
 	line "cleared my head!"
 	prompt
 
-_Route10AfterBattleText5::
+_Route10Hiker2AfterBattleText::
 	text "I feel bloated on"
 	line "mountain air!"
 	done
 
-_Route10BattleText6::
+_Route10CooltrainerF2BattleText::
 	text "I'm feeling a bit"
 	line "faint from this"
 	cont "tough hike."
 	done
 
-_Route10EndBattleText6::
+_Route10CooltrainerF2EndBattleText::
 	text "I'm"
 	line "not up to it!"
 	prompt
 
-_Route10AfterBattleText6::
+_Route10CooltrainerF2AfterBattleText::
 	text "The #MON here"
 	line "are so chunky!"
 	cont "There should be a"
@@ -99,11 +99,10 @@ _Route10AfterBattleText6::
 	cont "floral pattern!"
 	done
 
-_Route10Text9::
-_Route10Text7::
+_Route10RockTunnelSignText::
 	text "ROCK TUNNEL"
 	done
 
-_Route10Text10::
+_Route10PowerPlantSignText::
 	text "POWER PLANT"
 	done