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

1 files changed, 28 insertions, 28 deletions

diff --git a/text/Route25.asm b/text/Route25.asm
index 4786d830..f0b48eb4 100644
--- a/text/Route25.asm
+++ b/text/Route25.asm
@@ -1,156 +1,156 @@
-_Route25BattleText1::
+_Route25Youngster1BattleText::
 	text "Local trainers"
 	line "come here to"
 	cont "practice!"
 	done
 
-_Route25EndBattleText1::
+_Route25Youngster1EndBattleText::
 	text "You're"
 	line "decent."
 	prompt
 
-_Route25AfterBattleText1::
+_Route25Youngster1AfterBattleText::
 	text "All #MON have"
 	line "weaknesses. It's"
 	cont "best to raise"
 	cont "different kinds."
 	done
 
-_Route25BattleText2::
+_Route25Youngster2BattleText::
 	text "Dad took me to a"
 	line "great party on"
 	cont "S.S.ANNE at"
 	cont "VERMILION CITY!"
 	done
 
-_Route25EndBattleText2::
+_Route25Youngster2EndBattleText::
 	text "I'm"
 	line "not mad!"
 	prompt
 
-_Route25AfterBattleText2::
+_Route25Youngster2AfterBattleText::
 	text "On S.S.ANNE, I"
 	line "saw trainers from"
 	cont "around the world."
 	done
 
-_Route25BattleText3::
+_Route25CooltrainerMBattleText::
 	text "I'm a cool guy."
 	line "I've got a girl"
 	cont "friend!"
 	done
 
-_Route25EndBattleText3::
+_Route25CooltrainerMEndBattleText::
 	text "Aww,"
 	line "darn..."
 	prompt
 
-_Route25AfterBattleText3::
+_Route25CooltrainerMAfterBattleText::
 	text "Oh well. My girl"
 	line "will cheer me up."
 	done
 
-_Route25BattleText4::
+_Route25CooltrainerF1BattleText::
 	text "Hi! My boy"
 	line "friend is cool!"
 	done
 
-_Route25EndBattleText4::
+_Route25CooltrainerF1EndBattleText::
 	text "I'm in"
 	line "a slump!"
 	prompt
 
-_Route25AfterBattleText4::
+_Route25CooltrainerF1AfterBattleText::
 	text "I wish my guy was"
 	line "as good as you!"
 	done
 
-_Route25BattleText5::
+_Route25Youngster3BattleText::
 	text "I knew I had to"
 	line "fight you!"
 	done
 
-_Route25EndBattleText5::
+_Route25Youngster3EndBattleText::
 	text "I knew"
 	line "I'd lose too!"
 	prompt
 
-_Route25AfterBattleText5::
+_Route25Youngster3AfterBattleText::
 	text "If your #MON"
 	line "gets confused or"
 	cont "falls asleep,"
 	cont "switch it!"
 	done
 
-_Route25BattleText6::
+_Route25CooltrainerF2BattleText::
 	text "My friend has a"
 	line "cute #MON."
 	cont "I'm so jealous!"
 	done
 
-_Route25EndBattleText6::
+_Route25CooltrainerF2EndBattleText::
 	text "I'm"
 	line "not so jealous!"
 	prompt
 
-_Route25AfterBattleText6::
+_Route25CooltrainerF2AfterBattleText::
 	text "You came from MT."
 	line "MOON? May I have"
 	cont "a CLEFAIRY?"
 	done
 
-_Route25BattleText7::
+_Route25Hiker1BattleText::
 	text "I just got down"
 	line "from MT.MOON,"
 	cont "but I'm ready!"
 	done
 
-_Route25EndBattleText7::
+_Route25Hiker1EndBattleText::
 	text "You"
 	line "worked hard!"
 	prompt
 
-_Route25AfterBattleText7::
+_Route25Hiker1AfterBattleText::
 	text "Drat!"
 	line "A ZUBAT bit me"
 	cont "back in there."
 	done
 
-_Route25BattleText8::
+_Route25Hiker2BattleText::
 	text "I'm off to see a"
 	line "#MON collector"
 	cont "at the cape!"
 	done
 
-_Route25EndBattleText8::
+_Route25Hiker2EndBattleText::
 	text "You"
 	line "got me."
 	prompt
 
-_Route25AfterBattleText8::
+_Route25Hiker2AfterBattleText::
 	text "The collector has"
 	line "many rare kinds"
 	cont "of #MON."
 	done
 
-_Route25BattleText9::
+_Route25Hiker3BattleText::
 	text "You're going to"
 	line "see BILL? First,"
 	cont "let's fight!"
 	done
 
-_Route25EndBattleText9::
+_Route25Hiker3EndBattleText::
 	text "You're"
 	line "something."
 	prompt
 
-_Route25AfterBattleText9::
+_Route25Hiker3AfterBattleText::
 	text "The trail below"
 	line "is a shortcut to"
 	cont "CERULEAN CITY."
 	done
 
-_Route25Text11::
+_Route25BillSignText::
 	text "SEA COTTAGE"
 	line "BILL lives here!"
 	done