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

1 files changed, 27 insertions, 27 deletions

diff --git a/text/maps/route_21.asm b/text/maps/route_21.asm
index 032e7c28..d94bdfac 100644
--- a/text/maps/route_21.asm
+++ b/text/maps/route_21.asm
@@ -1,137 +1,137 @@
-_Route21BattleText1:: ; 91fb8 (24:5fb8)
+_Route21BattleText1::
 	text "You want to know"
 	line "if the fish are"
 	cont "biting?"
 	done
 
-_Route21EndBattleText1:: ; 91fe2 (24:5fe2)
+_Route21EndBattleText1::
 	text "Dang!"
 	prompt
 
-_Route21AfterBattleText1:: ; 91fe9 (24:5fe9)
+_Route21AfterBattleText1::
 	text "I can't catch"
 	line "anything good!"
 	done
 
-_Route21BattleText2:: ; 92006 (24:6006)
+_Route21BattleText2::
 	text "I got a big haul!"
 	line "Wanna go for it?"
 	done
 
-_Route21EndBattleText2:: ; 9202a (24:602a)
+_Route21EndBattleText2::
 	text "Darn"
 	line "MAGIKARP!"
 	prompt
 
-_Route21AfterBattleText2:: ; 9203a (24:603a)
+_Route21AfterBattleText2::
 	text "I seem to only"
 	line "catch MAGIKARP!"
 	done
 
-_Route21BattleText3:: ; 9205a (24:605a)
+_Route21BattleText3::
 	text "The sea cleanses"
 	line "my body and soul!"
 	done
 
-_Route21EndBattleText3:: ; 9207e (24:607e)
+_Route21EndBattleText3::
 	text "Ayah!"
 	prompt
 
-_Route21AfterBattleText3:: ; 92085 (24:6085)
+_Route21AfterBattleText3::
 	text "I like the"
 	line "mountains too!"
 	done
 
-_Route21BattleText4:: ; 920a0 (24:60a0)
+_Route21BattleText4::
 	text "What's wrong with"
 	line "me swimming?"
 	done
 
-_Route21EndBattleText4:: ; 920bf (24:60bf)
+_Route21EndBattleText4::
 	text "Cheap"
 	line "shot!"
 	prompt
 
-_Route21AfterBattleText4:: ; 920cc (24:60cc)
+_Route21AfterBattleText4::
 	text "I look like what?"
 	line "A studded inner"
 	cont "tube? Get lost!"
 	done
 
-_Route21BattleText5:: ; 920ff (24:60ff)
+_Route21BattleText5::
 	text "I caught all my"
 	line "#MON at sea!"
 	done
 
-_Route21EndBattleText5:: ; 9211d (24:611d)
+_Route21EndBattleText5::
 	text "Diver!!"
 	line "Down!!"
 	prompt
 
-_Route21AfterBattleText5:: ; 9212d (24:612d)
+_Route21AfterBattleText5::
 	text "Where'd you catch"
 	line "your #MON?"
 	done
 
-_Route21BattleText6:: ; 9214a (24:614a)
+_Route21BattleText6::
 	text "Right now, I'm in"
 	line "a triathlon meet!"
 	done
 
-_Route21EndBattleText6:: ; 9216e (24:616e)
+_Route21EndBattleText6::
 	text "Pant..."
 	line "pant...pant..."
 	prompt
 
-_Route21AfterBattleText6:: ; 92186 (24:6186)
+_Route21AfterBattleText6::
 	text "I'm beat!"
 	line "But, I still have"
 	cont "the bike race and"
 	cont "marathon left!"
 	done
 
-_Route21BattleText7:: ; 921c3 (24:61c3)
+_Route21BattleText7::
 	text "Ahh! Feel the sun"
 	line "and the wind!"
 	done
 
-_Route21EndBattleText7:: ; 921e4 (24:61e4)
+_Route21EndBattleText7::
 	text "Yow!"
 	line "I lost!"
 	prompt
 
-_Route21AfterBattleText7:: ; 921f2 (24:61f2)
+_Route21AfterBattleText7::
 	text "I'm sunburnt to a"
 	line "crisp!"
 	done
 
-_Route21BattleText8:: ; 9220b (24:620b)
+_Route21BattleText8::
 	text "Hey, don't scare"
 	line "away the fish!"
 	done
 
-_Route21EndBattleText8:: ; 9222b (24:622b)
+_Route21EndBattleText8::
 	text "Sorry!"
 	line "I didn't mean it!"
 	prompt
 
-_Route21AfterBattleText8:: ; 92244 (24:6244)
+_Route21AfterBattleText8::
 	text "I was just angry"
 	line "that I couldn't"
 	cont "catch anything."
 	done
 
-_Route21BattleText9:: ; 92275 (24:6275)
+_Route21BattleText9::
 	text "Keep me company"
 	line "'til I get a hit!"
 	done
 
-_Route21EndBattleText9:: ; 92297 (24:6297)
+_Route21EndBattleText9::
 	text "That"
 	line "burned some time."
 	prompt
 
-_Route21AfterBattleText9:: ; 922af (24:62af)
+_Route21AfterBattleText9::
 	text "Oh wait! I got a"
 	line "bite! Yeah!"
 	done