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

1 files changed, 32 insertions, 32 deletions

diff --git a/text/maps/route_20.asm b/text/maps/route_20.asm
index 101ef92c..c69dec51 100644
--- a/text/maps/route_20.asm
+++ b/text/maps/route_20.asm
@@ -1,157 +1,157 @@
-_Route20BattleText1:: ; 91c69 (24:5c69)
+_Route20BattleText1::
 	text "The water is"
 	line "shallow here."
 	done
 
-_Route20EndBattleText1:: ; 91c85 (24:5c85)
+_Route20EndBattleText1::
 	text "Splash!"
 	prompt
 
-_Route20AfterBattleText1:: ; 91c8e (24:5c8e)
+_Route20AfterBattleText1::
 	text "I wish I could"
 	line "ride my #MON."
 	done
 
-_Route20BattleText2:: ; 91cac (24:5cac)
+_Route20BattleText2::
 	text "SEAFOAM is a"
 	line "quiet getaway!"
 	done
 
-_Route20EndBattleText2:: ; 91cc9 (24:5cc9)
+_Route20EndBattleText2::
 	text "Quit it!"
 	prompt
 
-_Route20AfterBattleText2:: ; 91cd3 (24:5cd3)
+_Route20AfterBattleText2::
 	text "There's a huge"
 	line "cavern underneath"
 	cont "this island."
 	done
 
-_Route20BattleText3:: ; 91d01 (24:5d01)
+_Route20BattleText3::
 	text "I love floating"
 	line "with the fishes!"
 	done
 
-_Route20EndBattleText3:: ; 91d23 (24:5d23)
+_Route20EndBattleText3::
 	text "Yowch!"
 	prompt
 
-_Route20AfterBattleText3:: ; 91d2b (24:5d2b)
+_Route20AfterBattleText3::
 	text "Want to float"
 	line "with me?"
 	done
 
-_Route20BattleText4:: ; 91d43 (24:5d43)
+_Route20BattleText4::
 	text "Are you on"
 	line "vacation too?"
 	done
 
-_Route20EndBattleText4:: ; 91d5d (24:5d5d)
+_Route20EndBattleText4::
 	text "No"
 	line "mercy at all!"
 	prompt
 
-_Route20AfterBattleText4:: ; 91d6f (24:5d6f)
+_Route20AfterBattleText4::
 	text "SEAFOAM used to"
 	line "be one island!"
 	done
 
-_Route20BattleText5:: ; 91d8f (24:5d8f)
+_Route20BattleText5::
 	text "Check out my buff"
 	line "physique!"
 	done
 
-_Route20EndBattleText5:: ; 91dac (24:5dac)
+_Route20EndBattleText5::
 	text "Wimpy!"
 	prompt
 
-_Route20AfterBattleText5:: ; 91db4 (24:5db4)
+_Route20AfterBattleText5::
 	text "I should've been"
 	line "buffing up my"
 	cont "#MON, not me!"
 	done
 
-_Route20BattleText6:: ; 91de1 (24:5de1)
+_Route20BattleText6::
 	text "Why are you"
 	line "riding a #MON?"
 	cont "Can't you swim?"
 	done
 
-_Route20EndBattleText6:: ; 91e0c (24:5e0c)
+_Route20EndBattleText6::
 	text "Ouch!"
 	line "Torpedoed!"
 	prompt
 
-_Route20AfterBattleText6:: ; 91e1e (24:5e1e)
+_Route20AfterBattleText6::
 	text "Riding a #MON"
 	line "sure looks fun!"
 	done
 
-_Route20BattleText7:: ; 91e3d (24:5e3d)
+_Route20BattleText7::
 	text "I rode my bird"
 	line "#MON here!"
 	done
 
-_Route20EndBattleText7:: ; 91e58 (24:5e58)
+_Route20EndBattleText7::
 	text "Oh"
 	line "no!"
 	prompt
 
-_Route20AfterBattleText7:: ; 91e60 (24:5e60)
+_Route20AfterBattleText7::
 	text "My birds can't"
 	line "FLY me back!"
 	done
 
-_Route20BattleText8:: ; 91e7c (24:5e7c)
+_Route20BattleText8::
 	text "My boy friend gave"
 	line "me big pearls!"
 	done
 
-_Route20EndBattleText8:: ; 91e9f (24:5e9f)
+_Route20EndBattleText8::
 	text "Don't"
 	line "touch my pearls!"
 	prompt
 
-_Route20AfterBattleText8:: ; 91eb6 (24:5eb6)
+_Route20AfterBattleText8::
 	text "Will my pearls"
 	line "grow bigger"
 	cont "inside CLOYSTER?"
 	done
 
-_Route20BattleText9:: ; 91ee3 (24:5ee3)
+_Route20BattleText9::
 	text "I swam here from"
 	line "CINNABAR ISLAND!"
 	done
 
-_Route20EndBattleText9:: ; 91f06 (24:5f06)
+_Route20EndBattleText9::
 	text "I'm"
 	line "so disappointed!"
 	prompt
 
-_Route20AfterBattleText9:: ; 91f1b (24:5f1b)
+_Route20AfterBattleText9::
 	text "#MON have"
 	line "taken over an"
 	cont "abandoned mansion"
 	cont "on CINNABAR!"
 	done
 
-_Route20BattleText10:: ; 91f53 (24:5f53)
+_Route20BattleText10::
 	text "CINNABAR, in the"
 	line "west, has a LAB"
 	cont "for #MON."
 	done
 
-_Route20EndBattleText10:: ; 91f7f (24:5f7f)
+_Route20EndBattleText10::
 	text "Wait!"
 	prompt
 
-_Route20AfterBattleText10:: ; 91f86 (24:5f86)
+_Route20AfterBattleText10::
 	text "CINNABAR is a "
 	line "volcanic island!"
 	done
 
-_Route20Text12:: ; 91fa7 (24:5fa7)
-_Route20Text11:: ; 91fa7 (24:5fa7)
+_Route20Text12::
+_Route20Text11::
 	text "SEAFOAM ISLANDS"
 	done