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

1 files changed, 28 insertions, 28 deletions

diff --git a/text/Route8.asm b/text/Route8.asm
index c0988d70..a6b24d79 100644
--- a/text/Route8.asm
+++ b/text/Route8.asm
@@ -1,153 +1,153 @@
-_Route8BattleText1::
+_Route8SuperNerd1BattleText::
 	text "You look good at"
 	line "#MON, but"
 	cont "how's your chem?"
 	done
 
-_Route8EndBattleText1::
+_Route8SuperNerd1EndBattleText::
 	text "Ow!"
 	line "Meltdown!"
 	prompt
 
-_Route8AfterBattleText1::
+_Route8SuperNerd1AfterBattleText::
 	text "I am better at"
 	line "school than this!"
 	done
 
-_Route8BattleText2::
+_Route8Gambler1BattleText::
 	text "All right! Let's"
 	line "roll the dice!"
 	done
 
-_Route8EndBattleText2::
+_Route8Gambler1EndBattleText::
 	text "Drat!"
 	line "Came up short!"
 	prompt
 
-_Route8AfterBattleText2::
+_Route8Gambler1AfterBattleText::
 	text "Lady Luck's not"
 	line "with me today!"
 	done
 
-_Route8BattleText3::
+_Route8SuperNerd2BattleText::
 	text "You need strategy"
 	line "to win at this!"
 	done
 
-_Route8EndBattleText3::
+_Route8SuperNerd2EndBattleText::
 	text "It's"
 	line "not logical!"
 	prompt
 
-_Route8AfterBattleText3::
+_Route8SuperNerd2AfterBattleText::
 	text "Go with GRIMER"
 	line "first...and..."
 	cont "...and...then..."
 	done
 
-_Route8BattleText4::
+_Route8CooltrainerF1BattleText::
 	text "I like NIDORAN, so"
 	line "I collect them!"
 	done
 
-_Route8EndBattleText4::
+_Route8CooltrainerF21EndBattleText::
 	text "Why? Why??"
 	prompt
 
-_Route8AfterBattleText4::
+_Route8CooltrainerF1AfterBattleText::
 	text "When #MON grow"
 	line "up they get ugly!"
 	cont "They shouldn't"
 	cont "evolve!"
 	done
 
-_Route8BattleText5::
+_Route8SuperNerd3BattleText::
 	text "School is fun, but"
 	line "so are #MON."
 	done
 
-_Route8EndBattleText5::
+_Route8SuperNerd3EndBattleText::
 	text "I'll"
 	line "stay with school."
 	prompt
 
-_Route8AfterBattleText5::
+_Route8SuperNerd3AfterBattleText::
 	text "We're stuck here"
 	line "because of the"
 	cont "gates at SAFFRON."
 	done
 
-_Route8BattleText6::
+_Route8CooltrainerF2BattleText::
 	text "MEOWTH is so cute,"
 	line "meow, meow, meow!"
 	done
 
-_Route8EndBattleText6::
+_Route8CooltrainerF2EndBattleText::
 	text "Meow!"
 	prompt
 
-_Route8AfterBattleText6::
+_Route8CooltrainerF2AfterBattleText::
 	text "I think PIDGEY"
 	line "and RATTATA"
 	cont "are cute too!"
 	done
 
-_Route8BattleText7::
+_Route8CooltrainerF3BattleText::
 	text "We must look"
 	line "silly standing"
 	cont "here like this!"
 	done
 
-_Route8EndBattleText7::
+_Route8CooltrainerF3EndBattleText::
 	text "Look what"
 	line "you did!"
 	prompt
 
-_Route8AfterBattleText7::
+_Route8CooltrainerF3AfterBattleText::
 	text "SAFFRON's gate-"
 	line "keeper won't let"
 	cont "us through."
 	cont "He's so mean!"
 	done
 
-_Route8BattleText8::
+_Route8Gambler2BattleText::
 	text "I'm a rambling,"
 	line "gambling dude!"
 	done
 
-_Route8EndBattleText8::
+_Route8Gambler2EndBattleText::
 	text "Missed"
 	line "the big score!"
 	prompt
 
-_Route8AfterBattleText8::
+_Route8Gambler2AfterBattleText::
 	text "Gambling and"
 	line "#MON are like"
 	cont "eating peanuts!"
 	cont "Just can't stop!"
 	done
 
-_Route8BattleText9::
+_Route8CooltrainerF4BattleText::
 	text "What's a cute,"
 	line "round and fluffy"
 	cont "#MON?"
 	done
 
-_Route8EndBattleText9::
+_Route8CooltrainerF4EndBattleText::
 	text "Stop!"
 
 	para "Don't be so mean"
 	line "to my CLEFAIRY!"
 	prompt
 
-_Route8AfterBattleText9::
+_Route8CooltrainerF4AfterBattleText::
 	text "I heard that"
 	line "CLEFAIRY evolves"
 	cont "when it's exposed"
 	cont "to a MOON STONE."
 	done
 
-_Route8Text10::
+_Route8UndergroundSignText::
 	text "UNDERGROUND PATH"
 	line "CELADON CITY -"
 	cont "LAVENDER TOWN"