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

1 files changed, 22 insertions, 22 deletions

diff --git a/text/Route16.asm b/text/Route16.asm
index 2ef6b02a..27a882d8 100644
--- a/text/Route16.asm
+++ b/text/Route16.asm
@@ -1,90 +1,90 @@
-_Route16BattleText1::
+_Route16Biker1BattleText::
 	text "What do you want?"
 	done
 
-_Route16EndBattleText1::
+_Route16Biker1EndBattleText::
 	text "Don't you"
 	line "dare laugh!"
 	prompt
 
-_Route16AfterBattleText1::
+_Route16Biker1AfterBattleText::
 	text "We like just"
 	line "hanging here,"
 	cont "what's it to you?"
 	done
 
-_Route16BattleText2::
+_Route16Biker2BattleText::
 	text "Nice BIKE!"
 	line "Hand it over!"
 	done
 
-_Route16EndBattleText2::
+_Route16Biker2EndBattleText::
 	text "Knock-"
 	line "out!"
 	prompt
 
-_Route16AfterBattleText2::
+_Route16Biker2AfterBattleText::
 	text "Forget it, who"
 	line "needs your BIKE!"
 	done
 
-_Route16BattleText3::
+_Route16Biker3BattleText::
 	text "Come out and play,"
 	line "little mouse!"
 	done
 
-_Route16EndBattleText3::
+_Route16Biker3EndBattleText::
 	text "You"
 	line "little rat!"
 	prompt
 
-_Route16AfterBattleText3::
+_Route16Biker3AfterBattleText::
 	text "I hate losing!"
 	line "Get away from me!"
 	done
 
-_Route16BattleText4::
+_Route16biker4BattleText::
 	text "Hey, you just"
 	line "bumped me!"
 	done
 
-_Route16EndBattleText4::
+_Route16Biker4EndBattleText::
 	text "Kaboom!"
 	prompt
 
-_Route16AfterBattleText4::
+_Route16Biker4AfterBattleText::
 	text "You can also get"
 	line "to FUCHSIA from"
 	cont "VERMILION using a"
 	cont "coastal road."
 	done
 
-_Route16BattleText5::
+_Route16Biker5BattleText::
 	text "I'm feeling"
 	line "hungry and mean!"
 	done
 
-_Route16EndBattleText5::
+_Route16Biker5EndBattleText::
 	text "Bad,"
 	line "bad, bad!"
 	prompt
 
-_Route16AfterBattleText5::
+_Route16Biker5AfterBattleText::
 	text "I like my #MON"
 	line "ferocious! They"
 	cont "tear up enemies!"
 	done
 
-_Route16BattleText6::
+_Route16Biker6BattleText::
 	text "Sure, I'll go!"
 	done
 
-_Route16EndBattleText6::
+_Route16Biker6EndBattleText::
 	text "Don't make"
 	line "me mad!"
 	prompt
 
-_Route16AfterBattleText6::
+_Route16Biker6AfterBattleText::
 	text "I like harassing"
 	line "people with my"
 	cont "vicious #MON!"
@@ -95,25 +95,25 @@ _Route16Text7::
 	line "blocks the way!"
 	done
 
-_Route16Text10::
+_Route16SnorlaxWokeUpText::
 	text "SNORLAX woke up!"
 
 	para "It attacked in a"
 	line "grumpy rage!"
 	done
 
-_Route16Text11::
+_Route16SnorlaxReturnedToMountainsText::
 	text "With a big yawn,"
 	line "SNORLAX returned"
 	cont "to the mountains!"
 	done
 
-_Route16Text8::
+_Route16CyclingRoadSignText::
 	text "Enjoy the slope!"
 	line "CYCLING ROAD"
 	done
 
-_Route16Text9::
+_Route16SignText::
 	text "ROUTE 16"
 	line "CELADON CITY -"
 	cont "FUCHSIA CITY"