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

1 files changed, 33 insertions, 33 deletions

diff --git a/text/Route13.asm b/text/Route13.asm
index e2718919..26f7727f 100644
--- a/text/Route13.asm
+++ b/text/Route13.asm
@@ -1,170 +1,170 @@
-_Route13BattleText2::
+_Route13CooltrainerM1BattleText::
 	text "My bird #MON"
 	line "want to scrap!"
 	done
 
-_Route13EndBattleText2::
+_Route13CooltrainerM1EndBattleText::
 	text "My"
 	line "bird combo lost?"
 	prompt
 
-_Route13AfterBattleText2::
+_Route13CooltrainerM1AfterBattleText::
 	text "My #MON look"
 	line "happy even though"
 	cont "they lost."
 	done
 
-_Route13BattleText3::
+_Route13CooltrainerF1BattleText::
 	text "I'm told I'm good"
 	line "for a kid!"
 	done
 
-_Route13EndBattleText3::
+_Route13CooltrainerF1EndBattleText::
 	text "Ohh!"
 	line "I lost!"
 	prompt
 
-_Route13AfterBattleText3::
+_Route13CooltrainerF1AfterBattleText::
 	text "I want to become"
 	line "a good trainer."
 	cont "I'll train hard."
 	done
 
-_Route13BattleText4::
+_Route13CooltrainerF2BattleText::
 	text "Wow! Your BADGEs"
 	line "are too cool!"
 	done
 
-_Route13EndBattleText4::
+_Route13CooltrainerF2EndBattleText::
 	text "Not"
 	line "enough!"
 	prompt
 
-_Route13AfterBattleText4::
+_Route13CooltrainerF2AfterBattleText::
 	text "You got those"
 	line "BADGEs from GYM"
 	cont "LEADERs. I know!"
 	done
 
-_Route13BattleText5::
+_Route13CooltrainerF3BattleText::
 	text "My cute #MON"
 	line "wish to make your"
 	cont "acquaintance."
 	done
 
-_Route13EndBattleText5::
+_Route13CooltrainerF3EndBattleText::
 	text "Wow!"
 	line "You totally won!"
 	prompt
 
-_Route13AfterBattleText5::
+_Route13CooltrainerF3AfterBattleText::
 	text "You have to make"
 	line "#MON fight to"
 	cont "toughen them up!"
 	done
 
-_Route13BattleText6::
+_Route13CooltrainerF4BattleText::
 	text "I found CARBOS in"
 	line "a cave once."
 	done
 
-_Route13EndBattleText6::
+_Route13CooltrainerF4EndBattleText::
 	text "Just"
 	line "messed up!"
 	prompt
 
-_Route13AfterBattleText6::
+_Route13CooltrainerF4AfterBattleText::
 	text "CARBOS boosted"
 	line "the SPEED of my"
 	cont "#MON."
 	done
 
-_Route13BattleText7::
+_Route13CooltrainerM2BattleText::
 	text "The wind's blowing"
 	line "my way!"
 	done
 
-_Route13EndBattleText7::
+_Route13CooltrainerM2EndBattleText::
 	text "The"
 	line "wind turned!"
 	prompt
 
-_Route13AfterBattleText7::
+_Route13CooltrainerM2AfterBattleText::
 	text "I'm beat. I guess"
 	line "I'll FLY home."
 	done
 
-_Route13BattleText8::
+_Route13Beauty1BattleText::
 	text "Sure, I'll play"
 	line "with you!"
 	done
 
-_Route13EndBattleText8::
+_Route13Beauty1EndBattleText::
 	text "Oh!"
 	line "You little brute!"
 	prompt
 
-_Route13AfterBattleText8::
+_Route13Beauty1AfterBattleText::
 	text "I wonder which is"
 	line "stronger, male or"
 	cont "female #MON?"
 	done
 
-_Route13BattleText9::
+_Route13Beauty2BattleText::
 	text "Do you want to"
 	line "#MON with me?"
 	done
 
-_Route13EndBattleText9::
+_Route13Beauty2EndBattleText::
 	text "It's over"
 	line "already?"
 	prompt
 
-_Route13AfterBattleText9::
+_Route13Beauty2AfterBattleText::
 	text "I don't know"
 	line "anything about"
 	cont "#MON. I just"
 	cont "like cool ones!"
 	done
 
-_Route13BattleText10::
+_Route13BikerBattleText::
 	text "What're you"
 	line "lookin' at?"
 	done
 
-_Route13EndBattleText10::
+_Route13BikerEndBattleText::
 	text "Dang!"
 	line "Stripped gears!"
 	prompt
 
-_Route13AfterBattleText10::
+_Route13BikerAfterBattleText::
 	text "Get lost!"
 	done
 
-_Route13BattleText11::
+_Route13CooltrainerM3BattleText::
 	text "I always go with"
 	line "bird #MON!"
 	done
 
-_Route13EndBattleText11::
+_Route13CooltrainerM3EndBattleText::
 	text "Out"
 	line "of power!"
 	prompt
 
-_Route13AfterBattleText11::
+_Route13CooltrainerM3AfterBattleText::
 	text "I wish I could"
 	line "fly like PIDGEY"
 	cont "and PIDGEOTTO..."
 	done
 
-_Route13Text11::
+_Route13TrainerTips1Text::
 	text "TRAINER TIPS"
 
 	para "Look to the left"
 	line "of that post!"
 	done
 
-_Route13Text12::
+_Route13TrainerTips2Text::
 	text "TRAINER TIPS"
 
 	para "Use SELECT to"
@@ -172,7 +172,7 @@ _Route13Text12::
 	cont "the ITEM window!"
 	done
 
-_Route13Text13::
+_Route13SignText::
 	text "ROUTE 13"
 	line "North to SILENCE"
 	cont "BRIDGE"