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

1 files changed, 31 insertions, 31 deletions

diff --git a/text/maps/route_15.asm b/text/maps/route_15.asm
index d217c9a4..1368b3d5 100644
--- a/text/maps/route_15.asm
+++ b/text/maps/route_15.asm
@@ -1,15 +1,15 @@
-_Route15BattleText1:: ; 90c3e (24:4c3e)
+_Route15BattleText1::
 	text "Let me try out the"
 	line "#MON I just"
 	cont "got in a trade!"
 	done
 
-_Route15EndBattleText1:: ; 90c6e (24:4c6e)
+_Route15EndBattleText1::
 	text "Not"
 	line "good enough!"
 	prompt
 
-_Route15AfterBattleText1:: ; 90c80 (24:4c80)
+_Route15AfterBattleText1::
 	text "You can't change"
 	line "the nickname of"
 	cont "any #MON you"
@@ -19,152 +19,152 @@ _Route15AfterBattleText1:: ; 90c80 (24:4c80)
 	line "Trainer can."
 	done
 
-_Route15BattleText2:: ; 90cdd (24:4cdd)
+_Route15BattleText2::
 	text "You look gentle,"
 	line "so I think I can"
 	cont "beat you!"
 	done
 
-_Route15EndBattleText2:: ; 90d0a (24:4d0a)
+_Route15EndBattleText2::
 	text "No,"
 	line "wrong!"
 	prompt
 
-_Route15AfterBattleText2:: ; 90d16 (24:4d16)
+_Route15AfterBattleText2::
 	text "I'm afraid of"
 	line "BIKERs, they look"
 	cont "so ugly and mean!"
 	done
 
-_Route15BattleText3:: ; 90d48 (24:4d48)
+_Route15BattleText3::
 	text "When I whistle, I"
 	line "can summon bird"
 	cont "#MON!"
 	done
 
-_Route15EndBattleText3:: ; 90d71 (24:4d71)
+_Route15EndBattleText3::
 	text "Ow!"
 	line "That's tragic!"
 	prompt
 
-_Route15AfterBattleText3:: ; 90d84 (24:4d84)
+_Route15AfterBattleText3::
 	text "Maybe I'm not cut"
 	line "out for battles."
 	done
 
-_Route15BattleText4:: ; 90da7 (24:4da7)
+_Route15BattleText4::
 	text "Hmm? My birds are"
 	line "shivering! You're"
 	cont "good, aren't you?"
 	done
 
-_Route15EndBattleText4:: ; 90ddc (24:4ddc)
+_Route15EndBattleText4::
 	text "Just"
 	line "as I thought!"
 	prompt
 
-_Route15AfterBattleText4:: ; 90df0 (24:4df0)
+_Route15AfterBattleText4::
 	text "Did you know moves"
 	line "like EARTHQUAKE"
 	cont "don't have any"
 	cont "effect on birds?"
 	done
 
-_Route15BattleText5:: ; 90e33 (24:4e33)
+_Route15BattleText5::
 	text "Oh, you're a"
 	line "little cutie!"
 	done
 
-_Route15EndBattleText5:: ; 90e4e (24:4e4e)
+_Route15EndBattleText5::
 	text "You looked"
 	line "so cute too!"
 	prompt
 
-_Route15AfterBattleText5:: ; 90e67 (24:4e67)
+_Route15AfterBattleText5::
 	text "I forgive you!"
 	line "I can take it!"
 	done
 
-_Route15BattleText6:: ; 90e86 (24:4e86)
+_Route15BattleText6::
 	text "I raise #MON"
 	line "because I live"
 	cont "alone!"
 	done
 
-_Route15EndBattleText6:: ; 90eaa (24:4eaa)
+_Route15EndBattleText6::
 	text "I didn't"
 	line "ask for this!"
 	prompt
 
-_Route15AfterBattleText6:: ; 90ec1 (24:4ec1)
+_Route15AfterBattleText6::
 	text "I just like going"
 	line "home to be with"
 	cont "my #MON!"
 	done
 
-_Route15BattleText7:: ; 90eed (24:4eed)
+_Route15BattleText7::
 	text "Hey kid! C'mon!"
 	line "I just got these!"
 	done
 
-_Route15EndBattleText7:: ; 90f0f (24:4f0f)
+_Route15EndBattleText7::
 	text "Why"
 	line "not?"
 	prompt
 
-_Route15AfterBattleText7:: ; 90f19 (24:4f19)
+_Route15AfterBattleText7::
 	text "You only live"
 	line "once, so I live"
 	cont "as an outlaw!"
 	cont "TEAM ROCKET RULES!"
 	done
 
-_Route15BattleText8:: ; 90f59 (24:4f59)
+_Route15BattleText8::
 	text "Fork over all your"
 	line "cash when you"
 	cont "lose to me, kid!"
 	done
 
-_Route15EndBattleText8:: ; 90f8c (24:4f8c)
+_Route15EndBattleText8::
 	text "That"
 	line "can't be true!"
 	prompt
 
-_Route15AfterBattleText8:: ; 90fa0 (24:4fa0)
+_Route15AfterBattleText8::
 	text "I was just joking"
 	line "about the money!"
 	done
 
-_Route15BattleText9:: ; 90fc4 (24:4fc4)
+_Route15BattleText9::
 	text "What's cool?"
 	line "Trading #MON!"
 	done
 
-_Route15EndBattleText9:: ; 90fdf (24:4fdf)
+_Route15EndBattleText9::
 	text "I"
 	line "said trade!"
 	prompt
 
-_Route15AfterBattleText9:: ; 90fee (24:4fee)
+_Route15AfterBattleText9::
 	text "I trade #MON"
 	line "with my friends!"
 	done
 
-_Route15BattleText10:: ; 9100d (24:500d)
+_Route15BattleText10::
 	text "Want to play with"
 	line "my #MON?"
 	done
 
-_Route15EndBattleText10:: ; 91029 (24:5029)
+_Route15EndBattleText10::
 	text "I was"
 	line "too impatient!"
 	prompt
 
-_Route15AfterBattleText10:: ; 9103f (24:503f)
+_Route15AfterBattleText10::
 	text "I'll go train with"
 	line "weaker people.@@"
 
-_Route15Text12:: ; 91062 (24:5062)
+_Route15Text12::
 	text "ROUTE 15"
 	line "West to FUCHSIA"
 	cont "CITY"