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

1 files changed, 31 insertions, 32 deletions

diff --git a/text/Route20.asm b/text/Route20.asm
index 1ccf0b6c..b81b9d3a 100644
--- a/text/Route20.asm
+++ b/text/Route20.asm
@@ -1,156 +1,155 @@
-_Route20BattleText1::
+_Route20Swimmer1BattleText::
 	text "The water is"
 	line "shallow here."
 	done
 
-_Route20EndBattleText1::
+_Route20Swimmer1EndBattleText::
 	text "Splash!"
 	prompt
 
-_Route20AfterBattleText1::
+_Route20Swimmer1AfterBattleText::
 	text "I wish I could"
 	line "ride my #MON."
 	done
 
-_Route20BattleText2::
+_Route20Swimmer2BattleText::
 	text "SEAFOAM is a"
 	line "quiet getaway!"
 	done
 
-_Route20EndBattleText2::
+_Route20Swimmer2EndBattleText::
 	text "Quit it!"
 	prompt
 
-_Route20AfterBattleText2::
+_Route20Swimmer2AfterBattleText::
 	text "There's a huge"
 	line "cavern underneath"
 	cont "this island."
 	done
 
-_Route20BattleText3::
+_Route20Swimmer3BattleText::
 	text "I love floating"
 	line "with the fishes!"
 	done
 
-_Route20EndBattleText3::
+_Route20Swimmer3EndBattleText::
 	text "Yowch!"
 	prompt
 
-_Route20AfterBattleText3::
+_Route20Swimmer3AfterBattleText::
 	text "Want to float"
 	line "with me?"
 	done
 
-_Route20BattleText4::
+_Route20Swimmer4BattleText::
 	text "Are you on"
 	line "vacation too?"
 	done
 
-_Route20EndBattleText4::
+_Route20Swimmer4EndBattleText::
 	text "No"
 	line "mercy at all!"
 	prompt
 
-_Route20AfterBattleText4::
+_Route20Swimmer4AfterBattleText::
 	text "SEAFOAM used to"
 	line "be one island!"
 	done
 
-_Route20BattleText5::
+_Route20Swimmer5BattleText::
 	text "Check out my buff"
 	line "physique!"
 	done
 
-_Route20EndBattleText5::
+_Route20Swimmer5EndBattleText::
 	text "Wimpy!"
 	prompt
 
-_Route20AfterBattleText5::
+_Route20Swimmer5AfterBattleText::
 	text "I should've been"
 	line "buffing up my"
 	cont "#MON, not me!"
 	done
 
-_Route20BattleText6::
+_Route20Swimmer6BattleText::
 	text "Why are you"
 	line "riding a #MON?"
 	cont "Can't you swim?"
 	done
 
-_Route20EndBattleText6::
+_Route20Swimmer6EndBattleText::
 	text "Ouch!"
 	line "Torpedoed!"
 	prompt
 
-_Route20AfterBattleText6::
+_Route20Swimmer6AfterBattleText::
 	text "Riding a #MON"
 	line "sure looks fun!"
 	done
 
-_Route20BattleText7::
+_Route20CooltrainerMBattleText::
 	text "I rode my bird"
 	line "#MON here!"
 	done
 
-_Route20EndBattleText7::
+_Route20CooltrainerMEndBattleText::
 	text "Oh"
 	line "no!"
 	prompt
 
-_Route20AfterBattleText7::
+_Route20CooltrainerMAfterBattleText::
 	text "My birds can't"
 	line "FLY me back!"
 	done
 
-_Route20BattleText8::
+_Route20Swimmer7BattleText::
 	text "My boy friend gave"
 	line "me big pearls!"
 	done
 
-_Route20EndBattleText8::
+_Route20Swimmer7EndBattleText::
 	text "Don't"
 	line "touch my pearls!"
 	prompt
 
-_Route20AfterBattleText8::
+_Route20Swimmer7AfterBattleText::
 	text "Will my pearls"
 	line "grow bigger"
 	cont "inside CLOYSTER?"
 	done
 
-_Route20BattleText9::
+_Route20Swimmer8BattleText::
 	text "I swam here from"
 	line "CINNABAR ISLAND!"
 	done
 
-_Route20EndBattleText9::
+_Route20Swimmer8EndBattleText::
 	text "I'm"
 	line "so disappointed!"
 	prompt
 
-_Route20AfterBattleText9::
+_Route20Swimmer8AfterBattleText::
 	text "#MON have"
 	line "taken over an"
 	cont "abandoned mansion"
 	cont "on CINNABAR!"
 	done
 
-_Route20BattleText10::
+_Route20Swimmer9BattleText::
 	text "CINNABAR, in the"
 	line "west, has a LAB"
 	cont "for #MON."
 	done
 
-_Route20EndBattleText10::
+_Route20Swimmer9EndBattleText::
 	text "Wait!"
 	prompt
 
-_Route20AfterBattleText10::
+_Route20Swimmer9AfterBattleText::
 	text "CINNABAR is a "
 	line "volcanic island!"
 	done
 
-_Route20Text12::
-_Route20Text11::
+_Route20SeafoamIslandsSignText::
 	text "SEAFOAM ISLANDS"
 	done