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

1 files changed, 19 insertions, 19 deletions

diff --git a/text/Route6.asm b/text/Route6.asm
index 71760449..3d16a8d1 100644
--- a/text/Route6.asm
+++ b/text/Route6.asm
@@ -1,103 +1,103 @@
-_Route6BattleText1::
+_Route6CooltrainerM1BattleText::
 	text "I'm doing this"
 	line "out of love."
 	cont "Leave me alone!"
 	done
 
-_Route6EndBattleText1::
+_Route6CooltrainerM1EndBattleText::
 	text "No,"
 	line "this can't be..."
 	prompt
 
-_Route6AfterBattleText1::
+_Route6CooltrainerM1AfterBattleText::
 	text "My love will leave"
 	line "me in disgust."
 	done
 
-_Route6BattleText2::
+_Route6CooltrainerF1BattleText::
 	text "I'm training for"
 	line "my love. Don't"
 	cont "bother me!"
 	done
 
-_Route6EndBattleText2::
+_Route6CooltrainerF1EndBattleText::
 	text "My"
 	line "textbook never..."
 	prompt
 
-_Route6AfterBattleText2::
+_Route6CooltrainerF1AfterBattleText::
 	text "Now I understand,"
 	line "#MON isn't"
 	cont "about calculated"
 	cont "numbers."
 	done
 
-_Route6BattleText3::
+_Route6Youngster1BattleText::
 	text "There aren't many"
 	line "bugs out here."
 	done
 
-_Route6EndBattleText3::
+_Route6Youngster1EndBattleText::
 	text "No!"
 	line "You're kidding!"
 	prompt
 
-_Route6AfterBattleText3::
+_Route6Youngster1AfterBattleText::
 	text "I like bugs, so"
 	line "I'm going back to"
 	cont "VIRIDIAN FOREST."
 	done
 
-_Route6BattleText4::
+_Route6CooltrainerM2BattleText::
 	text "Huh? You want"
 	line "to talk to me?"
 	done
 
-_Route6EndBattleText4::
+_Route6CooltrainerM2EndBattleText::
 	text "I"
 	line "didn't start it!"
 	prompt
 
-_Route6AfterBattleText4::
+_Route6CooltrainerM2AfterBattleText::
 	text "I should carry"
 	line "more #MON with"
 	cont "me for safety."
 	done
 
-_Route6BattleText5::
+_Route6CooltrainerF2BattleText::
 	text "Me? Well, OK."
 	line "I'll play!"
 	done
 
-_Route6EndBattleText5::
+_Route6CooltrainerF2EndBattleText::
 	text "Just"
 	line "didn't work!"
 	prompt
 
-_Route6AfterBattleText5::
+_Route6CooltrainerF2AfterBattleText::
 	text "I want to get"
 	line "stronger! What's"
 	cont "your secret?"
 	done
 
-_Route6BattleText6::
+_Route6Youngster2BattleText::
 	text "I've never seen"
 	line "you around!"
 	cont "Are you good?"
 	done
 
-_Route6EndBattleText6::
+_Route6Youngster2EndBattleText::
 	text "You"
 	line "are too good!"
 	prompt
 
-_Route6AfterBattleText6::
+_Route6Youngster2AfterBattleText::
 	text "Are my #MON"
 	line "weak? Or, am I"
 	cont "just bad?"
 	done
 
-_Route6Text7::
+_Route6UndergroundPathSignText::
 	text "UNDERGROUND PATH"
 	line "CERULEAN CITY -"
 	cont "VERMILION CITY"