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

1 files changed, 25 insertions, 25 deletions

diff --git a/text/Route3.asm b/text/Route3.asm
index 14d44e64..7068e77d 100644
--- a/text/Route3.asm
+++ b/text/Route3.asm
@@ -8,138 +8,138 @@ _Route3Text1::
 	cont "lot out of you!"
 	done
 
-_Route3BattleText1::
+_Route3Youngster1BattleText::
 	text "Hey! I met you in"
 	line "VIRIDIAN FOREST!"
 	done
 
-_Route3EndBattleText1::
+_Route3Youngster1EndBattleText::
 	text "You"
 	line "beat me again!"
 	prompt
 
-_Route3AfterBattleText1::
+_Route3Youngster1AfterBattleText::
 	text "There are other"
 	line "kinds of #MON"
 	cont "than those found"
 	cont "in the forest!"
 	done
 
-_Route3BattleText2::
+_Route3Youngster2BattleText::
 	text "Hi! I like shorts!"
 	line "They're comfy and"
 	cont "easy to wear!"
 	done
 
-_Route3EndBattleText2::
+_Route3Youngster2EndBattleText::
 	text "I don't"
 	line "believe it!"
 	prompt
 
-_Route3AfterBattleText2::
+_Route3Youngster2AfterBattleText::
 	text "Are you storing"
 	line "your #MON on"
 	cont "PC? Each BOX can"
 	cont "hold 20 #MON!"
 	done
 
-_Route3BattleText3::
+_Route3CooltrainerF1BattleText::
 	text "You looked at me,"
 	line "didn't you?"
 	done
 
-_Route3EndBattleText3::
+_Route3CooltrainerF1EndBattleText::
 	text "You're"
 	line "mean!"
 	prompt
 
-_Route3AfterBattleText3::
+_Route3CooltrainerF1AfterBattleText::
 	text "Quit staring if"
 	line "you don't want to"
 	cont "fight!"
 	done
 
-_Route3BattleText4::
+_Route3Youngster3BattleText::
 	text "Are you a trainer?"
 	line "Let's fight!"
 	done
 
-_Route3EndBattleText4::
+_Route3Youngster3EndBattleText::
 	text "If I"
 	line "had new #MON,"
 	cont "I would've won!"
 	prompt
 
-_Route3AfterBattleText4::
+_Route3Youngster3AfterBattleText::
 	text "If a #MON BOX"
 	line "on the PC gets"
 	cont "full, just switch"
 	cont "to another BOX!"
 	done
 
-_Route3BattleText5::
+_Route3CooltrainerF2BattleText::
 	text "That look you"
 	line "gave me, it's so"
 	cont "intriguing!"
 	done
 
-_Route3EndBattleText5::
+_Route3CooltrainerF2EndBattleText::
 	text "Be nice!"
 	prompt
 
-_Route3AfterBattleText5::
+_Route3CooltrainerF2AfterBattleText::
 	text "Avoid fights by"
 	line "not letting"
 	cont "people see you!"
 	done
 
-_Route3BattleText6::
+_Route3Youngster4BattleText::
 	text "Hey! You're not"
 	line "wearing shorts!"
 	done
 
-_Route3EndBattleText6::
+_Route3Youngster4EndBattleText::
 	text "Lost!"
 	line "Lost! Lost!"
 	prompt
 
-_Route3AfterBattleText6::
+_Route3Youngster4AfterBattleText::
 	text "I always wear"
 	line "shorts, even in"
 	cont "winter!"
 	done
 
-_Route3BattleText7::
+_Route3Youngster5BattleText::
 	text "You can fight my"
 	line "new #MON!"
 	done
 
-_Route3EndBattleText7::
+_Route3Youngster5EndBattleText::
 	text "Done"
 	line "like dinner!"
 	prompt
 
-_Route3AfterBattleText7::
+_Route3Youngster5AfterBattleText::
 	text "Trained #MON"
 	line "are stronger than"
 	cont "the wild ones!"
 	done
 
-_Route3BattleText8::
+_Route3CooltrainerF3BattleText::
 	text "Eek! Did you"
 	line "touch me?"
 	done
 
-_Route3EndBattleText8::
+_Route3CooltrainerF3EndBattleText::
 	text "That's it?"
 	prompt
 
-_Route3AfterBattleText8::
+_Route3CooltrainerF3AfterBattleText::
 	text "ROUTE 4 is at the"
 	line "foot of MT.MOON."
 	done
 
-_Route3Text10::
+_Route3SignText::
 	text "ROUTE 3"
 	line "MT.MOON AHEAD"
 	done