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

1 files changed, 26 insertions, 26 deletions

diff --git a/text/Route12.asm b/text/Route12.asm
index 27befda5..65ba9c08 100644
--- a/text/Route12.asm
+++ b/text/Route12.asm
@@ -1,139 +1,139 @@
-_Route12Text1::
+_Route12SnorlaxText::
 	text "A sleeping #MON"
 	line "blocks the way!"
 	done
 
-_Route12Text13::
+_Route12SnorlaxWokeUpText::
 	text "SNORLAX woke up!"
 
 	para "It attacked in a"
 	line "grumpy rage!"
 	done
 
-_Route12Text14::
+_Route12SnorlaxCalmedDownText::
 	text "SNORLAX calmed"
 	line "down! With a big"
 	cont "yawn, it returned"
 	cont "to the mountains!"
 	done
 
-_Route12BattleText1::
+_Route12Fisher1BattleText::
 	text "Yeah! I got a"
 	line "bite, here!"
 	done
 
-_Route12EndBattleText1::
+_Route12Fisher1EndBattleText::
 	text "Tch!"
 	line "Just a small fry!"
 	prompt
 
-_Route12AfterBattleText1::
+_Route12Fisher1AfterBattleText::
 	text "Hang on! My line's"
 	line "snagged!"
 	done
 
-_Route12BattleText2::
+_Route12Fisher2BattleText::
 	text "Be patient!"
 	line "Fishing is a"
 	cont "waiting game!"
 	done
 
-_Route12EndBattleText2::
+_Route12Fisher2EndBattleText::
 	text "That"
 	line "one got away!"
 	prompt
 
-_Route12AfterBattleText2::
+_Route12Fisher2AfterBattleText::
 	text "With a better ROD,"
 	line "I could catch"
 	cont "better #MON!"
 	done
 
-_Route12BattleText3::
+_Route12CooltrainerMBattleText::
 	text "Have you found a"
 	line "MOON STONE?"
 	done
 
-_Route12EndBattleText3::
+_Route12CooltrainerMEndBattleText::
 	text "Oww!"
 	prompt
 
-_Route12AfterBattleText3::
+_Route12CooltrainerMAfterBattleText::
 	text "I could have made"
 	line "my #MON evolve"
 	cont "with MOON STONE!"
 	done
 
-_Route12BattleText4::
+_Route12SuperNerdBattleText::
 	text "Electricity is my"
 	line "specialty!"
 	done
 
-_Route12EndBattleText4::
+_Route12SuperNerdEndBattleText::
 	text "Unplugged!"
 	prompt
 
-_Route12AfterBattleText4::
+_Route12SuperNerdAfterBattleText::
 	text "Water conducts"
 	line "electricity, so"
 	cont "you should zap"
 	cont "sea #MON!"
 	done
 
-_Route12BattleText5::
+_Route12Fisher3BattleText::
 	text "The FISHING FOOL"
 	line "vs. #MON KID!"
 	done
 
-_Route12EndBattleText5::
+_Route12Fisher3EndBattleText::
 	text "Too"
 	line "much!"
 	prompt
 
-_Route12AfterBattleText5::
+_Route12Fisher3AfterBattleText::
 	text "You beat me at"
 	line "#MON, but I'm"
 	cont "good at fishing!"
 	done
 
-_Route12BattleText6::
+_Route12Fisher4BattleText::
 	text "I'd rather be"
 	line "working!"
 	done
 
-_Route12EndBattleText6::
+_Route12Fisher4EndBattleText::
 	text "It's"
 	line "not easy..."
 	prompt
 
-_Route12AfterBattleText6::
+_Route12Fisher4AfterBattleText::
 	text "It's all right."
 	line "Losing doesn't"
 	cont "bug me anymore."
 	done
 
-_Route12BattleText7::
+_Route12Fisher5BattleText::
 	text "You never know"
 	line "what you could"
 	cont "catch!"
 	done
 
-_Route12EndBattleText7::
+_Route12Fisher5EndBattleText::
 	text "Lost"
 	line "it!"
 	prompt
 
-_Route12AfterBattleText7::
+_Route12Fisher5AfterBattleText::
 	text "I catch MAGIKARP"
 	line "all the time, but"
 	cont "they're so weak!"
 	done
 
-_Route12Text11::
+_Route12SignText::
 	text "ROUTE 12 "
 	line "North to LAVENDER"
 	done
 
-_Route12Text12::
+_Route12SportFishingSignText::
 	text "SPORT FISHING AREA"
 	done