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

1 files changed, 31 insertions, 31 deletions

diff --git a/text/Route19.asm b/text/Route19.asm
index 244e31d0..ca060e00 100644
--- a/text/Route19.asm
+++ b/text/Route19.asm
@@ -1,156 +1,156 @@
-_Route19BattleText1::
+_Route19CooltrainerM1BattleText::
 	text "Have to warm up"
 	line "before my swim!"
 	done
 
-_Route19EndBattleText1::
+_Route19CooltrainerM1EndBattleText::
 	text "All"
 	line "warmed up!"
 	prompt
 
-_Route19AfterBattleText1::
+_Route19CooltrainerM1AfterBattleText::
 	text "Thanks, kid! I'm"
 	line "ready for a swim!"
 	done
 
-_Route19BattleText2::
+_Route19CooltrainerM2BattleText::
 	text "Wait! You'll have"
 	line "a heart attack!"
 	done
 
-_Route19EndBattleText2::
+_Route19CooltrainerM2EndBattleText::
 	text "Ooh!"
 	line "That's chilly!"
 	prompt
 
-_Route19AfterBattleText2::
+_Route19CooltrainerM2AfterBattleText::
 	text "Watch out for"
 	line "TENTACOOL!"
 	done
 
-_Route19BattleText3::
+_Route19Swimmer1BattleText::
 	text "I love swimming!"
 	line "What about you?"
 	done
 
-_Route19EndBattleText3::
+_Route19Swimmer1EndBattleText::
 	text "Belly"
 	line "flop!"
 	prompt
 
-_Route19AfterBattleText3::
+_Route19Swimmer1AfterBattleText::
 	text "I can beat #MON"
 	line "at swimming!"
 	done
 
-_Route19BattleText4::
+_Route19Swimmer2BattleText::
 	text "What's beyond the"
 	line "horizon?"
 	done
 
-_Route19EndBattleText4::
+_Route19Swimmer2EndBattleText::
 	text "Glub!"
 	prompt
 
-_Route19AfterBattleText4::
+_Route19Swimmer2AfterBattleText::
 	text "I see a couple of"
 	line "islands!"
 	done
 
-_Route19BattleText5::
+_Route19Swimmer3BattleText::
 	text "I tried diving"
 	line "for #MON, but"
 	cont "it was a no go!"
 	done
 
-_Route19EndBattleText5::
+_Route19Swimmer3EndBattleText::
 	text "Help!"
 	prompt
 
-_Route19AfterBattleText5::
+_Route19Swimmer3AfterBattleText::
 	text "You have to fish"
 	line "for sea #MON!"
 	done
 
-_Route19BattleText6::
+_Route19Swimmer4BattleText::
 	text "I look at the"
 	line "sea to forget!"
 	done
 
-_Route19EndBattleText6::
+_Route19Swimmer4EndBattleText::
 	text "Ooh!"
 	line "Traumatic!"
 	prompt
 
-_Route19AfterBattleText6::
+_Route19Swimmer4AfterBattleText::
 	text "I'm looking at the"
 	line "sea to forget!"
 	done
 
-_Route19BattleText7::
+_Route19Swimmer5BattleText::
 	text "Oh, I just love"
 	line "your ride! Can I"
 	cont "have it if I win?"
 	done
 
-_Route19EndBattleText7::
+_Route19Swimmer5EndBattleText::
 	text "Oh!"
 	line "I lost!"
 	prompt
 
-_Route19AfterBattleText7::
+_Route19Swimmer5AfterBattleText::
 	text "It's still a long"
 	line "way to go to"
 	cont "SEAFOAM ISLANDS."
 	done
 
-_Route19BattleText8::
+_Route19Swimmer6BattleText::
 	text "Swimming's great!"
 	line "Sunburns aren't!"
 	done
 
-_Route19EndBattleText8::
+_Route19Swimmer6EndBattleText::
 	text "Shocker!"
 	prompt
 
-_Route19AfterBattleText8::
+_Route19Swimmer6AfterBattleText::
 	text "My boy friend"
 	line "wanted to swim to"
 	cont "SEAFOAM ISLANDS."
 	done
 
-_Route19BattleText9::
+_Route19Swimmer7BattleText::
 	text "These waters are"
 	line "treacherous!"
 	done
 
-_Route19EndBattleText9::
+_Route19Swimmer7EndBattleText::
 	text "Ooh!"
 	line "Dangerous!"
 	prompt
 
-_Route19AfterBattleText9::
+_Route19Swimmer7AfterBattleText::
 	text "I got a cramp!"
 	line "Glub, glub..."
 	done
 
-_Route19BattleText10::
+_Route19Swimmer8BattleText::
 	text "I swam here, but"
 	line "I'm tired."
 	done
 
-_Route19EndBattleText10::
+_Route19Swimmer8EndBattleText::
 	text "I'm"
 	line "exhausted..."
 	prompt
 
-_Route19AfterBattleText10::
+_Route19Swimmer8AfterBattleText::
 	text "LAPRAS is so big,"
 	line "it must keep you"
 	cont "dry on water."
 	done
 
-_Route19Text11::
+_Route19SignText::
 	text "SEA ROUTE 19"
 	line "FUCHSIA CITY -"
 	cont "SEAFOAM ISLANDS"