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

1 files changed, 31 insertions, 35 deletions

diff --git a/text/maps/route_14.asm b/text/maps/route_14.asm
index b542274e..1371b5b0 100644
--- a/text/maps/route_14.asm
+++ b/text/maps/route_14.asm
@@ -1,151 +1,147 @@
-_Route14BattleText1:: ; 9080d (24:480d)
+_Route14BattleText1::
 	text "You need to use"
 	line "TMs to teach good"
 	cont "moves to #MON!"
 	done
 
-_Route14EndBattleText1:: ; 9083f (24:483f)
+_Route14EndBattleText1::
 	text "Not"
 	line "good enough!"
 	prompt
 
-_Route14AfterBattleText1:: ; 90851 (24:4851)
-IF DEF(_YELLOW)
-	text "You have some HMs,"
-ELSE
+_Route14AfterBattleText1::
 	text "You have some HMs"
-ENDC
 	line "right? #MON"
 	cont "can't ever forget"
 	cont "those moves."
 	done
 
-_Route14BattleText2:: ; 9088e (24:488e)
+_Route14BattleText2::
 	text "My bird #MON"
 	line "should be ready"
 	cont "for battle."
 	done
 
-_Route14EndBattleText2:: ; 908b8 (24:48b8)
+_Route14EndBattleText2::
 	text "Not"
 	line "ready yet!"
 	prompt
 
-_Route14AfterBattleText2:: ; 908c8 (24:48c8)
+_Route14AfterBattleText2::
 	text "They need to learn"
 	line "better moves."
 	done
 
-_Route14BattleText3:: ; 908ea (24:48ea)
+_Route14BattleText3::
 	text "TMs are on sale"
 	line "in CELADON!"
 	cont "But, only a few"
 	cont "people have HMs!"
 	done
 
-_Route14EndBattleText3:: ; 90928 (24:4928)
+_Route14EndBattleText3::
 	text "Aww,"
 	line "bummer!"
 	prompt
 
-_Route14AfterBattleText3:: ; 90936 (24:4936)
+_Route14AfterBattleText3::
 	text "Teach #MON"
 	line "moves of the same"
 	cont "element type for"
 	cont "more power."
 	done
 
-_Route14BattleText4:: ; 90971 (24:4971)
+_Route14BattleText4::
 	text "Have you taught"
 	line "your bird #MON"
 	cont "how to FLY?"
 	done
 
-_Route14EndBattleText4:: ; 9099d (24:499d)
+_Route14EndBattleText4::
 	text "Shot"
 	line "down in flames!"
 	prompt
 
-_Route14AfterBattleText4:: ; 909b3 (24:49b3)
+_Route14AfterBattleText4::
 	text "Bird #MON are"
 	line "my true love!"
 	done
 
-_Route14BattleText5:: ; 909d0 (24:49d0)
+_Route14BattleText5::
 	text "Have you heard of"
 	line "the legendary"
 	cont "#MON?"
 	done
 
-_Route14EndBattleText5:: ; 909f7 (24:49f7)
+_Route14EndBattleText5::
 	text "Why?"
 	line "Why'd I lose?"
 	prompt
 
-_Route14AfterBattleText5:: ; 90a0a (24:4a0a)
+_Route14AfterBattleText5::
 	text "The 3 legendary"
 	line "#MON are all"
 	cont "birds of prey."
 	done
 
-_Route14BattleText6:: ; 90a37 (24:4a37)
+_Route14BattleText6::
 	text "I'm not into it,"
 	line "but OK! Let's go!"
 	done
 
-_Route14EndBattleText6:: ; 90a59 (24:4a59)
+_Route14EndBattleText6::
 	text "I"
 	line "knew it!"
 	prompt
 
-_Route14AfterBattleText6:: ; 90a65 (24:4a65)
+_Route14AfterBattleText6::
 	text "Winning, losing,"
 	line "it doesn't matter"
 	cont "in the long run!"
 	done
 
-_Route14BattleText7:: ; 90a99 (24:4a99)
+_Route14BattleText7::
 	text "C'mon, c'mon."
 	line "Let's go, let's"
 	cont "go, let's go!"
 	done
 
-_Route14EndBattleText7:: ; 90ac1 (24:4ac1)
+_Route14EndBattleText7::
 	text "Arrg!"
 	line "Lost! Get lost!"
 	prompt
 
-_Route14AfterBattleText7:: ; 90ad8 (24:4ad8)
+_Route14AfterBattleText7::
 	text "What, what, what?"
 	line "What do you want?"
 	done
 
-_Route14BattleText8:: ; 90afd (24:4afd)
+_Route14BattleText8::
 	text "Perfect! I need to"
 	line "burn some time!"
 	done
 
-_Route14EndBattleText8:: ; 90b21 (24:4b21)
+_Route14EndBattleText8::
 	text "What?"
 	line "You!?"
 	prompt
 
-_Route14AfterBattleText8:: ; 90b2e (24:4b2e)
+_Route14AfterBattleText8::
 	text "Raising #MON"
 	line "is a drag, man."
 	done
 
-_Route14BattleText9:: ; 90b4c (24:4b4c)
+_Route14BattleText9::
 	text "We ride out here"
 	line "because there's"
 	cont "more room!"
 	done
 
-_Route14EndBattleText9:: ; 90b78 (24:4b78)
+_Route14EndBattleText9::
 	text "Wipe out!"
 	prompt
 
-_Route14AfterBattleText9:: ; 90b83 (24:4b83)
+_Route14AfterBattleText9::
 	text "It's cool you"
 	line "made your #MON"
 	cont "so strong!"
@@ -154,23 +150,23 @@ _Route14AfterBattleText9:: ; 90b83 (24:4b83)
 	line "And you know it!"
 	done
 
-_Route14BattleText10:: ; 90bcc (24:4bcc)
+_Route14BattleText10::
 	text "#MON fight?"
 	line "Cool! Rumble!"
 	done
 
-_Route14EndBattleText10:: ; 90be7 (24:4be7)
+_Route14EndBattleText10::
 	text "Blown"
 	line "away!"
 	prompt
 
-_Route14AfterBattleText10:: ; 90bf4 (24:4bf4)
+_Route14AfterBattleText10::
 	text "You know who'd"
 	line "win, you and me"
 	cont "one on one!"
 	done
 
-_Route14Text11:: ; 90c1f (24:4c1f)
+_Route14Text11::
 	text "ROUTE 14"
 	line "West to FUCHSIA"
 	cont "CITY"