shithub: pokered

Download patch

ref: f33bd1d89e03b7eec679048ffdf704551b22fde0
parent: f3b3e21e04ad01ff775dcb2621355287d747d73d
author: IIMarckus <iimarckus@gmail.com>
date: Sun Dec 6 09:04:42 EST 2015

Improve diffability with pokeyellow; remove address comments and ifs.

--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -1,4 +1,4 @@
-_AgathaBeforeBattleText:: ; 8686b (21:686b)
+_AgathaBeforeBattleText::
 	text "I am AGATHA of"
 	line "the ELITE FOUR!"
 
@@ -22,17 +22,13 @@
 	cont "trainer fights!"
 	done
 
-_AgathaEndBattleText:: ; 86970 (21:6970)
-IF DEF(_YELLOW)
-	text "Woo-hoo!"
-ELSE
+_AgathaEndBattleText::
 	text "Oh ho!"
-ENDC
 	line "You're something"
 	cont "special, child!"
 	prompt
 
-_AgathaAfterBattleText:: ; 86998 (21:6998)
+_AgathaAfterBattleText::
 	text "You win! I see"
 	line "what the old duff"
 	cont "sees in you now!"
@@ -42,7 +38,7 @@
 	cont "along now, child!"
 	done
 
-_AgathaDontRunAwayText:: ; 869fd (21:69fd)
+_AgathaDontRunAwayText::
 	text "Someone's voice:"
 	line "Don't run away!"
 	done
--- a/text/maps/bike_shop.asm
+++ b/text/maps/bike_shop.asm
@@ -1,4 +1,4 @@
-_BikeShopText_1d810:: ; 98e03 (26:4e03)
+_BikeShopText_1d810::
 	text "Hi! Welcome to"
 	line "our BIKE SHOP."
 
@@ -6,17 +6,17 @@
 	line "the BIKE for you!"
 	prompt
 
-_BikeShopText_1d815:: ; 98e45 (26:4e45)
+_BikeShopText_1d815::
 	text "It's a cool BIKE!"
 	line "Do you want it?"
 	done
 
-_BikeShopCantAffordText:: ; 98e67 (26:4e67)
+_BikeShopCantAffordText::
 	text "Sorry! You can't"
 	line "afford it!"
 	prompt
 
-_BikeShopText_1d81f:: ; 98e83 (26:4e83)
+_BikeShopText_1d81f::
 	text "Oh, that's..."
 
 	para "A BIKE VOUCHER!"
@@ -24,17 +24,17 @@
 	para "OK! Here you go!"
 	prompt
 
-_BikeShopText_1d824:: ; 98eb2 (26:4eb2)
+_BikeShopText_1d824::
 	text $52, " exchanged"
 	line "the BIKE VOUCHER"
 	cont "for a BICYCLE.@@"
 
-_BikeShopComeAgainText:: ; 98ee0 (26:4ee0)
+_BikeShopComeAgainText::
 	text "Come back again"
 	line "some time!"
 	done
 
-_BikeShopText_1d82f:: ; 98efc (26:4efc)
+_BikeShopText_1d82f::
 	text "How do you like"
 	line "your new BICYCLE?"
 
@@ -43,12 +43,12 @@
 	cont "and in caves!"
 	done
 
-_BikeShopText_1d834:: ; 98f4d (26:4f4d)
+_BikeShopText_1d834::
 	text "You better make"
 	line "room for this!"
 	done
 
-_BikeShopText_1d843:: ; 98f6d (26:4f6d)
+_BikeShopText_1d843::
 	text "A plain city BIKE"
 	line "is good enough"
 	cont "for me!"
@@ -58,13 +58,13 @@
 	cont "on an MTB!"
 	done
 
-_BikeShopText_1d85c:: ; 98fc1 (26:4fc1)
+_BikeShopText_1d85c::
 	text "These BIKEs are"
 	line "cool, but they're"
 	cont "way expensive!"
 	done
 
-_BikeShopText_1d861:: ; 98ff2 (26:4ff2)
+_BikeShopText_1d861::
 	text "Wow. Your BIKE is"
 	line "really cool!"
 	done
--- a/text/maps/bills_house.asm
+++ b/text/maps/bills_house.asm
@@ -1,11 +1,4 @@
-IF DEF(_YELLOW)
-_BillsHouseDontLeaveText::
-	text "Whoa, don't go"
-	line "anywhere, wait!"
-	done
-ENDC
-
-_BillsHouseText_1e865:: ; 8d267 (23:5267)
+_BillsHouseText_1e865::
 	text "Hiya! I'm a"
 	line "#MON..."
 	cont "...No I'm not!"
@@ -26,7 +19,7 @@
 	line "Help me out here!"
 	done
 
-_BillsHouseText_1e86a:: ; 8d345 (23:5345)
+_BillsHouseText_1e86a::
 	text "When I'm in the"
 	line "TELEPORTER, go to"
 	cont "my PC and run the"
@@ -34,7 +27,7 @@
 	cont "System!"
 	done
 
-_BillsHouseText_1e86f:: ; 8d391 (23:5391)
+_BillsHouseText_1e86f::
 	text "No!? Come on, you"
 	line "gotta help a guy"
 	cont "in deep trouble!"
@@ -44,7 +37,7 @@
 	cont "OK? All right!"
 	prompt
 
-_BillThankYouText:: ; 8d3f5 (23:53f5)
+_BillThankYouText::
 	text "BILL: Yeehah!"
 	line "Thanks, bud! I"
 	cont "owe you one!"
@@ -60,18 +53,18 @@
 	cont "maybe this'll do."
 	prompt
 
-_SSTicketReceivedText:: ; 8d499 (23:5499)
+_SSTicketReceivedText::
 	text $52, " received"
 	line "an @"
 	TX_RAM wcf4b
 	text "!@@"
 
-_SSTicketNoRoomText:: ; 8d4b0 (23:54b0)
+_SSTicketNoRoomText::
 	text "You've got too"
 	line "much stuff, bud!"
 	done
 
-_BillsHouseText_1e8cb:: ; 8d4d0 (23:54d0)
+_BillsHouseText_1e8cb::
 	text "That cruise ship,"
 	line "S.S.ANNE, is in"
 	cont "VERMILION CITY."
@@ -86,7 +79,7 @@
 	cont "instead of me?"
 	done
 
-_BillsHouseText_1e8da:: ; 8d57f (23:557f)
+_BillsHouseText_1e8da::
 	text "BILL: Look, bud,"
 	line "just check out"
 	cont "some of my rare"
--- a/text/maps/blues_house.asm
+++ b/text/maps/blues_house.asm
@@ -29,19 +29,11 @@
 	done
 
 _BluesHouseText2::
-IF DEF(_YELLOW)
-	text "Spending time"
-	line "with your #MON"
-	cont "makes them more"
-	cont "friendly to you."
-	done
-ELSE
 	text "#MON are living"
 	line "things! If they"
 	cont "get tired, give"
 	cont "them a rest!"
 	done
-ENDC
 
 _BluesHouseText3::
 	text "It's a big map!"
--- a/text/maps/bruno.asm
+++ b/text/maps/bruno.asm
@@ -1,4 +1,4 @@
-_BrunoBeforeBattleText:: ; 86749 (21:6749)
+_BrunoBeforeBattleText::
 	text "I am BRUNO of"
 	line "the ELITE FOUR!"
 
@@ -20,18 +20,18 @@
 	para "Hoo hah!"
 	done
 
-_BrunoEndBattleText:: ; 86805 (21:6805)
+_BrunoEndBattleText::
 	text "Why?"
 	line "How could I lose?"
 	prompt
 
-_BrunoAfterBattleText:: ; 8681d (21:681d)
+_BrunoAfterBattleText::
 	text "My job is done!"
 	line "Go face your next"
 	cont "challenge!"
 	done
 
-_BrunoDontRunAwayText:: ; 8684b (21:684b)
+_BrunoDontRunAwayText::
 	text "Someone's voice:"
 	line "Don't run away!"
 	done
--- a/text/maps/celadon_city.asm
+++ b/text/maps/celadon_city.asm
@@ -1,33 +1,25 @@
-_CeladonCityText1:: ; a59fb (29:59fb)
+_CeladonCityText1::
 	text "I got my KOFFING"
-IF DEF(_YELLOW)
-	line "from my friend!"
-
-	para "We get along now,"
-	line "because I was"
-	cont "very nice to it!"
-ELSE
 	line "in CINNABAR!"
 
 	para "It's nice, but it"
 	line "breathes poison"
 	cont "when it's angry!"
-ENDC
 	done
 
-_CeladonCityText2:: ; a5a4b (29:5a4b)
+_CeladonCityText2::
 	text "Heheh! This GYM"
 	line "is great! It's"
 	cont "full of women!"
 	done
 
-_CeladonCityText3:: ; a5a79 (29:5a79)
+_CeladonCityText3::
 	text "The GAME CORNER"
 	line "is bad for our"
 	cont "city's image!"
 	done
 
-_CeladonCityText4:: ; a5aa6 (29:5aa6)
+_CeladonCityText4::
 	text "Moan! I blew it"
 	line "all at the slots!"
 
@@ -36,7 +28,7 @@
 	cont "coins for prizes!"
 	done
 
-_TM41PreText:: ; a5afd (29:5afd)
+_TM41PreText::
 	text "Hello, there!"
 
 	para "I've seen you,"
@@ -47,13 +39,13 @@
 	line "dropping by!"
 	prompt
 
-_ReceivedTM41Text:: ; a5b5a (29:5b5a)
+_ReceivedTM41Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM41ExplanationText:: ; a5b6e (29:5b6e)
+_TM41ExplanationText::
 	text "TM41 teaches"
 	line "SOFTBOILED!"
 
@@ -64,12 +56,12 @@
 	line "CHANSEY!"
 	done
 
-_TM41NoRoomText:: ; a5bb8 (29:5bb8)
+_TM41NoRoomText::
 	text "Oh, your pack is"
 	line "full of items!"
 	done
 
-_CeladonCityText6:: ; a5bd9 (29:5bd9)
+_CeladonCityText6::
 	text "This is my trusted"
 	line "pal, POLIWRATH!"
 
@@ -78,21 +70,21 @@
 	cont "used WATER STONE!"
 	done
 
-_CeladonCityText7:: ; a5c30 (29:5c30)
+_CeladonCityText7::
 	text "POLIWRATH: Ribi"
 	line "ribit!@@"
 
-_CeladonCityText8:: ; a5c49 (29:5c49)
+_CeladonCityText8::
 	text "What are you"
 	line "staring at?"
 	done
 
-_CeladonCityText9:: ; a5c63 (29:5c63)
+_CeladonCityText9::
 	text "Keep out of TEAM"
 	line "ROCKET's way!"
 	done
 
-_CeladonCityText10:: ; a5c82 (29:5c82)
+_CeladonCityText10::
 	text "TRAINER TIPS"
 
 	para "X ACCURACY boosts"
@@ -108,36 +100,32 @@
 	cont "STORE!"
 	done
 
-_CeladonCityText11:: ; a5d18 (29:5d18)
+_CeladonCityText11::
 	text "CELADON CITY"
 	line "The City of"
 	cont "Rainbow Dreams"
 	done
 
-_CeladonCityText13:: ; a5d41 (29:5d41)
+_CeladonCityText13::
 	text "CELADON CITY"
 	line "#MON GYM"
 	cont "LEADER: ERIKA"
 
-IF DEF(_YELLOW)
-	para "The Nature-Loving"
-ELSE
 	para "The Nature Loving"
-ENDC
 	line "Princess!"
 	done
 
-_CeladonCityText14:: ; a5d82 (29:5d82)
+_CeladonCityText14::
 	text "CELADON MANSION"
 	done
 
-_CeladonCityText15:: ; a5d93 (29:5d93)
+_CeladonCityText15::
 	text "Find what you"
 	line "need at CELADON"
 	cont "DEPT. STORE!"
 	done
 
-_CeladonCityText16:: ; a5dbf (29:5dbf)
+_CeladonCityText16::
 	text "TRAINER TIPS"
 
 	para "GUARD SPEC."
@@ -151,19 +139,15 @@
 	cont "STORE!"
 	done
 
-_CeladonCityText17:: ; a5e3e (29:5e3e)
+_CeladonCityText17::
 	text "Coins exchanged"
 	line "for prizes!"
 	cont "PRIZE EXCHANGE"
 	done
 
-_CeladonCityText18:: ; a5e6a (29:5e6a)
+_CeladonCityText18::
 	text "ROCKET GAME CORNER"
 	line "The playground"
-IF DEF(_YELLOW)
-	cont "for grownups!"
-ELSE
 	cont "for grown-ups!"
-ENDC
 	done
 
--- a/text/maps/celadon_dept_store_1f.asm
+++ b/text/maps/celadon_dept_store_1f.asm
@@ -1,4 +1,4 @@
-_CeladonMart1Text1:: ; 9c672 (27:4672)
+_CeladonMart1Text1::
 	text "Hello! Welcome to"
 	line "CELADON DEPT."
 	cont "STORE."
@@ -8,7 +8,7 @@
 	cont "the store layout."
 	done
 
-_CeladonMart1Text2:: ; 9c6cd (27:46cd)
+_CeladonMart1Text2::
 	text "1F: SERVICE"
 	line "    COUNTER"
 
@@ -25,7 +25,7 @@
 	line "VENDING MACHINES"
 	done
 
-_CeladonMart1Text3:: ; 9c752 (27:4752)
+_CeladonMart1Text3::
 	text "1F: SERVICE"
 	line "    COUNTER"
 	done
--- a/text/maps/celadon_dept_store_2f.asm
+++ b/text/maps/celadon_dept_store_2f.asm
@@ -1,4 +1,4 @@
-_CeladonMart2Text3:: ; 9c76b (27:476b)
+_CeladonMart2Text3::
 	text "SUPER REPEL keeps"
 	line "weak #MON at"
 	cont "bay..."
@@ -7,13 +7,13 @@
 	line "powerful REPEL!"
 	done
 
-_CeladonMart2Text4:: ; 9c7b2 (27:47b2)
+_CeladonMart2Text4::
 	text "For long outings,"
 	line "you should buy"
 	cont "REVIVE."
 	done
 
-_CeladonMart2Text5:: ; 9c7dc (27:47dc)
+_CeladonMart2Text5::
 	text "Top Grade Items"
 	line "for Trainers!"
 
--- a/text/maps/celadon_dept_store_3f.asm
+++ b/text/maps/celadon_dept_store_3f.asm
@@ -1,4 +1,4 @@
-_TM18PreReceiveText:: ; 9c814 (27:4814)
+_TM18PreReceiveText::
 	text "Oh, hi! I finally"
 	line "finished #MON!"
 
@@ -7,13 +7,13 @@
 	cont "useful!"
 	prompt
 
-_ReceivedTM18Text:: ; 9c85a (27:485a)
+_ReceivedTM18Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM18ExplanationText:: ; 9c86e (27:486e)
+_TM18ExplanationText::
 	text "TM18 is COUNTER!"
 	line "Not like the one"
 	cont "I'm leaning on,"
@@ -20,12 +20,12 @@
 	cont "mind you!"
 	done
 
-_TM18NoRoomText:: ; 9c8aa (27:48aa)
+_TM18NoRoomText::
 	text "Your pack is full"
 	line "of items!"
 	done
 
-_CeladonMart3Text2:: ; 9c8c7 (27:48c7)
+_CeladonMart3Text2::
 	text "Captured #MON"
 	line "are registered"
 	cont "with an ID No."
@@ -35,7 +35,7 @@
 	cont "caught it!"
 	done
 
-_CeladonMart3Text3:: ; 9c92d (27:492d)
+_CeladonMart3Text3::
 	text "All right!"
 
 	para "My buddy's going"
@@ -44,7 +44,7 @@
 	cont "GRAVELER!"
 	done
 
-_CeladonMart3Text4:: ; 9c975 (27:4975)
+_CeladonMart3Text4::
 	text "Come on GRAVELER!"
 
 	para "I love GRAVELER!"
@@ -57,7 +57,7 @@
 	cont "#MON!"
 	done
 
-_CeladonMart3Text5:: ; 9c9d5 (27:49d5)
+_CeladonMart3Text5::
 	text "You can identify"
 	line "#MON you got"
 	cont "in trades by"
@@ -64,35 +64,35 @@
 	cont "their ID Numbers!"
 	done
 
-_CeladonMart3Text6:: ; 9ca13 (27:4a13)
+_CeladonMart3Text6::
 	text "It's an SNES!"
 	done
 
-_CeladonMart3Text7:: ; 9ca21 (27:4a21)
+_CeladonMart3Text7::
 	text "An RPG! There's"
 	line "no time for that!"
 	done
 
-_CeladonMart3Text9:: ; 9ca43 (27:4a43)
+_CeladonMart3Text9::
 	text "A sports game!"
 	line "Dad'll like that!"
 	done
 
-_CeladonMart3Text11:: ; 9ca64 (27:4a64)
+_CeladonMart3Text11::
 	text "A puzzle game!"
 	line "Looks addictive!"
 	done
 
-_CeladonMart3Text13:: ; 9ca85 (27:4a85)
+_CeladonMart3Text13::
 	text "A fighting game!"
 	line "Looks tough!"
 	done
 
-_CeladonMart3Text14:: ; 9caa4 (27:4aa4)
+_CeladonMart3Text14::
 	text "3F: TV GAME SHOP"
 	done
 
-_CeladonMart3Text15:: ; 9cab6 (27:4ab6)
+_CeladonMart3Text15::
 	text "Red and Blue!"
 	line "Both are #MON!"
 	done
--- a/text/maps/celadon_dept_store_4f.asm
+++ b/text/maps/celadon_dept_store_4f.asm
@@ -1,19 +1,10 @@
-_CeladonMart4Text2:: ; 9cad4 (27:4ad4)
+_CeladonMart4Text2::
 	text "I'm getting a"
-IF DEF(_YELLOW)
-	line "gift for COPYCAT"
-	cont "in CERULEAN CITY."
-
-	para "It's got to be a"
-	line "# DOLL. They"
-	cont "are trendy!"
-ELSE
 	line "# DOLL for my"
 	cont "girl friend!"
-ENDC
 	done
 
-_CeladonMart4Text3:: ; 9cafd (27:4afd)
+_CeladonMart4Text3::
 	text "I heard something"
 	line "useful."
 
@@ -23,7 +14,7 @@
 	cont "with a # DOLL!"
 	done
 
-_CeladonMart4Text4:: ; 9cb56 (27:4b56)
+_CeladonMart4Text4::
 	text "Express yourself"
 	line "with gifts!"
 
--- a/text/maps/celadon_dept_store_5f.asm
+++ b/text/maps/celadon_dept_store_5f.asm
@@ -1,4 +1,4 @@
-_CeladonMart5Text1:: ; 9ddff (27:5dff)
+_CeladonMart5Text1::
 	text "#MON ability"
 	line "enhancers can be"
 	cont "bought only here."
@@ -11,7 +11,7 @@
 	line "increase SPEED."
 	done
 
-_CeladonMart5Text2:: ; 9de79 (27:5e79)
+_CeladonMart5Text2::
 	text "I'm here for"
 	line "#MON ability"
 	cont "enhancers."
@@ -23,7 +23,7 @@
 	line "DEFENSE!"
 	done
 
-_CeladonMart5Text5:: ; 9ded6 (27:5ed6)
+_CeladonMart5Text5::
 	text "5F: DRUG STORE"
 	done
 
--- a/text/maps/celadon_dept_store_roof.asm
+++ b/text/maps/celadon_dept_store_roof.asm
@@ -1,9 +1,9 @@
-_CeladonMartRoofText_484ee:: ; 9cbb5 (27:4bb5)
+_CeladonMartRoofText_484ee::
 	text "Give her which"
 	line "drink?"
 	done
 
-_CeladonMartRoofText_484f3:: ; 9cbcc (27:4bcc)
+_CeladonMartRoofText_484f3::
 	text "Yay!"
 
 	para "FRESH WATER!"
@@ -13,13 +13,13 @@
 	para "You can have this"
 	line "from me!@@"
 
-_CeladonMartRoofText_484f9:: ; 9cc06 (27:4c06)
+_CeladonMartRoofText_484f9::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_CeladonMartRoofText_484fe:: ; 9cc1a (27:4c1a)
+_CeladonMartRoofText_484fe::
 	db $0
 	para "@"
 	TX_RAM wcf4b
@@ -29,7 +29,7 @@
 	para "It can freeze the"
 	line "target sometimes!@@"
 
-_CeladonMartRoofText_48504:: ; 9cc5a (27:4c5a)
+_CeladonMartRoofText_48504::
 	text "Yay!"
 
 	para "SODA POP!"
@@ -39,27 +39,23 @@
 	para "You can have this"
 	line "from me!@@"
 
-_CeladonMartRoofText_4850a:: ; 9cc91 (27:4c91)
+_CeladonMartRoofText_4850a::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_CeladonMartRoofText_4850f:: ; 9cca5 (27:4ca5)
+_CeladonMartRoofText_4850f::
 	db $0
 	para "@"
 	TX_RAM wcf4b
 	text " contains"
-IF DEF(_YELLOW)
-	line "ROCK SLIDE!@@"
-ELSE
 	line "ROCK SLIDE!"
 
 	para "It can spook the"
 	line "target sometimes!@@"
-ENDC
 
-_CeladonMartRoofText_48515:: ; 9cce6 (27:4ce6)
+_CeladonMartRoofText_48515::
 	text "Yay!"
 
 	para "LEMONADE!"
@@ -69,25 +65,25 @@
 	para "You can have this"
 	line "from me!@@"
 
-_ReceivedTM49Text:: ; 9cd1d (27:4d1d)
+_ReceivedTM49Text::
 	text $52, " received"
 	line "TM49!@@"
 
-_CeladonMartRoofText_48520:: ; 9cd30 (27:4d30)
+_CeladonMartRoofText_48520::
 	db $0
 	para "TM49 contains"
 	line "TRI ATTACK!@@"
 
-_CeladonMartRoofText_48526:: ; 9cd4d (27:4d4d)
+_CeladonMartRoofText_48526::
 	text "You don't have"
 	line "space for this!@@"
 
-_CeladonMartRoofText_4852c:: ; 9cd6d (27:4d6d)
+_CeladonMartRoofText_4852c::
 	text "No thank you!"
 	line "I'm not thirsty"
 	cont "after all!@@"
 
-_CeladonMartRoofText1:: ; 9cd97 (27:4d97)
+_CeladonMartRoofText1::
 	text "My sister is a"
 	line "trainer, believe"
 	cont "it or not."
@@ -97,13 +93,13 @@
 	cont "drives me nuts!"
 	done
 
-_CeladonMartRoofText_48598:: ; 9cdee (27:4dee)
+_CeladonMartRoofText_48598::
 	text "I'm thirsty!"
 	line "I want something"
 	cont "to drink!"
 	done
 
-_CeladonMartRoofText4:: ; 9ce16 (27:4e16)
+_CeladonMartRoofText4::
 	text "I'm thirsty!"
 	line "I want something"
 	cont "to drink!"
@@ -111,33 +107,33 @@
 	para "Give her a drink?"
 	done
 
-_CeladonMartRoofText6:: ; 9ce50 (27:4e50)
+_CeladonMartRoofText6::
 	text "ROOFTOP SQUARE:"
 	line "VENDING MACHINES"
 	done
 
-_VendingMachineText1:: ; 9ce72 (27:4e72)
+_VendingMachineText1::
 	text "A vending machine!"
 	line "Here's the menu!"
 	prompt
 
-_VendingMachineText4:: ; 9ce96 (27:4e96)
+_VendingMachineText4::
 	text "Oops, not enough"
 	line "money!"
 	done
 
-_VendingMachineText5:: ; 9ceaf (27:4eaf)
+_VendingMachineText5::
 	TX_RAM wcf4b
 	db $0
 	line "popped out!"
 	done
 
-_VendingMachineText6:: ; 9cec0 (27:4ec0)
+_VendingMachineText6::
 	text "There's no more"
 	line "room for stuff!"
 	done
 
-_VendingMachineText7:: ; 9cee0 (27:4ee0)
+_VendingMachineText7::
 	text "Not thirsty!"
 	done
 
--- a/text/maps/celadon_diner.asm
+++ b/text/maps/celadon_diner.asm
@@ -1,4 +1,4 @@
-_CeladonDinerText1:: ; 9df3f (27:5f3f)
+_CeladonDinerText1::
 	text "Hi!"
 
 	para "We're taking a"
@@ -5,7 +5,7 @@
 	line "break now."
 	done
 
-_CeladonDinerText2:: ; 9df5d (27:5f5d)
+_CeladonDinerText2::
 	text "My #MON are"
 	line "weak, so I often"
 	cont "have to go to the"
@@ -12,13 +12,13 @@
 	cont "DRUG STORE."
 	done
 
-_CeladonDinerText3:: ; 9df99 (27:5f99)
+_CeladonDinerText3::
 	text "Psst! There's a"
 	line "basement under"
 	cont "the GAME CORNER."
 	done
 
-_CeladonDinerText4:: ; 9dfc9 (27:5fc9)
+_CeladonDinerText4::
 	text "Munch..."
 
 	para "The man at that"
@@ -26,7 +26,7 @@
 	cont "at the slots."
 	done
 
-_CeladonDinerText_491a7:: ; 9e003 (27:6003)
+_CeladonDinerText_491a7::
 	text "Go ahead! Laugh!"
 
 	para "I'm flat out"
@@ -41,18 +41,18 @@
 	cont "more!"
 	prompt
 
-_ReceivedCoinCaseText:: ; 9e07a (27:607a)
+_ReceivedCoinCaseText::
 	text $52, " received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
 
-_CoinCaseNoRoomText:: ; 9e090 (27:6090)
+_CoinCaseNoRoomText::
 	text "Make room for"
 	line "this!"
 	done
 
-_CeladonDinerText_491b7:: ; 9e0a5 (27:60a5)
+_CeladonDinerText_491b7::
 	text "I always thought"
 	line "I was going to"
 	cont "win it back..."
--- a/text/maps/celadon_game_corner.asm
+++ b/text/maps/celadon_game_corner.asm
@@ -1,4 +1,4 @@
-_CeladonGameCornerText1:: ; 9d8d5 (27:58d5)
+_CeladonGameCornerText1::
 	text "Welcome!"
 
 	para "You can exchange"
@@ -7,7 +7,7 @@
 	cont "next door."
 	done
 
-_CeladonGameCornerText_48d22:: ; 9d91a (27:591a)
+_CeladonGameCornerText_48d22::
 	text "Welcome to ROCKET"
 	line "GAME CORNER!"
 
@@ -19,32 +19,32 @@
 	cont "like some?"
 	done
 
-_CeladonGameCornerText_48d27:: ; 9d984 (27:5984)
+_CeladonGameCornerText_48d27::
 	text "Thanks! Here are"
 	line "your 50 coins!"
 	done
 
-_CeladonGameCornerText_48d2c:: ; 9d9a5 (27:59a5)
+_CeladonGameCornerText_48d2c::
 	text "No? Please come"
 	line "play sometime!"
 	done
 
-_CeladonGameCornerText_48d31:: ; 9d9c5 (27:59c5)
+_CeladonGameCornerText_48d31::
 	text "You can't afford"
 	line "the coins!"
 	done
 
-_CeladonGameCornerText_48d36:: ; 9d9e1 (27:59e1)
+_CeladonGameCornerText_48d36::
 	text "Oops! Your COIN"
 	line "CASE is full."
 	done
 
-_CeladonGameCornerText_48d3b:: ; 9da00 (27:5a00)
+_CeladonGameCornerText_48d3b::
 	text "You don't have a"
 	line "COIN CASE!"
 	done
 
-_CeladonGameCornerText3:: ; 9da1c (27:5a1c)
+_CeladonGameCornerText3::
 	text "Keep this quiet."
 
 	para "It's rumored that"
@@ -52,37 +52,37 @@
 	cont "by TEAM ROCKET."
 	done
 
-_CeladonGameCornerText4:: ; 9da61 (27:5a61)
+_CeladonGameCornerText4::
 	text "I think these"
 	line "machines have"
 	cont "different odds."
 	done
 
-_CeladonGameCornerText_48d9c:: ; 9da8e (27:5a8e)
+_CeladonGameCornerText_48d9c::
 	text "Kid, do you want"
 	line "to play?"
 	prompt
 
-_Received10CoinsText:: ; 9daa9 (27:5aa9)
+_Received10CoinsText::
 	text $52, " received"
 	line "10 coins!@@"
 
-_CeladonGameCornerText_48da7:: ; 9dac0 (27:5ac0)
+_CeladonGameCornerText_48da7::
 	text "You don't need my"
 	line "coins!"
 	done
 
-_CeladonGameCornerText_48dac:: ; 9dad9 (27:5ad9)
+_CeladonGameCornerText_48dac::
 	text "Wins seem to come"
 	line "and go."
 	done
 
-_CeladonGameCornerText6:: ; 9daf4 (27:5af4)
+_CeladonGameCornerText6::
 	text "I'm having a"
 	line "wonderful time!"
 	done
 
-_CeladonGameCornerText_48dca:: ; 9db11 (27:5b11)
+_CeladonGameCornerText_48dca::
 	text "Hey!"
 
 	para "You have better"
@@ -99,7 +99,7 @@
 	cont "be fooled!"
 	done
 
-_CeladonGameCornerText_48dcf:: ; 9dbac (27:5bac)
+_CeladonGameCornerText_48dcf::
 	text "They offer rare"
 	line "#MON that can"
 	cont "be exchanged for"
@@ -109,33 +109,33 @@
 	line "seem to win!"
 	done
 
-_CeladonGameCornerText8:: ; 9dc06 (27:5c06)
+_CeladonGameCornerText8::
 	text "Games are scary!"
 	line "It's so easy to"
 	cont "get hooked!"
 	done
 
-_CeladonGameCornerText_48e26:: ; 9dc33 (27:5c33)
+_CeladonGameCornerText_48e26::
 	text "What's up? Want"
 	line "some coins?"
 	prompt
 
-_Received20CoinsText:: ; 9dc4f (27:5c4f)
+_Received20CoinsText::
 	text $52, " received"
 	line "20 coins!@@"
 
-_CeladonGameCornerText_48e31:: ; 9dc66 (27:5c66)
+_CeladonGameCornerText_48e31::
 	text "You have lots of"
 	line "coins!"
 	done
 
-_CeladonGameCornerText_48e36:: ; 9dc7f (27:5c7f)
+_CeladonGameCornerText_48e36::
 	text "Darn! I need more"
 	line "coins for the"
 	cont "#MON I want!"
 	done
 
-_CeladonGameCornerText_48e88:: ; 9dcad (27:5cad)
+_CeladonGameCornerText_48e88::
 	text "Hey, what? You're"
 	line "throwing me off!"
 	cont "Here are some"
@@ -142,38 +142,38 @@
 	cont "coins, shoo!"
 	prompt
 
-_CeladonGameCornerText_48e8d:: ; 9dceb (27:5ceb)
+_CeladonGameCornerText_48e8d::
 	text $52, " received"
 	line "20 coins!@@"
 
-_CeladonGameCornerText_48e93:: ; 9dd02 (27:5d02)
+_CeladonGameCornerText_48e93::
 	text "You've got your"
 	line "own coins!"
 	done
 
-_CeladonGameCornerText_48e98:: ; 9dd1d (27:5d1d)
+_CeladonGameCornerText_48e98::
 	text "The trick is to"
 	line "watch the reels"
 	cont "closely!"
 	done
 
-_CeladonGameCornerText_48ece:: ; 9dd47 (27:5d47)
+_CeladonGameCornerText_48ece::
 	text "I'm guarding this"
 	line "poster!"
 	cont "Go away, or else!"
 	done
 
-_CeladonGameCornerText_48ed3:: ; 9dd73 (27:5d73)
+_CeladonGameCornerText_48ed3::
 	text "Dang!"
 	prompt
 
-_CeladonGameCornerText_48ed8:: ; 9dd7a (27:5d7a)
+_CeladonGameCornerText_48ed8::
 	text "Our hideout might"
 	line "be discovered! I"
 	cont "better tell BOSS!"
 	done
 
-_CeladonGameCornerText_48f09:: ; 9ddb0 (27:5db0)
+_CeladonGameCornerText_48f09::
 	text "Hey!"
 
 	para "A switch behind"
@@ -180,7 +180,7 @@
 	line "the poster!?"
 	cont "Let's push it!@@"
 
-_CeladonGameCornerText_48f19:: ; 9dde2 (27:5de2)
+_CeladonGameCornerText_48f19::
 	text "Oops! Forgot the"
 	line "COIN CASE!"
 	done
--- a/text/maps/celadon_gym.asm
+++ b/text/maps/celadon_gym.asm
@@ -1,4 +1,4 @@
-_CeladonGymText_48a5e:: ; 9d28f (27:528f)
+_CeladonGymText_48a5e::
 	text "Hello. Lovely"
 	line "weather isn't it?"
 	cont "It's so pleasant."
@@ -25,7 +25,7 @@
 	line "shall not lose."
 	done
 
-_CeladonGymText_48a63:: ; 9d3c2 (27:53c2)
+_CeladonGymText_48a63::
 	text "Oh!"
 	line "I concede defeat."
 
@@ -36,7 +36,7 @@
 	line "the RAINBOWBADGE."
 	prompt
 
-_CeladonGymText_48a68:: ; 9d418 (27:5418)
+_CeladonGymText_48a68::
 	text "You are cataloging"
 	line "#MON? I must"
 	cont "say I'm impressed."
@@ -47,7 +47,7 @@
 	cont "unattractive."
 	done
 
-_CeladonGymText9:: ; 9d481 (27:5481)
+_CeladonGymText9::
 	text "The RAINBOWBADGE"
 	line "will make #MON"
 	cont "up to L50 obey."
@@ -61,13 +61,13 @@
 	line "this with you."
 	done
 
-_ReceivedTM21Text:: ; 9d50c (27:550c)
+_ReceivedTM21Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM21ExplanationText:: ; 9d520 (27:5520)
+_TM21ExplanationText::
 	db $0
 	para "TM21 contains"
 	line "MEGA DRAIN."
@@ -78,12 +78,12 @@
 	cont "your #MON!"
 	done
 
-_TM21NoRoomText:: ; 9d576 (27:5576)
+_TM21NoRoomText::
 	text "You should make"
 	line "room for this."
 	done
 
-_CeladonGymBattleText2:: ; 9d596 (27:5596)
+_CeladonGymBattleText2::
 	text "Hey!"
 
 	para "You are not"
@@ -90,28 +90,28 @@
 	line "allowed in here!"
 	done
 
-_CeladonGymEndBattleText2:: ; 9d5b9 (27:55b9)
+_CeladonGymEndBattleText2::
 	text "You're"
 	line "too rough!"
 	prompt
 
-_CeladonGymAfterBattleText2:: ; 9d5cb (27:55cb)
+_CeladonGymAfterBattleText2::
 	text "Bleaah!"
 	line "I hope ERIKA"
 	cont "wipes you out!"
 	done
 
-_CeladonGymBattleText3:: ; 9d5f0 (27:55f0)
+_CeladonGymBattleText3::
 	text "I was getting"
 	line "bored."
 	done
 
-_CeladonGymEndBattleText3:: ; 9d606 (27:5606)
+_CeladonGymEndBattleText3::
 	text "My"
 	line "makeup!"
 	prompt
 
-_CeladonGymAfterBattleText3:: ; 9d612 (27:5612)
+_CeladonGymAfterBattleText3::
 	text "Grass-type #MON"
 	line "are tough against"
 	cont "the water-type!"
@@ -121,23 +121,23 @@
 	cont "ground #MON!"
 	done
 
-_CeladonGymBattleText4:: ; 9d675 (27:5675)
+_CeladonGymBattleText4::
 	text "Aren't you the"
 	line "peeping Tom?"
 	done
 
-_CeladonGymEndBattleText4:: ; 9d691 (27:5691)
+_CeladonGymEndBattleText4::
 	text "I'm"
 	line "in shock!"
 	prompt
 
-_CeladonGymAfterBattleText4:: ; 9d69f (27:569f)
+_CeladonGymAfterBattleText4::
 	text "Oh, you weren't"
 	line "peeping? We get a"
 	cont "lot of gawkers!"
 	done
 
-_CeladonGymBattleText5:: ; 9d6d1 (27:56d1)
+_CeladonGymBattleText5::
 	text "Look at my grass"
 	line "#MON!"
 
@@ -145,11 +145,11 @@
 	line "to raise!"
 	done
 
-_CeladonGymEndBattleText5:: ; 9d702 (27:5702)
+_CeladonGymEndBattleText5::
 	text "No!"
 	prompt
 
-_CeladonGymAfterBattleText5:: ; 9d707 (27:5707)
+_CeladonGymAfterBattleText5::
 	text "We only use grass-"
 	line "type #MON at"
 	cont "our GYM!"
@@ -159,18 +159,18 @@
 	cont "arrangements!"
 	done
 
-_CeladonGymBattleText6:: ; 9d762 (27:5762)
+_CeladonGymBattleText6::
 	text "Don't bring any"
 	line "bugs or fire"
 	cont "#MON in here!"
 	done
 
-_CeladonGymEndBattleText6:: ; 9d78d (27:578d)
+_CeladonGymEndBattleText6::
 	text "Oh!"
 	line "You!"
 	prompt
 
-_CeladonGymAfterBattleText6:: ; 9d797 (27:5797)
+_CeladonGymAfterBattleText6::
 	text "Our LEADER, ERIKA,"
 	line "might be quiet,"
 	cont "but she's also"
@@ -177,18 +177,18 @@
 	cont "very skilled!"
 	done
 
-_CeladonGymBattleText7:: ; 9d7d7 (27:57d7)
+_CeladonGymBattleText7::
 	text "Pleased to meet"
 	line "you. My hobby is"
 	cont "#MON training."
 	done
 
-_CeladonGymEndBattleText7:: ; 9d808 (27:5808)
+_CeladonGymEndBattleText7::
 	text "Oh!"
 	line "Splendid!"
 	prompt
 
-_CeladonGymAfterBattleText7:: ; 9d817 (27:5817)
+_CeladonGymAfterBattleText7::
 	text "I have a blind"
 	line "date coming up."
 	cont "I have to learn"
@@ -195,7 +195,7 @@
 	cont "to be polite."
 	done
 
-_CeladonGymBattleText8:: ; 9d855 (27:5855)
+_CeladonGymBattleText8::
 	text "Welcome to"
 	line "CELADON GYM!"
 
@@ -204,12 +204,12 @@
 	cont "girl power!"
 	done
 
-_CeladonGymEndBattleText8:: ; 9d897 (27:5897)
+_CeladonGymEndBattleText8::
 	text "Oh!"
 	line "Beaten!"
 	prompt
 
-_CeladonGymAfterBattleText8:: ; 9d8a4 (27:58a4)
+_CeladonGymAfterBattleText8::
 	text "I didn't bring my"
 	line "best #MON!"
 
--- a/text/maps/celadon_hotel.asm
+++ b/text/maps/celadon_hotel.asm
@@ -1,4 +1,4 @@
-_CeladonHotelText1:: ; 9e18a (27:618a)
+_CeladonHotelText1::
 	text "#MON? No, this"
 	line "is a hotel for"
 	cont "people."
@@ -6,7 +6,7 @@
 	para "We're full up."
 	done
 
-_CeladonHotelText2:: ; 9e1bf (27:61bf)
+_CeladonHotelText2::
 	text "I'm on vacation"
 	line "with my brother"
 	cont "and boy friend."
@@ -15,7 +15,7 @@
 	line "pretty city!"
 	done
 
-_CeladonHotelText3:: ; 9e20e (27:620e)
+_CeladonHotelText3::
 	text "Why did she bring"
 	line "her brother?"
 	done
--- a/text/maps/celadon_house.asm
+++ b/text/maps/celadon_house.asm
@@ -1,10 +1,10 @@
-_CeladonHouseText1:: ; 9e0d5 (27:60d5)
+_CeladonHouseText1::
 	text "Hehehe! The slots"
 	line "just reel in the"
 	cont "dough, big time!"
 	done
 
-_CeladonHouseText2:: ; 9e10a (27:610a)
+_CeladonHouseText2::
 	text "CHIEF!"
 
 	para "We just shipped"
@@ -12,7 +12,7 @@
 	cont "slot prizes!"
 	done
 
-_CeladonHouseText3:: ; 9e13c (27:613c)
+_CeladonHouseText3::
 	text "Don't touch the"
 	line "poster at the"
 	cont "GAME CORNER!"
--- a/text/maps/celadon_mansion_1f.asm
+++ b/text/maps/celadon_mansion_1f.asm
@@ -1,7 +1,7 @@
-_CeladonMansion1Text1:: ; 9ceee (27:4eee)
+_CeladonMansion1Text1::
 	text "MEOWTH: Meow!@@"
 
-_CeladonMansion1Text2:: ; 9cefe (27:4efe)
+_CeladonMansion1Text2::
 	text "My dear #MON"
 	line "keep me company."
 
@@ -9,15 +9,15 @@
 	line "money home!"
 	done
 
-_CeladonMansion1Text3:: ; 9cf3c (27:4f3c)
+_CeladonMansion1Text3::
 	text "CLEFAIRY: Pi"
 	line "pippippi!@@"
 
-_CeladonMansion1Text4:: ; 9cf55 (27:4f55)
+_CeladonMansion1Text4::
 	text "NIDORAN: Kya"
 	line "kyaoo!@@"
 
-_CeladonMansion1Text5:: ; 9cf6b (27:4f6b)
+_CeladonMansion1Text5::
 	text "CELADON MANSION"
 	line "Manager's Suite"
 	done
--- a/text/maps/celadon_mansion_2f.asm
+++ b/text/maps/celadon_mansion_2f.asm
@@ -1,4 +1,4 @@
-_CeladonMansion2Text1:: ; 9cf8b (27:4f8b)
+_CeladonMansion2Text1::
 	text "GAME FREAK"
 	line "Meeting Room"
 	done
--- a/text/maps/celadon_mansion_3f.asm
+++ b/text/maps/celadon_mansion_3f.asm
@@ -1,15 +1,15 @@
-_ProgrammerText:: ; 9cfa4 (27:4fa4)
+_ProgrammerText::
 	text "Me? I'm the"
 	line "programmer!"
 	done
 
-_GraphicArtistText:: ; 9cfbc (27:4fbc)
+_GraphicArtistText::
 	text "I'm the graphic"
 	line "artist!"
 	cont "I drew you!"
 	done
 
-_WriterText:: ; 9cfe0 (27:4fe0)
+_WriterText::
 	text "I wrote the story!"
 	line "Isn't ERIKA cute?"
 
@@ -20,7 +20,7 @@
 	line "I like her!"
 	done
 
-_GameDesignerText:: ; 9d03a (27:503a)
+_GameDesignerText::
 	text "Is that right?"
 
 	para "I'm the game"
@@ -34,7 +34,7 @@
 	line "come tell me!"
 	done
 
-_CompletedDexText:: ; 9d0ad (27:50ad)
+_CompletedDexText::
 	text "Wow! Excellent!"
 	line "You completed"
 	cont "your #DEX!"
@@ -41,7 +41,7 @@
 	cont "Congratulations!"
 	cont "...@@"
 
-_CeladonMansion3Text5:: ; 9d0ed (27:50ed)
+_CeladonMansion3Text5::
 	text "It's the game"
 	line "program! Messing"
 	cont "with it could bug"
@@ -48,19 +48,19 @@
 	cont "out the game!"
 	done
 
-_CeladonMansion3Text6:: ; 9d12c (27:512c)
+_CeladonMansion3Text6::
 	text "Someone's playing"
 	line "a game instead of"
 	cont "working!"
 	done
 
-_CeladonMansion3Text7:: ; 9d159 (27:5159)
+_CeladonMansion3Text7::
 	text "It's the script!"
 	line "Better not look"
 	cont "at the ending!"
 	done
 
-_CeladonMansion3Text8:: ; 9d189 (27:5189)
+_CeladonMansion3Text8::
 	text "GAME FREAK"
 	line "Development Room"
 	done
--- a/text/maps/celadon_mansion_4f_inside.asm
+++ b/text/maps/celadon_mansion_4f_inside.asm
@@ -1,4 +1,4 @@
-_CeladonMansion5Text1:: ; 9d1ba (27:51ba)
+_CeladonMansion5Text1::
 	text "I know everything"
 	line "about the world"
 	cont "of #MON in"
--- a/text/maps/celadon_mansion_4f_outside.asm
+++ b/text/maps/celadon_mansion_4f_outside.asm
@@ -1,4 +1,4 @@
-_CeladonMansion4Text1:: ; 9d1a6 (27:51a6)
+_CeladonMansion4Text1::
 	text "I KNOW EVERYTHING!"
 	done
 
--- a/text/maps/celadon_pokecenter.asm
+++ b/text/maps/celadon_pokecenter.asm
@@ -1,4 +1,4 @@
-_CeladonPokecenterText2:: ; 9d226 (27:5226)
+_CeladonPokecenterText2::
 	text "# FLUTE awakens"
 	line "#MON with a"
 	cont "sound that only"
@@ -5,7 +5,7 @@
 	cont "they can hear!"
 	done
 
-_CeladonPokecenterText3:: ; 9d262 (27:5262)
+_CeladonPokecenterText3::
 	text "I rode uphill on"
 	line "CYCLING ROAD from"
 	cont "FUCHSIA!"
--- a/text/maps/celadon_prize_room.asm
+++ b/text/maps/celadon_prize_room.asm
@@ -1,4 +1,4 @@
-_CeladonPrizeRoomText1:: ; 9dee6 (27:5ee6)
+_CeladonPrizeRoomText1::
 	text "I sure do fancy"
 	line "that PORYGON!"
 
@@ -6,7 +6,7 @@
 	line "win at slots!"
 	done
 
-_CeladonPrizeRoomText2:: ; 9df24 (27:5f24)
+_CeladonPrizeRoomText2::
 	text "I had a major"
 	line "haul today!"
 	done
--- a/text/maps/cerulean_badge_house.asm
+++ b/text/maps/cerulean_badge_house.asm
@@ -1,4 +1,4 @@
-_CeruleanHouse2Text_74e77:: ; 990c9 (26:50c9)
+_CeruleanHouse2Text_74e77::
 	text "#MON BADGEs"
 	line "are owned only by"
 	cont "skilled trainers."
@@ -10,7 +10,7 @@
 	line "amazing secrets!"
 	prompt
 
-_CeruleanHouse2Text_74e7c:: ; 9913a (26:513a)
+_CeruleanHouse2Text_74e7c::
 	text "Now then..."
 
 	para "Which of the 8"
@@ -18,30 +18,22 @@
 	cont "describe?"
 	done
 
-_CeruleanHouse2Text_74e81:: ; 99170 (26:5170)
-IF DEF(_YELLOW)
-	text "Come visit me any-"
-ELSE
+_CeruleanHouse2Text_74e81::
 	text "Come visit me any"
-ENDC
 	line "time you wish."
 	done
 
-_CeruleanHouse2Text_74e96:: ; 99192 (26:5192)
+_CeruleanHouse2Text_74e96::
 	text "The ATTACK of all"
 	line "#MON increases"
 	cont "a little bit."
 
 	para "It also lets you"
-IF DEF(_YELLOW)
-	line "use FLASH any-"
-ELSE
 	line "use FLASH any"
-ENDC
 	cont "time you desire."
 	prompt
 
-_CeruleanHouse2Text_74e9b:: ; 991f2 (26:51f2)
+_CeruleanHouse2Text_74e9b::
 	text "#MON up to L30"
 	line "will obey you."
 
@@ -53,7 +45,7 @@
 	cont "of battle."
 	prompt
 
-_CeruleanHouse2Text_74ea0:: ; 9925d (26:525d)
+_CeruleanHouse2Text_74ea0::
 	text "The SPEED of all"
 	line "#MON increases"
 	cont "a little bit."
@@ -63,7 +55,7 @@
 	cont "of battle."
 	prompt
 
-_CeruleanHouse2Text_74ea5:: ; 992b8 (26:52b8)
+_CeruleanHouse2Text_74ea5::
 	text "#MON up to L50"
 	line "will obey you."
 
@@ -75,7 +67,7 @@
 	cont "side of battle."
 	prompt
 
-_CeruleanHouse2Text_74eaa:: ; 9932a (26:532a)
+_CeruleanHouse2Text_74eaa::
 	text "The DEFENSE of all"
 	line "#MON increases"
 	cont "a little bit."
@@ -85,7 +77,7 @@
 	cont "of battle."
 	prompt
 
-_CeruleanHouse2Text_74eaf:: ; 99388 (26:5388)
+_CeruleanHouse2Text_74eaf::
 	text "#MON up to L70"
 	line "will obey you."
 
@@ -93,13 +85,13 @@
 	line "become unruly!"
 	prompt
 
-_CeruleanHouse2Text_74eb4:: ; 993c7 (26:53c7)
+_CeruleanHouse2Text_74eb4::
 	text "Your #MON's"
 	line "SPECIAL abilities"
 	cont "increase a bit."
 	prompt
 
-_CeruleanHouse2Text_74eb9:: ; 993f5 (26:53f5)
+_CeruleanHouse2Text_74eb9::
 	text "All #MON will"
 	line "obey you!"
 	prompt
--- a/text/maps/cerulean_city.asm
+++ b/text/maps/cerulean_city.asm
@@ -1,4 +1,4 @@
-_CeruleanCityText_19668:: ; a4d2b (29:4d2b)
+_CeruleanCityText_19668::
 	text $53, ": Yo!"
 	line $52, "!"
 
@@ -16,19 +16,19 @@
 	cont $52, "!"
 	done
 
-_CeruleanCityText_1966d:: ; a4dbe (29:4dbe)
+_CeruleanCityText_1966d::
 	text "Hey!"
 	line "Take it easy!"
 	cont "You won already!"
 	prompt
 
-_CeruleanCityText_19672:: ; a4de3 (29:4de3)
+_CeruleanCityText_19672::
 	text "Heh!"
 	line "You're no match"
 	cont "for my genius!"
 	prompt
 
-_CeruleanCityText_19677:: ; a4e07 (29:4e07)
+_CeruleanCityText_19677::
 	text $53, ": Hey,"
 	line "guess what?"
 
@@ -58,7 +58,7 @@
 	cont "Smell ya later!"
 	done
 
-_CeruleanCityText_196d9:: ; a4f27 (29:4f27)
+_CeruleanCityText_196d9::
 	text "Hey! Stay out!"
 	line "It's not your"
 	cont "yard! Huh? Me?"
@@ -68,16 +68,16 @@
 	cont "you believe me?"
 	done
 
-_ReceivedTM28Text:: ; a4f82 (29:4f82)
+_ReceivedTM28Text::
 	text $52, " recovered"
 	line "TM28!@@"
 
-_ReceivedTM28Text2:: ; a4f96 (29:4f96)
+_ReceivedTM28Text2::
 	db $0
 	para "I better get"
 	line "moving! Bye!@@"
 
-_TM28NoRoomText:: ; a4fb3 (29:4fb3)
+_TM28NoRoomText::
 	text "Make room for"
 	line "this!"
 
@@ -85,18 +85,18 @@
 	line "I give it to you!"
 	done
 
-_CeruleanCityText_196ee:: ; a4feb (29:4feb)
+_CeruleanCityText_196ee::
 	text "Stop!"
 	line "I give up! I'll"
 	cont "leave quietly!"
 	prompt
 
-_CeruleanCityText_196f3:: ; a5010 (29:5010)
+_CeruleanCityText_196f3::
 	text "OK! I'll return"
 	line "the TM I stole!"
 	prompt
 
-_CeruleanCityText3:: ; a5030 (29:5030)
+_CeruleanCityText3::
 	text "You're a trainer"
 	line "too? Collecting,"
 	cont "fighting, it's a"
@@ -103,7 +103,7 @@
 	cont "tough life."
 	done
 
-_CeruleanCityText4:: ; a506e (29:506e)
+_CeruleanCityText4::
 	text "That bush in"
 	line "front of the shop"
 	cont "is in the way."
@@ -112,7 +112,7 @@
 	line "way around."
 	done
 
-_CeruleanCityText5:: ; a50ba (29:50ba)
+_CeruleanCityText5::
 	text "You're making an"
 	line "encyclopedia on"
 	cont "#MON? That"
@@ -119,16 +119,7 @@
 	cont "sounds amusing."
 	done
 
-_CeruleanCityText6:: ; a50f6 (29:50f6)
-IF DEF(_YELLOW)
-	text "These poor people"
-	line "here were robbed."
-
-	para "We're positive"
-	line "that TEAM ROCKET"
-	cont "is behind this"
-	cont "terrible deed."
-ELSE
+_CeruleanCityText6::
 	text "The people here"
 	line "were robbed."
 
@@ -136,57 +127,31 @@
 	line "TEAM ROCKET is"
 	cont "behind this most"
 	cont "heinous crime!"
-ENDC
 
 	para "Even our POLICE"
-IF DEF(_YELLOW)
-	line "FORCE has trouble"
-ELSE
 	line "force has trouble"
-ENDC
 	cont "with the ROCKETs!"
 	done
 
-_CeruleanCityText_19730:: ; a5188 (29:5188)
-IF DEF(_YELLOW)
-	text "OK! ELECTRODE!"
-ELSE
+_CeruleanCityText_19730::
 	text "OK! SLOWBRO!"
-ENDC
 	line "Use SONICBOOM!"
-IF DEF(_YELLOW)
-	cont "Please ELECTRODE,"
-ELSE
 	cont "Come on, SLOWBRO"
-ENDC
 	cont "pay attention!"
 	done
 
-_CeruleanCityText_19735:: ; a51c5 (29:51c5)
-IF DEF(_YELLOW)
-	text "ELECTRODE, TACKLE!"
-ELSE
+_CeruleanCityText_19735::
 	text "SLOWBRO punch!"
-ENDC
 	line "No! You blew it"
 	cont "again!"
 	done
 
-_CeruleanCityText_1973a:: ; a51ec (29:51ec)
-IF DEF(_YELLOW)
-	text "ELECTRODE, SWIFT!"
-ELSE
+_CeruleanCityText_1973a::
 	text "SLOWBRO, WITHDRAW!"
-ENDC
 	line "No! That's wrong!"
 
-IF DEF(_YELLOW)
-	para "Training #MON"
-	line "is difficult!"
-ELSE
 	para "It's so hard to"
 	line "control #MON!"
-ENDC
 
 	para "Your #MON's"
 	line "obedience depends"
@@ -194,43 +159,27 @@
 	cont "as a trainer!"
 	done
 
-_CeruleanCityText_1976f:: ; a526b (29:526b)
-IF DEF(_YELLOW)
-	text "ELECTRODE took a"
-ELSE
+_CeruleanCityText_1976f::
 	text "SLOWBRO took a"
-ENDC
 	line "snooze..."
 	done
 
-_CeruleanCityText_19774:: ; a5285 (29:5285)
-IF DEF(_YELLOW)
-	text "ELECTRODE is"
-ELSE
+_CeruleanCityText_19774::
 	text "SLOWBRO is"
-ENDC
 	line "loafing around..."
 	done
 
-_CeruleanCityText_19779:: ; a52a3 (29:52a3)
-IF DEF(_YELLOW)
-	text "ELECTRODE turned"
-ELSE
+_CeruleanCityText_19779::
 	text "SLOWBRO turned"
-ENDC
 	line "away..."
 	done
 
-_CeruleanCityText_1977e:: ; a52bb (29:52bb)
-IF DEF(_YELLOW)
-	text "ELECTRODE"
-ELSE
+_CeruleanCityText_1977e::
 	text "SLOWBRO"
-ENDC
 	line "ignored orders..."
 	done
 
-_CeruleanCityText9:: ; a52d6 (29:52d6)
+_CeruleanCityText9::
 	text "I want a bright"
 	line "red BICYCLE!"
 
@@ -239,7 +188,7 @@
 	cont "get dirty!"
 	done
 
-_CeruleanCityText10:: ; a531f (29:531f)
+_CeruleanCityText10::
 	text "This is CERULEAN"
 	line "CAVE! Horribly"
 	cont "strong #MON"
@@ -251,7 +200,7 @@
 	cont "is allowed in!"
 	done
 
-_CeruleanCityText12:: ; a539a (29:539a)
+_CeruleanCityText12::
 	text "CERULEAN CITY"
 	line "A Mysterious,"
 	cont "Blue Aura"
@@ -258,7 +207,7 @@
 	cont "Surrounds It"
 	done
 
-_CeruleanCityText13:: ; a53ce (29:53ce)
+_CeruleanCityText13::
 	text "TRAINER TIPS"
 
 	para "Pressing B Button"
@@ -267,13 +216,13 @@
 	cont "process."
 	done
 
-_CeruleanCityText16:: ; a541a (29:541a)
+_CeruleanCityText16::
 	text "Grass and caves"
 	line "handled easily!"
 	cont "BIKE SHOP"
 	done
 
-_CeruleanCityText17:: ; a5445 (29:5445)
+_CeruleanCityText17::
 	text "CERULEAN CITY"
 	line "#MON GYM"
 	cont "LEADER: MISTY"
--- a/text/maps/cerulean_gym.asm
+++ b/text/maps/cerulean_gym.asm
@@ -1,12 +1,7 @@
-_CeruleanGymText_5c7be:: ; 989c1 (26:49c1)
+_CeruleanGymText_5c7be::
 	text "Hi, you're a new"
 	line "face!"
 
-IF DEF(_YELLOW)
-	para "What's your policy"
-	line "on #MON? What"
-	cont "is your approach?"
-ELSE
 	para "Trainers who want"
 	line "to turn pro have"
 	cont "to have a policy"
@@ -15,24 +10,14 @@
 	para "What is your"
 	line "approach when you"
 	cont "catch #MON?"
-ENDC
 
 	para "My policy is an"
 	line "all-out offensive"
 	cont "with water-type"
 	cont "#MON!"
-
-IF DEF(_YELLOW)
-	para "MISTY, the world-"
-	line "famous beauty, is"
-	cont "your host!"
-
-	para "Are you ready,"
-	line "sweetie?"
-ENDC
 	done
 
-_CeruleanGymText_5c7c3:: ; 98a7b (26:4a7b)
+_CeruleanGymText_5c7c3::
 	text "TM11 teaches"
 	line "BUBBLEBEAM!"
 
@@ -40,7 +25,7 @@
 	line "aquatic #MON!"
 	done
 
-_CeruleanGymText_5c7c8:: ; 98ab0 (26:4ab0)
+_CeruleanGymText_5c7c8::
 	text "The CASCADEBADGE"
 	line "makes all #MON"
 	cont "up to L30 obey!"
@@ -50,11 +35,7 @@
 
 	para "There's more, you"
 	line "can now use CUT"
-IF DEF(_YELLOW)
-	cont "anytime!"
-ELSE
 	cont "any time!"
-ENDC
 
 	para "You can CUT down"
 	line "small bushes to"
@@ -64,23 +45,18 @@
 	line "my favorite TM!"
 	done
 
-_ReceivedTM11Text:: ; 98b7d (26:4b7d)
+_ReceivedTM11Text::
 	text $52, " received"
 	line "TM11!@@"
 
-_CeruleanGymText_5c7d3:: ; 98b90 (26:4b90)
+_CeruleanGymText_5c7d3::
 	text "You better make"
 	line "room for this!"
 	done
 
-_CeruleanGymText_5c7d8:: ; 98bb0 (26:4bb0)
-IF DEF(_YELLOW)
-	text "I can't"
-	line "believe I lost!"
-ELSE
+_CeruleanGymText_5c7d8::
 	text "Wow!"
 	line "You're too much!"
-ENDC
 
 	para "All right!"
 
@@ -88,7 +64,7 @@
 	line "CASCADEBADGE to"
 	cont "show you beat me!@@"
 
-_CeruleanGymBattleText1:: ; 98c05 (26:4c05)
+_CeruleanGymBattleText1::
 	text "I'm more than good"
 	line "enough for you!"
 
@@ -95,12 +71,12 @@
 	para "MISTY can wait!"
 	done
 
-_CeruleanGymEndBattleText1:: ; 98c38 (26:4c38)
+_CeruleanGymEndBattleText1::
 	text "You"
 	line "overwhelmed me!"
 	prompt
 
-_CeruleanGymAfterBattleText1:: ; 98c4d (26:4c4d)
+_CeruleanGymAfterBattleText1::
 	text "You have to face"
 	line "other trainers to"
 	cont "find out how good"
@@ -107,7 +83,7 @@
 	cont "you really are."
 	done
 
-_CeruleanGymBattleText2:: ; 98c93 (26:4c93)
+_CeruleanGymBattleText2::
 	text "Splash!"
 
 	para "I'm first up!"
@@ -114,12 +90,12 @@
 	line "Let's do it!"
 	done
 
-_CeruleanGymEndBattleText2:: ; 98cb5 (26:4cb5)
+_CeruleanGymEndBattleText2::
 	text "That"
 	line "can't be!"
 	prompt
 
-_CeruleanGymAfterBattleText2:: ; 98cc4 (26:4cc4)
+_CeruleanGymAfterBattleText2::
 	text "MISTY is going to"
 	line "keep improving!"
 
@@ -127,7 +103,7 @@
 	line "someone like you!"
 	done
 
-_CeruleanGymText_5c82a:: ; 98d0a (26:4d0a)
+_CeruleanGymText_5c82a::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -145,15 +121,11 @@
 	line "electricity!"
 	done
 
-_CeruleanGymText_5c82f:: ; 98db0 (26:4db0)
+_CeruleanGymText_5c82f::
 	text "You beat MISTY!"
 	line "What'd I tell ya?"
 
-IF DEF(_YELLOW)
-	para "You and me, kid,"
-ELSE
 	para "You and me kid,"
-ENDC
 	line "we make a pretty"
 	cont "darn good team!"
 	done
--- a/text/maps/cerulean_mart.asm
+++ b/text/maps/cerulean_mart.asm
@@ -1,4 +1,4 @@
-_CeruleanMartText2:: ; 99012 (26:5012)
+_CeruleanMartText2::
 	text "Use REPEL to keep"
 	line "bugs and weak"
 	cont "#MON away."
@@ -9,7 +9,7 @@
 	cont "for best results!"
 	done
 
-_CeruleanMartText3:: ; 9907f (26:507f)
+_CeruleanMartText3::
 	text "Have you seen any"
 	line "RARE CANDY?"
 
--- a/text/maps/cerulean_pokecenter.asm
+++ b/text/maps/cerulean_pokecenter.asm
@@ -1,4 +1,4 @@
-_CeruleanPokecenterText1:: ; 988e5 (26:48e5)
+_CeruleanPokecenterText1::
 	text "That BILL!"
 
 	para "I heard that"
@@ -7,7 +7,7 @@
 	cont "rare #MON!"
 	done
 
-_CeruleanPokecenterText3:: ; 9892a (26:492a)
+_CeruleanPokecenterText3::
 	text "Have you heard"
 	line "about BILL?"
 
--- a/text/maps/cerulean_trade_house.asm
+++ b/text/maps/cerulean_trade_house.asm
@@ -1,43 +1,4 @@
-IF DEF(_YELLOW)
-MelanieText1::
-	text "I nursed this"
-	line "BULBASAUR back to"
-	cont "health."
-
-	para "It needs a good"
-	line "trainer to take"
-	cont "care of it now.@@"
-
-MelanieText2::
-	text "I know! Would you"
-	line "take care of this"
-	cont "BULBASAUR?"
-	done
-
-MelanieText3::
-	text "Please take care"
-	line "of BULBASAUR!@@"
-
-MelanieText4::
-	text "Is BULBASAUR"
-	line "doing well?@@"
-
-MelanieText5::
-	text "Oh..."
-	line "That's too bad...@@"
-
-MelanieBulbasaurText::
-	text "BULBASAUR: Bubba!"
-	line "Zoar!@@"
-
-MelanieOddishText::
-	text "ODDISH: Orddissh!@@"
-
-MelanieSandshrewText::
-	text "SANDSHREW: Pikii!@@"
-ENDC
-
-_CeruleanHouse1Text1:: ; 9888c (26:488c)
+_CeruleanHouse1Text1::
 	text "My husband likes"
 	line "trading #MON."
 
--- a/text/maps/cerulean_trashed_house.asm
+++ b/text/maps/cerulean_trashed_house.asm
@@ -1,4 +1,4 @@
-_CeruleanTrashedText_1d6ab:: ; 9875c (26:475c)
+_CeruleanTrashedText_1d6ab::
 	text "Those miserable"
 	line "ROCKETs!"
 
@@ -14,7 +14,7 @@
 	line "bundle, it did!"
 	done
 
-_CeruleanTrashedText_1d6b0:: ; 987e2 (26:47e2)
+_CeruleanTrashedText_1d6b0::
 	text "I figure what's"
 	line "lost is lost!"
 
@@ -23,7 +23,7 @@
 	cont "DIG without a TM!"
 	done
 
-_CeruleanHouseTrashedText2:: ; 98834 (26:4834)
+_CeruleanHouseTrashedText2::
 	text "TEAM ROCKET must"
 	line "be trying to DIG"
 	cont "their way into no"
@@ -30,7 +30,7 @@
 	cont "good!"
 	done
 
-_CeruleanHouseTrashedText3:: ; 9886f (26:486f)
+_CeruleanHouseTrashedText3::
 	text "TEAM ROCKET left"
 	line "a way out!"
 	done
--- a/text/maps/champion.asm
+++ b/text/maps/champion.asm
@@ -1,4 +1,4 @@
-_GaryText_760f4:: ; 860e1 (21:60e1)
+_GaryText_760f4::
 	text $53, ": Hey!"
 
 	para "I was looking"
@@ -35,7 +35,7 @@
 	cont "in the world!"
 	done
 
-_GaryText_760f9:: ; 8623b (21:623b)
+_GaryText_760f9::
 	text "NO!"
 	line "That can't be!"
 	cont "You beat my best!"
@@ -49,7 +49,7 @@
 	cont "It's not fair!"
 	prompt
 
-_GaryText_760fe:: ; 862b4 (21:62b4)
+_GaryText_760fe::
 	text "Hahaha!"
 	line "I won, I won!"
 
@@ -65,7 +65,7 @@
 	line "Hahaha!"
 	prompt
 
-_GaryText_76103:: ; 8632f (21:632f)
+_GaryText_76103::
 	text "Why?"
 	line "Why did I lose?"
 
@@ -81,11 +81,11 @@
 	line "like to admit it."
 	done
 
-_GaryText2:: ; 863c1 (21:63c1)
+_GaryText2::
 	text "OAK: ", $52, "!"
 	done
 
-_GaryText_76120:: ; 863ca (21:63ca)
+_GaryText_76120::
 	text "OAK: So, you won!"
 	line "Congratulations!"
 	cont "You're the new"
@@ -103,7 +103,7 @@
 	line "come of age!"
 	done
 
-_GaryText_76125:: ; 86463 (21:6463)
+_GaryText_76125::
 	text "OAK: ", $53, "! I'm"
 	line "disappointed!"
 
@@ -129,7 +129,7 @@
 	cont "a champ again!"
 	done
 
-_GaryText_7612a:: ; 86567 (21:6567)
+_GaryText_7612a::
 	text "OAK: ", $52, "!"
 
 	para "You understand"
--- a/text/maps/cinnabar_gym.asm
+++ b/text/maps/cinnabar_gym.asm
@@ -1,4 +1,4 @@
-_BlaineBattleText:: ; a0844 (28:4844)
+_BlaineBattleText::
 	text "Hah!"
 
 	para "I am BLAINE! I"
@@ -13,7 +13,7 @@
 	line "have BURN HEAL!"
 	done
 
-_BlaineEndBattleText:: ; a08c7 (28:48c7)
+_BlaineEndBattleText::
 	text "I have"
 	line "burnt out!"
 
@@ -20,7 +20,7 @@
 	para "You have earned"
 	line "the VOLCANOBADGE!@@"
 
-_BlaineFireBlastText:: ; a08fd (28:48fd)
+_BlaineFireBlastText::
 	text "FIRE BLAST is the"
 	line "ultimate fire"
 	cont "technique!"
@@ -29,7 +29,7 @@
 	line "water #MON!"
 	done
 
-_BlaineBadgeText:: ; a0946 (28:4946)
+_BlaineBadgeText::
 	text "Hah!"
 
 	para "The VOLCANOBADGE"
@@ -41,13 +41,13 @@
 	line "have this too!"
 	done
 
-_ReceivedTM38Text:: ; a09a8 (28:49a8)
+_ReceivedTM38Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM38ExplanationText:: ; a09bc (28:49bc)
+_TM38ExplanationText::
 	db $0
 	para "TM38 contains"
 	line "FIRE BLAST!"
@@ -60,23 +60,23 @@
 	cont "good bets!"
 	done
 
-_TM38NoRoomText:: ; a0a1e (28:4a1e)
+_TM38NoRoomText::
 	text "Make room for my"
 	line "gift!"
 	done
 
-_CinnabarGymText_7595f:: ; a0a36 (28:4a36)
+_CinnabarGymText_7595f::
 	text "Do you know how"
 	line "hot #MON fire"
 	cont "breath can get?"
 	done
 
-_CinnabarGymText_75964:: ; a0a65 (28:4a65)
+_CinnabarGymText_75964::
 	text "Yow!"
 	line "Hot, hot, hot!"
 	prompt
 
-_CinnabarGymText_75969:: ; a0a7a (28:4a7a)
+_CinnabarGymText_75969::
 	text "Fire, or to be"
 	line "more precise,"
 	cont "combustion..."
@@ -85,66 +85,66 @@
 	line "blah..."
 	done
 
-_CinnabarGymText_75994:: ; a0ac0 (28:4ac0)
+_CinnabarGymText_75994::
 	text "I was a thief, but"
 	line "I became straight"
 	cont "as a trainer!"
 	done
 
-_CinnabarGymText_75999:: ; a0af4 (28:4af4)
+_CinnabarGymText_75999::
 	text "I"
 	line "surrender!"
 	prompt
 
-_CinnabarGymText_7599e:: ; a0b02 (28:4b02)
+_CinnabarGymText_7599e::
 	text "I can't help"
 	line "stealing other"
 	cont "people's #MON!"
 	done
 
-_CinnabarGymText_759c9:: ; a0b2c (28:4b2c)
+_CinnabarGymText_759c9::
 	text "You can't win!"
 	line "I have studied"
 	cont "#MON totally!"
 	done
 
-_CinnabarGymText_759ce:: ; a0b58 (28:4b58)
+_CinnabarGymText_759ce::
 	text "Waah!"
 	line "My studies!"
 	prompt
 
-_CinnabarGymText_759d3:: ; a0b6b (28:4b6b)
+_CinnabarGymText_759d3::
 	text "My theories are"
 	line "too complicated"
 	cont "for you!"
 	done
 
-_CinnabarGymText_759fe:: ; a0b95 (28:4b95)
+_CinnabarGymText_759fe::
 	text "I just like using"
 	line "fire #MON!"
 	done
 
-_CinnabarGymText_75a03:: ; a0bb3 (28:4bb3)
+_CinnabarGymText_75a03::
 	text "Too hot"
 	line "to handle!"
 	prompt
 
-_CinnabarGymText_75a08:: ; a0bc7 (28:4bc7)
+_CinnabarGymText_75a08::
 	text "I wish there was"
 	line "a thief #MON!"
 	cont "I'd use that!"
 	done
 
-_CinnabarGymText_75a33:: ; a0bf4 (28:4bf4)
+_CinnabarGymText_75a33::
 	text "I know why BLAINE"
 	line "became a trainer!"
 	done
 
-_CinnabarGymText_75a38:: ; a0c19 (28:4c19)
+_CinnabarGymText_75a38::
 	text "Ow!"
 	prompt
 
-_CinnabarGymText_75a3d:: ; a0c1e (28:4c1e)
+_CinnabarGymText_75a3d::
 	text "BLAINE was lost"
 	line "in the mountains"
 	cont "when a fiery bird"
@@ -155,40 +155,40 @@
 	cont "his way down!"
 	done
 
-_CinnabarGymText_75a68:: ; a0c90 (28:4c90)
+_CinnabarGymText_75a68::
 	text "I've been to many"
 	line "GYMs, but this is"
 	cont "my favorite!"
 	done
 
-_CinnabarGymText_75a6d:: ; a0cc1 (28:4cc1)
+_CinnabarGymText_75a6d::
 	text "Yowza!"
 	line "Too hot!"
 	prompt
 
-_CinnabarGymText_75a72:: ; a0cd2 (28:4cd2)
+_CinnabarGymText_75a72::
 	text "Us fire #MON"
 	line "fans like PONYTA"
 	cont "and NINETALES!"
 	done
 
-_CinnabarGymText_75a9d:: ; a0d00 (28:4d00)
+_CinnabarGymText_75a9d::
 	text "Fire is weak"
 	line "against H2O!"
 	done
 
-_CinnabarGymText_75aa2:: ; a0d1b (28:4d1b)
+_CinnabarGymText_75aa2::
 	text "Oh!"
 	line "Snuffed out!"
 	prompt
 
-_CinnabarGymText_75aa7:: ; a0d2d (28:4d2d)
+_CinnabarGymText_75aa7::
 	text "Water beats fire!"
 	line "But, fire melts"
 	cont "ice #MON!"
 	done
 
-_CinnabarGymText_75ac2:: ; a0d5a (28:4d5a)
+_CinnabarGymText_75ac2::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -203,7 +203,7 @@
 	line "some BURN HEALs!"
 	done
 
-_CinnabarGymText_75ac7:: ; a0dd9 (28:4dd9)
+_CinnabarGymText_75ac7::
 	text $52, "! You beat"
 	line "that fire brand!"
 	done
--- a/text/maps/cinnabar_island.asm
+++ b/text/maps/cinnabar_island.asm
@@ -1,9 +1,9 @@
-_CinnabarIslandText8:: ; a61cf (29:61cf)
+_CinnabarIslandText8::
 	text "The door is"
 	line "locked..."
 	done
 
-_CinnabarIslandText1:: ; a61e6 (29:61e6)
+_CinnabarIslandText1::
 	text "CINNABAR GYM's"
 	line "BLAINE is an odd"
 	cont "man who has lived"
@@ -10,28 +10,24 @@
 	cont "here for decades."
 	done
 
-_CinnabarIslandText2:: ; a622a (29:622a)
+_CinnabarIslandText2::
 	text "Scientists conduct"
 	line "experiments in"
-IF DEF(_YELLOW)
-	cont "the burned-out"
-ELSE
 	cont "the burned out"
-ENDC
 	cont "building."
 	done
 
-_CinnabarIslandText3:: ; a6266 (29:6266)
+_CinnabarIslandText3::
 	text "CINNABAR ISLAND"
 	line "The Fiery Town of"
 	cont "Burning Desire"
 	done
 
-_CinnabarIslandText6:: ; a6298 (29:6298)
+_CinnabarIslandText6::
 	text "#MON LAB"
 	done
 
-_CinnabarIslandText7:: ; a62a2 (29:62a2)
+_CinnabarIslandText7::
 	text "CINNABAR ISLAND"
 	line "#MON GYM"
 	cont "LEADER: BLAINE"
--- a/text/maps/cinnabar_lab.asm
+++ b/text/maps/cinnabar_lab.asm
@@ -1,4 +1,4 @@
-_Lab1Text1:: ; a0df7 (28:4df7)
+_Lab1Text1::
 	text "We study #MON"
 	line "extensively here."
 
@@ -7,23 +7,23 @@
 	cont "for examination."
 	done
 
-_Lab1Text2:: ; a0e49 (28:4e49)
+_Lab1Text2::
 	text "A photo of the"
 	line "LAB's founder,"
 	cont "DR.FUJI!"
 	done
 
-_Lab1Text3:: ; a0e70 (28:4e70)
+_Lab1Text3::
 	text "#MON LAB"
 	line "Meeting Room"
 	done
 
-_Lab1Text4:: ; a0e87 (28:4e87)
+_Lab1Text4::
 	text "#MON LAB"
 	line "R-and-D Room"
 	done
 
-_Lab1Text5:: ; a0e9e (28:4e9e)
+_Lab1Text5::
 	text "#MON LAB"
 	line "Testing Room"
 	done
--- a/text/maps/cinnabar_lab_fossil_room.asm
+++ b/text/maps/cinnabar_lab_fossil_room.asm
@@ -1,4 +1,4 @@
-_Lab4Text_75dc6:: ; a10e8 (28:50e8)
+_Lab4Text_75dc6::
 	text "Hiya!"
 
 	para "I am important"
@@ -11,11 +11,11 @@
 	line "fossil for me?"
 	prompt
 
-_Lab4Text_75dcb:: ; a1145 (28:5145)
+_Lab4Text_75dcb::
 	text "No! Is too bad!"
 	done
 
-_Lab4Text_75dd0:: ; a1156 (28:5156)
+_Lab4Text_75dd0::
 	text "I take a little"
 	line "time!"
 
@@ -23,7 +23,7 @@
 	line "little while!"
 	done
 
-_Lab4Text_75dd5:: ; a118d (28:518d)
+_Lab4Text_75dd5::
 	text "Where were you?"
 
 	para "Your fossil is"
@@ -35,7 +35,7 @@
 	line "like I think!"
 	prompt
 
-_Lab4Text_610ae:: ; a11d6 (28:51d6)
+_Lab4Text_610ae::
 	text "Oh! That is"
 	line "@"
 	TX_RAM wcd6d
@@ -54,7 +54,7 @@
 	cont "again!"
 	done
 
-_Lab4Text_610b3:: ; a1259 (28:5259)
+_Lab4Text_610b3::
 	text "So! You hurry and"
 	line "give me that!"
 
@@ -64,7 +64,7 @@
 	text "!"
 	prompt
 
-_Lab4Text_610b8:: ; a128f (28:528f)
+_Lab4Text_610b8::
 	text "I take a little"
 	line "time!"
 
@@ -72,7 +72,7 @@
 	line "little while!"
 	done
 
-_Lab4Text_610bd:: ; a12c6 (28:52c6)
+_Lab4Text_610bd::
 	text "Aiyah! You come"
 	line "again!"
 	done
--- a/text/maps/cinnabar_lab_metronome_room.asm
+++ b/text/maps/cinnabar_lab_metronome_room.asm
@@ -1,4 +1,4 @@
-_TM35PreReceiveText:: ; a0f09 (28:4f09)
+_TM35PreReceiveText::
 	text "Tch-tch-tch!"
 	line "I made a cool TM!"
 
@@ -6,13 +6,13 @@
 	line "kinds of fun!"
 	prompt
 
-_ReceivedTM35Text:: ; a0f48 (28:4f48)
+_ReceivedTM35Text::
 	text $52, " received "
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM35ExplanationText:: ; a0f5d (28:4f5d)
+_TM35ExplanationText::
 	text "Tch-tch-tch!"
 	line "That's the sound"
 	cont "of a METRONOME!"
@@ -23,18 +23,18 @@
 	cont "it doesn't know!"
 	done
 
-_TM35NoRoomText:: ; a0fc7 (28:4fc7)
+_TM35NoRoomText::
 	text "Your pack is"
 	line "crammed full!"
 	done
 
-_Lab3Text2:: ; a0fe3 (28:4fe3)
+_Lab3Text2::
 	text "EEVEE can evolve"
 	line "into 1 of 3 kinds"
 	cont "of #MON."
 	done
 
-_Lab3Text3:: ; a1010 (28:5010)
+_Lab3Text3::
 	text "There's an e-mail"
 	line "message!"
 
@@ -58,7 +58,7 @@
 	para "..."
 	done
 
-_Lab3Text5:: ; a10d8 (28:50d8)
+_Lab3Text5::
 	text "An amber pipe!"
 	done
 
--- a/text/maps/cinnabar_lab_trade_room.asm
+++ b/text/maps/cinnabar_lab_trade_room.asm
@@ -1,4 +1,4 @@
-_Lab2Text1:: ; a0eb5 (28:4eb5)
+_Lab2Text1::
 	text "I found this very"
 	line "strange fossil in"
 	cont "MT.MOON!"
--- a/text/maps/cinnabar_mart.asm
+++ b/text/maps/cinnabar_mart.asm
@@ -1,10 +1,10 @@
-_CinnabarMartText2:: ; a139b (28:539b)
+_CinnabarMartText2::
 	text "Don't they have X"
 	line "ATTACK? It's good"
 	cont "for battles!"
 	done
 
-_CinnabarMartText3:: ; a13cb (28:53cb)
+_CinnabarMartText3::
 	text "It never hurts to"
 	line "have extra items!"
 	done
--- a/text/maps/cinnabar_pokecenter.asm
+++ b/text/maps/cinnabar_pokecenter.asm
@@ -1,5 +1,5 @@
-_CinnabarPokecenterText2:: ; a12de (28:52de)
-_CinnabarPokecenterText1:: ; a12de (28:52de)
+_CinnabarPokecenterText2::
+_CinnabarPokecenterText1::
 	text "You can cancel"
 	line "evolution."
 
@@ -9,7 +9,7 @@
 	cont "it the way it is."
 	done
 
-_CinnabarPokecenterText3:: ; a133e (28:533e)
+_CinnabarPokecenterText3::
 	text "Do you have any"
 	line "friends?"
 
--- a/text/maps/copycats_house_1f.asm
+++ b/text/maps/copycats_house_1f.asm
@@ -1,4 +1,4 @@
-_CopycatsHouse1FText1:: ; a14f7 (28:54f7)
+_CopycatsHouse1FText1::
 	text "My daughter is so"
 	line "self-centered."
 	cont "She only has a"
@@ -5,7 +5,7 @@
 	cont "few friends."
 	done
 
-_CopycatsHouse1FText2:: ; a1535 (28:5535)
+_CopycatsHouse1FText2::
 	text "My daughter likes"
 	line "to mimic people."
 
@@ -15,11 +15,6 @@
 	cont "around here!"
 	done
 
-_CopycatsHouse1FText3:: ; a1596 (28:5596)
-IF DEF(_YELLOW)
-	text "CHANSEY: Chaan"
-	line "sey!@@"
-ELSE
+_CopycatsHouse1FText3::
 	text "CHANSEY: Chaan!"
 	line "Sii!@@"
-ENDC
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/copycats_house_2f.asm
@@ -1,4 +1,4 @@
-_CopycatsHouse2FText_5ccd4:: ; a15ad (28:55ad)
+_CopycatsHouse2FText_5ccd4::
 	text $52, ": Hi! Do"
 	line "you like #MON?"
 
@@ -15,7 +15,7 @@
 	line "favorite hobby!"
 	prompt
 
-_TM31PreReceiveText:: ; a1636 (28:5636)
+_TM31PreReceiveText::
 	text "Oh wow!"
 	line "A # DOLL!"
 
@@ -26,13 +26,13 @@
 	line "this, then!"
 	prompt
 
-_ReceivedTM31Text:: ; a1675 (28:5675)
+_ReceivedTM31Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM31ExplanationText1:: ; a1689 (28:5689)
+_TM31ExplanationText1::
 	db $0
 	para "TM31 contains my"
 	line "favorite, MIMIC!"
@@ -40,7 +40,7 @@
 	para "Use it on a good"
 	line "#MON!@@"
 
-_TM31ExplanationText2:: ; a16c5 (28:56c5)
+_TM31ExplanationText2::
 	text $52, ": Hi!"
 	line "Thanks for TM31!"
 
@@ -54,11 +54,11 @@
 	line "It's a scream!"
 	done
 
-_TM31NoRoomText:: ; a1733 (28:5733)
+_TM31NoRoomText::
 	text "Don't you want"
 	line "this?@@"
 
-_CopycatsHouse2FText2:: ; a1749 (28:5749)
+_CopycatsHouse2FText2::
 	text "DODUO: Giiih!"
 
 	para "MIRROR MIRROR ON"
@@ -67,19 +67,19 @@
 	cont "OF ALL?"
 	done
 
-_CopycatsHouse2FText3:: ; a1792 (28:5792)
+_CopycatsHouse2FText3::
 	text "This is a rare"
 	line "#MON! Huh?"
 	cont "It's only a doll!"
 	done
 
-_CopycatsHouse2FText6:: ; a17be (28:57be)
+_CopycatsHouse2FText6::
 	text "A game with MARIO"
 	line "wearing a bucket"
 	cont "on his head!"
 	done
 
-_CopycatsHouse2FText_5cd17:: ; a17ef (28:57ef)
+_CopycatsHouse2FText_5cd17::
 	text "..."
 
 	para "My Secrets!"
@@ -91,7 +91,7 @@
 	cont "CLEFAIRY!"
 	done
 
-_CopycatsHouse2FText_5cd1c:: ; a1842 (28:5842)
+_CopycatsHouse2FText_5cd1c::
 	text "Huh? Can't see!"
 	done
 
--- a/text/maps/daycare_1.asm
+++ b/text/maps/daycare_1.asm
@@ -1,4 +1,4 @@
-_DayCareIntroText:: ; 8ab95 (22:6b95)
+_DayCareIntroText::
 	text "I run a DAYCARE."
 	line "Would you like me"
 	cont "to raise one of"
@@ -5,12 +5,12 @@
 	cont "your #MON?"
 	done
 
-_DayCareWhichMonText:: ; 8abd4 (22:6bd4)
+_DayCareWhichMonText::
 	text "Which #MON"
 	line "should I raise?"
 	prompt
 
-_DayCareWillLookAfterMonText:: ; 8abf0 (22:6bf0)
+_DayCareWillLookAfterMonText::
 	text "Fine, I'll look"
 	line "after @"
 	TX_RAM wcd6d
@@ -18,12 +18,12 @@
 	cont "for a while."
 	prompt
 
-_DayCareComeSeeMeInAWhileText:: ; 8ac19 (22:6c19)
+_DayCareComeSeeMeInAWhileText::
 	text "Come see me in"
 	line "a while."
 	done
 
-_DayCareMonHasGrownText:: ; 8ac32 (22:6c32)
+_DayCareMonHasGrownText::
 	text "Your @"
 	TX_RAM wcd6d
 	db $0
@@ -37,7 +37,7 @@
 	para "Aren't I great?"
 	prompt
 
-_DayCareOweMoneyText:: ; 8ac7d (22:6c7d)
+_DayCareOweMoneyText::
 	text "You owe me ¥@"
 	TX_BCD wDayCareTotalCost, $c2
 	db $0
@@ -45,7 +45,7 @@
 	cont "of this #MON."
 	done
 
-_DayCareGotMonBackText:: ; 8acae (22:6cae)
+_DayCareGotMonBackText::
 	text $52, " got"
 	line "@"
 	TX_RAM wDayCareMonName
@@ -52,7 +52,7 @@
 	text " back!"
 	done
 
-_DayCareMonNeedsMoreTimeText:: ; 8acc1 (22:6cc1)
+_DayCareMonNeedsMoreTimeText::
 	text "Back already?"
 	line "Your @"
 	TX_RAM wcd6d
--- a/text/maps/daycare_2.asm
+++ b/text/maps/daycare_2.asm
@@ -1,37 +1,33 @@
-_DayCareAllRightThenText:: ; 8c000 (23:4000)
+_DayCareAllRightThenText::
 	text "All right then,"
 	line "@@"
 
-_DayCareComeAgainText:: ; 8c013 (23:4013)
-IF DEF(_YELLOW)
-	text "Come again."
-ELSE
+_DayCareComeAgainText::
 	text "come again."
-ENDC
 	done
 
-_DayCareNoRoomForMonText:: ; 8c020 (23:4020)
+_DayCareNoRoomForMonText::
 	text "You have no room"
 	line "for this #MON!"
 	done
 
-_DayCareOnlyHaveOneMonText:: ; 8c041 (23:4041)
+_DayCareOnlyHaveOneMonText::
 	text "You only have one"
 	line "#MON with you."
 	done
 
-_DayCareCantAcceptMonWithHMText:: ; 8c063 (23:4063)
+_DayCareCantAcceptMonWithHMText::
 	text "I can't accept a"
 	line "#MON that"
 	cont "knows an HM move."
 	done
 
-_DayCareHeresYourMonText:: ; 8c090 (23:4090)
+_DayCareHeresYourMonText::
 	text "Thank you! Here's"
 	line "your #MON!"
 	prompt
 
-_DayCareNotEnoughMoneyText:: ; 8c0ad (23:40ad)
+_DayCareNotEnoughMoneyText::
 	text "Hey, you don't"
 	line "have enough ¥!"
 	done
--- a/text/maps/digletts_cave_route_11_entrance.asm
+++ b/text/maps/digletts_cave_route_11_entrance.asm
@@ -1,4 +1,4 @@
-_DiglettsCaveEntRoute11Text1:: ; 8c7f9 (23:47f9)
+_DiglettsCaveEntRoute11Text1::
 	text "What a surprise!"
 	line "DIGLETTs dug this"
 	cont "long tunnel!"
--- a/text/maps/digletts_cave_route_2_entrance.asm
+++ b/text/maps/digletts_cave_route_2_entrance.asm
@@ -1,4 +1,4 @@
-_DiglettsCaveRoute2Text1:: ; 8a6a7 (22:66a7)
+_DiglettsCaveRoute2Text1::
 	text "I went to ROCK"
 	line "TUNNEL, but it's"
 	cont "dark and scary."
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -1,35 +1,15 @@
 PikachuFanText::
 	text "Won't you admire"
-IF DEF(_YELLOW)
-	line "my CLEFAIRY's"
-ELSE
 	line "my PIKACHU's"
-ENDC
 	cont "adorable tail?"
 	done
 
 PikachuFanBetterText::
-IF DEF(_YELLOW)
-	text "Humph! My CLEFAIRY"
-ELSE
 	text "Humph! My PIKACHU"
-ENDC
 	line "is twice as cute"
 	cont "as that one!"
 	done
 
-IF DEF(_YELLOW)
-PikachuFanPrintText::
-	text "Our CHAIRMAN's new"
-	line "hobby is taking"
-	cont "#MON photos."
-
-	para "He gave me a nice"
-	line "PRINT of my cute"
-	cont "CLEFAIRY."
-	done
-ENDC
-
 SeelFanText::
 	text "I just love my"
 	line "SEEL!"
@@ -45,22 +25,9 @@
 	line "more attractive!"
 	done
 
-IF DEF(_YELLOW)
-SeelFanPrintText::
-	text "I'm going to hook"
-	line "up the cable to"
-	cont "get a photo PRINT"
-	cont "of my SEEL!"
-	done
-ENDC
-
 FanClubPikachuText::
-IF DEF(_YELLOW)
-	text "CLEFAIRY: Pippii!"
-ELSE
 	text "PIKACHU: Chu!"
 	line "Pikachu!"
-ENDC
 	done
 
 FanClubSeelText::
@@ -71,14 +38,8 @@
 	text "I chair the"
 	line "#MON Fan Club!"
 
-IF DEF(_YELLOW)
-	para "I have more than"
-	line "100 #MON. I"
-	cont "love them all!"
-ELSE
 	para "I have collected"
 	line "over 100 #MON!"
-ENDC
 
 	para "I'm very fussy"
 	line "when it comes to"
@@ -86,13 +47,8 @@
 
 	para "So..."
 
-IF DEF(_YELLOW)
-	para "Did you come to"
-	line "hear me brag"
-ELSE
 	para "Did you come"
 	line "visit to hear"
-ENDC
 	cont "about my #MON?"
 	done
 
@@ -169,54 +125,19 @@
 	line "this!"
 	done
 
-IF DEF(_YELLOW)
-FanClubChairPrintText1::
-	text "Hi there, ",$52,"!"
-	line "Have you seen my"
-	cont "#MON photos?"
-
-	para "I have them framed"
-	line "up on that wall."
-
-	para "Ah, I know!"
-
-	para "Would you like me"
-	line "to take a photo"
-	cont "of your #MON?"
-	done
-
-FanClubChairPrintText2::
-	text "No? That's really"
-	line "disappointing."
-	done
-
-FanClubChairPrintText3::
-	text "OK, I'm done."
-	done
-
-FanClubChairPrintText4::
-	text "Maybe we won't"
-	line "PRINT this now."
-	done
-ENDC
-
-_FanClubText6:: ; 9a948 (26:6948)
-IF DEF(_YELLOW)
-	text "Our CHAIRMAN is"
-ELSE
+_FanClubText6::
 	text "Our Chairman is"
-ENDC
 	line "very vocal about"
 	cont "#MON."
 	done
 
-_FanClubText7:: ; 9a970 (26:6970)
+_FanClubText7::
 	text "Let's all listen"
 	line "politely to other"
 	cont "trainers!"
 	done
 
-_FanClubText8:: ; 9a99d (26:699d)
+_FanClubText8::
 	text "If someone brags,"
 	line "brag right back!"
 	done
--- a/text/maps/fighting_dojo.asm
+++ b/text/maps/fighting_dojo.asm
@@ -1,4 +1,4 @@
-_FightingDojoText_5ce8e:: ; a1852 (28:5852)
+_FightingDojoText_5ce8e::
 	text "Grunt!"
 
 	para "I am the KARATE"
@@ -12,12 +12,12 @@
 	para "Fwaaa!"
 	done
 
-_FightingDojoText_5ce93:: ; a18ba (28:58ba)
+_FightingDojoText_5ce93::
 	text "Hwa!"
 	line "Arrgh! Beaten!"
 	prompt
 
-_FightingDojoText_5ce98:: ; a18cf (28:58cf)
+_FightingDojoText_5ce98::
 	text "Indeed, I have"
 	line "lost!"
 
@@ -34,7 +34,7 @@
 	line "one you like!"
 	done
 
-_FightingDojoText_5ce9d:: ; a1972 (28:5972)
+_FightingDojoText_5ce9d::
 	text "Ho!"
 
 	para "Stay and train at"
@@ -41,17 +41,17 @@
 	line "Karate with us!"
 	done
 
-_FightingDojoBattleText1:: ; a1999 (28:5999)
+_FightingDojoBattleText1::
 	text "Hoargh! Take your"
 	line "shoes off!"
 	done
 
-_FightingDojoEndBattleText1:: ; a19b7 (28:59b7)
+_FightingDojoEndBattleText1::
 	text "I give"
 	line "up!"
 	prompt
 
-_FightingDojoAfterBattleText1:: ; a19c3 (28:59c3)
+_FightingDojoAfterBattleText1::
 	text "You wait 'til you"
 	line "see our Master!"
 
@@ -59,22 +59,22 @@
 	line "compared to him!"
 	done
 
-_FightingDojoBattleText2:: ; a1a05 (28:5a05)
+_FightingDojoBattleText2::
 	text "I hear you're"
 	line "good! Show me!"
 	done
 
-_FightingDojoEndBattleText2:: ; a1a22 (28:5a22)
+_FightingDojoEndBattleText2::
 	text "Judge!"
 	line "1 point!"
 	prompt
 
-_FightingDojoAfterBattleText2:: ; a1a33 (28:5a33)
+_FightingDojoAfterBattleText2::
 	text "Our Master is a"
 	line "pro fighter!"
 	done
 
-_FightingDojoBattleText3:: ; a1a51 (28:5a51)
+_FightingDojoBattleText3::
 	text "Nothing tough"
 	line "frightens me!"
 
@@ -82,18 +82,18 @@
 	line "for training!"
 	done
 
-_FightingDojoEndBattleText3:: ; a1a8d (28:5a8d)
+_FightingDojoEndBattleText3::
 	text "Yow!"
 	line "Stubbed fingers!"
 	prompt
 
-_FightingDojoAfterBattleText3:: ; a1aa4 (28:5aa4)
+_FightingDojoAfterBattleText3::
 	text "The only thing"
 	line "that frightens us"
 	cont "is psychic power!"
 	done
 
-_FightingDojoBattleText4:: ; a1ad8 (28:5ad8)
+_FightingDojoBattleText4::
 	text "Hoohah!"
 
 	para "You're trespassing"
@@ -101,38 +101,30 @@
 	cont "DOJO!"
 	done
 
-_FightingDojoEndBattleText4:: ; a1b09 (28:5b09)
+_FightingDojoEndBattleText4::
 	text "Oof!"
 	line "I give up!"
 	prompt
 
-_FightingDojoAfterBattleText4:: ; a1b1a (28:5b1a)
+_FightingDojoAfterBattleText4::
 	text "The prime fighters"
 	line "across the land"
 	cont "train here."
 	done
 
-_WantHitmonleeText:: ; a1b4a (28:5b4a)
+_WantHitmonleeText::
 	text "You want the"
-IF DEF(_YELLOW)
-	line "hard-kicking"
-ELSE
 	line "hard kicking"
-ENDC
 	cont "HITMONLEE?"
 	done
 
-_WantHitmonchanText:: ; a1b70 (28:5b70)
+_WantHitmonchanText::
 	text "You want the"
-IF DEF(_YELLOW)
-	line "piston-punching"
-ELSE
 	line "piston punching"
-ENDC
 	cont "HITMONCHAN?"
 	done
 
-_OtherHitmonText:: ; a1b9a (28:5b9a)
+_OtherHitmonText::
 	text "Better not get"
 	line "greedy..."
 	done
--- a/text/maps/fuchsia_city.asm
+++ b/text/maps/fuchsia_city.asm
@@ -1,4 +1,4 @@
-_FuchsiaCityText1:: ; a5e9c (29:5e9c)
+_FuchsiaCityText1::
 	text "Did you try the"
 	line "SAFARI GAME? Some"
 	cont "#MON can only"
@@ -5,7 +5,7 @@
 	cont "be caught there."
 	done
 
-_FuchsiaCityText2:: ; a5ede (29:5ede)
+_FuchsiaCityText2::
 	text "SAFARI ZONE has a"
 	line "zoo in front of"
 	cont "the entrance."
@@ -15,57 +15,53 @@
 	cont "catching #MON."
 	done
 
-_FuchsiaCityText3:: ; a5f3e (29:5f3e)
+_FuchsiaCityText3::
 	text "ERIK: Where's"
 	line "SARA? I said I'd"
 	cont "meet her here."
 	done
 
-_FuchsiaCityText4:: ; a5f6b (29:5f6b)
+_FuchsiaCityText4::
 	text "That item ball in"
 	line "there is really a"
 	cont "#MON."
 	done
 
-_FuchsiaCityText5:: ; a5f96 (29:5f96)
+_FuchsiaCityText5::
 	text "!"
 	done
 
-_FuchsiaCityText11:: ; a5f99 (29:5f99)
+_FuchsiaCityText11::
 	text "FUCHSIA CITY"
 	line "Behold! It's"
 	cont "Passion Pink!"
 	done
 
-_FuchsiaCityText13:: ; a5fc1 (29:5fc1)
+_FuchsiaCityText13::
 	text "SAFARI GAME"
 	line "#MON-U-CATCH!"
 	done
 
-_FuchsiaCityText16:: ; a5fdc (29:5fdc)
+_FuchsiaCityText16::
 	text "SAFARI ZONE"
 	line "WARDEN's HOME"
 	done
 
-_FuchsiaCityText17:: ; a5ff6 (29:5ff6)
+_FuchsiaCityText17::
 	text "#MON PARADISE"
 	line "SAFARI ZONE"
 	done
 
-_FuchsiaCityText18:: ; a6011 (29:6011)
+_FuchsiaCityText18::
 	text "FUCHSIA CITY"
 	line "#MON GYM"
 	cont "LEADER: KOGA"
 
 	para "The Poisonous"
-IF DEF(_YELLOW)
-	line "Ninja Master!"
-ELSE
 	line "Ninja Master"
-ENDC
 	done
 
-_FuchsiaCityChanseyText:: ; a6050 (29:6050)
+_FuchsiaCityChanseyText::
 	text "Name: CHANSEY"
 
 	para "Catching one is"
@@ -72,7 +68,7 @@
 	line "all up to chance."
 	prompt
 
-_FuchsiaCityVoltorbText:: ; a6081 (29:6081)
+_FuchsiaCityVoltorbText::
 	text "Name: VOLTORB"
 
 	para "The very image of"
@@ -79,7 +75,7 @@
 	line "a # BALL."
 	prompt
 
-_FuchsiaCityKangaskhanText:: ; a60ac (29:60ac)
+_FuchsiaCityKangaskhanText::
 	text "Name: KANGASKHAN"
 
 	para "A maternal #MON"
@@ -88,7 +84,7 @@
 	cont "on its belly."
 	prompt
 
-_FuchsiaCitySlowpokeText:: ; a60fd (29:60fd)
+_FuchsiaCitySlowpokeText::
 	text "Name: SLOWPOKE"
 
 	para "Friendly and very"
@@ -95,7 +91,7 @@
 	line "slow moving."
 	prompt
 
-_FuchsiaCityLaprasText:: ; a612c (29:612c)
+_FuchsiaCityLaprasText::
 	text "Name: LAPRAS"
 
 	para "A.K.A. the king"
@@ -102,7 +98,7 @@
 	line "of the seas."
 	prompt
 
-_FuchsiaCityOmanyteText:: ; a6157 (29:6157)
+_FuchsiaCityOmanyteText::
 	text "Name: OMANYTE"
 
 	para "A #MON that"
@@ -110,7 +106,7 @@
 	cont "from a fossil."
 	prompt
 
-_FuchsiaCityKabutoText:: ; a6191 (29:6191)
+_FuchsiaCityKabutoText::
 	text "Name: KABUTO"
 
 	para "A #MON that"
@@ -118,7 +114,7 @@
 	cont "from a fossil."
 	prompt
 
-_FuchsiaCityText_19b2a:: ; a61ca (29:61ca)
+_FuchsiaCityText_19b2a::
 	text "..."
 	done
 
--- a/text/maps/fuchsia_fishing_house.asm
+++ b/text/maps/fuchsia_fishing_house.asm
@@ -1,4 +1,4 @@
-_FuchsiaHouse3Text_561bd:: ; a0695 (28:4695)
+_FuchsiaHouse3Text_561bd::
 	text "I'm the FISHING"
 	line "GURU's older"
 	cont "brother!"
@@ -10,7 +10,7 @@
 	line "fish?"
 	done
 
-_FuchsiaHouse3Text_561c2:: ; a06e8 (28:46e8)
+_FuchsiaHouse3Text_561c2::
 	text "Grand! I like"
 	line "your style!"
 
@@ -22,12 +22,12 @@
 	TX_RAM wcf4b
 	text "!@@"
 
-_FuchsiaHouse3Text_56212:: ; a0737 (28:4737)
+_FuchsiaHouse3Text_56212::
 	text "Oh... That's so"
 	line "disappointing..."
 	done
 
-_FuchsiaHouse3Text_56217:: ; a0758 (28:4758)
+_FuchsiaHouse3Text_56217::
 	text "Hello there,"
 	line $52, "!"
 
@@ -35,7 +35,7 @@
 	line "biting?"
 	done
 
-_FuchsiaHouse3Text_5621c:: ; a0782 (28:4782)
+_FuchsiaHouse3Text_5621c::
 	text "Oh no!"
 
 	para "You have no room"
--- a/text/maps/fuchsia_gym_1.asm
+++ b/text/maps/fuchsia_gym_1.asm
@@ -1,4 +1,4 @@
-_KogaBeforeBattleText:: ; 9e9b1 (27:69b1)
+_KogaBeforeBattleText::
 	text "KOGA: Fwahahaha!"
 
 	para "A mere child like"
@@ -16,7 +16,7 @@
 	cont "techniques!"
 	done
 
-_KogaAfterBattleText:: ; 9ea66 (27:6a66)
+_KogaAfterBattleText::
 	text "Humph!"
 	line "You have proven"
 	cont "your worth!"
--- a/text/maps/fuchsia_gym_2.asm
+++ b/text/maps/fuchsia_gym_2.asm
@@ -1,4 +1,4 @@
-_KogaExplainToxicText:: ; a0000 (28:4000)
+_KogaExplainToxicText::
 	text "When afflicted by"
 	line "TOXIC, #MON"
 	cont "suffer more and"
@@ -9,7 +9,7 @@
 	line "terrorize foes!"
 	done
 
-_FuchsiaGymText9:: ; a0069 (28:4069)
+_FuchsiaGymText9::
 	text "Now that you have"
 	line "the SOULBADGE,"
 	cont "the DEFENSE of"
@@ -24,13 +24,13 @@
 	line "too!"
 	done
 
-_ReceivedTM06Text:: ; a00eb (28:40eb)
+_ReceivedTM06Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM06ExplanationText:: ; a00ff (28:40ff)
+_TM06ExplanationText::
 	db $0
 	para "TM06 contains"
 	line "TOXIC!"
@@ -40,12 +40,12 @@
 	cont "400 years old!"
 	done
 
-_TM06NoRoomText:: ; a0143 (28:4143)
+_TM06NoRoomText::
 	text "Make space for"
 	line "this, child!"
 	done
 
-_FuchsiaGymBattleText1:: ; a0160 (28:4160)
+_FuchsiaGymBattleText1::
 	text "Strength isn't"
 	line "the key for"
 	cont "#MON!"
@@ -57,29 +57,29 @@
 	cont "brute strength!"
 	done
 
-_FuchsiaGymEndBattleText1:: ; a01c2 (28:41c2)
+_FuchsiaGymEndBattleText1::
 	text "What?"
 	line "Extraordinary!"
 	prompt
 
-_FuchsiaGymAfterBattleText1:: ; a01d8 (28:41d8)
+_FuchsiaGymAfterBattleText1::
 	text "So, you mix brawn"
 	line "with brains?"
 	cont "Good strategy!"
 	done
 
-_FuchsiaGymBattleText2:: ; a0207 (28:4207)
+_FuchsiaGymBattleText2::
 	text "I wanted to become"
 	line "a ninja, so I"
 	cont "joined this GYM!"
 	done
 
-_FuchsiaGymEndBattleText2:: ; a023a (28:423a)
+_FuchsiaGymEndBattleText2::
 	text "I'm done"
 	line "for!"
 	prompt
 
-_FuchsiaGymAfterBattleText2:: ; a0248 (28:4248)
+_FuchsiaGymAfterBattleText2::
 	text "I will keep on"
 	line "training under"
 	cont "KOGA, my ninja"
@@ -86,18 +86,18 @@
 	cont "master!"
 	done
 
-_FuchsiaGymBattleText3:: ; a027e (28:427e)
+_FuchsiaGymBattleText3::
 	text "Let's see you"
 	line "beat my special"
 	cont "techniques!"
 	done
 
-_FuchsiaGymEndBattleText3:: ; a02a8 (28:42a8)
+_FuchsiaGymEndBattleText3::
 	text "You"
 	line "had me fooled!"
 	prompt
 
-_FuchsiaGymAfterBattleText3:: ; a02bc (28:42bc)
+_FuchsiaGymAfterBattleText3::
 	text "I like poison and"
 	line "sleep techniques,"
 	cont "as they linger"
@@ -104,7 +104,7 @@
 	cont "after battle!"
 	done
 
-_FuchsiaGymBattleText4:: ; a02fe (28:42fe)
+_FuchsiaGymBattleText4::
 	text "Stop right there!"
 
 	para "Our invisible"
@@ -112,12 +112,12 @@
 	cont "frustrated?"
 	done
 
-_FuchsiaGymEndBattleText4:: ; a033a (28:433a)
+_FuchsiaGymEndBattleText4::
 	text "Whoa!"
 	line "He's got it!"
 	prompt
 
-_FuchsiaGymAfterBattleText4:: ; a034d (28:434d)
+_FuchsiaGymAfterBattleText4::
 	text "You impressed me!"
 	line "Here's a hint!"
 
@@ -126,7 +126,7 @@
 	cont "invisible walls!"
 	done
 
-_FuchsiaGymBattleText5:: ; a03a1 (28:43a1)
+_FuchsiaGymBattleText5::
 	text "I also study the"
 	line "way of the ninja"
 	cont "with master KOGA!"
@@ -136,16 +136,16 @@
 	cont "animals!"
 	done
 
-_FuchsiaGymEndBattleText5:: ; a0402 (28:4402)
+_FuchsiaGymEndBattleText5::
 	text "Awoo!"
 	prompt
 
-_FuchsiaGymAfterBattleText5:: ; a0409 (28:4409)
+_FuchsiaGymAfterBattleText5::
 	text "I still have much"
 	line "to learn!"
 	done
 
-_FuchsiaGymBattleText6:: ; a0426 (28:4426)
+_FuchsiaGymBattleText6::
 	text "Master KOGA comes"
 	line "from a long line"
 	cont "of ninjas!"
@@ -154,12 +154,12 @@
 	line "descend from?"
 	done
 
-_FuchsiaGymEndBattleText6:: ; a0470 (28:4470)
+_FuchsiaGymEndBattleText6::
 	text "Dropped"
 	line "my balls!"
 	prompt
 
-_FuchsiaGymAfterBattleText6:: ; a0483 (28:4483)
+_FuchsiaGymAfterBattleText6::
 	text "Where there is"
 	line "light, there is"
 	cont "shadow!"
@@ -169,7 +169,7 @@
 	cont "choose?"
 	done
 
-_FuchsiaGymText_7564e:: ; a04d2 (28:44d2)
+_FuchsiaGymText_7564e::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -186,7 +186,7 @@
 	cont "to reach him!"
 	done
 
-_FuchsiaGymText_75653:: ; a0574 (28:4574)
+_FuchsiaGymText_75653::
 	text "It's amazing how"
 	line "ninja can terrify"
 	cont "even now!"
--- a/text/maps/fuchsia_house.asm
+++ b/text/maps/fuchsia_house.asm
@@ -1,4 +1,4 @@
-_FuchsiaHouse1Text1:: ; 9e2a3 (27:62a3)
+_FuchsiaHouse1Text1::
 	text "SAFARI ZONE's"
 	line "WARDEN is old,"
 	cont "but still active!"
@@ -7,7 +7,7 @@
 	line "false, though."
 	done
 
-_FuchsiaHouse1Text2:: ; 9e2f3 (27:62f3)
+_FuchsiaHouse1Text2::
 	text "Hmm? You've met"
 	line "BILL?"
 
@@ -18,7 +18,7 @@
 	cont "even as a child!"
 	done
 
-_FuchsiaHouse1Text3:: ; 9e34d (27:634d)
+_FuchsiaHouse1Text3::
 	text "BILL files his"
 	line "own #MON data"
 	cont "on his PC!"
--- a/text/maps/fuchsia_mart.asm
+++ b/text/maps/fuchsia_mart.asm
@@ -1,4 +1,4 @@
-_FuchsiaMartText2:: ; 9e22e (27:622e)
+_FuchsiaMartText2::
 	text "Do you have a"
 	line "SAFARI ZONE flag?"
 
@@ -6,7 +6,7 @@
 	line "or calendars?"
 	done
 
-_FuchsiaMartText3:: ; 9e26e (27:626e)
+_FuchsiaMartText3::
 	text "Did you try X"
 	line "SPEED? It speeds"
 	cont "up a #MON in"
--- a/text/maps/fuchsia_meeting_room.asm
+++ b/text/maps/fuchsia_meeting_room.asm
@@ -1,4 +1,4 @@
-_FuchsiaMeetingRoomText1:: ; a05a1 (28:45a1)
+_FuchsiaMeetingRoomText1::
 	text "We nicknamed the"
 	line "WARDEN SLOWPOKE."
 
@@ -6,7 +6,7 @@
 	line "both look vacant!"
 	done
 
-_FuchsiaMeetingRoomText2:: ; a05e6 (28:45e6)
+_FuchsiaMeetingRoomText2::
 	text "SLOWPOKE is very"
 	line "knowledgeable"
 	cont "about #MON!"
@@ -16,7 +16,7 @@
 	cont "extinct #MON!"
 	done
 
-_FuchsiaMeetingRoomText3:: ; a0642 (28:4642)
+_FuchsiaMeetingRoomText3::
 	text "SLOWPOKE came in,"
 	line "but I couldn't"
 	cont "understand him."
--- a/text/maps/fuchsia_pokecenter.asm
+++ b/text/maps/fuchsia_pokecenter.asm
@@ -1,4 +1,4 @@
-_FuchsiaPokecenterText1:: ; 9e387 (27:6387)
+_FuchsiaPokecenterText1::
 	text "You can't win"
 	line "with just one"
 	cont "strong #MON."
@@ -8,7 +8,7 @@
 	cont "them evenly."
 	done
 
-_FuchsiaPokecenterText3:: ; 9e3de (27:63de)
+_FuchsiaPokecenterText3::
 	text "There's a narrow"
 	line "trail west of"
 	cont "VIRIDIAN CITY."
--- a/text/maps/fujis_house.asm
+++ b/text/maps/fujis_house.asm
@@ -1,16 +1,16 @@
-_LavenderHouse1Text_1d8d1:: ; 99e8d (26:5e8d)
+_LavenderHouse1Text_1d8d1::
 	text "That's odd, MR.FUJI"
 	line "isn't here."
 	cont "Where'd he go?"
 	done
 
-_LavenderHouse1Text_1d8d6:: ; 99eba (26:5eba)
+_LavenderHouse1Text_1d8d6::
 	text "MR.FUJI had been"
 	line "praying alone for"
 	cont "CUBONE's mother."
 	done
 
-_LavenderHouse1Text_1d8f4:: ; 99eee (26:5eee)
+_LavenderHouse1Text_1d8f4::
 	text "This is really"
 	line "MR.FUJI's house."
 
@@ -21,19 +21,19 @@
 	cont "orphaned #MON!"
 	done
 
-_LavenderHouse1Text_1d8f9:: ; 99f4b (26:5f4b)
+_LavenderHouse1Text_1d8f9::
 	text "It's so warm!"
 	line "#MON are so"
 	cont "nice to hug!"
 	done
 
-_LavenderHouse1Text3:: ; 99f72 (26:5f72)
+_LavenderHouse1Text3::
 	text "PSYDUCK: Gwappa!@@"
 
-_LavenderHouse1Text4:: ; 99f85 (26:5f85)
+_LavenderHouse1Text4::
 	text "NIDORINO: Gaoo!@@"
 
-_LavenderHouse1Text_1d94c:: ; 99f97 (26:5f97)
+_LavenderHouse1Text_1d94c::
 	text "MR.FUJI: ", $52, "."
 
 	para "Your #DEX quest"
@@ -45,13 +45,13 @@
 	line "help your quest."
 	prompt
 
-_ReceivedFluteText:: ; 99ffb (26:5ffb)
+_ReceivedFluteText::
 	text $52, " received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
 
-_FluteExplanationText:: ; 9a011 (26:6011)
+_FluteExplanationText::
 	db $0
 	para "Upon hearing #"
 	line "FLUTE, sleeping"
@@ -62,17 +62,17 @@
 	line "sleeping #MON."
 	done
 
-_FluteNoRoomText:: ; 9a069 (26:6069)
+_FluteNoRoomText::
 	text "You must make"
 	line "room for this!"
 	done
 
-_MrFujiAfterFluteText:: ; 9a087 (26:6087)
+_MrFujiAfterFluteText::
 	text "MR.FUJI: Has my"
 	line "FLUTE helped you?"
 	done
 
-_LavenderHouse1Text6:: ; 9a0aa (26:60aa)
+_LavenderHouse1Text6::
 	text "#MON Monthly"
 	line "Grand Prize"
 	cont "Drawing!"
--- a/text/maps/hall_of_fame.asm
+++ b/text/maps/hall_of_fame.asm
@@ -1,10 +1,6 @@
-_HallofFameRoomText1:: ; 85fb5 (21:5fb5)
+_HallofFameRoomText1::
 	text "OAK: Er-hem!"
-IF DEF(_YELLOW)
-	line "Congratulations,"
-ELSE
 	line "Congratulations"
-ENDC
 	cont $52, "!"
 
 	para "This floor is the"
--- a/text/maps/indigo_plateau_lobby.asm
+++ b/text/maps/indigo_plateau_lobby.asm
@@ -1,4 +1,4 @@
-_IndigoPlateauLobbyText1:: ; a13f0 (28:53f0)
+_IndigoPlateauLobbyText1::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -13,7 +13,7 @@
 	cont "is it! Go for it!"
 	done
 
-_IndigoPlateauLobbyText3:: ; a148b (28:548b)
+_IndigoPlateauLobbyText3::
 	text "From here on, you"
 	line "face the ELITE"
 	cont "FOUR one by one!"
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -1,10 +1,6 @@
-_LanceBeforeBattleText:: ; 85d3c (21:5d3c)
+_LanceBeforeBattleText::
 	text "Ah! I heard about"
-IF DEF(_YELLOW)
-	line "you, ", $52, "!"
-ELSE
 	line "you ", $52, "!"
-ENDC
 
 	para "I lead the ELITE"
 	line "FOUR! You can"
@@ -31,7 +27,7 @@
 	cont "with me, ", $52, "!"
 	done
 
-_LanceEndBattleText:: ; 85e64 (21:5e64)
+_LanceEndBattleText::
 	text "That's it!"
 
 	para "I hate to admit"
@@ -39,7 +35,7 @@
 	cont "#MON master!"
 	prompt
 
-_LanceAfterBattleText:: ; 85e9e (21:5e9e)
+_LanceAfterBattleText::
 	text "I still can't"
 	line "believe my"
 	cont "dragons lost to"
--- a/text/maps/lavender_house.asm
+++ b/text/maps/lavender_house.asm
@@ -1,7 +1,7 @@
-_LavenderHouse2Text1:: ; 9a238 (26:6238)
+_LavenderHouse2Text1::
 	text "CUBONE: Kyarugoo!@@"
 
-_LavenderHouse2Text_1d9dc:: ; 9a24c (26:624c)
+_LavenderHouse2Text_1d9dc::
 	text "I hate those"
 	line "horrible ROCKETs!"
 
@@ -13,7 +13,7 @@
 	cont "from TEAM ROCKET!"
 	done
 
-_LavenderHouse2Text_1d9e1:: ; 9a2b9 (26:62b9)
+_LavenderHouse2Text_1d9e1::
 	text "The GHOST of"
 	line "#MON TOWER is"
 	cont "gone!"
--- a/text/maps/lavender_mart.asm
+++ b/text/maps/lavender_mart.asm
@@ -1,4 +1,4 @@
-_LavenderMartText2:: ; 9a104 (26:6104)
+_LavenderMartText2::
 	text "I'm searching for"
 	line "items that raise"
 	cont "the abilities of"
@@ -14,13 +14,13 @@
 	line "I can get them?"
 	done
 
-_LavenderMart_5c953:: ; 9a1b4 (26:61b4)
+_LavenderMart_5c953::
 	text "You know REVIVE?"
 	line "It revives any"
 	cont "fainted #MON!"
 	done
 
-_LavenderMart_5c958:: ; 9a1e3 (26:61e3)
+_LavenderMart_5c958::
 	text "I found a NUGGET"
 	line "in the mountains."
 
--- a/text/maps/lavender_pokecenter.asm
+++ b/text/maps/lavender_pokecenter.asm
@@ -1,12 +1,12 @@
-_LavenderPokecenterText4:: ; 9940e (26:540e)
-_LavenderPokecenterText2:: ; 9940e (26:540e)
-_LavenderPokecenterText1:: ; 9940e (26:540e)
+_LavenderPokecenterText4::
+_LavenderPokecenterText2::
+_LavenderPokecenterText1::
 	text "TEAM ROCKET will"
 	line "do anything for"
 	cont "the sake of gold!"
 	done
 
-_LavenderPokecenterText3:: ; 99442 (26:5442)
+_LavenderPokecenterText3::
 	text "I saw CUBONE's"
 	line "mother die trying"
 	cont "to escape from"
--- a/text/maps/lavender_town.asm
+++ b/text/maps/lavender_town.asm
@@ -1,14 +1,14 @@
-_LavenderTownText_4413c:: ; a5482 (29:5482)
+_LavenderTownText_4413c::
 	text "Do you believe in"
 	line "GHOSTs?"
 	done
 
-_LavenderTownText_44141:: ; a549d (29:549d)
+_LavenderTownText_44141::
 	text "Really? So there"
 	line "are believers..."
 	done
 
-_LavenderTownText_44146:: ; a54c0 (29:54c0)
+_LavenderTownText_44146::
 	text "Hahaha, I guess"
 	line "not."
 
@@ -17,7 +17,7 @@
 	cont "it's not real."
 	done
 
-_LavenderTownText2:: ; a5506 (29:5506)
+_LavenderTownText2::
 	text "This town is known"
 	line "as the grave site"
 	cont "of #MON."
@@ -27,7 +27,7 @@
 	cont "#MON TOWER."
 	done
 
-_LavenderTownText3:: ; a555f (29:555f)
+_LavenderTownText3::
 	text "GHOSTs appeared"
 	line "in #MON TOWER."
 
@@ -37,13 +37,13 @@
 	cont "ROCKETs killed."
 	done
 
-_LavenderTownText4:: ; a55bb (29:55bb)
+_LavenderTownText4::
 	text "LAVENDER TOWN"
 	line "The Noble Purple"
 	cont "Town"
 	done
 
-_LavenderTownText5:: ; a55e0 (29:55e0)
+_LavenderTownText5::
 	text "New SILPH SCOPE!"
 
 	para "Make the Invisible"
@@ -52,12 +52,12 @@
 	para "SILPH CO."
 	done
 
-_LavenderTownText8:: ; a561d (29:561d)
+_LavenderTownText8::
 	text "LAVENDER VOLUNTEER"
 	line "#MON HOUSE"
 	done
 
-_LavenderTownText9:: ; a563c (29:563c)
+_LavenderTownText9::
 	text "May the Souls of"
 	line "#MON Rest Easy"
 	cont "#MON TOWER"
--- a/text/maps/lorelei.asm
+++ b/text/maps/lorelei.asm
@@ -1,4 +1,4 @@
-_LoreleiBeforeBattleText:: ; 865ef (21:65ef)
+_LoreleiBeforeBattleText::
 	text "Welcome to"
 	line "#MON LEAGUE!"
 
@@ -21,12 +21,12 @@
 	line "Are you ready?"
 	done
 
-_LoreleiEndBattleText:: ; 866c4 (21:66c4)
+_LoreleiEndBattleText::
 	text "How"
 	line "dare you!"
 	prompt
 
-_LoreleiAfterBattleText:: ; 866d3 (21:66d3)
+_LoreleiAfterBattleText::
 	text "You're better"
 	line "than I thought!"
 	cont "Go on ahead!"
@@ -36,7 +36,7 @@
 	cont "LEAGUE power!"
 	done
 
-_LoreleiDontRunAwayText:: ; 86729 (21:6729)
+_LoreleiDontRunAwayText::
 	text "Someone's voice:"
 	line "Don't run away!"
 	done
--- a/text/maps/mansion_1f.asm
+++ b/text/maps/mansion_1f.asm
@@ -1,30 +1,30 @@
-_Mansion1BattleText2:: ; a07a8 (28:47a8)
+_Mansion1BattleText2::
 	text "Who are you? There"
 	line "shouldn't be"
 	cont "anyone here."
 	done
 
-_Mansion1EndBattleText2:: ; a07d5 (28:47d5)
+_Mansion1EndBattleText2::
 	text "Ouch!"
 	prompt
 
-_Mansion1AfterBattleText2:: ; a07dc (28:47dc)
+_Mansion1AfterBattleText2::
 	text "A key? I don't"
 	line "know what you're"
 	cont "talking about."
 	done
 
-_MansionSwitchText:: ; a080a (28:480a)
+_MansionSwitchText::
 	text "A secret switch!"
 
 	para "Press it?"
 	done
 
-_MansionSwitchPressedText:: ; a0826 (28:4826)
+_MansionSwitchPressedText::
 	text "Who wouldn't?"
 	prompt
 
-_MansionSwitchNotPressedText:: ; a0834 (28:4834)
+_MansionSwitchNotPressedText::
 	text "Not quite yet!"
 	done
 
--- a/text/maps/mansion_2f.asm
+++ b/text/maps/mansion_2f.asm
@@ -1,21 +1,21 @@
-_Mansion2BattleText1:: ; 852b7 (21:52b7)
+_Mansion2BattleText1::
 	text "I can't get out!"
 	line "This old place is"
 	cont "one big puzzle!"
 	done
 
-_Mansion2EndBattleText1:: ; 852ea (21:52ea)
+_Mansion2EndBattleText1::
 	text "Oh no!"
 	line "My bag of loot!"
 	prompt
 
-_Mansion2AfterBattleText1:: ; 85302 (21:5302)
+_Mansion2AfterBattleText1::
 	text "Switches open and"
 	line "close alternating"
 	cont "sets of doors!"
 	done
 
-_Mansion2Text3:: ; 85336 (21:5336)
+_Mansion2Text3::
 	text "Diary: July 5"
 	line "Guyana,"
 	cont "South America"
@@ -25,7 +25,7 @@
 	cont "in the jungle."
 	done
 
-_Mansion2Text4:: ; 85389 (21:5389)
+_Mansion2Text4::
 	text "Diary: July 10"
 	line "We christened the"
 	cont "newly discovered"
@@ -32,17 +32,17 @@
 	cont "#MON, MEW."
 	done
 
-_Mansion2Text_520c2:: ; 853c7 (21:53c7)
+_Mansion2Text_520c2::
 	text "A secret switch!"
 
 	para "Press it?"
 	done
 
-_Mansion2Text_520c7:: ; 853e3 (21:53e3)
+_Mansion2Text_520c7::
 	text "Who wouldn't?"
 	prompt
 
-_Mansion2Text_520cc:: ; 853f1 (21:53f1)
+_Mansion2Text_520cc::
 	text "Not quite yet!"
 	done
 
--- a/text/maps/mansion_3f.asm
+++ b/text/maps/mansion_3f.asm
@@ -1,34 +1,34 @@
-_Mansion3BattleText1:: ; 85401 (21:5401)
+_Mansion3BattleText1::
 	text "This place is"
 	line "like, huge!"
 	done
 
-_Mansion3EndBattleText1:: ; 8541c (21:541c)
+_Mansion3EndBattleText1::
 	text "Ayah!"
 	prompt
 
-_Mansion3AfterBattleText1:: ; 85423 (21:5423)
+_Mansion3AfterBattleText1::
 	text "I wonder where"
 	line "my partner went."
 	done
 
-_Mansion3BattleText2:: ; 85444 (21:5444)
+_Mansion3BattleText2::
 	text "My mentor once"
 	line "lived here."
 	done
 
-_Mansion3EndBattleText2:: ; 85460 (21:5460)
+_Mansion3EndBattleText2::
 	text "Whew!"
 	line "Overwhelming!"
 	prompt
 
-_Mansion3AfterBattleText2:: ; 85475 (21:5475)
+_Mansion3AfterBattleText2::
 	text "So, you're stuck?"
 	line "Try jumping off"
 	cont "over there!"
 	done
 
-_Mansion3Text5:: ; 854a3 (21:54a3)
+_Mansion3Text5::
 	text "Diary: Feb. 6"
 	line "MEW gave birth."
 
--- a/text/maps/mansion_b1f.asm
+++ b/text/maps/mansion_b1f.asm
@@ -1,34 +1,34 @@
-_Mansion4BattleText1:: ; 854df (21:54df)
+_Mansion4BattleText1::
 	text "Uh-oh. Where am"
 	line "I now?"
 	done
 
-_Mansion4EndBattleText1:: ; 854f7 (21:54f7)
+_Mansion4EndBattleText1::
 	text "Awooh!"
 	prompt
 
-_Mansion4AfterBattleText1:: ; 854ff (21:54ff)
+_Mansion4AfterBattleText1::
 	text "You can find stuff"
 	line "lying around."
 	done
 
-_Mansion4BattleText2:: ; 85521 (21:5521)
+_Mansion4BattleText2::
 	text "This place is"
 	line "ideal for a lab."
 	done
 
-_Mansion4EndBattleText2:: ; 85541 (21:5541)
+_Mansion4EndBattleText2::
 	text "What"
 	line "was that for?"
 	prompt
 
-_Mansion4AfterBattleText2:: ; 85555 (21:5555)
+_Mansion4AfterBattleText2::
 	text "I like it here!"
 	line "It's conducive to"
 	cont "my studies!"
 	done
 
-_Mansion4Text7:: ; 85583 (21:5583)
+_Mansion4Text7::
 	text "Diary; Sept. 1"
 	line "MEWTWO is far too"
 	cont "powerful."
--- a/text/maps/mr_psychics_house.asm
+++ b/text/maps/mr_psychics_house.asm
@@ -1,4 +1,4 @@
-_TM29PreReceiveText:: ; a24fe (28:64fe)
+_TM29PreReceiveText::
 	text "...Wait! Don't"
 	line "say a word!"
 
@@ -5,13 +5,13 @@
 	para "You wanted this!"
 	prompt
 
-_ReceivedTM29Text:: ; a252a (28:652a)
+_ReceivedTM29Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM29ExplanationText:: ; a253e (28:653e)
+_TM29ExplanationText::
 	text "TM29 is PSYCHIC!"
 
 	para "It can lower the"
@@ -19,7 +19,7 @@
 	cont "abilities."
 	done
 
-_TM29NoRoomText:: ; a257c (28:657c)
+_TM29NoRoomText::
 	text "Where do you plan"
 	line "to put this?"
 	done
--- a/text/maps/mt_moon_1f.asm
+++ b/text/maps/mt_moon_1f.asm
@@ -1,112 +1,112 @@
-_MtMoon1BattleText2:: ; 80692 (20:4692)
+_MtMoon1BattleText2::
 	text "WHOA! You shocked"
 	line "me! Oh, you're"
 	cont "just a kid!"
 	done
 
-_MtMoon1EndBattleText2:: ; 806bf (20:46bf)
+_MtMoon1EndBattleText2::
 	text "Wow!"
 	line "Shocked again!"
 	prompt
 
-_MtMoon1AfterBattleText2:: ; 806d4 (20:46d4)
+_MtMoon1AfterBattleText2::
 	text "Kids like you"
 	line "shouldn't be"
 	cont "here!"
 	done
 
-_MtMoon1BattleText3:: ; 806f5 (20:46f5)
+_MtMoon1BattleText3::
 	text "Did you come to"
 	line "explore too?"
 	done
 
-_MtMoon1EndBattleText3:: ; 80713 (20:4713)
+_MtMoon1EndBattleText3::
 	text "Losing"
 	line "stinks!"
 	prompt
 
-_MtMoon1AfterBattleText3:: ; 80723 (20:4723)
+_MtMoon1AfterBattleText3::
 	text "I came down here"
 	line "to show off to"
 	cont "girls."
 	done
 
-_MtMoon1BattleText4:: ; 8074b (20:474b)
+_MtMoon1BattleText4::
 	text "Wow! It's way"
 	line "bigger in here"
 	cont "than I thought!"
 	done
 
-_MtMoon1EndBattleText4:: ; 80778 (20:4778)
+_MtMoon1EndBattleText4::
 	text "Oh!"
 	line "I lost it!"
 	prompt
 
-_MtMoon1AfterBattleText4:: ; 80788 (20:4788)
+_MtMoon1AfterBattleText4::
 	text "How do you get"
 	line "out of here?"
 	done
 
-_MtMoon1BattleText5:: ; 807a5 (20:47a5)
+_MtMoon1BattleText5::
 	text "What! Don't sneak"
 	line "up on me!"
 	done
 
-_MtMoon1EndBattleText5:: ; 807c1 (20:47c1)
+_MtMoon1EndBattleText5::
 	text "My"
 	line "#MON won't do!"
 	prompt
 
-_MtMoon1AfterBattleText5:: ; 807d3 (20:47d3)
+_MtMoon1AfterBattleText5::
 	text "I have to find"
 	line "stronger #MON."
 	done
 
-_MtMoon1BattleText6:: ; 807f2 (20:47f2)
+_MtMoon1BattleText6::
 	text "What? I'm waiting"
 	line "for my friends to"
 	cont "find me here."
 	done
 
-_MtMoon1EndBattleText6:: ; 80824 (20:4824)
+_MtMoon1EndBattleText6::
 	text "I lost?"
 	prompt
 
-_MtMoon1AfterBattleText6:: ; 8082d (20:482d)
+_MtMoon1AfterBattleText6::
 	text "I heard there are"
 	line "some very rare"
 	cont "fossils here."
 	done
 
-_MtMoon1BattleText7:: ; 8085d (20:485d)
+_MtMoon1BattleText7::
 	text "Suspicious men"
 	line "are in the cave."
 	cont "What about you?"
 	done
 
-_MtMoon1EndBattleText7:: ; 8088e (20:488e)
+_MtMoon1EndBattleText7::
 	text "You"
 	line "got me!"
 	prompt
 
-_MtMoon1AfterBattleText7:: ; 8089b (20:489b)
+_MtMoon1AfterBattleText7::
 	text "I saw them! I'm"
 	line "sure they're from"
 	cont "TEAM ROCKET!"
 	done
 
-_MtMoon1BattleText8:: ; 808c9 (20:48c9)
+_MtMoon1BattleText8::
 	text "Go through this"
 	line "cave to get to"
 	cont "CERULEAN CITY!"
 	done
 
-_MtMoon1EndBattleText8:: ; 808f8 (20:48f8)
+_MtMoon1EndBattleText8::
 	text "I"
 	line "lost."
 	prompt
 
-_MtMoon1AfterBattleText8:: ; 80901 (20:4901)
+_MtMoon1AfterBattleText8::
 	text "ZUBAT is tough!"
 	line "But, it can be"
 	cont "useful if you"
@@ -113,11 +113,7 @@
 	cont "catch one."
 	done
 
-_MtMoon1Text14:: ; 8093a (20:493a)
+_MtMoon1Text14::
 	text "Beware! ZUBAT is"
-IF DEF(_YELLOW)
-	line "a bloodsucker!"
-ELSE
 	line "a blood sucker!"
-ENDC
 	done
--- a/text/maps/mt_moon_b1f.asm
+++ b/text/maps/mt_moon_b1f.asm
@@ -1,4 +1,4 @@
-_MtMoonText1:: ; 8095c (20:495c)
+_MtMoonText1::
 	db $0
 	done
 
--- a/text/maps/mt_moon_b2f.asm
+++ b/text/maps/mt_moon_b2f.asm
@@ -1,47 +1,24 @@
-IF DEF(_YELLOW)
-_MtMoonJessieJamesText1::
-	text "Stop right there!@@"
-
-_MtMoonJessieJamesText2::
-	text "That fossil is"
-	line "TEAM ROCKET's!"
-
-	para "Surrender now, or"
-	line "prepare to fight!"
-	done
-
-_MtMoonJessieJamesText3::
-	text "A"
-	line "brat beat us?"
-	prompt
-
-_MtMoonJessieJamesText4::
-	text "TEAM ROCKET, blast"
-	line "off at the speed"
-	cont "of light!@@"
-ENDC
-
-_MtMoon3Text_49f24:: ; 8095e (20:495e)
+_MtMoon3Text_49f24::
 	text "You want the"
 	line "DOME FOSSIL?"
 	done
 
-_MtMoon3Text_49f64:: ; 80979 (20:4979)
+_MtMoon3Text_49f64::
 	text "You want the"
 	line "HELIX FOSSIL?"
 	done
 
-_MtMoon3Text_49f6f:: ; 80995 (20:4995)
+_MtMoon3Text_49f6f::
 	text $52, " got the"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_MtMoon3Text_49f7f:: ; 809a8 (20:49a8)
+_MtMoon3Text_49f7f::
 	text "Look, you've got"
 	line "no room for this.@@"
 
-_MtMoon3Text_49f85:: ; 809cc (20:49cc)
+_MtMoon3Text_49f85::
 	text "Hey, stop!"
 
 	para "I found these"
@@ -49,18 +26,18 @@
 	cont "both mine!"
 	done
 
-_MtMoon3Text_49f8a:: ; 80a01 (20:4a01)
+_MtMoon3Text_49f8a::
 	text "OK!"
 	line "I'll share!"
 	prompt
 
-_MtMoon3Text_49f8f:: ; 80a11 (20:4a11)
+_MtMoon3Text_49f8f::
 	text "We'll each take"
 	line "one!"
 	cont "No being greedy!"
 	done
 
-_MtMoon3Text_49f94:: ; 80a37 (20:4a37)
+_MtMoon3Text_49f94::
 	text "Far away, on"
 	line "CINNABAR ISLAND,"
 	cont "there's a #MON"
@@ -71,11 +48,11 @@
 	cont "fossils."
 	done
 
-_MtMoon3Text_49f99:: ; 80a93 (20:4a93)
+_MtMoon3Text_49f99::
 	text "All right. Then"
 	line "this is mine!@@"
 
-_MtMoon3BattleText2:: ; 80ab3 (20:4ab3)
+_MtMoon3BattleText2::
 	text "TEAM ROCKET will"
 	line "find the fossils,"
 	cont "revive and sell"
@@ -82,63 +59,63 @@
 	cont "them for cash!"
 	done
 
-_MtMoon3EndBattleText2:: ; 80af6 (20:4af6)
+_MtMoon3EndBattleText2::
 	text "Urgh!"
 	line "Now I'm mad!"
 	prompt
 
-_MtMoon3AfterBattleText2:: ; 80b09 (20:4b09)
+_MtMoon3AfterBattleText2::
 	text "You made me mad!"
 	line "TEAM ROCKET will"
 	cont "blacklist you!"
 	done
 
-_MtMoon3BattleText3:: ; 80b3b (20:4b3b)
+_MtMoon3BattleText3::
 	text "We, TEAM ROCKET,"
 	line "are #MON"
 	cont "gangsters!"
 	done
 
-_MtMoon3EndBattleText3:: ; 80b61 (20:4b61)
+_MtMoon3EndBattleText3::
 	text "I blew"
 	line "it!"
 	prompt
 
-_MtMoon3AfterBattleText3:: ; 80b6d (20:4b6d)
+_MtMoon3AfterBattleText3::
 	text "Darn it all! My"
 	line "associates won't"
 	cont "stand for this!"
 	done
 
-_MtMoon3BattleText4:: ; 80b9e (20:4b9e)
+_MtMoon3BattleText4::
 	text "We're pulling a"
 	line "big job here!"
 	cont "Get lost, kid!"
 	done
 
-_MtMoon3EndBattleText4:: ; 80bcb (20:4bcb)
+_MtMoon3EndBattleText4::
 	text "So, you"
 	line "are good."
 	prompt
 
-_MtMoon3AfterBattleText4:: ; 80bde (20:4bde)
+_MtMoon3AfterBattleText4::
 	text "If you find a"
 	line "fossil, give it"
 	cont "to me and scram!"
 	done
 
-_MtMoon3BattleText5:: ; 80c0e (20:4c0e)
+_MtMoon3BattleText5::
 	text "Little kids"
 	line "should leave"
 	cont "grown-ups alone!"
 	done
 
-_MtMoon3EndBattleText5:: ; 80c39 (20:4c39)
+_MtMoon3EndBattleText5::
 	text "I'm"
 	line "steamed!"
 	prompt
 
-_MtMoon3AfterBattleText5:: ; 80c46 (20:4c46)
+_MtMoon3AfterBattleText5::
 	text "#MON lived"
 	line "here long before"
 	cont "people came."
--- a/text/maps/mt_moon_pokecenter.asm
+++ b/text/maps/mt_moon_pokecenter.asm
@@ -1,4 +1,4 @@
-_MtMoonPokecenterText1:: ; 8a8eb (22:68eb)
+_MtMoonPokecenterText1::
 	text "I've 6 # BALLs"
 	line "set in my belt."
 
@@ -6,7 +6,7 @@
 	line "carry 6 #MON."
 	done
 
-_MtMoonPokecenterText3:: ; 8a929 (22:6929)
+_MtMoonPokecenterText3::
 	text "TEAM ROCKET"
 	line "attacks CERULEAN"
 	cont "citizens..."
@@ -16,7 +16,7 @@
 	cont "news!"
 	done
 
-_MtMoonPokecenterText_4935c:: ; 8a976 (22:6976)
+_MtMoonPokecenterText_4935c::
 	text "MAN: Hello, there!"
 	line "Have I got a deal"
 	cont "just for you!"
@@ -27,23 +27,23 @@
 	cont "What do you say?"
 	done
 
-_MtMoonPokecenterText_49361:: ; 8a9ec (22:69ec)
+_MtMoonPokecenterText_49361::
 	text "No? I'm only"
 	line "doing this as a"
 	cont "favor to you!"
 	done
 
-_MtMoonPokecenterText_49366:: ; 8aa17 (22:6a17)
+_MtMoonPokecenterText_49366::
 	text "You'll need more"
 	line "money than that!"
 	done
 
-_MtMoonPokecenterText_4936b:: ; 8aa39 (22:6a39)
+_MtMoonPokecenterText_4936b::
 	text "MAN: Well, I don't"
 	line "give refunds!"
 	done
 
-_MtMoonPokecenterText5:: ; 8aa5a (22:6a5a)
+_MtMoonPokecenterText5::
 	db $0
 	done
 
--- a/text/maps/museum_1f.asm
+++ b/text/maps/museum_1f.asm
@@ -1,8 +1,8 @@
-_Museum1FText_5c21a:: ; 9652c (25:652c)
+_Museum1FText_5c21a::
 	text "Come again!"
 	done
 
-_Museum1FText_5c21f:: ; 96539 (25:6539)
+_Museum1FText_5c21f::
 	text "It's ¥50 for a"
 	line "child's ticket."
 
@@ -10,17 +10,17 @@
 	line "come in?"
 	done
 
-_Museum1FText_5c224:: ; 96572 (25:6572)
+_Museum1FText_5c224::
 	text "Right, ¥50!"
 	line "Thank you!"
 	done
 
-_Museum1FText_5c229:: ; 9658a (25:658a)
+_Museum1FText_5c229::
 	text "You don't have"
 	line "enough money."
 	prompt
 
-_Museum1FText_5c22e:: ; 965a7 (25:65a7)
+_Museum1FText_5c22e::
 	text "You can't sneak"
 	line "in the back way!"
 
@@ -29,7 +29,7 @@
 	cont "AMBER is?"
 	done
 
-_Museum1FText_5c233:: ; 965f1 (25:65f1)
+_Museum1FText_5c233::
 	text "There's a lab"
 	line "somewhere trying"
 	cont "to resurrect"
@@ -37,28 +37,28 @@
 	cont "from AMBER."
 	done
 
-_Museum1FText_5c238:: ; 96636 (25:6636)
+_Museum1FText_5c238::
 	text "AMBER is fossil-"
 	line "ized tree sap."
 	done
 
-_Museum1FText_5c23d:: ; 96657 (25:6657)
+_Museum1FText_5c23d::
 	text "Please go to the"
 	line "other side!"
 	done
 
-_Museum1FText_5c242:: ; 96675 (25:6675)
+_Museum1FText_5c242::
 	text "Take plenty of"
 	line "time to look!"
 	done
 
-_Museum1FText_5c251:: ; 96693 (25:6693)
+_Museum1FText_5c251::
 	text "That is one"
 	line "magnificent"
 	cont "fossil!"
 	done
 
-_Museum1FText_5c28e:: ; 966b4 (25:66b4)
+_Museum1FText_5c28e::
 	text "Ssh! I think that"
 	line "this chunk of"
 	cont "AMBER contains"
@@ -72,11 +72,7 @@
 	para "But, my colleagues"
 	line "just ignore me!"
 
-IF DEF(_YELLOW)
-	para "So, I have a favor"
-ELSE
 	para "So I have a favor"
-ENDC
 	line "to ask!"
 
 	para "Take this to a"
@@ -84,21 +80,21 @@
 	cont "get it examined!"
 	prompt
 
-_ReceivedOldAmberText:: ; 96790 (25:6790)
+_ReceivedOldAmberText::
 	text $52, " received"
 	line "OLD AMBER!@@"
 
-_Museum1FText_5c299:: ; 967a8 (25:67a8)
+_Museum1FText_5c299::
 	text "Ssh! Get the OLD"
 	line "AMBER checked!"
 	done
 
-_Museum1FText_5c29e:: ; 967c9 (25:67c9)
+_Museum1FText_5c29e::
 	text "You don't have"
 	line "space for this!"
 	done
 
-_Museum1FText_5c2ad:: ; 967e8 (25:67e8)
+_Museum1FText_5c2ad::
 	text "We are proud of 2"
 	line "fossils of very"
 	cont "rare, prehistoric"
@@ -105,7 +101,7 @@
 	cont "#MON!"
 	done
 
-_Museum1FText_5c2bc:: ; 96823 (25:6823)
+_Museum1FText_5c2bc::
 	text "The AMBER is"
 	line "clear and gold!"
 	done
--- a/text/maps/museum_2f.asm
+++ b/text/maps/museum_2f.asm
@@ -1,4 +1,4 @@
-_Museum2FText1:: ; 96841 (25:6841)
+_Museum2FText1::
 	text "MOON STONE?"
 
 	para "What's so special"
@@ -5,7 +5,7 @@
 	line "about it?"
 	done
 
-_Museum2FText2:: ; 96869 (25:6869)
+_Museum2FText2::
 	text "July 20, 1969!"
 
 	para "The 1st lunar"
@@ -15,12 +15,12 @@
 	line "TV to watch it!"
 	done
 
-_Museum2FText3:: ; 968b1 (25:68b1)
+_Museum2FText3::
 	text "We have a space"
 	line "exhibit now."
 	done
 
-_Museum2FText4:: ; 968cf (25:68cf)
+_Museum2FText4::
 	text "I want a PIKACHU!"
 	line "It's so cute!"
 
@@ -28,32 +28,17 @@
 	line "to catch me one!"
 	done
 
-_Museum2FText5:: ; 96911 (25:6911)
+_Museum2FText5::
 	text "Yeah, a PIKACHU"
 	line "soon, I promise!"
 	done
 
-IF DEF(_YELLOW)
-_Museum2FPikachuText1::
-	text "Your PIKACHU looks"
-	line "untamed."
-	cont "May I have it for"
-	cont "my daughter?"
-	done
-
-_Museum2FPikachuText2::
-	text "I'd like to get"
-	line "that PIKACHU off"
-	cont "you, but it's too"
-	cont "attached to you."
-ENDC
-
-_Museum2FText6:: ; 96933 (25:6933)
+_Museum2FText6::
 	text "SPACE SHUTTLE"
 	line "COLUMBIA"
 	done
 
-_Museum2FText7:: ; 9694b (25:694b)
+_Museum2FText7::
 	text "Meteorite that"
 	line "fell on MT.MOON."
 	cont "(MOON STONE?)"
--- a/text/maps/name_rater.asm
+++ b/text/maps/name_rater.asm
@@ -1,4 +1,4 @@
-_NameRaterText_1dab3:: ; 9a308 (26:6308)
+_NameRaterText_1dab3::
 	text "Hello, hello!"
 	line "I am the official"
 	cont "NAME RATER!"
@@ -8,12 +8,12 @@
 	cont "your #MON?"
 	done
 
-_NameRaterText_1dab8:: ; 9a361 (26:6361)
+_NameRaterText_1dab8::
 	text "Which #MON"
 	line "should I look at?"
 	prompt
 
-_NameRaterText_1dabd:: ; 9a37f (26:637f)
+_NameRaterText_1dabd::
 	TX_RAM wcd6d
 	text ", is it?"
 	line "That is a decent"
@@ -26,12 +26,12 @@
 	para "How about it?"
 	done
 
-_NameRaterText_1dac2:: ; 9a3e5 (26:63e5)
+_NameRaterText_1dac2::
 	text "Fine! What should"
 	line "we name it?"
 	prompt
 
-_NameRaterText_1dac7:: ; 9a404 (26:6404)
+_NameRaterText_1dac7::
 	text "OK! This #MON"
 	line "has been renamed"
 	cont "@"
@@ -42,16 +42,12 @@
 	line "name than before!"
 	done
 
-_NameRaterText_1dacc:: ; 9a44c (26:644c)
-IF DEF(_YELLOW)
-	text "Fine! Come any-"
-ELSE
+_NameRaterText_1dacc::
 	text "Fine! Come any"
-ENDC
 	line "time you like!"
 	done
 
-_NameRaterText_1dad1:: ; 9a46b (26:646b)
+_NameRaterText_1dad1::
 	TX_RAM wcd6d
 	text ", is it?"
 	line "That is a truly"
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -1,22 +1,10 @@
-_OaksLabGaryText1:: ; 94d5b (25:4d5b)
+_OaksLabGaryText1::
 	text $53,": Yo"
 	line $52,"! Gramps"
 	cont "isn't around!"
-
-IF DEF(_YELLOW)
-	para "I ran here 'cos"
-	line "he said he had a"
-	cont "#MON for me."
-ENDC
 	done
 
-_OaksLabText40:: ; 94d79 (25:4d79)
-IF DEF(_YELLOW)
-	text $53,": Humph!"
-	line "I'll get a better"
-	cont "#MON than you!"
-	done
-ELSE
+_OaksLabText40::
 	text $53,": Heh, I"
 	line "don't need to be"
 	cont "greedy like you!"
@@ -24,105 +12,74 @@
 	para "Go ahead and"
 	line "choose, ", $52, "!"
 	done
-ENDC
 
-_OaksLabText41:: ; 94dbd (25:4dbd)
-IF DEF(_YELLOW)
-	text $53,": Heh, my"
-ELSE
+_OaksLabText41::
 	text $53,": My"
-ENDC
 	line "#MON looks a"
 	cont "lot stronger."
 	done
 
-_OaksLabText39:: ; 94ddf (25:4ddf)
-IF DEF(_YELLOW)
-	text "That's a #"
-	line "BALL. There's a"
-	cont "#MON inside!"
-	done
-ELSE
+_OaksLabText39::
 	text "Those are #"
 	line "BALLs. They"
 	cont "contain #MON!"
 	done
-ENDC
 
-IF DEF(_YELLOW)
-_OaksLabPikachuText::
-	text "OAK: Go ahead,"
-	line "it's yours!"
-	done
-ENDC
-
-_OaksLabCharmanderText:: ; 94e06 (25:4e06)
+_OaksLabCharmanderText::
 	text "So! You want the"
 	line "fire #MON,"
 	cont "CHARMANDER?"
 	done
 
-_OaksLabSquirtleText:: ; 94e2f (25:4e2f)
+_OaksLabSquirtleText::
 	text "So! You want the"
 	line "water #MON,"
 	cont "SQUIRTLE?"
 	done
 
-_OaksLabBulbasaurText:: ; 94e57 (25:4e57)
+_OaksLabBulbasaurText::
 	text "So! You want the"
 	line "plant #MON,"
 	cont "BULBASAUR?"
 	done
 
-_OaksLabMonEnergeticText:: ; 94e80 (25:4e80)
+_OaksLabMonEnergeticText::
 	text "This #MON is"
 	line "really energetic!"
 	prompt
 
-_OaksLabReceivedMonText:: ; 94ea0 (25:4ea0)
+_OaksLabReceivedMonText::
 	text $52, " received"
 	line "a @"
 	TX_RAM wcd6d
 	text "!@@"
 
-_OaksLabLastMonText:: ; 94eb6 (25:4eb6)
+_OaksLabLastMonText::
 	text "That's PROF.OAK's"
 	line "last #MON!"
 	done
 
-_OaksLabText_1d2f0:: ; 94ed2 (25:4ed2)
+_OaksLabText_1d2f0::
 	text "OAK: Now, ", $52, ","
 	line "which #MON do"
 	cont "you want?"
 	done
 
-_OaksLabText_1d2f5:: ; 94ef8 (25:4ef8)
+_OaksLabText_1d2f5::
 	text "OAK: If a wild"
 	line "#MON appears,"
 	cont "your #MON can"
 	cont "fight against it!"
-
-IF DEF(_YELLOW)
-	para "Afterward, go on"
-	line "to the next town."
-ENDC
 	done
 
-_OaksLabText_1d2fa:: ; 94f36 (25:4f36)
-IF DEF(_YELLOW)
-	text "OAK: You should"
-	line "talk to it and"
-	cont "see how it feels."
-	done
-ELSE
+_OaksLabText_1d2fa::
 	text "OAK: ", $52, ","
 	line "raise your young"
 	cont "#MON by making"
 	cont "it fight!"
 	done
-ENDC
 
-_OaksLabDeliverParcelText1:: ; 94f69 (25:4f69)
+_OaksLabDeliverParcelText1::
 	text "OAK: Oh, ", $52, "!"
 
 	para "How is my old"
@@ -141,29 +98,21 @@
 	para $52, " delivered"
 	line "OAK's PARCEL.@@"
 
-_OaksLabDeliverParcelText2:: ; 9500f (25:500f)
+_OaksLabDeliverParcelText2::
 	db $0
 	para "Ah! This is the"
 	line "custom # BALL"
 	cont "I ordered!"
-IF DEF(_YELLOW)
-	cont "Thanks, ",$52,"!"
-
-	para "By the way, I must"
-	line "ask you to do"
-	cont "something for me."
-ELSE
 	cont "Thank you!"
-ENDC
 	done
 
-_OaksLabAroundWorldText:: ; 95045 (25:5045)
+_OaksLabAroundWorldText::
 	text "#MON around the"
 	line "world wait for"
 	cont "you, ", $52, "!"
 	done
 
-_OaksLabGivePokeballsText1:: ; 9506d (25:506d)
+_OaksLabGivePokeballsText1::
 	text "OAK: You can't get"
 	line "detailed data on"
 	cont "#MON by just"
@@ -177,18 +126,13 @@
 	para $52, " got 5"
 	line "# BALLs!@@"
 
-_OaksLabGivePokeballsText2:: ; 950f2 (25:50f2)
+_OaksLabGivePokeballsText2::
 	db $0
 	para "When a wild"
 	line "#MON appears,"
 	cont "it's fair game."
 
-IF DEF(_YELLOW)
-	para "Just like I showed"
-	line "you, throw a #"
-ELSE
 	para "Just throw a #"
-ENDC
 	line "BALL at it and try"
 	line "to catch it!"
 
@@ -200,7 +144,7 @@
 	cont "have to be lucky!"
 	done
 
-_OaksLabPleaseVisitText:: ; 9519e (25:519e)
+_OaksLabPleaseVisitText::
 	text "OAK: Come see me"
 	line "sometimes."
 
@@ -209,7 +153,7 @@
 	cont "coming along."
 	done
 
-_OaksLabText_1d31d:: ; 951e9 (25:51e9)
+_OaksLabText_1d31d::
 	text "OAK: Good to see "
 	line "you! How is your "
 	cont "#DEX coming? "
@@ -217,17 +161,17 @@
 	cont "a look!"
 	prompt
 
-_OaksLabText_1d32c:: ; 95236 (25:5236)
+_OaksLabText_1d32c::
 	text "It's encyclopedia-"
 	line "like, but the"
 	cont "pages are blank!"
 	done
 
-_OaksLabText8:: ; 95268 (25:5268)
+_OaksLabText8::
 	text "?"
 	done
 
-_OaksLabText_1d340:: ; 9526b (25:526b)
+_OaksLabText_1d340::
 	text "PROF.OAK is the"
 	line "authority on"
 	cont "#MON!"
@@ -237,36 +181,13 @@
 	cont "in high regard!"
 	done
 
-_OaksLabRivalWaitingText:: ; 952bb (25:52bb)
+_OaksLabRivalWaitingText::
 	text $53, ": Gramps!"
 	line "I'm fed up with"
 	cont "waiting!"
 	done
 
-_OaksLabChooseMonText:: ; 952df (25:52df)
-IF DEF(_YELLOW)
-	text "OAK: Hmm? ",$53,"?"
-	line "Why are you here"
-	cont "already?"
-
-	para "I said for you to"
-	line "come by later..."
-
-	para "Ah, whatever!"
-	line "Just wait there."
-
-	para "Look, ",$52,"! Do"
-	line "you see that ball"
-	cont "on the table?"
-
-	para "It's called a #"
-	line "BALL. It holds a"
-	cont "#MON inside."
-
-	para "You may have it!"
-	line "Go on, take it!"
-	done
-ELSE
+_OaksLabChooseMonText::
 	text "OAK: ", $53, "?"
 	line "Let me think..."
 
@@ -293,97 +214,36 @@
 	cont "but you can have"
 	cont "one! Choose!"
 	done
-ENDC
 
-_OaksLabRivalInterjectionText:: ; 953dc (25:53dc)
+_OaksLabRivalInterjectionText::
 	text $53, ": Hey!"
 	line "Gramps! What"
 	cont "about me?"
 	done
 
-_OaksLabBePatientText:: ; 953fc (25:53fc)
-IF DEF(_YELLOW)
-	text "OAK: Be patient,"
-	line $53,", I'll give"
-	cont "you one later."
-	done
-ELSE
+_OaksLabBePatientText::
 	text "OAK: Be patient!"
 	line $53, ", you can"
 	cont "have one too!"
 	done
-ENDC
 
-IF DEF(_YELLOW)
-_OaksLabRivalTakesText1::
-	text $53,": No way!"
-	line $52,", I want"
-	cont "this #MON!"
-	prompt
-
-_OaksLabRivalTakesText2::
-	text $53," snatched"
-	line "the #MON!@@"
-
-_OaksLabRivalTakesText3::
-	text "OAK: ",$53,"! What"
-	line "are you doing?"
-	prompt
-
-_OaksLabRivalTakesText4::
-	text $53,": Gramps, I"
-	line "want this one!"
-	prompt
-
-_OaksLabRivalTakesText5::
-	text "OAK: But, I... Oh,"
-	line "all right then."
-	cont "That #MON is"
-	cont "yours."
-
-	para "I was going to"
-	line "give you one"
-	cont "anyway..."
-
-	para $52,", come over"
-	line "here."
-	done
-
-_OaksLabOakGivesText::
-	text "OAK: ",$52,", this"
-	line "is the #MON I"
-	cont "caught earlier."
-
-	para "You can have it."
-	line "I caught it in"
-	cont "the wild and it's"
-	cont "not tame yet."
-	prompt
-
-_OaksLabReceivedText::
-	text $52," received"
-	line "a "
-	TX_RAM $CD6D
-	text "!@@"
-ENDC
-
-_OaksLabLeavingText:: ; 95427 (25:5427)
+_OaksLabLeavingText::
 	text "OAK: Hey! Don't go"
 	line "away yet!"
 	done
 
-_OaksLabRivalPickingMonText:: ; 95444 (25:5444)
+_OaksLabRivalPickingMonText::
 	text $53, ": I'll take"
 	line "this one, then!"
 	done
 
-_OaksLabRivalReceivedMonText:: ; 95461 (25:5461)
+_OaksLabRivalReceivedMonText::
 	text $53, " received"
 	line "a @"
 	TX_RAM wcd6d
 	text "!@@"
 
-_OaksLabRivalChallengeText:: ; 95477 (25:5477)
+_OaksLabRivalChallengeText::
 	text $53, ": Wait"
 	line $52, "!"
 	cont "Let's check out"
@@ -393,7 +253,7 @@
 	line "you on!"
 	done
 
-_OaksLabText_1d3be:: ; 954b6 (25:54b6)
+_OaksLabText_1d3be::
 	text "WHAT?"
 	line "Unbelievable!"
 	cont "I picked the"
@@ -400,12 +260,12 @@
 	cont "wrong #MON!"
 	prompt
 
-_OaksLabText_1d3c3:: ; 954e4 (25:54e4)
+_OaksLabText_1d3c3::
 	text $53, ": Yeah! Am"
 	line "I great or what?"
 	prompt
 
-_OaksLabRivalToughenUpText:: ; 95502 (25:5502)
+_OaksLabRivalToughenUpText::
 	text $53, ": Okay!"
 	line "I'll make my"
 	cont "#MON fight to"
@@ -415,66 +275,22 @@
 	line "Smell you later!"
 	done
 
-IF DEF(_YELLOW)
-_OaksLabPikachuDislikesPokeballsText1::
-	text "OAK: What?"
-	done
-
-_OaksLabPikachuDislikesPokeballsText2::
-	text "OAK: Would you"
-	line "look at that!"
-
-	para "It's odd, but it"
-	line "appears that your"
-	cont "PIKACHU dislikes"
-	cont "# BALLs."
-
-	para "You should just"
-	line "keep it with you."
-
-	para "That should make"
-	line "it happy!"
-
-	para "You can talk to it"
-	line "and see how it"
-	cont "feels about you."
-	done
-ENDC
-
-_OaksLabText21:: ; 95551 (25:5551)
+_OaksLabText21::
 	text $53, ": Gramps!"
 	done
 
-_OaksLabText22:: ; 9555d (25:555d)
-IF DEF(_YELLOW)
-	text $53,": Gramps,"
-	line "my #MON has"
-	cont "grown stronger!"
-	cont "Check it out!"
-	done
-ELSE
+_OaksLabText22::
 	text $53, ": What did"
 	line "you call me for?"
 	done
-ENDC
 
-_OaksLabText23:: ; 9557b (25:557b)
-IF DEF(_YELLOW)
-	text "OAK: Ah, ",$53,","
-	line "good timing!"
-
-	para "I needed to ask"
-	line "both of you to do"
-	cont "something for me."
-	done
-ELSE
+_OaksLabText23::
 	text "OAK: Oh right! I"
 	line "have a request"
 	cont "of you two."
 	done
-ENDC
 
-_OaksLabText24:: ; 955a8 (25:55a8)
+_OaksLabText24::
 	text "On the desk there"
 	line "is my invention,"
 	cont "#DEX!"
@@ -488,7 +304,7 @@
 	line "encyclopedia!"
 	done
 
-_OaksLabText25:: ; 9562a (25:562a)
+_OaksLabText25::
 	text "OAK: ", $52, " and"
 	line $53, "! Take"
 	cont "these with you!"
@@ -496,7 +312,7 @@
 	para $52, " got"
 	line "#DEX from OAK!@@"
 
-_OaksLabText26:: ; 95664 (25:5664)
+_OaksLabText26::
 	text "To make a complete"
 	line "guide on all the"
 	cont "#MON in the"
@@ -519,7 +335,7 @@
 	cont "#MON history!"
 	done
 
-_OaksLabText27:: ; 95741 (25:5741)
+_OaksLabText27::
 	text $53, ": Alright"
 	line "Gramps! Leave it"
 	cont "all to me!"
@@ -537,12 +353,12 @@
 	cont $52, "! Hahaha!"
 	done
 
-_OaksLabText_1d405:: ; 957eb (25:57eb)
+_OaksLabText_1d405::
 	text "I study #MON as"
 	line "PROF.OAK's AIDE."
 	done
 
-_OaksLabText_441cc:: ; 9580c (25:580c)
+_OaksLabText_441cc::
 	text "#DEX comp-"
 	line "letion is:"
 
@@ -557,7 +373,7 @@
 	line "Rating:"
 	prompt
 
-_OaksLabText_44201:: ; 95858 (25:5858)
+_OaksLabText_44201::
 	text "You still have"
 	line "lots to do."
 	cont "Look for #MON"
@@ -564,7 +380,7 @@
 	cont "in grassy areas!"
 	done
 
-_OaksLabText_44206:: ; 95893 (25:5893)
+_OaksLabText_44206::
 	text "You're on the"
 	line "right track! "
 	cont "Get a FLASH HM"
@@ -571,7 +387,7 @@
 	cont "from my AIDE!"
 	done
 
-_OaksLabText_4420b:: ; 958cc (25:58cc)
+_OaksLabText_4420b::
 	text "You still need"
 	line "more #MON!"
 	cont "Try to catch"
@@ -578,7 +394,7 @@
 	cont "other species!"
 	done
 
-_OaksLabText_44210:: ; 95903 (25:5903)
+_OaksLabText_44210::
 	text "Good, you're"
 	line "trying hard!"
 	cont "Get an ITEMFINDER"
@@ -585,13 +401,13 @@
 	cont "from my AIDE!"
 	done
 
-_OaksLabText_44215:: ; 9593d (25:593d)
+_OaksLabText_44215::
 	text "Looking good!"
 	line "Go find my AIDE"
 	cont "when you get 50!"
 	done
 
-_OaksLabText_4421a:: ; 9596d (25:596d)
+_OaksLabText_4421a::
 	text "You finally got at"
 	line "least 50 species!"
 	cont "Be sure to get"
@@ -599,35 +415,30 @@
 	cont "AIDE!"
 	done
 
-_OaksLabText_4421f:: ; 959b8 (25:59b8)
-IF DEF(_YELLOW)
-	text "Oh! This is get-"
-	line "ting even better!"
-ELSE
+_OaksLabText_4421f::
 	text "Ho! This is geting"
 	line "even better!"
-ENDC
 	done
 
-_OaksLabText_44224:: ; 959d9 (25:59d9)
+_OaksLabText_44224::
 	text "Very good!"
 	line "Go fish for some"
 	cont "marine #MON!"
 	done
 
-_OaksLabText_44229:: ; 95a03 (25:5a03)
+_OaksLabText_44229::
 	text "Wonderful!"
 	line "Do you like to"
 	cont "collect things?"
 	done
 
-_OaksLabText_4422e:: ; 95a2e (25:5a2e)
+_OaksLabText_4422e::
 	text "I'm impressed!"
 	line "It must have been"
 	cont "difficult to do!"
 	done
 
-_OaksLabText_44233:: ; 95a60 (25:5a60)
+_OaksLabText_44233::
 	text "You finally got at"
 	line "least 100 species!"
 	cont "I can't believe"
@@ -634,25 +445,25 @@
 	cont "how good you are!"
 	done
 
-_OaksLabText_44238:: ; 95aa8 (25:5aa8)
+_OaksLabText_44238::
 	text "You even have the"
 	line "evolved forms of"
 	cont "#MON! Super!"
 	done
 
-_OaksLabText_4423d:: ; 95ad9 (25:5ad9)
+_OaksLabText_4423d::
 	text "Excellent! Trade"
 	line "with friends to"
 	cont "get some more!"
 	done
 
-_OaksLabText_44242:: ; 95b0a (25:5b0a)
+_OaksLabText_44242::
 	text "Outstanding!"
 	line "You've become a"
 	cont "real pro at this!"
 	done
 
-_OaksLabText_44247:: ; 95b39 (25:5b39)
+_OaksLabText_44247::
 	text "I have nothing"
 	line "left to say!"
 	cont "You're the"
@@ -659,13 +470,9 @@
 	cont "authority now!"
 	done
 
-_OaksLabText_4424c:: ; 95b6f (25:5b6f)
+_OaksLabText_4424c::
 	text "Your #DEX is"
-IF DEF(_YELLOW)
-	line "fully complete!"
-ELSE
 	line "entirely complete!"
-ENDC
 	cont "Congratulations!"
 	done
 
--- a/text/maps/pewter_city.asm
+++ b/text/maps/pewter_city.asm
@@ -1,4 +1,4 @@
-_PewterCityText1:: ; a497f (29:497f)
+_PewterCityText1::
 	text "It's rumored that"
 	line "CLEFAIRYs came"
 	cont "from the moon!"
@@ -8,7 +8,7 @@
 	cont "fell on MT.MOON."
 	done
 
-_PewterCityText2:: ; a49e0 (29:49e0)
+_PewterCityText2::
 	text "There aren't many"
 	line "serious #MON"
 	cont "trainers here!"
@@ -20,24 +20,24 @@
 	cont "into it!"
 	done
 
-_PewterCityText_193f1:: ; a4a56 (29:4a56)
+_PewterCityText_193f1::
 	text "Did you check out"
 	line "the MUSEUM?"
 	done
 
-_PewterCityText_193f6:: ; a4a75 (29:4a75)
+_PewterCityText_193f6::
 	text "Weren't those"
 	line "fossils from MT."
 	cont "MOON amazing?"
 	done
 
-_PewterCityText_193fb:: ; a4aa2 (29:4aa2)
+_PewterCityText_193fb::
 	text "Really?"
 	line "You absolutely"
 	cont "have to go!"
 	done
 
-_PewterCityText13:: ; a4ac6 (29:4ac6)
+_PewterCityText13::
 	text "It's right here!"
 	line "You have to pay"
 	cont "to get in, but"
@@ -45,24 +45,24 @@
 	cont "See you around!"
 	done
 
-_PewterCityText_19427:: ; a4b14 (29:4b14)
+_PewterCityText_19427::
 	text "Psssst!"
 	line "Do you know what"
 	cont "I'm doing?"
 	done
 
-_PewterCityText_1942c:: ; a4b38 (29:4b38)
+_PewterCityText_1942c::
 	text "That's right!"
 	line "It's hard work!"
 	done
 
-_PewterCityText_19431:: ; a4b55 (29:4b55)
+_PewterCityText_19431::
 	text "I'm spraying REPEL"
 	line "to keep #MON"
 	cont "out of my garden!"
 	done
 
-_PewterCityText_1945d:: ; a4b87 (29:4b87)
+_PewterCityText_1945d::
 	text "You're a trainer"
 	line "right? BROCK's"
 	cont "looking for new"
@@ -70,13 +70,13 @@
 	cont "Follow me!"
 	done
 
-_PewterCityText_19462:: ; a4bce (29:4bce)
+_PewterCityText_19462::
 	text "If you have the"
 	line "right stuff, go"
 	cont "take on BROCK!"
 	done
 
-_PewterCityText6:: ; a4bfe (29:4bfe)
+_PewterCityText6::
 	text "TRAINER TIPS"
 
 	para "Any #MON that"
@@ -85,7 +85,7 @@
 	cont "short, earns EXP!"
 	done
 
-_PewterCityText7:: ; a4c4a (29:4c4a)
+_PewterCityText7::
 	text "NOTICE!"
 
 	para "Thieves have been"
@@ -96,12 +96,12 @@
 	cont "with any info!"
 	done
 
-_PewterCityText10:: ; a4cb1 (29:4cb1)
+_PewterCityText10::
 	text "PEWTER MUSEUM"
 	line "OF SCIENCE"
 	done
 
-_PewterCityText11:: ; a4ccb (29:4ccb)
+_PewterCityText11::
 	text "PEWTER CITY"
 	line "#MON GYM"
 	cont "LEADER: BROCK"
@@ -110,7 +110,7 @@
 	line "#MON Trainer!"
 	done
 
-_PewterCityText12:: ; a4d0c (29:4d0c)
+_PewterCityText12::
 	text "PEWTER CITY"
 	line "A Stone Gray"
 	cont "City"
--- a/text/maps/pewter_gym_1.asm
+++ b/text/maps/pewter_gym_1.asm
@@ -1,4 +1,4 @@
-_PewterGymText_5c49e:: ; 9697a (25:697a)
+_PewterGymText_5c49e::
 	text "I'm BROCK!"
 	line "I'm PEWTER's GYM"
 	cont "LEADER!"
--- a/text/maps/pewter_gym_2.asm
+++ b/text/maps/pewter_gym_2.asm
@@ -1,25 +1,8 @@
-_PewterGymText_5c4a3:: ; 98000 (26:4000)
+_PewterGymText_5c4a3::
 	text "There are all"
 	line "kinds of trainers"
 	cont "in the world!"
 
-IF DEF(_YELLOW)
-	para "Some raise #MON"
-	line "for fights. Some"
-	cont "see them as pets."
-
-	para "I'm in training to"
-	line "become a #MON"
-	cont "breeder."
-
-	para "If you take your"
-	line "#MON training"
-	cont "seriously, go"
-	cont "visit the GYM in"
-	cont "CERULEAN and test"
-	cont "your abilities!"
-	done
-ELSE
 	para "You appear to be"
 	line "very gifted as a"
 	cont "#MON trainer!"
@@ -28,18 +11,17 @@
 	line "CERULEAN and test"
 	cont "your abilities!"
 	done
-ENDC
 
-_TM34PreReceiveText:: ; 98092 (26:4092)
+_TM34PreReceiveText::
 	text "Wait! Take this"
 	line "with you!"
 	done
 
-_ReceivedTM34Text:: ; 980ad (26:40ad)
+_ReceivedTM34Text::
 	text $52, " received"
 	line "TM34!@@"
 
-_TM34ExplanationText:: ; 980c0 (26:40c0)
+_TM34ExplanationText::
 	db $0
 	para "A TM contains a"
 	line "technique that"
@@ -62,12 +44,12 @@
 	cont "it back double!"
 	done
 
-_TM34NoRoomText:: ; 981ab (26:41ab)
+_TM34NoRoomText::
 	text "You don't have"
 	line "room for this!"
 	done
 
-_PewterGymText_5c4bc:: ; 981c9 (26:41c9)
+_PewterGymText_5c4bc::
 	text "I took"
 	line "you for granted."
 
@@ -78,7 +60,7 @@
 	para $52, " received"
 	line "the BOULDERBADGE!@@"
 
-_PewterGymText_5c4c1:: ; 98232 (26:4232)
+_PewterGymText_5c4c1::
 	db $0
 	para "That's an official"
 	line "#MON LEAGUE"
@@ -90,14 +72,10 @@
 
 	para "The technique"
 	line "FLASH can now be"
-IF DEF(_YELLOW)
-	cont "used anytime!"
-ELSE
 	cont "used any time!"
-ENDC
 	prompt
 
-_PewterGymBattleText1:: ; 982ae (26:42ae)
+_PewterGymBattleText1::
 	text "Stop right there,"
 	line "kid!"
 
@@ -106,7 +84,7 @@
 	cont "BROCK!"
 	done
 
-_PewterGymEndBattleText1:: ; 982f1 (26:42f1)
+_PewterGymEndBattleText1::
 	text "Darn!"
 
 	para "Light years isn't"
@@ -114,13 +92,13 @@
 	cont "distance!"
 	prompt
 
-_PewterGymAfterBattleText1:: ; 98325 (26:4325)
+_PewterGymAfterBattleText1::
 	text "You're pretty hot,"
 	line "but not as hot"
 	cont "as BROCK!"
 	done
 
-_PewterGymText_5c515:: ; 98351 (26:4351)
+_PewterGymText_5c515::
 	text "Hiya! I can tell"
 	line "you have what it"
 	cont "takes to become a"
@@ -134,12 +112,12 @@
 	line "to the top!"
 	done
 
-_PewterGymText_5c51a:: ; 983dc (26:43dc)
+_PewterGymText_5c51a::
 	text "All right! Let's"
 	line "get happening!"
 	prompt
 
-_PewterGymText_5c51f:: ; 983fc (26:43fc)
+_PewterGymText_5c51f::
 	text "The 1st #MON"
 	line "out in a match is"
 	cont "at the top of the"
@@ -151,30 +129,14 @@
 	cont "made easier!"
 	done
 
-_PewterGymText_5c524:: ; 98476 (26:4476)
+_PewterGymText_5c524::
 	text "It's a free"
 	line "service! Let's"
 	cont "get happening!"
 	prompt
 
-_PewterGymText_5c529:: ; 9849f (26:449f)
+_PewterGymText_5c529::
 	text "Just as I thought!"
 	line "You're #MON"
 	cont "champ material!"
 	done
-
-IF DEF(_YELLOW)
-_PewterGymGuyText::
-	text "All right! Let's"
-	line "get happening!"
-
-	para "It will be tough"
-	line "for your PIKACHU"
-	cont "at this GYM!"
-
-	para "Electric attacks"
-	line "are harmless to"
-	cont "BROCK's ground-"
-	cont "type #MON."
-	done
-ENDC
--- a/text/maps/pewter_house_1.asm
+++ b/text/maps/pewter_house_1.asm
@@ -1,11 +1,11 @@
-_PewterHouse1Text1:: ; 984ce (26:44ce)
+_PewterHouse1Text1::
 	text "NIDORAN: Bowbow!@@"
 
-_PewterHouse1Text2:: ; 984e1 (26:44e1)
+_PewterHouse1Text2::
 	text "NIDORAN sit!"
 	done
 
-_PewterHouse1Text3:: ; 984ef (26:44ef)
+_PewterHouse1Text3::
 	text "Our #MON's an"
 	line "outsider, so it's"
 	cont "hard to handle."
--- a/text/maps/pewter_house_2.asm
+++ b/text/maps/pewter_house_2.asm
@@ -1,4 +1,4 @@
-_PewterHouse2Text1:: ; 98656 (26:4656)
+_PewterHouse2Text1::
 	text "#MON learn new"
 	line "techniques as"
 	cont "they grow!"
@@ -8,7 +8,7 @@
 	cont "the trainer!"
 	done
 
-_PewterHouse2Text2:: ; 986ae (26:46ae)
+_PewterHouse2Text2::
 	text "#MON become"
 	line "easier to catch"
 	cont "when they are"
--- a/text/maps/pewter_mart.asm
+++ b/text/maps/pewter_mart.asm
@@ -1,9 +1,5 @@
-_PewterMartText_74cc6:: ; 985ac (26:45ac)
-IF DEF(_YELLOW)
-	text "A shady old man"
-ELSE
+_PewterMartText_74cc6::
 	text "A shady, old man"
-ENDC
 	line "got me to buy"
 	cont "this really weird"
 	cont "fish #MON!"
@@ -12,7 +8,7 @@
 	line "and it cost ¥500!"
 	done
 
-_PewterMartText_74cd5:: ; 9860c (26:460c)
+_PewterMartText_74cd5::
 	text "Good things can"
 	line "happen if you"
 	cont "raise #MON"
--- a/text/maps/pewter_pokecenter.asm
+++ b/text/maps/pewter_pokecenter.asm
@@ -1,4 +1,4 @@
-_PewterPokecenterText1:: ; 98704 (26:4704)
+_PewterPokecenterText1::
 	text "What!?"
 
 	para "TEAM ROCKET is"
@@ -8,22 +8,7 @@
 	para "Scram!"
 	done
 
-IF DEF(_YELLOW)
-_PewterPokecenterText2::
-	text "#MON CENTERS"
-	line "are wonderful!"
-
-	para "They heal #MON"
-	line "completely."
-
-	para "Even conditions"
-	line "like sleep, burn,"
-	cont "poison and others"
-	cont "are cured."
-	done
-ENDC
-
-_PewterPokecenterText5:: ; 98744 (26:4744)
+_PewterPokecenterText5::
 	text "JIGGLYPUFF: Puu"
 	line "pupuu!"
 	done
--- a/text/maps/pokemon_league_gate.asm
+++ b/text/maps/pokemon_league_gate.asm
@@ -1,4 +1,4 @@
-_Route22GateText_1e704:: ; 8cfbb (23:4fbb)
+_Route22GateText_1e704::
 	text "Only truly skilled"
 	line "trainers are"
 	cont "allowed through."
@@ -6,7 +6,7 @@
 	para "You don't have the"
 	line "BOULDERBADGE yet!@@"
 
-_Route22GateText_1e715:: ; 8d012 (23:5012)
+_Route22GateText_1e715::
 	db $0
 	para "The rules are"
 	line "rules. I can't"
@@ -13,7 +13,7 @@
 	cont "let you pass."
 	done
 
-_Route22GateText_1e71a:: ; 8d03e (23:503e)
+_Route22GateText_1e71a::
 	text "Oh! That is the"
 	line "BOULDERBADGE!"
 	cont "Go right ahead!@@"
--- a/text/maps/pokemon_tower_1f.asm
+++ b/text/maps/pokemon_tower_1f.asm
@@ -1,4 +1,4 @@
-_PokemonTower1Text1:: ; 9947f (26:547f)
+_PokemonTower1Text1::
 	text "#MON TOWER was"
 	line "erected in the"
 	cont "memory of #MON"
@@ -5,13 +5,13 @@
 	cont "that had died."
 	done
 
-_PokemonTower1Text2:: ; 994bc (26:54bc)
+_PokemonTower1Text2::
 	text "Did you come to"
 	line "pay respects?"
 	cont "Bless you!"
 	done
 
-_PokemonTower1Text3:: ; 994e6 (26:54e6)
+_PokemonTower1Text3::
 	text "I came to pray"
 	line "for my CLEFAIRY."
 
@@ -19,12 +19,12 @@
 	line "stop crying..."
 	done
 
-_PokemonTower1Text4:: ; 99524 (26:5524)
+_PokemonTower1Text4::
 	text "My GROWLITHE..."
 	line "Why did you die?"
 	done
 
-_PokemonTower1Text5:: ; 99546 (26:5546)
+_PokemonTower1Text5::
 	text "I am a CHANNELER!"
 	line "There are spirits"
 	cont "up to mischief!"
--- a/text/maps/pokemon_tower_2f.asm
+++ b/text/maps/pokemon_tower_2f.asm
@@ -1,4 +1,4 @@
-_PokemonTower2Text_6062d:: ; 9957b (26:557b)
+_PokemonTower2Text_6062d::
 	text $53, ": Hey,"
 	line $52, "! What"
 	cont "brings you here?"
@@ -10,7 +10,7 @@
 	cont "Let's go, pal!"
 	done
 
-_PokemonTower2Text_60632:: ; 995e5 (26:55e5)
+_PokemonTower2Text_60632::
 	text "What?"
 	line "You stinker!"
 
@@ -18,7 +18,7 @@
 	line "you too!"
 	prompt
 
-_PokemonTower2Text_60637:: ; 99614 (26:5614)
+_PokemonTower2Text_60637::
 	text $53, ": Well,"
 	line "look at all your"
 	cont "wimpy #MON!"
@@ -27,7 +27,7 @@
 	line "bit more!"
 	prompt
 
-_PokemonTower2Text_6063c:: ; 99657 (26:5657)
+_PokemonTower2Text_6063c::
 	text "How's your #DEX"
 	line "coming, pal?"
 	cont "I just caught a"
@@ -46,7 +46,7 @@
 	para "Smell ya later!"
 	done
 
-_PokemonTower2Text2:: ; 9971a (26:571a)
+_PokemonTower2Text2::
 	text "Even we could not"
 	line "identify the"
 	cont "wayward GHOSTs!"
--- a/text/maps/pokemon_tower_3f.asm
+++ b/text/maps/pokemon_tower_3f.asm
@@ -1,45 +1,45 @@
-_PokemonTower3BattleText1:: ; 99776 (26:5776)
+_PokemonTower3BattleText1::
 	text "Urrg...Awaa..."
 	line "Huhu...graa.."
 	done
 
-_PokemonTower3EndBattleText1:: ; 99794 (26:5794)
+_PokemonTower3EndBattleText1::
 	text "Hwa!"
 	line "I'm saved!"
 	prompt
 
-_PokemonTower3AfterBattleText1:: ; 997a4 (26:57a4)
+_PokemonTower3AfterBattleText1::
 	text "The GHOSTs can be"
 	line "identified by the"
 	cont "SILPH SCOPE."
 	done
 
-_PokemonTower3BattleText2:: ; 997d6 (26:57d6)
+_PokemonTower3BattleText2::
 	text "Kekeke...."
 	line "Kwaaah!"
 	done
 
-_PokemonTower3EndBattleText2:: ; 997ea (26:57ea)
+_PokemonTower3EndBattleText2::
 	text "Hmm?"
 	line "What am I doing?"
 	prompt
 
-_PokemonTower3AfterBattleText2:: ; 99801 (26:5801)
+_PokemonTower3AfterBattleText2::
 	text "Sorry! I was"
 	line "possessed!"
 	done
 
-_PokemonTower3BattleText3:: ; 9981a (26:581a)
+_PokemonTower3BattleText3::
 	text "Be gone!"
 	line "Evil spirit!"
 	done
 
-_PokemonTower3EndBattleText3:: ; 99831 (26:5831)
+_PokemonTower3EndBattleText3::
 	text "Whew!"
 	line "The spirit left!"
 	prompt
 
-_PokemonTower3AfterBattleText3:: ; 99849 (26:5849)
+_PokemonTower3AfterBattleText3::
 	text "My friends were"
 	line "possessed too!"
 	done
--- a/text/maps/pokemon_tower_4f.asm
+++ b/text/maps/pokemon_tower_4f.asm
@@ -1,44 +1,44 @@
-_PokemonTower4BattleText1:: ; 99869 (26:5869)
+_PokemonTower4BattleText1::
 	text "GHOST! No!"
 	line "Kwaaah!"
 	done
 
-_PokemonTower4EndBattleText1:: ; 9987d (26:587d)
+_PokemonTower4EndBattleText1::
 	text "Where"
 	line "is the GHOST?"
 	prompt
 
-_PokemonTower4AfterBattleText1:: ; 99892 (26:5892)
+_PokemonTower4AfterBattleText1::
 	text "I must have been"
 	line "dreaming..."
 	done
 
-_PokemonTower4BattleText2:: ; 998b0 (26:58b0)
+_PokemonTower4BattleText2::
 	text "Be cursed with"
 	line "me! Kwaaah!"
 	done
 
-_PokemonTower4EndBattleText2:: ; 998cc (26:58cc)
+_PokemonTower4EndBattleText2::
 	text "What!"
 	prompt
 
-_PokemonTower4AfterBattleText2:: ; 998d3 (26:58d3)
+_PokemonTower4AfterBattleText2::
 	text "We can't crack"
 	line "the identity of"
 	cont "the GHOSTs."
 	done
 
-_PokemonTower4BattleText3:: ; 998fe (26:58fe)
+_PokemonTower4BattleText3::
 	text "Huhuhu..."
 	line "Beat me not!"
 	done
 
-_PokemonTower4EndBattleText3:: ; 99916 (26:5916)
+_PokemonTower4EndBattleText3::
 	text "Huh?"
 	line "Who? What?"
 	prompt
 
-_PokemonTower4AfterBattleText3:: ; 99927 (26:5927)
+_PokemonTower4AfterBattleText3::
 	text "May the departed"
 	line "souls of #MON"
 	cont "rest in peace..."
--- a/text/maps/pokemon_tower_5f.asm
+++ b/text/maps/pokemon_tower_5f.asm
@@ -1,4 +1,4 @@
-_PokemonTower5Text1:: ; 99958 (26:5958)
+_PokemonTower5Text1::
 	text "Come, child! I"
 	line "sealed this space"
 	cont "with white magic!"
@@ -6,63 +6,63 @@
 	para "You can rest here!"
 	done
 
-_PokemonTower5BattleText1:: ; 9999f (26:599f)
+_PokemonTower5BattleText1::
 	text "Give...me..."
 	line "your...soul..."
 	done
 
-_PokemonTower5EndBattleText1:: ; 999bc (26:59bc)
+_PokemonTower5EndBattleText1::
 	text "Gasp!"
 	prompt
 
-_PokemonTower5AfterBattleText1:: ; 999c3 (26:59c3)
+_PokemonTower5AfterBattleText1::
 	text "I was under"
 	line "possession!"
 	done
 
-_PokemonTower5BattleText2:: ; 999dc (26:59dc)
+_PokemonTower5BattleText2::
 	text "You...shall..."
 	line "join...us..."
 	done
 
-_PokemonTower5EndBattleText2:: ; 999f9 (26:59f9)
+_PokemonTower5EndBattleText2::
 	text "What"
 	line "a nightmare!"
 	prompt
 
-_PokemonTower5AfterBattleText2:: ; 99a0c (26:5a0c)
+_PokemonTower5AfterBattleText2::
 	text "I was possessed!"
 	done
 
-_PokemonTower5BattleText3:: ; 99a1e (26:5a1e)
+_PokemonTower5BattleText3::
 	text "Zombies!"
 	done
 
-_PokemonTower5EndBattleText3:: ; 99a28 (26:5a28)
+_PokemonTower5EndBattleText3::
 	text "Ha?"
 	prompt
 
-_PokemonTower5AfterBattleText3:: ; 99a2d (26:5a2d)
+_PokemonTower5AfterBattleText3::
 	text "I regained my"
 	line "senses!"
 	done
 
-_PokemonTower5BattleText4:: ; 99a44 (26:5a44)
+_PokemonTower5BattleText4::
 	text "Urgah..."
 	line "Urff...."
 	done
 
-_PokemonTower5EndBattleText4:: ; 99a57 (26:5a57)
+_PokemonTower5EndBattleText4::
 	text "Whoo!"
 	prompt
 
-_PokemonTower5AfterBattleText4:: ; 99a5e (26:5a5e)
+_PokemonTower5AfterBattleText4::
 	text "I fell to evil"
 	line "spirits despite"
 	cont "my training!"
 	done
 
-_PokemonTower5Text7:: ; 99a8b (26:5a8b)
+_PokemonTower5Text7::
 	text "Entered purified,"
 	line "protected zone!"
 
--- a/text/maps/pokemon_tower_6f.asm
+++ b/text/maps/pokemon_tower_6f.asm
@@ -1,10 +1,10 @@
-_PokemonTower2Text_60c1f:: ; 99ac8 (26:5ac8)
+_PokemonTower2Text_60c1f::
 	text "The GHOST was the"
 	line "restless soul of"
 	cont "CUBONE's mother!"
 	done
 
-_PokemonTower2Text_60c24:: ; 99afc (26:5afc)
+_PokemonTower2Text_60c24::
 	text "The mother's soul"
 	line "was calmed."
 
@@ -12,50 +12,50 @@
 	line "the afterlife!"
 	done
 
-_PokemonTower6BattleText1:: ; 99b38 (26:5b38)
+_PokemonTower6BattleText1::
 	text "Give...me..."
 	line "blood..."
 	done
 
-_PokemonTower6EndBattleText1:: ; 99b4f (26:5b4f)
+_PokemonTower6EndBattleText1::
 	text "Groan!"
 	prompt
 
-_PokemonTower6AfterBattleText1:: ; 99b57 (26:5b57)
+_PokemonTower6AfterBattleText1::
 	text "I feel anemic and"
 	line "weak..."
 	done
 
-_PokemonTower6BattleText2:: ; 99b72 (26:5b72)
+_PokemonTower6BattleText2::
 	text "Urff... Kwaah!"
 	done
 
-_PokemonTower6EndBattleText2:: ; 99b82 (26:5b82)
+_PokemonTower6EndBattleText2::
 	text "Some-"
 	line "thing fell out!"
 	prompt
 
-_PokemonTower6AfterBattleText2:: ; 99b99 (26:5b99)
+_PokemonTower6AfterBattleText2::
 	text "Hair didn't fall"
 	line "out! It was an"
 	cont "evil spirit!"
 	done
 
-_PokemonTower6BattleText3:: ; 99bc6 (26:5bc6)
+_PokemonTower6BattleText3::
 	text "Ke..ke...ke..."
 	line "ke..ke...ke!!"
 	done
 
-_PokemonTower6EndBattleText3:: ; 99be4 (26:5be4)
+_PokemonTower6EndBattleText3::
 	text "Keee!"
 	prompt
 
-_PokemonTower6AfterBattleText3:: ; 99beb (26:5beb)
+_PokemonTower6AfterBattleText3::
 	text "What's going on"
 	line "here?"
 	done
 
-_PokemonTower6Text6:: ; 99c01 (26:5c01)
+_PokemonTower6Text6::
 	text "Be gone..."
 	line "Intruders..."
 	done
--- a/text/maps/pokemon_tower_7f.asm
+++ b/text/maps/pokemon_tower_7f.asm
@@ -1,30 +1,4 @@
-IF DEF(_YELLOW)
-_PokemonTowerJessieJamesText1::
-	text "Stop right there!@@"
-
-_PokemonTowerJessieJamesText2::
-	text "Grampa here wanted"
-	line "to complain, so"
-	cont "we're setting him"
-	cont "straight."
-
-	para "So render yourself"
-	line "invisible, or"
-	cont "prepare to fight!"
-	done
-
-_PokemonTowerJessieJamesText3::
-	text "You"
-	line "will regret this!"
-	prompt
-
-_PokemonTowerJessieJamesText4::
-	text "Looks like TEAM"
-	line "ROCKET's blasting"
-	cont "off again!@@"
-ENDC
-
-_TowerRescueFujiText:: ; 99c1a (26:5c1a)
+_TowerRescueFujiText::
 	text "MR.FUJI: Heh? You"
 	line "came to save me?"
 
@@ -50,21 +24,21 @@
 	cont "of this tower."
 	done
 
-_PokemonTower7BattleText1:: ; 99d31 (26:5d31)
+_PokemonTower7BattleText1::
 	text "What do you want?"
 	line "Why are you here?"
 	done
 
-_PokemonTower7EndBattleText1:: ; 99d56 (26:5d56)
+_PokemonTower7EndBattleText1::
 	text "I give up!"
 	prompt
 
-_PokemonTower7AfterBattleText1:: ; 99d62 (26:5d62)
+_PokemonTower7AfterBattleText1::
 	text "I'm not going to"
 	line "forget this!"
 	done
 
-_PokemonTower7BattleText2:: ; 99d80 (26:5d80)
+_PokemonTower7BattleText2::
 	text "This old guy came"
 	line "and complained"
 	cont "about us harming"
@@ -74,12 +48,12 @@
 	line "over as adults!"
 	done
 
-_PokemonTower7EndBattleText2:: ; 99de1 (26:5de1)
+_PokemonTower7EndBattleText2::
 	text "Please!"
 	line "No more!"
 	prompt
 
-_PokemonTower7AfterBattleText2:: ; 99df3 (26:5df3)
+_PokemonTower7AfterBattleText2::
 	text "#MON are only"
 	line "good for making"
 	cont "money!"
@@ -88,18 +62,17 @@
 	line "business!"
 	done
 
-_PokemonTower7BattleText3:: ; 99e33 (26:5e33)
+_PokemonTower7BattleText3::
 	text "You're not saving"
 	line "anyone, kid!"
 	done
 
-_PokemonTower7EndBattleText3:: ; 99e52 (26:5e52)
+_PokemonTower7EndBattleText3::
 	text "Don't"
 	line "fight us ROCKETs!"
 	prompt
 
-_PokemonTower7AfterBattleText3:: ; 99e6a (26:5e6a)
+_PokemonTower7AfterBattleText3::
 	text "You're not getting"
 	line "away with this!"
 	done
-
--- a/text/maps/power_plant.asm
+++ b/text/maps/power_plant.asm
@@ -1,7 +1,7 @@
-_VoltorbBattleText:: ; 8c5e2 (23:45e2)
+_VoltorbBattleText::
 	text "Bzzzt!"
 	done
 
-_ZapdosBattleText:: ; 8c5ea (23:45ea)
+_ZapdosBattleText::
 	text "Gyaoo!@@"
 
--- a/text/maps/reds_house_1f.asm
+++ b/text/maps/reds_house_1f.asm
@@ -1,11 +1,7 @@
 _MomWakeUpText::
 	text "MOM: Right."
 	line "All boys leave"
-IF DEF(_YELLOW)
-	cont "home someday."
-ELSE
 	cont "home some day."
-ENDC
 	cont "It said so on TV."
 
 	para "PROF.OAK, next"
@@ -14,22 +10,10 @@
 	done
 
 _MomHealText1::
-IF DEF(_YELLOW)
-	text "MOM: ",$52,", if"
-	line "your drive your"
-	cont "#MON too hard,"
-	cont "they'll dislike"
-	cont "you."
-
-	para "You should take a"
-	line "rest."
-	prompt
-ELSE
 	text "MOM: ",$52,"!"
 	line "You should take a"
 	cont "quick rest."
 	prompt
-ENDC
 
 _MomHealText2::
 	text "MOM: Oh good!"
--- a/text/maps/rock_tunnel_b1f.asm
+++ b/text/maps/rock_tunnel_b1f.asm
@@ -1,31 +1,31 @@
-_RockTunnel1BattleText1:: ; 8c33a (23:433a)
+_RockTunnel1BattleText1::
 	text "This tunnel goes"
 	line "a long way, kid!"
 	done
 
-_RockTunnel1EndBattleText1:: ; 8c35d (23:435d)
+_RockTunnel1EndBattleText1::
 	text "Doh!"
 	line "You win!"
 	prompt
 
-_RockTunnel1AfterBattleText1:: ; 8c36c (23:436c)
+_RockTunnel1AfterBattleText1::
 	text "Watch for ONIX!"
 	line "It can put the"
 	cont "squeeze on you!"
 	done
 
-_RockTunnel1BattleText2:: ; 8c39c (23:439c)
+_RockTunnel1BattleText2::
 	text "Hmm. Maybe I'm"
 	line "lost in here..."
 	done
 
-_RockTunnel1EndBattleText2:: ; 8c3bb (23:43bb)
+_RockTunnel1EndBattleText2::
 	text "Ease up!"
 	line "What am I doing?"
 	cont "Which way is out?"
 	prompt
 
-_RockTunnel1AfterBattleText2:: ; 8c3e8 (23:43e8)
+_RockTunnel1AfterBattleText2::
 	text "That sleeping"
 	line "#MON on ROUTE"
 	cont "12 forced me to"
@@ -32,83 +32,83 @@
 	cont "take this detour."
 	done
 
-_RockTunnel1BattleText3:: ; 8c427 (23:4427)
+_RockTunnel1BattleText3::
 	text "Outsiders like"
 	line "you need to show"
 	cont "me some respect!"
 	done
 
-_RockTunnel1EndBattleText3:: ; 8c459 (23:4459)
+_RockTunnel1EndBattleText3::
 	text "I give!"
 	prompt
 
-_RockTunnel1AfterBattleText3:: ; 8c462 (23:4462)
+_RockTunnel1AfterBattleText3::
 	text "You're talented"
 	line "enough to hike!"
 	done
 
-_RockTunnel1BattleText4:: ; 8c482 (23:4482)
+_RockTunnel1BattleText4::
 	text "#MON fight!"
 	line "Ready, go!"
 	done
 
-_RockTunnel1EndBattleText4:: ; 8c49a (23:449a)
+_RockTunnel1EndBattleText4::
 	text "Game"
 	line "over!"
 	prompt
 
-_RockTunnel1AfterBattleText4:: ; 8c4a6 (23:44a6)
+_RockTunnel1AfterBattleText4::
 	text "Oh well, I'll get"
 	line "a ZUBAT as I go!"
 	done
 
-_RockTunnel1BattleText5:: ; 8c4c9 (23:44c9)
+_RockTunnel1BattleText5::
 	text "Eek! Don't try"
 	line "anything funny in"
 	cont "the dark!"
 	done
 
-_RockTunnel1EndBattleText5:: ; 8c4f4 (23:44f4)
+_RockTunnel1EndBattleText5::
 	text "It"
 	line "was too dark!"
 	prompt
 
-_RockTunnel1AfterBattleText5:: ; 8c506 (23:4506)
+_RockTunnel1AfterBattleText5::
 	text "I saw a MACHOP"
 	line "in this tunnel!"
 	done
 
-_RockTunnel1BattleText6:: ; 8c526 (23:4526)
+_RockTunnel1BattleText6::
 	text "I came this far"
 	line "for #MON!"
 	done
 
-_RockTunnel1EndBattleText6:: ; 8c541 (23:4541)
+_RockTunnel1EndBattleText6::
 	text "I'm"
 	line "out of #MON!"
 	prompt
 
-_RockTunnel1AfterBattleText6:: ; 8c552 (23:4552)
+_RockTunnel1AfterBattleText6::
 	text "You looked cute"
 	line "and harmless!"
 	done
 
-_RockTunnel1BattleText7:: ; 8c571 (23:4571)
+_RockTunnel1BattleText7::
 	text "You have #MON!"
 	line "Let's start!"
 	done
 
-_RockTunnel1EndBattleText7:: ; 8c58d (23:458d)
+_RockTunnel1EndBattleText7::
 	text "You"
 	line "play hard!"
 	prompt
 
-_RockTunnel1AfterBattleText7:: ; 8c59d (23:459d)
+_RockTunnel1AfterBattleText7::
 	text "Whew! I'm all"
 	line "sweaty now!"
 	done
 
-_RockTunnel1Text8:: ; 8c5b7 (23:45b7)
+_RockTunnel1Text8::
 	text "ROCK TUNNEL"
 	line "CERULEAN CITY -"
 	cont "LAVENDER TOWN"
--- a/text/maps/rock_tunnel_b2f_1.asm
+++ b/text/maps/rock_tunnel_b2f_1.asm
@@ -1,108 +1,108 @@
-_RockTunnel2BattleText2:: ; 86a1d (21:6a1d)
+_RockTunnel2BattleText2::
 	text "Hikers leave twigs"
 	line "as trail markers."
 	done
 
-_RockTunnel2EndBattleText2:: ; 86a43 (21:6a43)
+_RockTunnel2EndBattleText2::
 	text "Ohhh!"
 	line "I did my best!"
 	prompt
 
-_RockTunnel2AfterBattleText2:: ; 86a59 (21:6a59)
+_RockTunnel2AfterBattleText2::
 	text "I want to go "
 	line "home!"
 	done
 
-_RockTunnel2BattleText3:: ; 86a6e (21:6a6e)
+_RockTunnel2BattleText3::
 	text "Hahaha! Can you"
 	line "beat my power?"
 	done
 
-_RockTunnel2EndBattleText3:: ; 86a8e (21:6a8e)
+_RockTunnel2EndBattleText3::
 	text "Oops!"
 	line "Out-muscled!"
 	prompt
 
-_RockTunnel2AfterBattleText3:: ; 86aa2 (21:6aa2)
+_RockTunnel2AfterBattleText3::
 	text "I go for power"
 	line "because I hate"
 	cont "thinking!"
 	done
 
-_RockTunnel2BattleText4:: ; 86acb (21:6acb)
+_RockTunnel2BattleText4::
 	text "You have a"
 	line "#DEX?"
 	cont "I want one too!"
 	done
 
-_RockTunnel2EndBattleText4:: ; 86aed (21:6aed)
+_RockTunnel2EndBattleText4::
 	text "Shoot!"
 	line "I'm so jealous!"
 	prompt
 
-_RockTunnel2AfterBattleText4:: ; 86b04 (21:6b04)
+_RockTunnel2AfterBattleText4::
 	text "When you finish"
 	line "your #DEX, can"
 	cont "I have it?"
 	done
 
-_RockTunnel2BattleText5:: ; 86b2f (21:6b2f)
+_RockTunnel2BattleText5::
 	text "Do you know about"
 	line "costume players?"
 	done
 
-_RockTunnel2EndBattleText5:: ; 86b53 (21:6b53)
+_RockTunnel2EndBattleText5::
 	text "Well,"
 	line "that's that."
 	prompt
 
-_RockTunnel2AfterBattleText5:: ; 86b66 (21:6b66)
+_RockTunnel2AfterBattleText5::
 	text "Costume players"
 	line "dress up as"
 	cont "#MON for fun."
 	done
 
-_RockTunnel2BattleText6:: ; 86b91 (21:6b91)
+_RockTunnel2BattleText6::
 	text "My #MON"
 	line "techniques will"
 	cont "leave you crying!"
 	done
 
-_RockTunnel2EndBattleText6:: ; 86bbc (21:6bbc)
+_RockTunnel2EndBattleText6::
 	text "I give!"
 	line "You're a better"
 	cont "technician!"
 	prompt
 
-_RockTunnel2AfterBattleText6:: ; 86be0 (21:6be0)
+_RockTunnel2AfterBattleText6::
 	text "In mountains,"
 	line "you'll often find"
 	cont "rock-type #MON."
 	done
 
-_RockTunnel2BattleText7:: ; 86c10 (21:6c10)
+_RockTunnel2BattleText7::
 	text "I don't often"
 	line "come here, but I"
 	cont "will fight you."
 	done
 
-_RockTunnel2EndBattleText7:: ; 86c3f (21:6c3f)
+_RockTunnel2EndBattleText7::
 	text "Oh!"
 	line "I lost!"
 	prompt
 
-_RockTunnel2AfterBattleText7:: ; 86c4c (21:6c4c)
+_RockTunnel2AfterBattleText7::
 	text "I like tiny"
 	line "#MON, big ones"
 	cont "are too scary!"
 	done
 
-_RockTunnel2BattleText8:: ; 86c77 (21:6c77)
+_RockTunnel2BattleText8::
 	text "Hit me with your"
 	line "best shot!"
 	done
 
-_RockTunnel2EndBattleText8:: ; 86c94 (21:6c94)
+_RockTunnel2EndBattleText8::
 	text "Fired"
 	line "away!"
 	prompt
--- a/text/maps/rock_tunnel_b2f_2.asm
+++ b/text/maps/rock_tunnel_b2f_2.asm
@@ -1,20 +1,20 @@
-_RockTunnel2AfterBattleText8:: ; 88000 (22:4000)
+_RockTunnel2AfterBattleText8::
 	text "I'll raise my"
 	line "#MON to beat"
 	cont "yours, kid!"
 	done
 
-_RockTunnel2BattleText9:: ; 88027 (22:4027)
+_RockTunnel2BattleText9::
 	text "I draw #MON"
 	line "when I'm home."
 	done
 
-_RockTunnel2EndBattleText9:: ; 88042 (22:4042)
+_RockTunnel2EndBattleText9::
 	text "Whew!"
 	line "I'm exhausted!"
 	prompt
 
-_RockTunnel2AfterBattleText9:: ; 88057 (22:4057)
+_RockTunnel2AfterBattleText9::
 	text "I'm an artist,"
 	line "not a fighter."
 	done
--- a/text/maps/rock_tunnel_pokecenter.asm
+++ b/text/maps/rock_tunnel_pokecenter.asm
@@ -1,4 +1,4 @@
-_RockTunnelPokecenterText1:: ; 8c2c0 (23:42c0)
+_RockTunnelPokecenterText1::
 	text "The element types"
 	line "of #MON make"
 	cont "them stronger"
@@ -7,7 +7,7 @@
 	cont "others!"
 	done
 
-_RockTunnelPokecenterText3:: ; 8c316 (23:4316)
+_RockTunnelPokecenterText3::
 	text "I sold a useless"
 	line "NUGGET for ¥5000!"
 	done
--- a/text/maps/rocket_hideout_b1f.asm
+++ b/text/maps/rocket_hideout_b1f.asm
@@ -1,73 +1,73 @@
-_RocketHideout1EndBattleText6:: ; 81f2a (20:5f2a)
+_RocketHideout1EndBattleText6::
 	text "Why...?@@"
 
-_RocketHideout1BattleText2:: ; 81f34 (20:5f34)
+_RocketHideout1BattleText2::
 	text "Who are you? How"
 	line "did you get here?"
 	done
 
-_RocketHideout1EndBattleText2:: ; 81f58 (20:5f58)
+_RocketHideout1EndBattleText2::
 	text "Oww!"
 	line "Beaten!"
 	prompt
 
-_RocketHideout1AfterBattleTxt2:: ; 81f66 (20:5f66)
+_RocketHideout1AfterBattleTxt2::
 	text "Are you dissing"
 	line "TEAM ROCKET?"
 	done
 
-_RocketHideout1BattleText3:: ; 81f84 (20:5f84)
+_RocketHideout1BattleText3::
 	text "You broke into"
 	line "our operation?"
 	done
 
-_RocketHideout1EndBattleText3:: ; 81fa3 (20:5fa3)
+_RocketHideout1EndBattleText3::
 	text "Burnt!"
 	prompt
 
-_RocketHideout1AfterBattleTxt3:: ; 81fab (20:5fab)
+_RocketHideout1AfterBattleTxt3::
 	text "You're not going"
 	line "to get away with"
 	cont "this, brat!"
 	done
 
-_RocketHideout1BattleText4:: ; 81fd9 (20:5fd9)
+_RocketHideout1BattleText4::
 	text "Intruder alert!"
 	done
 
-_RocketHideout1EndBattleText4:: ; 81fea (20:5fea)
+_RocketHideout1EndBattleText4::
 	text "I"
 	line "can't do it!"
 	prompt
 
-_RocketHideout1AfterBattleTxt4:: ; 81ff9 (20:5ff9)
+_RocketHideout1AfterBattleTxt4::
 	text "SILPH SCOPE?"
 	line "I don't know"
 	cont "where it is!"
 	done
 
-_RocketHideout1BattleText5:: ; 82020 (20:6020)
+_RocketHideout1BattleText5::
 	text "Why did you come"
 	line "here?"
 	done
 
-_RocketHideout1EndBattleText5:: ; 82038 (20:6038)
+_RocketHideout1EndBattleText5::
 	text "This"
 	line "won't do!"
 	prompt
 
-_RocketHideout1AfterBattleTxt5:: ; 82047 (20:6047)
+_RocketHideout1AfterBattleTxt5::
 	text "OK, I'll talk!"
 	line "Take the elevator"
 	cont "to see my BOSS!"
 	done
 
-_RocketHideout1BattleText6:: ; 82078 (20:6078)
+_RocketHideout1BattleText6::
 	text "Are you lost, you"
 	line "little rat?"
 	done
 
-_RocketHideout1AfterBattleTxt6:: ; 82097 (20:6097)
+_RocketHideout1AfterBattleTxt6::
 	text "Uh-oh, that fight"
 	line "opened the door!"
 	done
--- a/text/maps/rocket_hideout_b2f.asm
+++ b/text/maps/rocket_hideout_b2f.asm
@@ -1,15 +1,15 @@
-_RocketHideout2BattleText2:: ; 820bb (20:60bb)
+_RocketHideout2BattleText2::
 	text "BOSS said you can"
 	line "see GHOSTs with"
 	cont "the SILPH SCOPE!"
 	done
 
-_RocketHideout2EndBattleText2:: ; 820ef (20:60ef)
+_RocketHideout2EndBattleText2::
 	text "I"
 	line "surrender!"
 	prompt
 
-_RocketHideout2AfterBattleTxt2:: ; 820fd (20:60fd)
+_RocketHideout2AfterBattleTxt2::
 	text "The TEAM ROCKET"
 	line "HQ has 4 basement"
 	cont "floors. Can you"
--- a/text/maps/rocket_hideout_b3f.asm
+++ b/text/maps/rocket_hideout_b3f.asm
@@ -1,15 +1,15 @@
-_RocketHideout3BattleText2:: ; 82140 (20:6140)
+_RocketHideout3BattleText2::
 	text "Stop meddling in"
 	line "TEAM ROCKET's"
 	cont "affairs!"
 	done
 
-_RocketHideout3EndBattleText2:: ; 82168 (20:6168)
+_RocketHideout3EndBattleText2::
 	text "Oof!"
 	line "Taken down!"
 	prompt
 
-_RocketHideout3AfterBattleTxt2:: ; 8217a (20:617a)
+_RocketHideout3AfterBattleTxt2::
 	text "SILPH SCOPE?"
 	line "The machine the"
 	cont "BOSS stole. It's"
@@ -16,18 +16,18 @@
 	cont "here somewhere."
 	done
 
-_RocketHideout3BattleTxt:: ; 821b8 (20:61b8)
+_RocketHideout3BattleTxt::
 	text "We got word from"
 	line "upstairs that you"
 	cont "were coming!"
 	done
 
-_RocketHideout3EndBattleText3:: ; 821e9 (20:61e9)
+_RocketHideout3EndBattleText3::
 	text "What?"
 	line "I lost? No!"
 	prompt
 
-_RocketHide3AfterBattleText3:: ; 821fc (20:61fc)
+_RocketHide3AfterBattleText3::
 	text "Go ahead and go!"
 	line "But, you need the"
 	cont "LIFT KEY to run"
--- a/text/maps/rocket_hideout_b4f.asm
+++ b/text/maps/rocket_hideout_b4f.asm
@@ -1,40 +1,15 @@
-IF DEF(_YELLOW)
-_RocketHideoutJessieJamesText1::
-	text "Not another step,"
-	line "brat!@@"
-
-_RocketHideoutJessieJamesText2::
-	text "How dare you"
-	line "humiliate us at"
-	cont "MT.MOON!"
-
-	para "It's payback time,"
-	line "you brat!"
-	done
-
-_RocketHideoutJessieJamesText3::
-	text "Such"
-	line "a dreadful twerp!"
-	prompt
-
-_RocketHideoutJessieJamesText4::
-	text "Looks like TEAM"
-	line "ROCKET's blasting"
-	cont "off again!@@"
-ENDC
-
-_RocketHideout4Text_4557a:: ; 8223e (20:623e)
+_RocketHideout4Text_4557a::
 	text "So! I must say, I"
 	line "am impressed you"
 	cont "got here!"
 	done
 
-_RocketHideout4Text_4557f:: ; 8226c (20:626c)
+_RocketHideout4Text_4557f::
 	text "WHAT!"
 	line "This cannot be!"
 	prompt
 
-_RocketHideout4Text_45584:: ; 82283 (20:6283)
+_RocketHideout4Text_45584::
 	text "I see that you"
 	line "raise #MON"
 	cont "with utmost care."
@@ -51,49 +26,49 @@
 	line "again..."
 	done
 
-_RocketHideout4BattleText2:: ; 82326 (20:6326)
+_RocketHideout4BattleText2::
 	text "I know you! You"
 	line "ruined our plans"
 	cont "at MT.MOON!"
 	done
 
-_RocketHideout4EndBattleText2:: ; 82354 (20:6354)
+_RocketHideout4EndBattleText2::
 	text "Burned"
 	line "again!"
 	prompt
 
-_RocketHide4AfterBattleText2:: ; 82363 (20:6363)
+_RocketHide4AfterBattleText2::
 	text "Do you have"
 	line "something against"
 	cont "TEAM ROCKET?"
 	done
 
-_RocketHideout4BattleText3:: ; 8238f (20:638f)
+_RocketHideout4BattleText3::
 	text "How can you not"
 	line "see the beauty of"
 	cont "our evil?"
 	done
 
-_RocketHideout4EndBattleText3:: ; 823bc (20:63bc)
+_RocketHideout4EndBattleText3::
 	text "Ayaya!"
 	prompt
 
-_RocketHide4AfterBattleText3:: ; 823c4 (20:63c4)
+_RocketHide4AfterBattleText3::
 	text "BOSS! I'm sorry I"
 	line "failed you!"
 	done
 
-_RocketHideout4BattleText4:: ; 823e2 (20:63e2)
+_RocketHideout4BattleText4::
 	text "The elevator"
 	line "doesn't work? Who"
 	cont "has the LIFT KEY?"
 	done
 
-_RocketHideout4EndBattleText4:: ; 82413 (20:6413)
+_RocketHideout4EndBattleText4::
 	text "No!"
 	prompt
 
-_RocketHideout4Text_455ec:: ; 82418 (20:6418)
+_RocketHideout4Text_455ec::
 	text "Oh no! I dropped"
 	line "the LIFT KEY!"
 	done
--- a/text/maps/rocket_hideout_elevator.asm
+++ b/text/maps/rocket_hideout_elevator.asm
@@ -1,4 +1,4 @@
-_RocketElevatorText_4578b:: ; 82438 (20:6438)
+_RocketElevatorText_4578b::
 	text "It appears to"
 	line "need a key.@@"
 
--- a/text/maps/route_1.asm
+++ b/text/maps/route_1.asm
@@ -1,4 +1,4 @@
-_Route1ViridianMartSampleText:: ; 8d5bf (23:55bf)
+_Route1ViridianMartSampleText::
 	text "Hi! I work at a"
 	line "#MON MART."
 
@@ -12,24 +12,24 @@
 	cont "Here you go!"
 	prompt
 
-_Route1Text_1cae8:: ; 8d643 (23:5643)
+_Route1Text_1cae8::
 	text $52, " got"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_Route1Text_1caee:: ; 8d652 (23:5652)
+_Route1Text_1caee::
 	text "We also carry"
 	line "# BALLs for"
 	cont "catching #MON!"
 	done
 
-_Route1Text_1caf3:: ; 8d67c (23:567c)
+_Route1Text_1caf3::
 	text "You have too much"
 	line "stuff with you!"
 	done
 
-_Route1Text2:: ; 8d69f (23:569f)
+_Route1Text2::
 	text "See those ledges"
 	line "along the road?"
 
@@ -42,7 +42,7 @@
 	cont "quicker that way."
 	done
 
-_Route1Text3:: ; 8d720 (23:5720)
+_Route1Text3::
 	text "ROUTE 1"
 	line "PALLET TOWN -"
 	cont "VIRIDIAN CITY"
--- a/text/maps/route_10.asm
+++ b/text/maps/route_10.asm
@@ -1,4 +1,4 @@
-_Route10BattleText1:: ; 8e642 (23:6642)
+_Route10BattleText1::
 	text "Wow, are you a"
 	line "#MANIAC too?"
 	cont "Want to see my"
@@ -5,21 +5,21 @@
 	cont "collection?"
 	done
 
-_Route10EndBattleText1:: ; 8e67a (23:667a)
+_Route10EndBattleText1::
 	text "Humph."
 	line "I'm not angry!"
 	prompt
 
-_Route10AfterBattleText1:: ; 8e690 (23:6690)
+_Route10AfterBattleText1::
 	text "I have more rare"
 	line "#MON at home!"
 	done
 
-_Route10BattleText2:: ; 8e6b0 (23:66b0)
+_Route10BattleText2::
 	text "Ha-hahah-ah-ha!"
 	done
 
-_Route10EndBattleText2:: ; 8e6c1 (23:66c1)
+_Route10EndBattleText2::
 	text "Ha-haha!"
 	line "Not laughing!"
 	cont "Ha-hay fever!"
@@ -26,32 +26,28 @@
 	cont "Haha-ha-choo!"
 	prompt
 
-_Route10AfterBattleText2:: ; 8e6f5 (23:66f5)
+_Route10AfterBattleText2::
 	text "Haha-ha-choo!"
 	line "Ha-choo!"
 	cont "Snort! Snivel!"
 	done
 
-_Route10BattleText3:: ; 8e71c (23:671c)
-IF DEF(_YELLOW)
-	text "Hi, kid, want to"
-ELSE
+_Route10BattleText3::
 	text "Hi kid, want to"
-ENDC
 	line "see my #MON?"
 	done
 
-_Route10EndBattleText3:: ; 8e73a (23:673a)
+_Route10EndBattleText3::
 	text "Oh no!"
 	line "My #MON!"
 	prompt
 
-_Route10AfterBattleText3:: ; 8e74b (23:674b)
+_Route10AfterBattleText3::
 	text "I don't like you"
 	line "for beating me!"
 	done
 
-_Route10BattleText4:: ; 8e76c (23:676c)
+_Route10BattleText4::
 	text "I've been to a"
 	line "#MON GYM a few"
 	cont "times. But, I"
@@ -58,44 +54,44 @@
 	cont "lost each time."
 	done
 
-_Route10EndBattleText4:: ; 8e7a8 (23:67a8)
+_Route10EndBattleText4::
 	text "Ohh!"
 	line "Blew it again!"
 	prompt
 
-_Route10AfterBattleText4:: ; 8e7bd (23:67bd)
+_Route10AfterBattleText4::
 	text "I noticed some"
 	line "#MANIACs"
 	cont "prowling around."
 	done
 
-_Route10BattleText5:: ; 8e7e7 (23:67e7)
+_Route10BattleText5::
 	text "Ah! This mountain"
 	line "air is delicious!"
 	done
 
-_Route10EndBattleText5:: ; 8e80c (23:680c)
+_Route10EndBattleText5::
 	text "That"
 	line "cleared my head!"
 	prompt
 
-_Route10AfterBattleText5:: ; 8e823 (23:6823)
+_Route10AfterBattleText5::
 	text "I feel bloated on"
 	line "mountain air!"
 	done
 
-_Route10BattleText6:: ; 8e844 (23:6844)
+_Route10BattleText6::
 	text "I'm feeling a bit"
 	line "faint from this"
 	cont "tough hike."
 	done
 
-_Route10EndBattleText6:: ; 8e872 (23:6872)
+_Route10EndBattleText6::
 	text "I'm"
 	line "not up to it!"
 	prompt
 
-_Route10AfterBattleText6:: ; 8e884 (23:6884)
+_Route10AfterBattleText6::
 	text "The #MON here"
 	line "are so chunky!"
 	cont "There should be a"
@@ -103,12 +99,12 @@
 	cont "floral pattern!"
 	done
 
-_Route10Text9:: ; 8e8d4 (23:68d4)
-_Route10Text7:: ; 8e8d4 (23:68d4)
+_Route10Text9::
+_Route10Text7::
 	text "ROCK TUNNEL"
 	done
 
-_Route10Text10:: ; 8e8e1 (23:68e1)
+_Route10Text10::
 	text "POWER PLANT"
 	done
 
--- a/text/maps/route_11_1.asm
+++ b/text/maps/route_11_1.asm
@@ -1,123 +1,123 @@
-_Route11BattleText1:: ; 8e8ee (23:68ee)
+_Route11BattleText1::
 	text "Win, lose or draw!"
 	done
 
-_Route11EndBattleText1:: ; 8e902 (23:6902)
+_Route11EndBattleText1::
 	text "Atcha!"
 	line "Didn't go my way!"
 	prompt
 
-_Route11AfterBattleText1:: ; 8e91b (23:691b)
+_Route11AfterBattleText1::
 	text "#MON is life!"
 	line "And to live is to"
 	cont "gamble!"
 	done
 
-_Route11BattleText2:: ; 8e944 (23:6944)
+_Route11BattleText2::
 	text "Competition! I"
 	line "can't get enough!"
 	done
 
-_Route11EndBattleText2:: ; 8e965 (23:6965)
+_Route11EndBattleText2::
 	text "I had"
 	line "a chance!"
 	prompt
 
-_Route11AfterBattleText2:: ; 8e976 (23:6976)
+_Route11AfterBattleText2::
 	text "You can't be a"
 	line "coward in the"
 	cont "world of #MON!"
 	done
 
-_Route11BattleText3:: ; 8e9a2 (23:69a2)
+_Route11BattleText3::
 	text "Let's go, but"
 	line "don't cheat!"
 	done
 
-_Route11EndBattleText3:: ; 8e9bc (23:69bc)
+_Route11EndBattleText3::
 	text "Huh?"
 	line "That's not right!"
 	prompt
 
-_Route11AfterBattleText3:: ; 8e9d3 (23:69d3)
+_Route11AfterBattleText3::
 	text "I did my best! I"
 	line "have no regrets!"
 	done
 
-_Route11BattleText4:: ; 8e9f6 (23:69f6)
+_Route11BattleText4::
 	text "Careful!"
 	line "I'm laying down"
 	cont "some cables!"
 	done
 
-_Route11EndBattleText4:: ; 8ea1c (23:6a1c)
+_Route11EndBattleText4::
 	text "That"
 	line "was electric!"
 	prompt
 
-_Route11AfterBattleText4:: ; 8ea30 (23:6a30)
+_Route11AfterBattleText4::
 	text "Spread the word"
 	line "to save energy!"
 	done
 
-_Route11BattleText5:: ; 8ea51 (23:6a51)
+_Route11BattleText5::
 	text "I just became a"
 	line "trainer! But, I"
 	cont "think I can win!"
 	done
 
-_Route11EndBattleText5:: ; 8ea83 (23:6a83)
+_Route11EndBattleText5::
 	text "My"
 	line "#MON couldn't!"
 	prompt
 
-_Route11AfterBattleText5:: ; 8ea95 (23:6a95)
+_Route11AfterBattleText5::
 	text "What do you want?"
 	line "Leave me alone!"
 	done
 
-_Route11BattleText6:: ; 8eab8 (23:6ab8)
+_Route11BattleText6::
 	text "Fwahaha! I have"
 	line "never lost!"
 	done
 
-_Route11EndBattleText6:: ; 8ead5 (23:6ad5)
+_Route11EndBattleText6::
 	text "My"
 	line "first loss!"
 	prompt
 
-_Route11AfterBattleText6:: ; 8eae5 (23:6ae5)
+_Route11AfterBattleText6::
 	text "Luck of the draw!"
 	line "Just luck!"
 	done
 
-_Route11BattleText7:: ; 8eb03 (23:6b03)
+_Route11BattleText7::
 	text "I have never won"
 	line "before..."
 	done
 
-_Route11EndBattleText7:: ; 8eb1f (23:6b1f)
+_Route11EndBattleText7::
 	text "I saw"
 	line "this coming..."
 	prompt
 
-_Route11AfterBattleText7:: ; 8eb35 (23:6b35)
+_Route11AfterBattleText7::
 	text "It's just luck."
 	line "Luck of the draw."
 	done
 
-_Route11BattleText8:: ; 8eb57 (23:6b57)
+_Route11BattleText8::
 	text "I'm the best in"
 	line "my class!"
 	done
 
-_Route11EndBattleText8:: ; 8eb71 (23:6b71)
+_Route11EndBattleText8::
 	text "Darn!"
 	line "I need to make my"
 	cont "#MON stronger!"
 	prompt
 
-_Route11AfterBattleText8:: ; 8eb99 (23:6b99)
+_Route11AfterBattleText8::
 	text "There's a fat"
 	line "#MON that"
 	cont "comes down from"
@@ -127,7 +127,7 @@
 	line "you can get it."
 	done
 
-_Route11BattleText9:: ; 8ebee (23:6bee)
+_Route11BattleText9::
 	text "Watch out for"
 	line "live wires!"
 	done
--- a/text/maps/route_11_2.asm
+++ b/text/maps/route_11_2.asm
@@ -1,29 +1,29 @@
-_Route11EndBattleText9:: ; 90000 (24:4000)
+_Route11EndBattleText9::
 	text "Whoa!"
 	line "You spark plug!"
 	prompt
 
-_Route11AfterBattleText9:: ; 90017 (24:4017)
+_Route11AfterBattleText9::
 	text "Well, better get"
 	line "back to work."
 	done
 
-_Route11BattleText10:: ; 90037 (24:4037)
+_Route11BattleText10::
 	text "My #MON should"
 	line "be ready by now!"
 	done
 
-_Route11EndBattleText10:: ; 90058 (24:4058)
+_Route11EndBattleText10::
 	text "Too"
 	line "much, too young!"
 	prompt
 
-_Route11AfterBattleText10:: ; 9006e (24:406e)
+_Route11AfterBattleText10::
 	text "I better go find"
 	line "stronger ones!"
 	done
 
-_Route11Text11:: ; 9008f (24:408f)
+_Route11Text11::
 	text "DIGLETT's CAVE"
 	done
 
--- a/text/maps/route_11_gate.asm
+++ b/text/maps/route_11_gate.asm
@@ -1,4 +1,4 @@
-_Route11GateText1:: ; 8c5f3 (23:45f3)
+_Route11GateText1::
 	text "When you catch"
 	line "lots of #MON,"
 	cont "isn't it hard to"
--- a/text/maps/route_11_gate_upstairs.asm
+++ b/text/maps/route_11_gate_upstairs.asm
@@ -1,4 +1,4 @@
-_Route11GateUpstairsText_494a3:: ; 8c689 (23:4689)
+_Route11GateUpstairsText_494a3::
 	text "There are items on"
 	line "the ground that"
 	cont "can't be seen."
@@ -28,7 +28,7 @@
 	line "view!"
 	done
 
-_Route11GateUpstairsText_494d5:: ; 8c78b (23:478b)
+_Route11GateUpstairsText_494d5::
 	text "Looked into the"
 	line "binoculars."
 
--- a/text/maps/route_12.asm
+++ b/text/maps/route_12.asm
@@ -1,9 +1,9 @@
-_Route12Text1:: ; 9009e (24:409e)
+_Route12Text1::
 	text "A sleeping #MON"
 	line "blocks the way!"
 	done
 
-_Route12Text13:: ; 900bf (24:40bf)
+_Route12Text13::
 	text "SNORLAX woke up!"
 
 	para "It attacked in a"
@@ -10,7 +10,7 @@
 	line "grumpy rage!"
 	done
 
-_Route12Text14:: ; 900ef (24:40ef)
+_Route12Text14::
 	text "SNORLAX calmed"
 	line "down! With a big"
 	cont "yawn, it returned"
@@ -17,63 +17,63 @@
 	cont "to the mountains!"
 	done
 
-_Route12BattleText1:: ; 90134 (24:4134)
+_Route12BattleText1::
 	text "Yeah! I got a"
 	line "bite, here!"
 	done
 
-_Route12EndBattleText1:: ; 9014f (24:414f)
+_Route12EndBattleText1::
 	text "Tch!"
 	line "Just a small fry!"
 	prompt
 
-_Route12AfterBattleText1:: ; 90167 (24:4167)
+_Route12AfterBattleText1::
 	text "Hang on! My line's"
 	line "snagged!"
 	done
 
-_Route12BattleText2:: ; 90183 (24:4183)
+_Route12BattleText2::
 	text "Be patient!"
 	line "Fishing is a"
 	cont "waiting game!"
 	done
 
-_Route12EndBattleText2:: ; 901ab (24:41ab)
+_Route12EndBattleText2::
 	text "That"
 	line "one got away!"
 	prompt
 
-_Route12AfterBattleText2:: ; 901bf (24:41bf)
+_Route12AfterBattleText2::
 	text "With a better ROD,"
 	line "I could catch"
 	cont "better #MON!"
 	done
 
-_Route12BattleText3:: ; 901ee (24:41ee)
+_Route12BattleText3::
 	text "Have you found a"
 	line "MOON STONE?"
 	done
 
-_Route12EndBattleText3:: ; 9020c (24:420c)
+_Route12EndBattleText3::
 	text "Oww!"
 	prompt
 
-_Route12AfterBattleText3:: ; 90212 (24:4212)
+_Route12AfterBattleText3::
 	text "I could have made"
 	line "my #MON evolve"
 	cont "with MOON STONE!"
 	done
 
-_Route12BattleText4:: ; 90245 (24:4245)
+_Route12BattleText4::
 	text "Electricity is my"
 	line "specialty!"
 	done
 
-_Route12EndBattleText4:: ; 90263 (24:4263)
+_Route12EndBattleText4::
 	text "Unplugged!"
 	prompt
 
-_Route12AfterBattleText4:: ; 9026f (24:426f)
+_Route12AfterBattleText4::
 	text "Water conducts"
 	line "electricity, so"
 	cont "you should zap"
@@ -80,65 +80,61 @@
 	cont "sea #MON!"
 	done
 
-_Route12BattleText5:: ; 902a8 (24:42a8)
+_Route12BattleText5::
 	text "The FISHING FOOL"
 	line "vs. #MON KID!"
 	done
 
-_Route12EndBattleText5:: ; 902c8 (24:42c8)
+_Route12EndBattleText5::
 	text "Too"
 	line "much!"
 	prompt
 
-_Route12AfterBattleText5:: ; 902d3 (24:42d3)
+_Route12AfterBattleText5::
 	text "You beat me at"
 	line "#MON, but I'm"
 	cont "good at fishing!"
 	done
 
-_Route12BattleText6:: ; 90301 (24:4301)
+_Route12BattleText6::
 	text "I'd rather be"
 	line "working!"
 	done
 
-_Route12EndBattleText6:: ; 90318 (24:4318)
+_Route12EndBattleText6::
 	text "It's"
 	line "not easy..."
 	prompt
 
-_Route12AfterBattleText6:: ; 90329 (24:4329)
+_Route12AfterBattleText6::
 	text "It's all right."
 	line "Losing doesn't"
-IF DEF(_YELLOW)
-	cont "bug me anymore."
-ELSE
 	cont "bug me any more."
-ENDC
 	done
 
-_Route12BattleText7:: ; 90358 (24:4358)
+_Route12BattleText7::
 	text "You never know"
 	line "what you could"
 	cont "catch!"
 	done
 
-_Route12EndBattleText7:: ; 9037e (24:437e)
+_Route12EndBattleText7::
 	text "Lost"
 	line "it!"
 	prompt
 
-_Route12AfterBattleText7:: ; 90388 (24:4388)
+_Route12AfterBattleText7::
 	text "I catch MAGIKARP"
 	line "all the time, but"
 	cont "they're so weak!"
 	done
 
-_Route12Text11:: ; 903bc (24:43bc)
+_Route12Text11::
 	text "ROUTE 12 "
 	line "North to LAVENDER"
 	done
 
-_Route12Text12:: ; 903d9 (24:43d9)
+_Route12Text12::
 	text "SPORT FISHING AREA"
 	done
 
--- a/text/maps/route_12_gate.asm
+++ b/text/maps/route_12_gate.asm
@@ -1,4 +1,4 @@
-_Route12GateText1:: ; 8c84a (23:484a)
+_Route12GateText1::
 	text "There's a lookout"
 	line "spot upstairs."
 	done
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/route_12_gate_upstairs.asm
@@ -1,4 +1,4 @@
-_TM39PreReceiveText:: ; 8c86b (23:486b)
+_TM39PreReceiveText::
 	text "My #MON's"
 	line "ashes are stored"
 	cont "in #MON TOWER."
@@ -5,18 +5,14 @@
 
 	para "You can have this"
 	line "TM. I don't need"
-IF DEF(_YELLOW)
-	cont "it anymore..."
-ELSE
 	cont "it any more..."
-ENDC
 	prompt
 
-_ReceivedTM39Text:: ; 8c8c6 (23:48c6)
+_ReceivedTM39Text::
 	text $52, " received"
 	line "TM39!@@"
 
-_TM39ExplanationText:: ; 8c8d9 (23:48d9)
+_TM39ExplanationText::
 	text "TM39 is a move"
 	line "called SWIFT."
 
@@ -26,12 +22,12 @@
 	cont "afford to lose."
 	done
 
-_TM39NoRoomText:: ; 8c93c (23:493c)
+_TM39NoRoomText::
 	text "You don't have"
 	line "room for this."
 	done
 
-_Route12GateUpstairsText_495b8:: ; 8c95a (23:495a)
+_Route12GateUpstairsText_495b8::
 	text "Looked into the"
 	line "binoculars."
 
@@ -38,7 +34,7 @@
 	para "A man fishing!"
 	done
 
-_Route12GateUpstairsText_495c4:: ; 8c986 (23:4986)
+_Route12GateUpstairsText_495c4::
 	text "Looked into the"
 	line "binoculars."
 
--- a/text/maps/route_12_house.asm
+++ b/text/maps/route_12_house.asm
@@ -1,4 +1,4 @@
-_Route12HouseText_564c0:: ; 8c9b3 (23:49b3)
+_Route12HouseText_564c0::
 	text "I'm the FISHING"
 	line "GURU's brother!"
 
@@ -9,7 +9,7 @@
 	line "fish?"
 	done
 
-_Route12HouseText_564c5:: ; 8ca00 (23:4a00)
+_Route12HouseText_564c5::
 	text "Grand! I like"
 	line "your style!"
 
@@ -21,7 +21,7 @@
 	TX_RAM wcf4b
 	text "!@@"
 
-_Route12HouseText_564ca:: ; 8ca4f (23:4a4f)
+_Route12HouseText_564ca::
 	db $0
 	para "Fishing is a way"
 	line "of life!"
@@ -32,12 +32,12 @@
 	cont "one!"
 	done
 
-_Route12HouseText_564cf:: ; 8caa1 (23:4aa1)
+_Route12HouseText_564cf::
 	text "Oh... That's so"
 	line "disappointing..."
 	done
 
-_Route12HouseText_564d4:: ; 8cac2 (23:4ac2)
+_Route12HouseText_564d4::
 	text "Hello there,"
 	line $52, "!"
 
@@ -51,7 +51,7 @@
 	line "wherever you can!"
 	done
 
-_Route12HouseText_564d9:: ; 8cb38 (23:4b38)
+_Route12HouseText_564d9::
 	text "Oh no!"
 
 	para "I had a gift for"
--- a/text/maps/route_13.asm
+++ b/text/maps/route_13.asm
@@ -1,126 +1,126 @@
-_Route13BattleText2:: ; 903ed (24:43ed)
+_Route13BattleText2::
 	text "My bird #MON"
 	line "want to scrap!"
 	done
 
-_Route13EndBattleText2:: ; 9040a (24:440a)
+_Route13EndBattleText2::
 	text "My"
 	line "bird combo lost?"
 	prompt
 
-_Route13AfterBattleText2:: ; 9041f (24:441f)
+_Route13AfterBattleText2::
 	text "My #MON look"
 	line "happy even though"
 	cont "they lost."
 	done
 
-_Route13BattleText3:: ; 9044a (24:444a)
+_Route13BattleText3::
 	text "I'm told I'm good"
 	line "for a kid!"
 	done
 
-_Route13EndBattleText3:: ; 90466 (24:4466)
+_Route13EndBattleText3::
 	text "Ohh!"
 	line "I lost!"
 	prompt
 
-_Route13AfterBattleText3:: ; 90474 (24:4474)
+_Route13AfterBattleText3::
 	text "I want to become"
 	line "a good trainer."
 	cont "I'll train hard."
 	done
 
-_Route13BattleText4:: ; 904a6 (24:44a6)
+_Route13BattleText4::
 	text "Wow! Your BADGEs"
 	line "are too cool!"
 	done
 
-_Route13EndBattleText4:: ; 904c6 (24:44c6)
+_Route13EndBattleText4::
 	text "Not"
 	line "enough!"
 	prompt
 
-_Route13AfterBattleText4:: ; 904d3 (24:44d3)
+_Route13AfterBattleText4::
 	text "You got those"
 	line "BADGEs from GYM"
 	cont "LEADERs. I know!"
 	done
 
-_Route13BattleText5:: ; 90503 (24:4503)
+_Route13BattleText5::
 	text "My cute #MON"
 	line "wish to make your"
 	cont "acquaintance."
 	done
 
-_Route13EndBattleText5:: ; 90531 (24:4531)
+_Route13EndBattleText5::
 	text "Wow!"
 	line "You totally won!"
 	prompt
 
-_Route13AfterBattleText5:: ; 90548 (24:4548)
+_Route13AfterBattleText5::
 	text "You have to make"
 	line "#MON fight to"
 	cont "toughen them up!"
 	done
 
-_Route13BattleText6:: ; 90579 (24:4579)
+_Route13BattleText6::
 	text "I found CARBOS in"
 	line "a cave once."
 	done
 
-_Route13EndBattleText6:: ; 90599 (24:4599)
+_Route13EndBattleText6::
 	text "Just"
 	line "messed up!"
 	prompt
 
-_Route13AfterBattleText6:: ; 905aa (24:45aa)
+_Route13AfterBattleText6::
 	text "CARBOS boosted"
 	line "the SPEED of my"
 	cont "#MON."
 	done
 
-_Route13BattleText7:: ; 905d0 (24:45d0)
+_Route13BattleText7::
 	text "The wind's blowing"
 	line "my way!"
 	done
 
-_Route13EndBattleText7:: ; 905eb (24:45eb)
+_Route13EndBattleText7::
 	text "The"
 	line "wind turned!"
 	prompt
 
-_Route13AfterBattleText7:: ; 905fd (24:45fd)
+_Route13AfterBattleText7::
 	text "I'm beat. I guess"
 	line "I'll FLY home."
 	done
 
-_Route13BattleText8:: ; 9061d (24:461d)
+_Route13BattleText8::
 	text "Sure, I'll play"
 	line "with you!"
 	done
 
-_Route13EndBattleText8:: ; 90637 (24:4637)
+_Route13EndBattleText8::
 	text "Oh!"
 	line "You little brute!"
 	prompt
 
-_Route13AfterBattleText8:: ; 9064e (24:464e)
+_Route13AfterBattleText8::
 	text "I wonder which is"
 	line "stronger, male or"
 	cont "female #MON?"
 	done
 
-_Route13BattleText9:: ; 90680 (24:4680)
+_Route13BattleText9::
 	text "Do you want to"
 	line "#MON with me?"
 	done
 
-_Route13EndBattleText9:: ; 9069e (24:469e)
+_Route13EndBattleText9::
 	text "It's over"
 	line "already?"
 	prompt
 
-_Route13AfterBattleText9:: ; 906b1 (24:46b1)
+_Route13AfterBattleText9::
 	text "I don't know"
 	line "anything about"
 	cont "#MON. I just"
@@ -127,37 +127,37 @@
 	cont "like cool ones!"
 	done
 
-_Route13BattleText10:: ; 906ea (24:46ea)
+_Route13BattleText10::
 	text "What're you"
 	line "lookin' at?"
 	done
 
-_Route13EndBattleText10:: ; 90702 (24:4702)
+_Route13EndBattleText10::
 	text "Dang!"
 	line "Stripped gears!"
 	prompt
 
-_Route13AfterBattleText10:: ; 90719 (24:4719)
+_Route13AfterBattleText10::
 	text "Get lost!"
 	done
 
-_Route13BattleText11:: ; 90724 (24:4724)
+_Route13BattleText11::
 	text "I always go with"
 	line "bird #MON!"
 	done
 
-_Route13EndBattleText11:: ; 90741 (24:4741)
+_Route13EndBattleText11::
 	text "Out"
 	line "of power!"
 	prompt
 
-_Route13AfterBattleText11:: ; 90750 (24:4750)
+_Route13AfterBattleText11::
 	text "I wish I could"
 	line "fly like PIDGEY"
 	cont "and PIDGEOTTO..."
 	done
 
-_Route13Text11:: ; 90781 (24:4781)
+_Route13Text11::
 	text "TRAINER TIPS"
 
 	para "Look to the left"
@@ -164,7 +164,7 @@
 	line "of that post!"
 	done
 
-_Route13Text12:: ; 907ae (24:47ae)
+_Route13Text12::
 	text "TRAINER TIPS"
 
 	para "Use SELECT to"
@@ -172,7 +172,7 @@
 	cont "the ITEM window!"
 	done
 
-_Route13Text13:: ; 907eb (24:47eb)
+_Route13Text13::
 	text "ROUTE 13"
 	line "North to SILENCE"
 	cont "BRIDGE"
--- a/text/maps/route_14.asm
+++ b/text/maps/route_14.asm
@@ -1,42 +1,38 @@
-_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"
@@ -43,12 +39,12 @@
 	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"
@@ -55,97 +51,97 @@
 	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 @@
 	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"
--- 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,51 +19,51 @@
 	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"
@@ -70,49 +70,49 @@
 	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!"
@@ -119,52 +119,52 @@
 	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"
--- a/text/maps/route_15_gate.asm
+++ b/text/maps/route_15_gate.asm
@@ -1,4 +1,4 @@
-_Route15GateText1:: ; 8cb73 (23:4b73)
+_Route15GateText1::
 	text "Are you working"
 	line "on a #DEX?"
 
--- a/text/maps/route_15_gate_upstairs.asm
+++ b/text/maps/route_15_gate_upstairs.asm
@@ -1,4 +1,4 @@
-_Route15GateUpstairsText_4968c:: ; 8cbac (23:4bac)
+_Route15GateUpstairsText_4968c::
 	text "EXP.ALL gives"
 	line "EXP points to all"
 	cont "the #MON with"
@@ -15,7 +15,7 @@
 	cont "store it via PC."
 	done
 
-_Route15GateUpstairsText_49698:: ; 8cc65 (23:4c65)
+_Route15GateUpstairsText_49698::
 	text "Looked into the"
 	line "binoculars."
 
--- a/text/maps/route_16.asm
+++ b/text/maps/route_16.asm
@@ -1,62 +1,58 @@
-_Route16BattleText1:: ; 91081 (24:5081)
+_Route16BattleText1::
 	text "What do you want?"
 	done
 
-_Route16EndBattleText1:: ; 91094 (24:5094)
+_Route16EndBattleText1::
 	text "Don't you"
 	line "dare laugh!"
 	prompt
 
-_Route16AfterBattleText1:: ; 910aa (24:50aa)
+_Route16AfterBattleText1::
 	text "We like just"
 	line "hanging here,"
 	cont "what's it to you?"
 	done
 
-_Route16BattleText2:: ; 910d7 (24:50d7)
+_Route16BattleText2::
 	text "Nice BIKE!"
 	line "Hand it over!"
 	done
 
-_Route16EndBattleText2:: ; 910f1 (24:50f1)
-IF DEF(_YELLOW)
-	text "Knock-"
-ELSE
+_Route16EndBattleText2::
 	text "Knock"
-ENDC
 	line "out!"
 	prompt
 
-_Route16AfterBattleText2:: ; 910fd (24:50fd)
+_Route16AfterBattleText2::
 	text "Forget it, who"
 	line "needs your BIKE!"
 	done
 
-_Route16BattleText3:: ; 9111e (24:511e)
+_Route16BattleText3::
 	text "Come out and play,"
 	line "little mouse!"
 	done
 
-_Route16EndBattleText3:: ; 91140 (24:5140)
+_Route16EndBattleText3::
 	text "You"
 	line "little rat!"
 	prompt
 
-_Route16AfterBattleText3:: ; 91151 (24:5151)
+_Route16AfterBattleText3::
 	text "I hate losing!"
 	line "Get away from me!"
 	done
 
-_Route16BattleText4:: ; 91173 (24:5173)
+_Route16BattleText4::
 	text "Hey, you just"
 	line "bumped me!"
 	done
 
-_Route16EndBattleText4:: ; 9118d (24:518d)
+_Route16EndBattleText4::
 	text "Kaboom!"
 	prompt
 
-_Route16AfterBattleText4:: ; 91196 (24:5196)
+_Route16AfterBattleText4::
 	text "You can also get"
 	line "to FUCHSIA from"
 	cont "VERMILION using a"
@@ -63,43 +59,43 @@
 	cont "coastal road."
 	done
 
-_Route16BattleText5:: ; 911d8 (24:51d8)
+_Route16BattleText5::
 	text "I'm feeling"
 	line "hungry and mean!"
 	done
 
-_Route16EndBattleText5:: ; 911f5 (24:51f5)
+_Route16EndBattleText5::
 	text "Bad,"
 	line "bad, bad!"
 	prompt
 
-_Route16AfterBattleText5:: ; 91205 (24:5205)
+_Route16AfterBattleText5::
 	text "I like my #MON"
 	line "ferocious! They"
 	cont "tear up enemies!"
 	done
 
-_Route16BattleText6:: ; 91236 (24:5236)
+_Route16BattleText6::
 	text "Sure, I'll go!"
 	done
 
-_Route16EndBattleText6:: ; 91245 (24:5245)
+_Route16EndBattleText6::
 	text "Don't make"
 	line "me mad!"
 	prompt
 
-_Route16AfterBattleText6:: ; 91258 (24:5258)
+_Route16AfterBattleText6::
 	text "I like harassing"
 	line "people with my"
 	cont "vicious #MON!"
 	done
 
-_Route16Text7:: ; 91287 (24:5287)
+_Route16Text7::
 	text "A sleeping #MON"
 	line "blocks the way!"
 	done
 
-_Route16Text10:: ; 912a8 (24:52a8)
+_Route16Text10::
 	text "SNORLAX woke up!"
 
 	para "It attacked in a"
@@ -106,18 +102,18 @@
 	line "grumpy rage!"
 	done
 
-_Route16Text11:: ; 912d8 (24:52d8)
+_Route16Text11::
 	text "With a big yawn,"
 	line "SNORLAX returned"
 	cont "to the mountains!"
 	done
 
-_Route16Text8:: ; 9130d (24:530d)
+_Route16Text8::
 	text "Enjoy the slope!"
 	line "CYCLING ROAD"
 	done
 
-_Route16Text9:: ; 9132c (24:532c)
+_Route16Text9::
 	text "ROUTE 16"
 	line "CELADON CITY -"
 	cont "FUCHSIA CITY"
--- a/text/maps/route_16_gate.asm
+++ b/text/maps/route_16_gate.asm
@@ -1,10 +1,10 @@
-_Route16GateText_49777:: ; 8cca0 (23:4ca0)
+_Route16GateText_49777::
 	text "No pedestrians"
 	line "are allowed on"
 	cont "CYCLING ROAD!"
 	done
 
-_Route16GateText_4977c:: ; 8cccd (23:4ccd)
+_Route16GateText_4977c::
 	text "CYCLING ROAD is a"
 	line "downhill course"
 	cont "by the sea. It's"
@@ -11,12 +11,12 @@
 	cont "a great ride."
 	done
 
-_Route16GateText_49781:: ; 8cd0e (23:4d0e)
+_Route16GateText_49781::
 	text "Excuse me! Wait"
 	line "up please!"
 	done
 
-_Route16GateText2:: ; 8cd2a (23:4d2a)
+_Route16GateText2::
 	text "How'd you get in?"
 	line "Good effort!"
 	done
--- a/text/maps/route_16_gate_upstairs.asm
+++ b/text/maps/route_16_gate_upstairs.asm
@@ -1,15 +1,15 @@
-_Route16GateUpstairsText_49820:: ; 8cd49 (23:4d49)
+_Route16GateUpstairsText_49820::
 	text "I'm going for a"
 	line "ride with my girl"
 	cont "friend!"
 	done
 
-_Route16GateUpstairsText_4982f:: ; 8cd73 (23:4d73)
+_Route16GateUpstairsText_4982f::
 	text "We're going"
 	line "riding together!"
 	done
 
-_Route16GateUpstairsText_4983b:: ; 8cd90 (23:4d90)
+_Route16GateUpstairsText_4983b::
 	text "Looked into the"
 	line "binoculars."
 
@@ -17,7 +17,7 @@
 	line "STORE!"
 	done
 
-_Route16GateUpstairsText_49847:: ; 8cdc6 (23:4dc6)
+_Route16GateUpstairsText_49847::
 	text "Looked into the"
 	line "binoculars."
 
--- a/text/maps/route_16_house.asm
+++ b/text/maps/route_16_house.asm
@@ -1,4 +1,4 @@
-_Route16HouseText3:: ; 8ce02 (23:4e02)
+_Route16HouseText3::
 	text "Oh, you found my"
 	line "secret retreat!"
 
@@ -8,11 +8,11 @@
 	cont "to you with this!"
 	prompt
 
-_ReceivedHM02Text:: ; 8ce66 (23:4e66)
+_ReceivedHM02Text::
 	text $52, " received"
 	line "HM02!@@"
 
-_HM02ExplanationText:: ; 8ce79 (23:4e79)
+_HM02ExplanationText::
 	text "HM02 is FLY."
 	line "It will take you"
 	cont "back to any town."
@@ -21,12 +21,12 @@
 	line "use!"
 	done
 
-_HM02NoRoomText:: ; 8cebe (23:4ebe)
+_HM02NoRoomText::
 	text "You don't have any"
 	line "room for this."
 	done
 
-_Route16HouseText_1e652:: ; 8cee0 (23:4ee0)
+_Route16HouseText_1e652::
 	text "FEAROW: Kyueen!"
 	done
 
--- a/text/maps/route_17.asm
+++ b/text/maps/route_17.asm
@@ -1,157 +1,153 @@
-_Route17BattleText1:: ; 91352 (24:5352)
+_Route17BattleText1::
 	text "There's no money"
 	line "in fighting kids!"
 	done
 
-_Route17EndBattleText1:: ; 91375 (24:5375)
+_Route17EndBattleText1::
 	text "Burned"
 	line "out!"
 	prompt
 
-_Route17AfterBattleText1:: ; 91382 (24:5382)
+_Route17AfterBattleText1::
 	text "Good stuff is"
 	line "lying around on"
 	cont "CYCLING ROAD!"
 	done
 
-_Route17BattleText2:: ; 913af (24:53af)
+_Route17BattleText2::
 	text "What do you want,"
 	line "kiddo?"
 	done
 
-_Route17EndBattleText2:: ; 913c9 (24:53c9)
+_Route17EndBattleText2::
 	text "Whoo!"
 	prompt
 
-_Route17AfterBattleText2:: ; 913d0 (24:53d0)
+_Route17AfterBattleText2::
 	text "I could belly-"
 	line "bump you outta"
 	cont "here!"
 	done
 
-_Route17BattleText3:: ; 913f5 (24:53f5)
+_Route17BattleText3::
 	text "You heading to"
 	line "FUCHSIA?"
 	done
 
-_Route17EndBattleText3:: ; 9140e (24:540e)
+_Route17EndBattleText3::
 	text "Crash and"
 	line "burn!"
 	prompt
 
-_Route17AfterBattleText3:: ; 9141f (24:541f)
+_Route17AfterBattleText3::
 	text "I love racing"
 	line "downhill!"
 	done
 
-_Route17BattleText4:: ; 91438 (24:5438)
+_Route17BattleText4::
 	text "We're BIKERs!"
 	line "Highway stars!"
 	done
 
-_Route17EndBattleText4:: ; 91455 (24:5455)
+_Route17EndBattleText4::
 	text "Smoked!"
 	prompt
 
-_Route17AfterBattleText4:: ; 9145e (24:545e)
+_Route17AfterBattleText4::
 	text "Are you looking"
 	line "for adventure?"
 	done
 
-_Route17BattleText5:: ; 9147e (24:547e)
+_Route17BattleText5::
 	text "Let VOLTORB"
 	line "electrify you!"
 	done
 
-_Route17EndBattleText5:: ; 9149a (24:549a)
+_Route17EndBattleText5::
 	text "Grounded"
 	line "out!"
 	prompt
 
-_Route17AfterBattleText5:: ; 914a9 (24:54a9)
+_Route17AfterBattleText5::
 	text "I got my VOLTORB"
 	line "at the abandoned"
 	cont "POWER PLANT."
 	done
 
-_Route17BattleText6:: ; 914d9 (24:54d9)
+_Route17BattleText6::
 	text "My #MON won't"
 	line "evolve! Why?"
 	done
 
-_Route17EndBattleText6:: ; 914f4 (24:54f4)
+_Route17EndBattleText6::
 	text "Why,"
 	line "you!"
 	prompt
 
-_Route17AfterBattleText6:: ; 914ff (24:54ff)
+_Route17AfterBattleText6::
 	text "Maybe some #MON"
 	line "need element"
 	cont "STONEs to evolve."
 	done
 
-_Route17BattleText7:: ; 9152f (24:552f)
+_Route17BattleText7::
 	text "I need a little"
 	line "exercise!"
 	done
 
-_Route17EndBattleText7:: ; 9154a (24:554a)
+_Route17EndBattleText7::
 	text "Whew!"
 	line "Good workout!"
 	prompt
 
-_Route17AfterBattleText7:: ; 9155f (24:555f)
+_Route17AfterBattleText7::
 	text "I'm sure I lost"
 	line "weight there!"
 	done
 
-_Route17BattleText8:: ; 9157d (24:557d)
+_Route17BattleText8::
 	text "Be a rebel!"
 	done
 
-_Route17EndBattleText8:: ; 9158a (24:558a)
+_Route17EndBattleText8::
 	text "Aaaargh!"
 	prompt
 
-_Route17AfterBattleText8:: ; 91594 (24:5594)
+_Route17AfterBattleText8::
 	text "Be ready to fight"
 	line "for your beliefs!"
 	done
 
-_Route17BattleText9:: ; 915b9 (24:55b9)
+_Route17BattleText9::
 	text "Nice BIKE!"
 	line "How's it handle?"
 	done
 
-_Route17EndBattleText9:: ; 915d5 (24:55d5)
+_Route17EndBattleText9::
 	text "Shoot!"
 	prompt
 
-_Route17AfterBattleText9:: ; 915dd (24:55dd)
+_Route17AfterBattleText9::
 	text "The slope makes"
 	line "it hard to steer!"
 	done
 
-_Route17BattleText10:: ; 91600 (24:5600)
-IF DEF(_YELLOW)
-	text "Get lost, kid!"
-ELSE
+_Route17BattleText10::
 	text "Get lost kid!"
-ENDC
 	line "I'm bushed!"
 	done
 
-_Route17EndBattleText10:: ; 9161a (24:561a)
+_Route17EndBattleText10::
 	text "Are you"
 	line "satisfied?"
 	prompt
 
-_Route17AfterBattleText10:: ; 9162e (24:562e)
+_Route17AfterBattleText10::
 	text "I need to catch"
 	line "a few Zs!"
 	done
 
-_Route17Text11:: ; 91649 (24:5649)
+_Route17Text11::
 	text "It's a notice!"
 
 	para "Watch out for"
@@ -158,7 +154,7 @@
 	line "discarded items!"
 	done
 
-_Route17Text12:: ; 91677 (24:5677)
+_Route17Text12::
 	text "TRAINER TIPS"
 
 	para "All #MON are"
@@ -170,7 +166,7 @@
 	cont "different rates."
 	done
 
-_Route17Text13:: ; 916d8 (24:56d8)
+_Route17Text13::
 	text "TRAINER TIPS"
 
 	para "Press the A or B"
@@ -179,13 +175,13 @@
 	cont "slope."
 	done
 
-_Route17Text14:: ; 91721 (24:5721)
+_Route17Text14::
 	text "ROUTE 17"
 	line "CELADON CITY -"
 	cont "FUCHSIA CITY"
 	done
 
-_Route17Text15:: ; 91747 (24:5747)
+_Route17Text15::
 	text "It's a notice!"
 
 	para "Don't throw the"
@@ -193,7 +189,7 @@
 	cont "BALLs instead!"
 	done
 
-_Route17Text16:: ; 91782 (24:5782)
+_Route17Text16::
 	text "CYCLING ROAD"
 	line "Slope ends here!"
 	done
--- a/text/maps/route_18.asm
+++ b/text/maps/route_18.asm
@@ -1,57 +1,57 @@
-_Route18BattleText1:: ; 917a1 (24:57a1)
+_Route18BattleText1::
 	text "I always check"
 	line "every grassy area"
 	cont "for new #MON."
 	done
 
-_Route18EndBattleText1:: ; 917d1 (24:57d1)
+_Route18EndBattleText1::
 	text "Tch!"
 	prompt
 
-_Route18AfterBattleText1:: ; 917d7 (24:57d7)
+_Route18AfterBattleText1::
 	text "I wish I had a"
 	line "BIKE!"
 	done
 
-_Route18BattleText2:: ; 917ed (24:57ed)
+_Route18BattleText2::
 	text "Kurukkoo!"
 	line "How do you like"
 	cont "my bird call?"
 	done
 
-_Route18EndBattleText2:: ; 91816 (24:5816)
+_Route18EndBattleText2::
 	text "I"
 	line "had to bug you!"
 	prompt
 
-_Route18AfterBattleText2:: ; 91829 (24:5829)
+_Route18AfterBattleText2::
 	text "I also collect sea"
 	line "#MON on"
 	cont "weekends!"
 	done
 
-_Route18BattleText3:: ; 9184f (24:584f)
+_Route18BattleText3::
 	text "This is my turf!"
 	line "Get out of here!"
 	done
 
-_Route18EndBattleText3:: ; 91872 (24:5872)
+_Route18EndBattleText3::
 	text "Darn!"
 	prompt
 
-_Route18AfterBattleText3:: ; 91879 (24:5879)
+_Route18AfterBattleText3::
 	text "This is my fave"
 	line "#MON hunting"
 	cont "area!"
 	done
 
-_Route18Text4:: ; 9189d (24:589d)
+_Route18Text4::
 	text "ROUTE 18"
 	line "CELADON CITY -"
 	cont "FUCHSIA CITY"
 	done
 
-_Route18Text5:: ; 918c3 (24:58c3)
+_Route18Text5::
 	text "CYCLING ROAD"
 	line "No pedestrians"
 	cont "permitted!"
--- a/text/maps/route_18_gate.asm
+++ b/text/maps/route_18_gate.asm
@@ -1,15 +1,15 @@
-_Route18GateText_49928:: ; 8cef1 (23:4ef1)
+_Route18GateText_49928::
 	text "You need a BICYCLE"
 	line "for CYCLING ROAD!"
 	done
 
-_Route18GateText_4992d:: ; 8cf17 (23:4f17)
+_Route18GateText_4992d::
 	text "CYCLING ROAD is"
 	line "all uphill from"
 	cont "here."
 	done
 
-_Route18GateText_49932:: ; 8cf3e (23:4f3e)
+_Route18GateText_49932::
 	text "Excuse me!"
 	done
 
--- a/text/maps/route_18_gate_upstairs.asm
+++ b/text/maps/route_18_gate_upstairs.asm
@@ -1,4 +1,4 @@
-_Route18GateUpstairsText_49993:: ; 8cf4a (23:4f4a)
+_Route18GateUpstairsText_49993::
 	text "Looked into the"
 	line "binoculars."
 
@@ -6,7 +6,7 @@
 	line "the west!"
 	done
 
-_Route18GateUpstairsText_4999f:: ; 8cf83 (23:4f83)
+_Route18GateUpstairsText_4999f::
 	text "Looked into the"
 	line "binoculars."
 
--- a/text/maps/route_19.asm
+++ b/text/maps/route_19.asm
@@ -1,156 +1,156 @@
-_Route19BattleText1:: ; 918eb (24:58eb)
+_Route19BattleText1::
 	text "Have to warm up"
 	line "before my swim!"
 	done
 
-_Route19EndBattleText1:: ; 9190c (24:590c)
+_Route19EndBattleText1::
 	text "All"
 	line "warmed up!"
 	prompt
 
-_Route19AfterBattleText1:: ; 9191c (24:591c)
+_Route19AfterBattleText1::
 	text "Thanks, kid! I'm"
 	line "ready for a swim!"
 	done
 
-_Route19BattleText2:: ; 9193f (24:593f)
+_Route19BattleText2::
 	text "Wait! You'll have"
 	line "a heart attack!"
 	done
 
-_Route19EndBattleText2:: ; 91961 (24:5961)
+_Route19EndBattleText2::
 	text "Ooh!"
 	line "That's chilly!"
 	prompt
 
-_Route19AfterBattleText2:: ; 91975 (24:5975)
+_Route19AfterBattleText2::
 	text "Watch out for"
 	line "TENTACOOL!"
 	done
 
-_Route19BattleText3:: ; 9198f (24:598f)
+_Route19BattleText3::
 	text "I love swimming!"
 	line "What about you?"
 	done
 
-_Route19EndBattleText3:: ; 919b1 (24:59b1)
+_Route19EndBattleText3::
 	text "Belly"
 	line "flop!"
 	prompt
 
-_Route19AfterBattleText3:: ; 919be (24:59be)
+_Route19AfterBattleText3::
 	text "I can beat #MON"
 	line "at swimming!"
 	done
 
-_Route19BattleText4:: ; 919dc (24:59dc)
+_Route19BattleText4::
 	text "What's beyond the"
 	line "horizon?"
 	done
 
-_Route19EndBattleText4:: ; 919f7 (24:59f7)
+_Route19EndBattleText4::
 	text "Glub!"
 	prompt
 
-_Route19AfterBattleText4:: ; 919fe (24:59fe)
+_Route19AfterBattleText4::
 	text "I see a couple of"
 	line "islands!"
 	done
 
-_Route19BattleText5:: ; 91a1a (24:5a1a)
+_Route19BattleText5::
 	text "I tried diving"
 	line "for #MON, but"
 	cont "it was a no go!"
 	done
 
-_Route19EndBattleText5:: ; 91a48 (24:5a48)
+_Route19EndBattleText5::
 	text "Help!"
 	prompt
 
-_Route19AfterBattleText5:: ; 91a4f (24:5a4f)
+_Route19AfterBattleText5::
 	text "You have to fish"
 	line "for sea #MON!"
 	done
 
-_Route19BattleText6:: ; 91a6f (24:5a6f)
+_Route19BattleText6::
 	text "I look at the"
 	line "sea to forget!"
 	done
 
-_Route19EndBattleText6:: ; 91a8d (24:5a8d)
+_Route19EndBattleText6::
 	text "Ooh!"
 	line "Traumatic!"
 	prompt
 
-_Route19AfterBattleText6:: ; 91a9e (24:5a9e)
+_Route19AfterBattleText6::
 	text "I'm looking at the"
 	line "sea to forget!"
 	done
 
-_Route19BattleText7:: ; 91ac0 (24:5ac0)
+_Route19BattleText7::
 	text "Oh, I just love"
 	line "your ride! Can I"
 	cont "have it if I win?"
 	done
 
-_Route19EndBattleText7:: ; 91af4 (24:5af4)
+_Route19EndBattleText7::
 	text "Oh!"
 	line "I lost!"
 	prompt
 
-_Route19AfterBattleText7:: ; 91b01 (24:5b01)
+_Route19AfterBattleText7::
 	text "It's still a long"
 	line "way to go to"
 	cont "SEAFOAM ISLANDS."
 	done
 
-_Route19BattleText8:: ; 91b31 (24:5b31)
+_Route19BattleText8::
 	text "Swimming's great!"
 	line "Sunburns aren't!"
 	done
 
-_Route19EndBattleText8:: ; 91b53 (24:5b53)
+_Route19EndBattleText8::
 	text "Shocker!"
 	prompt
 
-_Route19AfterBattleText8:: ; 91b5d (24:5b5d)
+_Route19AfterBattleText8::
 	text "My boy friend"
 	line "wanted to swim to"
 	cont "SEAFOAM ISLANDS."
 	done
 
-_Route19BattleText9:: ; 91b8f (24:5b8f)
+_Route19BattleText9::
 	text "These waters are"
 	line "treacherous!"
 	done
 
-_Route19EndBattleText9:: ; 91bae (24:5bae)
+_Route19EndBattleText9::
 	text "Ooh!"
 	line "Dangerous!"
 	prompt
 
-_Route19AfterBattleText9:: ; 91bbf (24:5bbf)
+_Route19AfterBattleText9::
 	text "I got a cramp!"
 	line "Glub, glub..."
 	done
 
-_Route19BattleText10:: ; 91bdd (24:5bdd)
+_Route19BattleText10::
 	text "I swam here, but"
 	line "I'm tired."
 	done
 
-_Route19EndBattleText10:: ; 91bf9 (24:5bf9)
+_Route19EndBattleText10::
 	text "I'm"
 	line "exhausted..."
 	prompt
 
-_Route19AfterBattleText10:: ; 91c0a (24:5c0a)
+_Route19AfterBattleText10::
 	text "LAPRAS is so big,"
 	line "it must keep you"
 	cont "dry on water."
 	done
 
-_Route19Text11:: ; 91c3c (24:5c3c)
+_Route19Text11::
 	text "SEA ROUTE 19"
 	line "FUCHSIA CITY -"
 	cont "SEAFOAM ISLANDS"
--- a/text/maps/route_2.asm
+++ b/text/maps/route_2.asm
@@ -1,10 +1,10 @@
-_Route2Text3:: ; 8d745 (23:5745)
+_Route2Text3::
 	text "ROUTE 2"
 	line "VIRIDIAN CITY -"
 	cont "PEWTER CITY"
 	done
 
-_Route2Text4:: ; 8d76a (23:576a)
+_Route2Text4::
 	text "DIGLETT's CAVE"
 	done
 
--- a/text/maps/route_20.asm
+++ b/text/maps/route_20.asm
@@ -1,134 +1,134 @@
-_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"
@@ -135,23 +135,23 @@
 	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
 
--- a/text/maps/route_21.asm
+++ b/text/maps/route_21.asm
@@ -1,89 +1,89 @@
-_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"
@@ -90,48 +90,48 @@
 	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
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -1,4 +1,4 @@
-_Route22RivalBeforeBattleText1:: ; 922cd (24:62cd)
+_Route22RivalBeforeBattleText1::
 	text $53, ": Hey!"
 	line $52, "!"
 
@@ -17,7 +17,7 @@
 	cont "get any stronger?"
 	done
 
-_Route22RivalAfterBattleText1:: ; 9236f (24:636f)
+_Route22RivalAfterBattleText1::
 	text "I heard #MON"
 	line "LEAGUE has many"
 	cont "tough trainers!"
@@ -31,13 +31,13 @@
 	cont "a move on!"
 	done
 
-_Route22RivalDefeatedText1:: ; 923f4 (24:63f4)
+_Route22RivalDefeatedText1::
 	text "Awww!"
 	line "You just lucked"
 	cont "out!"
 	prompt
 
-_Route22Text_511bc:: ; 92410 (24:6410)
+_Route22Text_511bc::
 	text $53, ": What?"
 	line "Why do I have 2"
 	cont "#MON?"
@@ -46,7 +46,7 @@
 	cont "some more too!"
 	prompt
 
-_Route22RivalBeforeBattleText2:: ; 92450 (24:6450)
+_Route22RivalBeforeBattleText2::
 	text $53, ": What?"
 	line $52, "! What a"
 	cont "surprise to see"
@@ -59,21 +59,15 @@
 	line "the BADGEs too?"
 	cont "That's cool!"
 
-IF DEF(_YELLOW)
-	para "Then I'll whip"
-	line "you, ", $52, ", as"
-	cont "a warmup for"
-ELSE
 	para "Then I'll whip you"
 	line $52, " as a"
 	cont "warm up for"
-ENDC
 	cont "#MON LEAGUE!"
 
 	para "Come on!"
 	done
 
-_Route22RivalAfterBattleText2:: ; 92506 (24:6506)
+_Route22RivalAfterBattleText2::
 	text "That loosened me"
 	line "up! I'm ready for"
 	cont "#MON LEAGUE!"
@@ -86,7 +80,7 @@
 	cont "here. Smell ya!"
 	done
 
-_Route22RivalDefeatedText2:: ; 92583 (24:6583)
+_Route22RivalDefeatedText2::
 	text "What!?"
 
 	para "I was just"
@@ -93,7 +87,7 @@
 	line "careless!"
 	prompt
 
-_Route22Text_511d0:: ; 925a0 (24:65a0)
+_Route22Text_511d0::
 	text $53, ": Hahaha!"
 	line $52, "! That's"
 	cont "your best? You're"
@@ -104,7 +98,7 @@
 	line "more! You loser!"
 	prompt
 
-_Route22FrontGateText:: ; 92606 (24:6606)
+_Route22FrontGateText::
 	text "#MON LEAGUE"
 	line "Front Gate"
 	done
--- a/text/maps/route_23.asm
+++ b/text/maps/route_23.asm
@@ -1,4 +1,4 @@
-_VictoryRoadGuardText1:: ; 9261e (24:661e)
+_VictoryRoadGuardText1::
 	text "You can pass here"
 	line "only if you have"
 	cont "the @"
@@ -14,7 +14,7 @@
 	line "it to get to"
 	cont "#MON LEAGUE!@@"
 
-_VictoryRoadGuardText2:: ; 92696 (24:6696)
+_VictoryRoadGuardText2::
 	text "You can pass here"
 	line "only if you have"
 	cont "the @"
@@ -26,13 +26,13 @@
 	TX_RAM wcd6d
 	text "!@@"
 
-_VictoryRoadGuardText_513a3:: ; 926dd (24:66dd)
+_VictoryRoadGuardText_513a3::
 	db $0
 	para "OK then! Please,"
 	line "go right ahead!"
 	done
 
-_Route23Text8:: ; 92700 (24:6700)
+_Route23Text8::
 	text "VICTORY ROAD GATE"
 	line "- #MON LEAGUE"
 	done
--- a/text/maps/route_24_1.asm
+++ b/text/maps/route_24_1.asm
@@ -1,26 +1,26 @@
-_Route24Text_51510:: ; 92721 (24:6721)
+_Route24Text_51510::
 	text "Congratulations!"
 	line "You beat our 5"
 	cont "contest trainers!@@"
 
-_Route24Text_51515:: ; 92755 (24:6755)
+_Route24Text_51515::
 	db $0
 	para "You just earned a"
 	line "fabulous prize!"
 	prompt
 
-_Route24Text_5151a:: ; 92779 (24:6779)
+_Route24Text_5151a::
 	text $52, " received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
 
-_Route24Text_51521:: ; 9278f (24:678f)
+_Route24Text_51521::
 	text "You don't have"
 	line "any room!"
 	done
 
-_Route24Text_51526:: ; 927a8 (24:67a8)
+_Route24Text_51526::
 	text "By the way, would"
 	line "you like to join"
 	cont "TEAM ROCKET?"
@@ -46,12 +46,12 @@
 	cont "refuse!"
 	done
 
-_Route24Text_5152b:: ; 9288a (24:688a)
+_Route24Text_5152b::
 	text "Arrgh!"
 	line "You are good!"
 	prompt
 
-_Route24Text_51530:: ; 928a0 (24:68a0)
+_Route24Text_51530::
 	text "With your ability,"
 	line "you could become"
 	cont "a top leader in"
@@ -58,7 +58,7 @@
 	cont "TEAM ROCKET!"
 	done
 
-_Route24BattleText1:: ; 928e2 (24:68e2)
+_Route24BattleText1::
 	text "I saw your feat"
 	line "from the grass!"
 	done
--- a/text/maps/route_24_2.asm
+++ b/text/maps/route_24_2.asm
@@ -1,75 +1,75 @@
-_Route24EndBattleText1:: ; 94000 (25:4000)
+_Route24EndBattleText1::
 	text "I"
 	line "thought not!"
 	prompt
 
-_Route24AfterBattleText1:: ; 94010 (25:4010)
+_Route24AfterBattleText1::
 	text "I hid because the"
 	line "people on the"
 	cont "bridge scared me!"
 	done
 
-_Route24BattleText2:: ; 94043 (25:4043)
+_Route24BattleText2::
 	text "OK! I'm No. 5!"
 	line "I'll stomp you!"
 	done
 
-_Route24EndBattleText2:: ; 94061 (25:4061)
+_Route24EndBattleText2::
 	text "Whoa!"
 	line "Too much!"
 	prompt
 
-_Route24AfterBattleText2:: ; 94072 (25:4072)
+_Route24AfterBattleText2::
 	text "I did my best, I"
 	line "have no regrets!"
 	done
 
-_Route24BattleText3:: ; 94095 (25:4095)
+_Route24BattleText3::
 	text "I'm No. 4!"
 	line "Getting tired?"
 	done
 
-_Route24EndBattleText3:: ; 940af (25:40af)
+_Route24EndBattleText3::
 	text "I lost"
 	line "too!"
 	prompt
 
-_Route24AfterBattleText3:: ; 940bc (25:40bc)
+_Route24AfterBattleText3::
 	text "I did my best, so"
 	line "I've no regrets!"
 	done
 
-_Route24BattleText4:: ; 940df (25:40df)
+_Route24BattleText4::
 	text "Here's No. 3!"
 	line "I won't be easy!"
 	done
 
-_Route24EndBattleText4:: ; 940fd (25:40fd)
+_Route24EndBattleText4::
 	text "Ow!"
 	line "Stomped flat!"
 	prompt
 
-_Route24AfterBattleText4:: ; 94110 (25:4110)
+_Route24AfterBattleText4::
 	text "I did my best, I"
 	line "have no regrets!"
 	done
 
-_Route24BattleText5:: ; 94133 (25:4133)
+_Route24BattleText5::
 	text "I'm second!"
 	line "Now it's serious!"
 	done
 
-_Route24EndBattleText5:: ; 94150 (25:4150)
+_Route24EndBattleText5::
 	text "How could I"
 	line "lose?"
 	prompt
 
-_Route24AfterBattleText5:: ; 94163 (25:4163)
+_Route24AfterBattleText5::
 	text "I did my best, I"
 	line "have no regrets!"
 	done
 
-_Route24BattleText6:: ; 94186 (25:4186)
+_Route24BattleText6::
 	text "This is NUGGET"
 	line "BRIDGE! Beat us 5"
 	cont "trainers and win"
@@ -79,12 +79,12 @@
 	line "what it takes?"
 	done
 
-_Route24EndBattleText6:: ; 941e8 (25:41e8)
+_Route24EndBattleText6::
 	text "Whoo!"
 	line "Good stuff!"
 	prompt
 
-_Route24AfterBattleText6:: ; 941fb (25:41fb)
+_Route24AfterBattleText6::
 	text "I did my best, I"
 	line "have no regrets!"
 	done
--- a/text/maps/route_25.asm
+++ b/text/maps/route_25.asm
@@ -1,45 +1,15 @@
-IF DEF(_YELLOW)
-_Route25DamianText1::
-	text "I'm not good at"
-	line "raising #MON."
-
-	para "I should release"
-	line "my CHARMANDER"
-	cont "because I haven't"
-	cont "raised it well..."
-
-	para "If you promise me"
-	line "you'll care for"
-	cont "it, it's yours."
-	done
-
-_Route25DamianText2::
-	text "Take good care of"
-	line "my CHARMANDER!@@"
-
-_Route25DamianText3::
-	text "Oh... I'd better"
-	line "release it then."
-	done
-
-_Route25DamianText4::
-	text "How's CHARMANDER"
-	line "doing?"
-	done
-ENDC
-
-_Route25BattleText1:: ; 9421e (25:421e)
+_Route25BattleText1::
 	text "Local trainers"
 	line "come here to"
 	cont "practice!"
 	done
 
-_Route25EndBattleText1:: ; 94245 (25:4245)
+_Route25EndBattleText1::
 	text "You're"
 	line "decent."
 	prompt
 
-_Route25AfterBattleText1:: ; 94254 (25:4254)
+_Route25AfterBattleText1::
 	text "All #MON have"
 	line "weaknesses. It's"
 	cont "best to raise"
@@ -46,7 +16,7 @@
 	cont "different kinds."
 	done
 
-_Route25BattleText2:: ; 94292 (25:4292)
+_Route25BattleText2::
 	text "Dad took me to a"
 	line "great party on"
 	cont "S.S.ANNE at"
@@ -53,64 +23,59 @@
 	cont "VERMILION CITY!"
 	done
 
-_Route25EndBattleText2:: ; 942cf (25:42cf)
+_Route25EndBattleText2::
 	text "I'm"
 	line "not mad!"
 	prompt
 
-_Route25AfterBattleText2:: ; 942dc (25:42dc)
+_Route25AfterBattleText2::
 	text "On S.S.ANNE, I"
 	line "saw trainers from"
 	cont "around the world."
 	done
 
-_Route25BattleText3:: ; 94310 (25:4310)
+_Route25BattleText3::
 	text "I'm a cool guy."
 	line "I've got a girl"
 	cont "friend!"
 	done
 
-_Route25EndBattleText3:: ; 94337 (25:4337)
+_Route25EndBattleText3::
 	text "Aww,"
 	line "darn..."
 	prompt
 
-_Route25AfterBattleText3:: ; 94345 (25:4345)
+_Route25AfterBattleText3::
 	text "Oh well. My girl"
 	line "will cheer me up."
 	done
 
-_Route25BattleText4:: ; 94369 (25:4369)
+_Route25BattleText4::
 	text "Hi! My boy"
 	line "friend is cool!"
 	done
 
-_Route25EndBattleText4:: ; 94385 (25:4385)
-IF DEF(_YELLOW)
-	text "I'm in"
-	line "a slump!"
-ELSE
+_Route25EndBattleText4::
 	text "I was in"
 	line "bad condition!"
-ENDC
 	prompt
 
-_Route25AfterBattleText4:: ; 9439e (25:439e)
+_Route25AfterBattleText4::
 	text "I wish my guy was"
 	line "as good as you!"
 	done
 
-_Route25BattleText5:: ; 943c1 (25:43c1)
+_Route25BattleText5::
 	text "I knew I had to"
 	line "fight you!"
 	done
 
-_Route25EndBattleText5:: ; 943dd (25:43dd)
+_Route25EndBattleText5::
 	text "I knew"
 	line "I'd lose too!"
 	prompt
 
-_Route25AfterBattleText5:: ; 943f2 (25:43f2)
+_Route25AfterBattleText5::
 	text "If your #MON"
 	line "gets confused or"
 	cont "falls asleep,"
@@ -117,75 +82,75 @@
 	cont "switch it!"
 	done
 
-_Route25BattleText6:: ; 9442a (25:442a)
+_Route25BattleText6::
 	text "My friend has a"
 	line "cute #MON."
 	cont "I'm so jealous!"
 	done
 
-_Route25EndBattleText6:: ; 94455 (25:4455)
+_Route25EndBattleText6::
 	text "I'm"
 	line "not so jealous!"
 	prompt
 
-_Route25AfterBattleText6:: ; 94469 (25:4469)
+_Route25AfterBattleText6::
 	text "You came from MT."
 	line "MOON? May I have"
 	cont "a CLEFAIRY?"
 	done
 
-_Route25BattleText7:: ; 94499 (25:4499)
+_Route25BattleText7::
 	text "I just got down"
 	line "from MT.MOON,"
 	cont "but I'm ready!"
 	done
 
-_Route25EndBattleText7:: ; 944c6 (25:44c6)
+_Route25EndBattleText7::
 	text "You"
 	line "worked hard!"
 	prompt
 
-_Route25AfterBattleText7:: ; 944d8 (25:44d8)
+_Route25AfterBattleText7::
 	text "Drat!"
 	line "A ZUBAT bit me"
 	cont "back in there."
 	done
 
-_Route25BattleText8:: ; 944fd (25:44fd)
+_Route25BattleText8::
 	text "I'm off to see a"
 	line "#MON collector"
 	cont "at the cape!"
 	done
 
-_Route25EndBattleText8:: ; 9452a (25:452a)
+_Route25EndBattleText8::
 	text "You"
 	line "got me."
 	prompt
 
-_Route25AfterBattleText8:: ; 94537 (25:4537)
+_Route25AfterBattleText8::
 	text "The collector has"
 	line "many rare kinds"
 	cont "of #MON."
 	done
 
-_Route25BattleText9:: ; 94563 (25:4563)
+_Route25BattleText9::
 	text "You're going to"
 	line "see BILL? First,"
 	cont "let's fight!"
 	done
 
-_Route25EndBattleText9:: ; 94590 (25:4590)
+_Route25EndBattleText9::
 	text "You're"
 	line "something."
 	prompt
 
-_Route25AfterBattleText9:: ; 945a2 (25:45a2)
+_Route25AfterBattleText9::
 	text "The trail below"
 	line "is a shortcut to"
 	cont "CERULEAN CITY."
 	done
 
-_Route25Text11:: ; 945d3 (25:45d3)
+_Route25Text11::
 	text "SEA COTTAGE"
 	line "BILL lives here!"
 	done
--- a/text/maps/route_2_gate.asm
+++ b/text/maps/route_2_gate.asm
@@ -1,10 +1,10 @@
-_Route2GateText_5d616:: ; 8a7fc (22:67fc)
+_Route2GateText_5d616::
 	text "The HM FLASH"
 	line "lights even the"
 	cont "darkest dungeons."
 	done
 
-_Route2GateText2:: ; 8a82c (22:682c)
+_Route2GateText2::
 	text "Once a #MON"
 	line "learns FLASH, you"
 	cont "can get through"
--- a/text/maps/route_2_house.asm
+++ b/text/maps/route_2_house.asm
@@ -1,4 +1,4 @@
-_Route2HouseText1:: ; 8a7b8 (22:67b8)
+_Route2HouseText1::
 	text "A fainted #MON"
 	line "can't fight. But, "
 	cont "it can still use "
--- a/text/maps/route_3.asm
+++ b/text/maps/route_3.asm
@@ -1,4 +1,4 @@
-_Route3Text1:: ; 8d779 (23:5779)
+_Route3Text1::
 	text "Whew... I better"
 	line "take a rest..."
 	cont "Groan..."
@@ -8,17 +8,17 @@
 	cont "lot out of you!"
 	done
 
-_Route3BattleText1:: ; 8d7d5 (23:57d5)
+_Route3BattleText1::
 	text "Hey! I met you in"
 	line "VIRIDIAN FOREST!"
 	done
 
-_Route3EndBattleText1:: ; 8d7f9 (23:57f9)
+_Route3EndBattleText1::
 	text "You"
 	line "beat me again!"
 	prompt
 
-_Route3AfterBattleText1:: ; 8d80d (23:580d)
+_Route3AfterBattleText1::
 	text "There are other"
 	line "kinds of #MON"
 	cont "than those found"
@@ -25,18 +25,18 @@
 	cont "in the forest!"
 	done
 
-_Route3BattleText2:: ; 8d84c (23:584c)
+_Route3BattleText2::
 	text "Hi! I like shorts!"
 	line "They're comfy and"
 	cont "easy to wear!"
 	done
 
-_Route3EndBattleText2:: ; 8d87f (23:587f)
+_Route3EndBattleText2::
 	text "I don't"
 	line "believe it!"
 	prompt
 
-_Route3AfterBattleText2:: ; 8d893 (23:5893)
+_Route3AfterBattleText2::
 	text "Are you storing"
 	line "your #MON on"
 	cont "PC? Each BOX can"
@@ -43,39 +43,34 @@
 	cont "hold 20 #MON!"
 	done
 
-_Route3BattleText3:: ; 8d8d0 (23:58d0)
+_Route3BattleText3::
 	text "You looked at me,"
 	line "didn't you?"
 	done
 
-_Route3EndBattleText3:: ; 8d8ee (23:58ee)
+_Route3EndBattleText3::
 	text "You're"
 	line "mean!"
 	prompt
 
-_Route3AfterBattleText3:: ; 8d8fb (23:58fb)
+_Route3AfterBattleText3::
 	text "Quit staring if"
 	line "you don't want to"
 	cont "fight!"
 	done
 
-_Route3BattleText4:: ; 8d924 (23:5924)
+_Route3BattleText4::
 	text "Are you a trainer?"
 	line "Let's fight!"
 	done
 
-_Route3EndBattleText4:: ; 8d944 (23:5944)
+_Route3EndBattleText4::
 	text "If I"
-IF DEF(_YELLOW)
-	line "had new #MON,"
-	cont "I would've won!"
-ELSE
 	line "had new #MON I"
 	cont "would've won!"
-ENDC
 	prompt
 
-_Route3AfterBattleText4:: ; 8d966 (23:5966)
+_Route3AfterBattleText4::
 	text "If a #MON BOX"
 	line "on the PC gets"
 	cont "full, just switch"
@@ -82,69 +77,69 @@
 	cont "to another BOX!"
 	done
 
-_Route3BattleText5:: ; 8d9a6 (23:59a6)
+_Route3BattleText5::
 	text "That look you"
 	line "gave me, it's so"
 	cont "intriguing!"
 	done
 
-_Route3EndBattleText5:: ; 8d9d1 (23:59d1)
+_Route3EndBattleText5::
 	text "Be nice!"
 	prompt
 
-_Route3AfterBattleText5:: ; 8d9db (23:59db)
+_Route3AfterBattleText5::
 	text "Avoid fights by"
 	line "not letting"
 	cont "people see you!"
 	done
 
-_Route3BattleText6:: ; 8da08 (23:5a08)
+_Route3BattleText6::
 	text "Hey! You're not"
 	line "wearing shorts!"
 	done
 
-_Route3EndBattleText6:: ; 8da28 (23:5a28)
+_Route3EndBattleText6::
 	text "Lost!"
 	line "Lost! Lost!"
 	prompt
 
-_Route3AfterBattleText6:: ; 8da3b (23:5a3b)
+_Route3AfterBattleText6::
 	text "I always wear"
 	line "shorts, even in"
 	cont "winter!"
 	done
 
-_Route3BattleText7:: ; 8da62 (23:5a62)
+_Route3BattleText7::
 	text "You can fight my"
 	line "new #MON!"
 	done
 
-_Route3EndBattleText7:: ; 8da7e (23:5a7e)
+_Route3EndBattleText7::
 	text "Done"
 	line "like dinner!"
 	prompt
 
-_Route3AfterBattleText7:: ; 8da91 (23:5a91)
+_Route3AfterBattleText7::
 	text "Trained #MON"
 	line "are stronger than"
 	cont "the wild ones!"
 	done
 
-_Route3BattleText8:: ; 8dac0 (23:5ac0)
+_Route3BattleText8::
 	text "Eek! Did you"
 	line "touch me?"
 	done
 
-_Route3EndBattleText8:: ; 8dad8 (23:5ad8)
+_Route3EndBattleText8::
 	text "That's it?"
 	prompt
 
-_Route3AfterBattleText8:: ; 8dae3 (23:5ae3)
+_Route3AfterBattleText8::
 	text "ROUTE 4 is at the"
 	line "foot of MT.MOON."
 	done
 
-_Route3Text10:: ; 8db07 (23:5b07)
+_Route3Text10::
 	text "ROUTE 3"
 	line "MT.MOON AHEAD"
 	done
--- a/text/maps/route_4.asm
+++ b/text/maps/route_4.asm
@@ -1,20 +1,20 @@
-_Route4Text1:: ; 8db1e (23:5b1e)
+_Route4Text1::
 	text "Ouch! I tripped"
 	line "over a rocky"
 	cont "#MON, GEODUDE!"
 	done
 
-_Route4BattleText1:: ; 8db4b (23:5b4b)
+_Route4BattleText1::
 	text "I came to get my"
 	line "mushroom #MON!"
 	done
 
-_Route4EndBattleText1:: ; 8db6c (23:5b6c)
+_Route4EndBattleText1::
 	text "Oh! My cute"
 	line "mushroom #MON!"
 	prompt
 
-_Route4AfterBattleText1:: ; 8db88 (23:5b88)
+_Route4AfterBattleText1::
 	text "There might not"
 	line "be any more"
 	cont "mushrooms here."
@@ -23,12 +23,12 @@
 	line "them all."
 	done
 
-_Route4Text5:: ; 8dbcd (23:5bcd)
+_Route4Text5::
 	text "MT.MOON"
 	line "Tunnel Entrance"
 	done
 
-_Route4Text6:: ; 8dbe6 (23:5be6)
+_Route4Text6::
 	text "ROUTE 4"
 	line "MT.MOON -"
 	cont "CERULEAN CITY"
--- a/text/maps/route_5.asm
+++ b/text/maps/route_5.asm
@@ -1,4 +1,4 @@
-_Route5Text1:: ; 8dc07 (23:5c07)
+_Route5Text1::
 	text "UNDERGROUND PATH"
 	line "CERULEAN CITY -"
 	cont "VERMILION CITY"
--- a/text/maps/route_6.asm
+++ b/text/maps/route_6.asm
@@ -1,132 +1,96 @@
-IF DEF(_YELLOW)
 _Route6BattleText1::
-	text "I'm doing this"
-	line "out of love."
-	cont "Leave me alone!"
-	done
-
-_Route6EndBattleText1::
-	text "No,"
-	line "this can't be..."
-	prompt
-
-_Route6AfterBattleText1::
-	text "My love will leave"
-	line "me in disgust."
-	done
-
-_Route6BattleText2::
-	text "I'm training for"
-	line "my love. Don't"
-	cont "bother me!"
-	done
-
-_Route6EndBattleText2::
-	text "My"
-	line "textbook never..."
-	prompt
-
-_Route6AfterBattleText2::
-	text "Now I understand,"
-	line "#MON isn't"
-	cont "about calculated"
-	cont "numbers."
-	done
-ELSE
-_Route6BattleText1:: ; 8dc38 (23:5c38)
 	text "Who's there?"
 	line "Quit listening in"
 	cont "on us!"
 	done
 
-_Route6EndBattleText1:: ; 8dc5e (23:5c5e)
+_Route6EndBattleText1::
 	text "I"
 	line "just can't win!"
 	prompt
 
-_Route6AfterBattleText1:: ; 8dc70 (23:5c70)
+_Route6AfterBattleText1::
 	text "Whisper..."
 	line "whisper..."
 	done
 
-_Route6BattleText2:: ; 8dc87 (23:5c87)
+_Route6BattleText2::
 	text "Excuse me! This"
 	line "is a private"
 	cont "conversation!"
 	done
 
-_Route6EndBattleText2:: ; 8dcb3 (23:5cb3)
+_Route6EndBattleText2::
 	text "Ugh!"
 	line "I hate losing!"
 	prompt
-ENDC
 
-_Route6BattleText3:: ; 8dcc8 (23:5cc8)
+_Route6BattleText3::
 	text "There aren't many"
 	line "bugs out here."
 	done
 
-_Route6EndBattleText3:: ; 8dce9 (23:5ce9)
+_Route6EndBattleText3::
 	text "No!"
 	line "You're kidding!"
 	prompt
 
-_Route6AfterBattleText3:: ; 8dcfd (23:5cfd)
+_Route6AfterBattleText3::
 	text "I like bugs, so"
 	line "I'm going back to"
 	cont "VIRIDIAN FOREST."
 	done
 
-_Route6BattleText4:: ; 8dd30 (23:5d30)
+_Route6BattleText4::
 	text "Huh? You want"
 	line "to talk to me?"
 	done
 
-_Route6EndBattleText4:: ; 8dd4e (23:5d4e)
+_Route6EndBattleText4::
 	text "I"
 	line "didn't start it!"
 	prompt
 
-_Route6AfterBattleText4:: ; 8dd61 (23:5d61)
+_Route6AfterBattleText4::
 	text "I should carry"
 	line "more #MON with"
 	cont "me for safety."
 	done
 
-_Route6BattleText5:: ; 8dd8f (23:5d8f)
+_Route6BattleText5::
 	text "Me? Well, OK."
 	line "I'll play!"
 	done
 
-_Route6EndBattleText5:: ; 8dda8 (23:5da8)
+_Route6EndBattleText5::
 	text "Just"
 	line "didn't work!"
 	prompt
 
-_Route6AfterBattleText5:: ; 8ddba (23:5dba)
+_Route6AfterBattleText5::
 	text "I want to get"
 	line "stronger! What's"
 	cont "your secret?"
 	done
 
-_Route6BattleText6:: ; 8dde6 (23:5de6)
+_Route6BattleText6::
 	text "I've never seen"
 	line "you around!"
 	cont "Are you good?"
 	done
 
-_Route6EndBattleText6:: ; 8de10 (23:5e10)
+_Route6EndBattleText6::
 	text "You"
 	line "are too good!"
 	prompt
 
-_Route6AfterBattleText6:: ; 8de23 (23:5e23)
+_Route6AfterBattleText6::
 	text "Are my #MON"
 	line "weak? Or, am I"
 	cont "just bad?"
 	done
 
-_Route6Text7:: ; 8de49 (23:5e49)
+_Route6Text7::
 	text "UNDERGROUND PATH"
 	line "CERULEAN CITY -"
 	cont "VERMILION CITY"
--- a/text/maps/route_7.asm
+++ b/text/maps/route_7.asm
@@ -1,4 +1,4 @@
-_Route7Text1:: ; 8de7a (23:5e7a)
+_Route7Text1::
 	text "UNDERGROUND PATH"
 	line "CELADON CITY -"
 	cont "LAVENDER TOWN"
--- a/text/maps/route_8.asm
+++ b/text/maps/route_8.asm
@@ -1,60 +1,60 @@
-_Route8BattleText1:: ; 8dea9 (23:5ea9)
+_Route8BattleText1::
 	text "You look good at"
 	line "#MON, but"
 	cont "how's your chem?"
 	done
 
-_Route8EndBattleText1:: ; 8ded5 (23:5ed5)
+_Route8EndBattleText1::
 	text "Ow!"
 	line "Meltdown!"
 	prompt
 
-_Route8AfterBattleText1:: ; 8dee4 (23:5ee4)
+_Route8AfterBattleText1::
 	text "I am better at"
 	line "school than this!"
 	done
 
-_Route8BattleText2:: ; 8df06 (23:5f06)
+_Route8BattleText2::
 	text "All right! Let's"
 	line "roll the dice!"
 	done
 
-_Route8EndBattleText2:: ; 8df26 (23:5f26)
+_Route8EndBattleText2::
 	text "Drat!"
 	line "Came up short!"
 	prompt
 
-_Route8AfterBattleText2:: ; 8df3c (23:5f3c)
+_Route8AfterBattleText2::
 	text "Lady Luck's not"
 	line "with me today!"
 	done
 
-_Route8BattleText3:: ; 8df5b (23:5f5b)
+_Route8BattleText3::
 	text "You need strategy"
 	line "to win at this!"
 	done
 
-_Route8EndBattleText3:: ; 8df7e (23:5f7e)
+_Route8EndBattleText3::
 	text "It's"
 	line "not logical!"
 	prompt
 
-_Route8AfterBattleText3:: ; 8df90 (23:5f90)
+_Route8AfterBattleText3::
 	text "Go with GRIMER"
 	line "first...and..."
 	cont "...and...then..."
 	done
 
-_Route8BattleText4:: ; 8dfc0 (23:5fc0)
+_Route8BattleText4::
 	text "I like NIDORAN, so"
 	line "I collect them!"
 	done
 
-_Route8EndBattleText4:: ; 8dfe4 (23:5fe4)
+_Route8EndBattleText4::
 	text "Why? Why??"
 	prompt
 
-_Route8AfterBattleText4:: ; 8dff0 (23:5ff0)
+_Route8AfterBattleText4::
 	text "When #MON grow"
 	line "up they get ugly!"
 	cont "They shouldn't"
@@ -61,70 +61,66 @@
 	cont "evolve!"
 	done
 
-_Route8BattleText5:: ; 8e028 (23:6028)
+_Route8BattleText5::
 	text "School is fun, but"
 	line "so are #MON."
 	done
 
-_Route8EndBattleText5:: ; 8e049 (23:6049)
+_Route8EndBattleText5::
 	text "I'll"
 	line "stay with school."
 	prompt
 
-_Route8AfterBattleText5:: ; 8e060 (23:6060)
+_Route8AfterBattleText5::
 	text "We're stuck here"
 	line "because of the"
 	cont "gates at SAFFRON."
 	done
 
-_Route8BattleText6:: ; 8e092 (23:6092)
+_Route8BattleText6::
 	text "MEOWTH is so cute,"
 	line "meow, meow, meow!"
 	done
 
-_Route8EndBattleText6:: ; 8e0b8 (23:60b8)
+_Route8EndBattleText6::
 	text "Meow!"
 	prompt
 
-_Route8AfterBattleText6:: ; 8e0bf (23:60bf)
+_Route8AfterBattleText6::
 	text "I think PIDGEY"
 	line "and RATTATA"
 	cont "are cute too!"
 	done
 
-_Route8BattleText7:: ; 8e0e9 (23:60e9)
+_Route8BattleText7::
 	text "We must look"
 	line "silly standing"
 	cont "here like this!"
 	done
 
-_Route8EndBattleText7:: ; 8e116 (23:6116)
+_Route8EndBattleText7::
 	text "Look what"
 	line "you did!"
 	prompt
 
-_Route8AfterBattleText7:: ; 8e12a (23:612a)
-if DEF(_YELLOW)
-	text "SAFFRON's gate-"
-ELSE
+_Route8AfterBattleText7::
 	text "SAFFRON's gate"
-ENDC
 	line "keeper won't let"
 	cont "us through."
 	cont "He's so mean!"
 	done
 
-_Route8BattleText8:: ; 8e162 (23:6162)
+_Route8BattleText8::
 	text "I'm a rambling,"
 	line "gambling dude!"
 	done
 
-_Route8EndBattleText8:: ; 8e181 (23:6181)
+_Route8EndBattleText8::
 	text "Missed"
 	line "the big score!"
 	prompt
 
-_Route8AfterBattleText8:: ; 8e198 (23:6198)
+_Route8AfterBattleText8::
 	text "Gambling and"
 	line "#MON are like"
 	cont "eating peanuts!"
@@ -131,13 +127,13 @@
 	cont "Just can't stop!"
 	done
 
-_Route8BattleText9:: ; 8e1d4 (23:61d4)
+_Route8BattleText9::
 	text "What's a cute,"
 	line "round and fluffy"
 	cont "#MON?"
 	done
 
-_Route8EndBattleText9:: ; 8e1fa (23:61fa)
+_Route8EndBattleText9::
 	text "Stop!"
 
 	para "Don't be so mean"
@@ -144,7 +140,7 @@
 	line "to my CLEFAIRY!"
 	prompt
 
-_Route8AfterBattleText9:: ; 8e221 (23:6221)
+_Route8AfterBattleText9::
 	text "I heard that"
 	line "CLEFAIRY evolves"
 	cont "when it's exposed"
@@ -151,7 +147,7 @@
 	cont "to a MOON STONE."
 	done
 
-_Route8Text10:: ; 8e262 (23:6262)
+_Route8Text10::
 	text "UNDERGROUND PATH"
 	line "CELADON CITY -"
 	cont "LAVENDER TOWN"
--- a/text/maps/route_9.asm
+++ b/text/maps/route_9.asm
@@ -1,91 +1,74 @@
-_Route9BattleText1:: ; 8e291 (23:6291)
+_Route9BattleText1::
 	text "You have #MON"
 	line "with you!"
 	cont "You're mine!"
 	done
 
-_Route9EndBattleText1:: ; 8e2b6 (23:62b6)
+_Route9EndBattleText1::
 	text "You"
 	line "deceived me!"
 	prompt
 
-_Route9AfterBattleText1:: ; 8e2c8 (23:62c8)
+_Route9AfterBattleText1::
 	text "You need light to"
 	line "get through that"
 	cont "dark tunnel ahead."
 	done
 
-IF DEF(_YELLOW)
-_Route9BattleTextAJ::
-	text "I aim to be the"
-	line "ultimate trainer!"
-	done
-
-_Route9EndBattleTextAJ::
-	text "My"
-	line "SANDSHREW lost?"
-	prompt
-
-_Route9AfterBattleTextAJ::
-	text "I'll restart my"
-	line "100-win streak"
-	cont "with SANDSHREW."
-ENDC
-
-_Route9BattleText2:: ; 8e2ff (23:62ff)
+_Route9BattleText2::
 	text "Who's that walking"
 	line "with those good"
 	cont "looking #MON?"
 	done
 
-_Route9EndBattleText2:: ; 8e330 (23:6330)
+_Route9EndBattleText2::
 	text "Out"
 	line "like a light!"
 	prompt
 
-_Route9AfterBattleText2:: ; 8e343 (23:6343)
+_Route9AfterBattleText2::
 	text "Keep walking!"
 	done
 
-_Route9BattleText3:: ; 8e352 (23:6352)
+_Route9BattleText3::
 	text "I'm taking ROCK"
 	line "TUNNEL to go to"
 	cont "LAVENDER..."
 	done
 
-_Route9EndBattleText3:: ; 8e37e (23:637e)
+_Route9EndBattleText3::
 	text "Can't"
 	line "measure up!"
 	prompt
 
-_Route9AfterBattleText3:: ; 8e390 (23:6390)
+_Route9AfterBattleText3::
 	text "Are you off to"
 	line "ROCK TUNNEL too?"
 	done
 
-_Route9BattleText4:: ; 8e3b1 (23:63b1)
+_Route9BattleText4::
 	text "Don't you dare"
 	line "condescend me!"
 	done
 
-_Route9EndBattleText4:: ; 8e3cf (23:63cf)
+_Route9EndBattleText4::
 	text "No!"
 	line "You're too much!"
 	prompt
 
-_Route9AfterBattleText4:: ; 8e3e4 (23:63e4)
+_Route9AfterBattleText4::
 	text "You're obviously"
 	line "talented! Good"
 	cont "luck to you!"
 	done
 
-_Route9BattleText5:: ; 8e411 (23:6411)
+_Route9BattleText5::
 	text "Bwahaha!"
 	line "Great! I was"
 	cont "bored, eh!"
 	done
 
-_Route9EndBattleText5:: ; 8e433 (23:6433)
+_Route9EndBattleText5::
 	text "Keep it"
 	line "coming, eh!"
 
@@ -93,29 +76,29 @@
 	line "of #MON!"
 	prompt
 
-_Route9AfterBattleText5:: ; 8e461 (23:6461)
+_Route9AfterBattleText5::
 	text "You sure had guts"
 	line "standing up to me"
 	cont "there, eh?"
 	done
 
-_Route9BattleText6:: ; 8e491 (23:6491)
+_Route9BattleText6::
 	text "Hahaha!"
 	line "Aren't you a"
 	cont "little toughie!"
 	done
 
-_Route9EndBattleText6:: ; 8e4b6 (23:64b6)
+_Route9EndBattleText6::
 	text "What's"
 	line "that?"
 	prompt
 
-_Route9AfterBattleText6:: ; 8e4c3 (23:64c3)
+_Route9AfterBattleText6::
 	text "Hahaha! Kids"
 	line "should be tough!"
 	done
 
-_Route9BattleText7:: ; 8e4e2 (23:64e2)
+_Route9BattleText7::
 	text "I got up early"
 	line "every day to"
 	cont "raise my #MON"
@@ -122,7 +105,7 @@
 	cont "from cocoons!"
 	done
 
-_Route9EndBattleText7:: ; 8e51b (23:651b)
+_Route9EndBattleText7::
 	text "WHAT?"
 
 	para "What a total"
@@ -129,45 +112,45 @@
 	line "waste of time!"
 	prompt
 
-_Route9AfterBattleText7:: ; 8e53e (23:653e)
+_Route9AfterBattleText7::
 	text "I have to collect"
 	line "more than bugs to"
 	cont "get stronger..."
 	done
 
-_Route9BattleText8:: ; 8e573 (23:6573)
+_Route9BattleText8::
 	text "Hahahaha!"
 	line "Come on, dude!"
 	done
 
-_Route9EndBattleText8:: ; 8e58d (23:658d)
+_Route9EndBattleText8::
 	text "Hahahaha!"
 	line "You beat me fair!"
 	prompt
 
-_Route9AfterBattleText8:: ; 8e5aa (23:65aa)
+_Route9AfterBattleText8::
 	text "Hahahaha!"
 	line "Us hearty guys"
 	cont "always laugh!"
 	done
 
-_Route9BattleText9:: ; 8e5d2 (23:65d2)
+_Route9BattleText9::
 	text "Go, my super bug"
 	line "#MON!"
 	done
 
-_Route9EndBattleText9:: ; 8e5ea (23:65ea)
+_Route9EndBattleText9::
 	text "My"
 	line "bugs..."
 	prompt
 
-_Route9AfterBattleText9:: ; 8e5f6 (23:65f6)
+_Route9AfterBattleText9::
 	text "If you don't like"
 	line "bug #MON, you"
 	cont "bug me!"
 	done
 
-_Route9Text11:: ; 8e61e (23:661e)
+_Route9Text11::
 	text "ROUTE 9"
 	line "CERULEAN CITY-"
 	cont "ROCK TUNNEL"
--- a/text/maps/safari_zone_center.asm
+++ b/text/maps/safari_zone_center.asm
@@ -1,8 +1,8 @@
-_SafariZoneCenterText2:: ; 85807 (21:5807)
+_SafariZoneCenterText2::
 	text "REST HOUSE"
 	done
 
-_SafariZoneCenterText3:: ; 85813 (21:5813)
+_SafariZoneCenterText3::
 	text "TRAINER TIPS"
 
 	para "Press the START"
--- a/text/maps/safari_zone_east.asm
+++ b/text/maps/safari_zone_east.asm
@@ -1,8 +1,8 @@
-_SafariZoneEastText5:: ; 855e0 (21:55e0)
+_SafariZoneEastText5::
 	text "REST HOUSE"
 	done
 
-_SafariZoneEastText6:: ; 855ec (21:55ec)
+_SafariZoneEastText6::
 	text "TRAINER TIPS"
 
 	para "The remaining time"
@@ -10,7 +10,7 @@
 	cont "while you walk!"
 	done
 
-_SafariZoneEastText7:: ; 8562b (21:562b)
+_SafariZoneEastText7::
 	text "CENTER AREA"
 	line "NORTH: AREA 2"
 	done
--- a/text/maps/safari_zone_entrance.asm
+++ b/text/maps/safari_zone_entrance.asm
@@ -1,9 +1,9 @@
-_SafariZoneEntranceText1:: ; 9e6c7 (27:66c7)
+_SafariZoneEntranceText1::
 	text "Welcome to the"
 	line "SAFARI ZONE!"
 	done
 
-SafariZoneEntranceText_9e6e4:: ; 9e6e4 (27:66e4)
+SafariZoneEntranceText_9e6e4::
 	text "For just ¥500,"
 	line "you can catch all"
 	cont "the #MON you"
@@ -12,7 +12,7 @@
 	para "Would you like to"
 	line "join the hunt?@@"
 
-SafariZoneEntranceText_9e747:: ; 9e747 (27:6747)
+SafariZoneEntranceText_9e747::
 	text "That'll be ¥500"
 	line "please!"
 
@@ -23,7 +23,7 @@
 	para $52, " received"
 	line "30 SAFARI BALLs!@@"
 
-_SafariZoneEntranceText_75360:: ; 9e79f (27:679f)
+_SafariZoneEntranceText_75360::
 	db $0
 	para "We'll call you on"
 	line "the PA when you"
@@ -31,41 +31,41 @@
 	cont "or SAFARI BALLs!"
 	done
 
-_SafariZoneEntranceText_75365:: ; 9e7e3 (27:67e3)
+_SafariZoneEntranceText_75365::
 	text "OK! Please come"
 	line "again!"
 	done
 
-_SafariZoneEntranceText_7536a:: ; 9e7fb (27:67fb)
+_SafariZoneEntranceText_7536a::
 	text "Oops! Not enough"
 	line "money!"
 	done
 
-SafariZoneEntranceText_9e814:: ; 9e814 (27:6814)
+SafariZoneEntranceText_9e814::
 	text "Leaving early?@@"
 
-_SafariZoneEntranceText_753bb:: ; 9e825 (27:6825)
+_SafariZoneEntranceText_753bb::
 	text "Please return any"
 	line "SAFARI BALLs you"
 	cont "have left."
 	done
 
-_SafariZoneEntranceText_753c0:: ; 9e854 (27:6854)
+_SafariZoneEntranceText_753c0::
 	text "Good Luck!"
 	done
 
-_SafariZoneEntranceText_753c5:: ; 9e860 (27:6860)
+_SafariZoneEntranceText_753c5::
 	text "Did you get a"
 	line "good haul?"
 	cont "Come again!"
 	done
 
-_SafariZoneEntranceText_753e6:: ; 9e886 (27:6886)
+_SafariZoneEntranceText_753e6::
 	text "Hi! Is it your"
 	line "first time here?"
 	done
 
-_SafariZoneEntranceText_753eb:: ; 9e8a7 (27:68a7)
+_SafariZoneEntranceText_753eb::
 	text "SAFARI ZONE has 4"
 	line "zones in it."
 
@@ -87,7 +87,7 @@
 	cont "new #MON!"
 	done
 
-_SafariZoneEntranceText_753f0:: ; 9e993 (27:6993)
+_SafariZoneEntranceText_753f0::
 	text "Sorry, you're a"
 	line "regular here!"
 	done
--- a/text/maps/safari_zone_north.asm
+++ b/text/maps/safari_zone_north.asm
@@ -1,8 +1,8 @@
-_SafariZoneNorthText3:: ; 85646 (21:5646)
+_SafariZoneNorthText3::
 	text "REST HOUSE"
 	done
 
-_SafariZoneNorthText4:: ; 85652 (21:5652)
+_SafariZoneNorthText4::
 	text "TRAINER TIPS"
 
 	para "The SECRET HOUSE"
@@ -9,11 +9,11 @@
 	line "is still ahead!"
 	done
 
-_SafariZoneNorthText5:: ; 85681 (21:5681)
+_SafariZoneNorthText5::
 	text "AREA 2"
 	done
 
-_SafariZoneNorthText6:: ; 85689 (21:5689)
+_SafariZoneNorthText6::
 	text "TRAINER TIPS"
 
 	para "#MON hide in"
@@ -24,7 +24,7 @@
 	cont "flush them out."
 	done
 
-_SafariZoneNorthText7:: ; 856df (21:56df)
+_SafariZoneNorthText7::
 	text "TRAINER TIPS"
 
 	para "Win a free HM for"
--- a/text/maps/safari_zone_rest_house_1.asm
+++ b/text/maps/safari_zone_rest_house_1.asm
@@ -1,10 +1,10 @@
-_SafariZoneRestHouse1Text1:: ; 85851 (21:5851)
+_SafariZoneRestHouse1Text1::
 	text "SARA: Where did"
 	line "my boy friend,"
 	cont "ERIK, go?"
 	done
 
-_SafariZoneRestHouse1Text2:: ; 8587b (21:587b)
+_SafariZoneRestHouse1Text2::
 	text "I'm catching"
 	line "#MON to take"
 	cont "home as gifts!"
--- a/text/maps/safari_zone_rest_house_2.asm
+++ b/text/maps/safari_zone_rest_house_2.asm
@@ -1,4 +1,4 @@
-_SafariZoneRestHouse2Text1:: ; 85a2f (21:5a2f)
+_SafariZoneRestHouse2Text1::
 	text "Tossing ROCKs at"
 	line "#MON might"
 	cont "make them run,"
@@ -6,13 +6,13 @@
 	cont "easier to catch."
 	done
 
-_SafariZoneRestHouse2Text2:: ; 85a7a (21:5a7a)
+_SafariZoneRestHouse2Text2::
 	text "Using BAIT will"
 	line "make #MON"
 	cont "easier to catch."
 	done
 
-_SafariZoneRestHouse2Text3:: ; 85aa6 (21:5aa6)
+_SafariZoneRestHouse2Text3::
 	text "I hiked a lot, but"
 	line "I didn't see any"
 	cont "#MON I wanted."
--- a/text/maps/safari_zone_rest_house_3.asm
+++ b/text/maps/safari_zone_rest_house_3.asm
@@ -1,10 +1,10 @@
-_SafariZoneRestHouse3Text1:: ; 85ad9 (21:5ad9)
+_SafariZoneRestHouse3Text1::
 	text "How many did you"
 	line "catch? I'm bushed"
 	cont "from the work!"
 	done
 
-_SafariZoneRestHouse3Text2:: ; 85b0b (21:5b0b)
+_SafariZoneRestHouse3Text2::
 	text "I caught a"
 	line "CHANSEY!"
 
@@ -12,7 +12,7 @@
 	line "all worthwhile!"
 	done
 
-_SafariZoneRestHouse3Text3:: ; 85b40 (21:5b40)
+_SafariZoneRestHouse3Text3::
 	text "Whew! I'm tired"
 	line "from all the fun!"
 	done
--- a/text/maps/safari_zone_rest_house_4.asm
+++ b/text/maps/safari_zone_rest_house_4.asm
@@ -1,4 +1,4 @@
-_SafariZoneRestHouse4Text1:: ; 85b62 (21:5b62)
+_SafariZoneRestHouse4Text1::
 	text "You can keep any"
 	line "item you find on"
 	cont "the ground here."
@@ -9,7 +9,7 @@
 	cont "of them at once!"
 	done
 
-_SafariZoneRestHouse4Text2:: ; 85bd5 (21:5bd5)
+_SafariZoneRestHouse4Text2::
 	text "Go to the deepest"
 	line "part of the"
 	cont "SAFARI ZONE. You"
@@ -16,7 +16,7 @@
 	cont "will win a prize!"
 	done
 
-_SafariZoneRestHouse4Text3:: ; 85c17 (21:5c17)
+_SafariZoneRestHouse4Text3::
 	text "My EEVEE evolved"
 	line "into FLAREON!"
 
--- a/text/maps/safari_zone_secret_house.asm
+++ b/text/maps/safari_zone_secret_house.asm
@@ -1,4 +1,4 @@
-_SecretHouseText_4a350:: ; 858a4 (21:58a4)
+_SecretHouseText_4a350::
 	text "Ah! Finally!"
 
 	para "You're the first"
@@ -14,13 +14,13 @@
 	line "You have won!"
 	prompt
 
-_ReceivedHM03Text:: ; 85943 (21:5943)
+_ReceivedHM03Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_HM03ExplanationText:: ; 85957 (21:5957)
+_HM03ExplanationText::
 	text "HM03 is SURF!"
 
 	para "#MON will be"
@@ -37,7 +37,7 @@
 	cont "fabulous prize!"
 	done
 
-_HM03NoRoomText:: ; 85a02 (21:5a02)
+_HM03NoRoomText::
 	text "You don't have"
 	line "room for this"
 	cont "fabulous prize!"
--- a/text/maps/safari_zone_west.asm
+++ b/text/maps/safari_zone_west.asm
@@ -1,8 +1,8 @@
-_SafariZoneWestText5:: ; 85719 (21:5719)
+_SafariZoneWestText5::
 	text "REST HOUSE"
 	done
 
-_SafariZoneWestText6:: ; 85725 (21:5725)
+_SafariZoneWestText6::
 	text "REQUEST NOTICE"
 
 	para "Please find the"
@@ -15,7 +15,7 @@
 	line "Contact: WARDEN"
 	done
 
-_SafariZoneWestText7:: ; 857a3 (21:57a3)
+_SafariZoneWestText7::
 	text "TRAINER TIPS"
 
 	para "Zone Exploration"
@@ -25,7 +25,7 @@
 	line "the SECRET HOUSE!"
 	done
 
-_SafariZoneWestText8:: ; 857ed (21:57ed)
+_SafariZoneWestText8::
 	text "AREA 3"
 	line "EAST: CENTER AREA"
 	done
--- a/text/maps/saffron_city.asm
+++ b/text/maps/saffron_city.asm
@@ -1,34 +1,34 @@
-_SaffronCityText1:: ; a62e7 (29:62e7)
+_SaffronCityText1::
 	text "What do you want?"
 	line "Get lost!"
 	done
 
-_SaffronCityText2:: ; a6304 (29:6304)
+_SaffronCityText2::
 	text "BOSS said he'll"
 	line "take this town!"
 	done
 
-_SaffronCityText3:: ; a6324 (29:6324)
+_SaffronCityText3::
 	text "Get out of the"
 	line "way!"
 	done
 
-_SaffronCityText4:: ; a6339 (29:6339)
+_SaffronCityText4::
 	text "SAFFRON belongs"
 	line "to TEAM ROCKET!"
 	done
 
-_SaffronCityText5:: ; a635a (29:635a)
+_SaffronCityText5::
 	text "Being evil makes"
 	line "me feel so alive!"
 	done
 
-_SaffronCityText6:: ; a637e (29:637e)
+_SaffronCityText6::
 	text "Ow! Watch where"
 	line "you're walking!"
 	done
 
-_SaffronCityText7:: ; a639e (29:639e)
+_SaffronCityText7::
 	text "With SILPH under"
 	line "control, we can"
 	cont "exploit #MON"
@@ -35,13 +35,13 @@
 	cont "around the world!"
 	done
 
-_SaffronCityText8:: ; a63df (29:63df)
+_SaffronCityText8::
 	text "You beat TEAM"
 	line "ROCKET all alone?"
 	cont "That's amazing!"
 	done
 
-_SaffronCityText9:: ; a640f (29:640f)
+_SaffronCityText9::
 	text "Yeah! TEAM ROCKET"
 	line "is gone!"
 	cont "It's safe to go"
@@ -48,13 +48,13 @@
 	cont "out again!"
 	done
 
-_SaffronCityText10:: ; a6445 (29:6445)
+_SaffronCityText10::
 	text "People should be"
 	line "flocking back to"
 	cont "SAFFRON now."
 	done
 
-_SaffronCityText11:: ; a6475 (29:6475)
+_SaffronCityText11::
 	text "I flew here on my"
 	line "PIDGEOT when I"
 	cont "read about SILPH."
@@ -64,16 +64,16 @@
 	cont "media action."
 	done
 
-_SaffronCityText12:: ; a64d6 (29:64d6)
+_SaffronCityText12::
 	text "PIDGEOT: Bi bibii!@@"
 
-_SaffronCityText13:: ; a64eb (29:64eb)
+_SaffronCityText13::
 	text "I saw ROCKET"
 	line "BOSS escaping"
 	cont "SILPH's building."
 	done
 
-_SaffronCityText14:: ; a6518 (29:6518)
+_SaffronCityText14::
 	text "I'm a security"
 	line "guard."
 
@@ -81,7 +81,7 @@
 	line "don't allow in!"
 	done
 
-_SaffronCityText15:: ; a654f (29:654f)
+_SaffronCityText15::
 	text "..."
 	line "Snore..."
 
@@ -89,17 +89,17 @@
 	line "a snooze!"
 	done
 
-_SaffronCityText16:: ; a6577 (29:6577)
+_SaffronCityText16::
 	text "SAFFRON CITY"
 	line "Shining, Golden"
 	cont "Land of Commerce"
 	done
 
-_SaffronCityText17:: ; a65a6 (29:65a6)
+_SaffronCityText17::
 	text "FIGHTING DOJO"
 	done
 
-_SaffronCityText18:: ; a65b5 (29:65b5)
+_SaffronCityText18::
 	text "SAFFRON CITY"
 	line "#MON GYM"
 	cont "LEADER: SABRINA"
@@ -108,7 +108,7 @@
 	line "Psychic #MON!"
 	done
 
-_SaffronCityText20:: ; a65f8 (29:65f8)
+_SaffronCityText20::
 	text "TRAINER TIPS"
 
 	para "FULL HEAL cures"
@@ -120,7 +120,7 @@
 	cont "more convenient."
 	done
 
-_SaffronCityText21:: ; a6667 (29:6667)
+_SaffronCityText21::
 	text "TRAINER TIPS"
 
 	para "New GREAT BALL"
@@ -132,17 +132,17 @@
 	cont "#MON."
 	done
 
-_SaffronCityText22:: ; a66c7 (29:66c7)
+_SaffronCityText22::
 	text "SILPH CO."
 	line "OFFICE BUILDING"
 	done
 
-_SaffronCityText24:: ; a66e2 (29:66e2)
+_SaffronCityText24::
 	text "MR.PSYCHIC's"
 	line "HOUSE"
 	done
 
-_SaffronCityText25:: ; a66f5 (29:66f5)
+_SaffronCityText25::
 	text "SILPH's latest"
 	line "product!"
 
--- a/text/maps/saffron_gates.asm
+++ b/text/maps/saffron_gates.asm
@@ -1,17 +1,13 @@
-_SaffronGateText_1dfe7:: ; 8aa5c (22:6a5c)
+_SaffronGateText_1dfe7::
 	text "I'm on guard duty."
 	line "Gee, I'm thirsty,"
 	cont "though!"
 
-IF DEF(_YELLOW)
-	para "Oh, wait there,"
-ELSE
 	para "Oh wait there,"
-ENDC
 	line "the road's closed."
 	done
 
-_SaffronGateText_8aaa9:: ; 8aaa9 (22:6aa9)
+_SaffronGateText_8aaa9::
 	text "Whoa, boy!"
 	line "I'm parched!"
 	cont "..."
@@ -19,14 +15,10 @@
 	cont "this drink?"
 	cont "Gee, thanks!@@"
 
-_SaffronGateText_1dff1:: ; 8aaef (22:6aef)
+_SaffronGateText_1dff1::
 	db $0
 	para "..."
-IF DEF(_YELLOW)
-	line "Glug, glug..."
-ELSE
 	line "Glug glug..."
-ENDC
 	cont "..."
 	cont "Gulp..."
 	cont "If you want to go"
@@ -38,7 +30,7 @@
 	cont "the other guards!"
 	done
 
-_SaffronGateText_1dff6:: ; 8ab74 (22:6b74)
+_SaffronGateText_1dff6::
 	text "Hi, thanks for"
 	line "the cool drinks!"
 	done
--- a/text/maps/saffron_gym.asm
+++ b/text/maps/saffron_gym.asm
@@ -1,4 +1,4 @@
-_SaffronGymText_5d162:: ; a1bb4 (28:5bb4)
+_SaffronGymText_5d162::
 	text "I had a vision of"
 	line "your arrival!"
 
@@ -16,7 +16,7 @@
 	cont "you my powers!"
 	done
 
-_SaffronGymText_5d167:: ; a1c73 (28:5c73)
+_SaffronGymText_5d167::
 	text "I'm"
 	line "shocked!"
 	cont "But, a loss is a"
@@ -29,7 +29,7 @@
 	para "You earned the"
 	line "MARSHBADGE!@@"
 
-_SaffronGymText_5d16e:: ; a1cdc (28:5cdc)
+_SaffronGymText_5d16e::
 	text "Everyone has"
 	line "psychic power!"
 	cont "People just don't"
@@ -36,7 +36,7 @@
 	cont "realize it!"
 	done
 
-_SaffronGymText_5d173:: ; a1d16 (28:5d16)
+_SaffronGymText_5d173::
 	text "The MARSHBADGE"
 	line "makes #MON up"
 	cont "to L70 obey you!"
@@ -54,11 +54,11 @@
 	line "this TM with you!"
 	done
 
-ReceivedTM46Text:: ; a1dcd (28:5dcd)
+ReceivedTM46Text::
 	text $52, " received"
 	line "TM46!@@"
 
-_TM46ExplanationText:: ; a1de0 (28:5de0)
+_TM46ExplanationText::
 	db $0
 	para "TM46 is PSYWAVE!"
 	line "It uses powerful"
@@ -66,12 +66,12 @@
 	cont "inflict damage!"
 	done
 
-_TM46NoRoomText:: ; a1e25 (28:5e25)
+_TM46NoRoomText::
 	text "Your pack is full"
 	line "of other items!"
 	done
 
-_SaffronGymText_5d1e6:: ; a1e48 (28:5e48)
+_SaffronGymText_5d1e6::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -88,7 +88,7 @@
 	cont "even aim a punch!"
 	done
 
-_SaffronGymText_5d1eb:: ; a1ef0 (28:5ef0)
+_SaffronGymText_5d1eb::
 	text "Psychic power,"
 	line "huh?"
 
@@ -97,18 +97,18 @@
 	cont "at the slots!"
 	done
 
-_SaffronGymBattleText1:: ; a1f33 (28:5f33)
+_SaffronGymBattleText1::
 	text "SABRINA is younger"
 	line "than I, but I"
 	cont "respect her!"
 	done
 
-_SaffronGymEndBattleText1:: ; a1f62 (28:5f62)
+_SaffronGymEndBattleText1::
 	text "Not"
 	line "good enough!"
 	prompt
 
-_SaffronGymAfterBattleText1:: ; a1f74 (28:5f74)
+_SaffronGymAfterBattleText1::
 	text "In a battle of"
 	line "equals, the one"
 	cont "with the stronger"
@@ -119,27 +119,23 @@
 	cont "focus on winning!"
 	done
 
-_SaffronGymBattleText2:: ; a1fe0 (28:5fe0)
+_SaffronGymBattleText2::
 	text "Does our unseen"
 	line "power scare you?"
 	done
 
-_SaffronGymEndBattleText2:: ; a2002 (28:6002)
+_SaffronGymEndBattleText2::
 	text "I never"
 	line "foresaw this!"
 	prompt
 
-_SaffronGymAfterBattleText2:: ; a2019 (28:6019)
+_SaffronGymAfterBattleText2::
 	text "Psychic #MON"
-IF DEF(_YELLOW)
-	line "fear only bugs!"
-ELSE
 	line "fear only ghosts"
 	cont "and bugs!"
-ENDC
 	done
 
-_SaffronGymBattleText3:: ; a2042 (28:6042)
+_SaffronGymBattleText3::
 	text "#MON take on"
 	line "the appearance of"
 	cont "their trainers."
@@ -148,52 +144,52 @@
 	line "be tough, then!"
 	done
 
-_SaffronGymEndBattleText3:: ; a2091 (28:6091)
+_SaffronGymEndBattleText3::
 	text "I knew"
 	line "it!"
 	prompt
 
-_SaffronGymAfterBattleText3:: ; a209d (28:609d)
+_SaffronGymAfterBattleText3::
 	text "I must teach"
 	line "better techniques"
 	cont "to my #MON!"
 	done
 
-_SaffronGymBattleText4:: ; a20c9 (28:60c9)
+_SaffronGymBattleText4::
 	text "You know that"
 	line "power alone isn't"
 	cont "enough!"
 	done
 
-_SaffronGymEndBattleText4:: ; a20f1 (28:60f1)
+_SaffronGymEndBattleText4::
 	text "I don't"
 	line "believe this!"
 	prompt
 
-_SaffronGymAfterBattleText4:: ; a2107 (28:6107)
+_SaffronGymAfterBattleText4::
 	text "SABRINA just wiped"
 	line "out the KARATE"
 	cont "MASTER next door!"
 	done
 
-_SaffronGymBattleText5:: ; a213c (28:613c)
+_SaffronGymBattleText5::
 	text "You and I, our"
 	line "#MON shall"
 	cont "fight!"
 	done
 
-_SaffronGymEndBattleText5:: ; a215e (28:615e)
+_SaffronGymEndBattleText5::
 	text "I lost"
 	line "after all!"
 	prompt
 
-_SaffronGymAfterBattleText5:: ; a2171 (28:6171)
+_SaffronGymAfterBattleText5::
 	text "I knew that this"
 	line "was going to take"
 	cont "place."
 	done
 
-_SaffronGymBattleText6:: ; a219c (28:619c)
+_SaffronGymBattleText6::
 	text "SABRINA is young,"
 	line "but she's also"
 	cont "our LEADER!"
@@ -202,12 +198,12 @@
 	line "her easily!"
 	done
 
-_SaffronGymEndBattleText6:: ; a21e4 (28:61e4)
+_SaffronGymEndBattleText6::
 	text "I lost"
 	line "my concentration!"
 	prompt
 
-_SaffronGymAfterBattleText6:: ; a21fe (28:61fe)
+_SaffronGymAfterBattleText6::
 	text "There used to be"
 	line "2 #MON GYMs in"
 	cont "SAFFRON."
@@ -219,7 +215,7 @@
 	cont "creamed them!"
 	done
 
-_SaffronGymBattleText7:: ; a2277 (28:6277)
+_SaffronGymBattleText7::
 	text "SAFFRON #MON"
 	line "GYM is famous for"
 	cont "its psychics!"
@@ -229,11 +225,11 @@
 	cont "I can tell!"
 	done
 
-_SaffronGymEndBattleText7:: ; a22ca (28:62ca)
+_SaffronGymEndBattleText7::
 	text "Arrrgh!"
 	prompt
 
-_SaffronGymAfterBattleText7:: ; a22d3 (28:62d3)
+_SaffronGymAfterBattleText7::
 	text "That's right! I"
 	line "used telepathy to"
 	cont "read your mind!"
--- a/text/maps/saffron_house.asm
+++ b/text/maps/saffron_house.asm
@@ -1,4 +1,4 @@
-_SaffronHouse1Text1:: ; a2305 (28:6305)
+_SaffronHouse1Text1::
 	text "Thank you for"
 	line "writing. I hope"
 	cont "to see you soon!"
@@ -7,16 +7,16 @@
 	line "at my letter!"
 	done
 
-_SaffronHouse1Text2:: ; a2352 (28:6352)
+_SaffronHouse1Text2::
 	text "PIDGEY: Kurukkoo!@@"
 
-_SaffronHouse1Text3:: ; a2366 (28:6366)
+_SaffronHouse1Text3::
 	text "The COPYCAT is"
 	line "cute! I'm getting"
 	cont "her a # DOLL!"
 	done
 
-_SaffronHouse1Text4:: ; a2395 (28:6395)
+_SaffronHouse1Text4::
 	text "I was given a PP"
 	line "UP as a gift."
 
--- a/text/maps/saffron_mart.asm
+++ b/text/maps/saffron_mart.asm
@@ -1,4 +1,4 @@
-_SaffronMartText2:: ; a23e3 (28:63e3)
+_SaffronMartText2::
 	text "MAX REPEL lasts"
 	line "longer than SUPER"
 	cont "REPEL for keeping"
@@ -6,7 +6,7 @@
 	cont "away!"
 	done
 
-_SaffronMartText3:: ; a242a (28:642a)
+_SaffronMartText3::
 	text "REVIVE is costly,"
 	line "but it revives"
 	cont "fainted #MON!"
--- a/text/maps/saffron_pokecenter.asm
+++ b/text/maps/saffron_pokecenter.asm
@@ -1,10 +1,10 @@
-_SaffronPokecenterText1:: ; a248e (28:648e)
+_SaffronPokecenterText1::
 	text "#MON growth"
 	line "rates differ from"
 	cont "specie to specie."
 	done
 
-_SaffronPokecenterText3:: ; a24bf (28:64bf)
+_SaffronPokecenterText3::
 	text "SILPH CO. is very"
 	line "famous. That's"
 	cont "why it attracted"
--- a/text/maps/school.asm
+++ b/text/maps/school.asm
@@ -1,18 +1,10 @@
-_SchoolText1:: ; 95d15 (25:5d15)
+_SchoolText1::
 	text "Whew! I'm trying"
 	line "to memorize all"
 	cont "my notes."
 	done
 
-IF DEF(_YELLOW)
-_SchoolText3::
-	text "Sis says #MON"
-	line "will become tame"
-	cont "if you treat them"
-	cont "nicely."
-ENDC
-
-_SchoolText2:: ; 95d40 (25:5d40)
+_SchoolText2::
 	text "Okay!"
 
 	para "Be sure to read"
--- a/text/maps/seafoam_islands_b4f.asm
+++ b/text/maps/seafoam_islands_b4f.asm
@@ -1,13 +1,13 @@
-_SeafoamIslands5BattleText2:: ; 88075 (22:4075)
+_SeafoamIslands5BattleText2::
 	text "Gyaoo!@@"
 
-_SeafoamIslands5Text4:: ; 8807e (22:407e)
+_SeafoamIslands5Text4::
 	text "Boulders might"
 	line "change the flow"
 	cont "of water!"
 	done
 
-_SeafoamIslands5Text5:: ; 880a8 (22:40a8)
+_SeafoamIslands5Text5::
 	text "DANGER"
 	line "Fast current!"
 	done
--- a/text/maps/silph_co_10f.asm
+++ b/text/maps/silph_co_10f.asm
@@ -1,68 +1,42 @@
-_SilphCo10Text_5a1d3:: ; 84d8d (21:4d8d)
+_SilphCo10Text_5a1d3::
 	text "Waaaaa!"
 	cont "I'm scared!"
 	done
 
-_SilphCo10Text_5a1d8:: ; 84da1 (21:4da1)
+_SilphCo10Text_5a1d8::
 	text "Please keep quiet"
 	line "about my crying!"
 	done
 
-_SilphCo10BattleText1:: ; 84dc5 (21:4dc5)
+_SilphCo10BattleText1::
 	text "Welcome to the"
 	line "10F! So good of"
 	cont "you to join me!"
 	done
 
-_SilphCo10EndBattleText1:: ; 84df5 (21:4df5)
+_SilphCo10EndBattleText1::
 	text "I'm"
 	line "stunned!"
 	prompt
 
-_SilphCo10AfterBattleText1:: ; 84e02 (21:4e02)
+_SilphCo10AfterBattleText1::
 	text "Nice try, but the"
 	line "boardroom is up"
 	cont "one more floor!"
 	done
 
-_SilphCo10BattleText2:: ; 84e35 (21:4e35)
+_SilphCo10BattleText2::
 	text "Enough of your"
 	line "silly games!"
 	done
 
-_SilphCo10EndBattleText2:: ; 84e52 (21:4e52)
+_SilphCo10EndBattleText2::
 	text "No"
 	line "continues left!"
 	prompt
 
-_SilphCo10AfterBattleText2:: ; 84e66 (21:4e66)
+_SilphCo10AfterBattleText2::
 	text "Are you satisfied"
 	line "with beating me?"
 	cont "Then go on home!"
 	done
-
-IF DEF(_YELLOW)
-_SilphCoJessieJamesText1::
-	text "Hold it right"
-	line "there, brat!@@"
-
-_SilphCoJessieJamesText2::
-	text "Our BOSS is in a"
-	line "meeting!"
-
-	para "You better not"
-	line "disturb him!"
-	done
-
-_SilphCoJessieJamesText3::
-	text "Like"
-	line "always..."
-	prompt
-
-_SilphCoJessieJamesText4::
-	text "TEAM ROCKET, blast"
-	line "off at the speed"
-	cont "of light!"
-
-	para "Again...@@"
-ENDC
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -1,4 +1,4 @@
-_SilphCoPresidentText:: ; 84e9b (21:4e9b)
+_SilphCoPresidentText::
 	text "PRESIDENT: Thank"
 	line "you for saving"
 	cont "SILPH!"
@@ -19,13 +19,13 @@
 	line "will do!"
 	prompt
 
-_ReceivedSilphCoMasterBallText:: ; 84f63 (21:4f63)
+_ReceivedSilphCoMasterBallText::
 	text $52, " got a"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_SilphCo10Text_6231c:: ; 84f74 (21:4f74)
+_SilphCo10Text_6231c::
 	text "PRESIDENT: You"
 	line "can't buy that"
 	cont "anywhere!"
@@ -43,12 +43,12 @@
 	cont "it, though."
 	done
 
-_SilphCoMasterBallNoRoomText:: ; 85013 (21:5013)
+_SilphCoMasterBallNoRoomText::
 	text "You have no"
 	line "room for this."
 	done
 
-_SilphCo11Text2:: ; 8502f (21:502f)
+_SilphCo11Text2::
 	text "SECRETARY: Thank"
 	line "you for rescuing"
 	cont "all of us!"
@@ -57,12 +57,8 @@
 	line "courage."
 	done
 
-_SilphCo11Text3:: ; 85075 (21:5075)
-IF DEF(_YELLOW)
-	text "Ah, ", $52, "!"
-ELSE
+_SilphCo11Text3::
 	text "Ah ", $52, "!"
-ENDC
 	line "So we meet again!"
 
 	para "The PRESIDENT and"
@@ -74,20 +70,16 @@
 	line "out of grown-up"
 	cont "matters..."
 
-IF DEF(_YELLOW)
-	para "or, experience a"
-ELSE
 	para "Or, experience a"
-ENDC
 	line "world of pain!"
 	done
 
-_SilphCo10Text_62330:: ; 85119 (21:5119)
+_SilphCo10Text_62330::
 	text "Arrgh!!"
 	line "I lost again!?"
 	prompt
 
-_SilphCo10Text_62335:: ; 85131 (21:5131)
+_SilphCo10Text_62335::
 	text "Blast it all!"
 	line "You ruined our"
 	cont "plans for SILPH!"
@@ -104,39 +96,39 @@
 	line "shall return!"
 	done
 
-_SilphCo11BattleText1:: ; 851d6 (21:51d6)
+_SilphCo11BattleText1::
 	text "Stop right there!"
 	line "Don't you move!"
 	done
 
-_SilphCo11EndBattleText1:: ; 851f8 (21:51f8)
+_SilphCo11EndBattleText1::
 	text "Don't..."
 	line "Please!"
 	prompt
 
-_SilphCo11AfterBattleText1:: ; 85209 (21:5209)
+_SilphCo11AfterBattleText1::
 	text "So, you want to"
 	line "see my BOSS?"
 	done
 
-_SilphCo11BattleText2:: ; 85227 (21:5227)
+_SilphCo11BattleText2::
 	text "Halt! Do you have"
 	line "an appointment"
 	cont "with my BOSS?"
 	done
 
-_SilphCo11EndBattleText2:: ; 85257 (21:5257)
+_SilphCo11EndBattleText2::
 	text "Gaah!"
 	line "Demolished!"
 	prompt
 
-_SilphCo11AfterBattleText2:: ; 8526a (21:526a)
+_SilphCo11AfterBattleText2::
 	text "Watch your step,"
 	line "my BOSS likes his"
 	cont "#MON tough!"
 	done
 
-_SilphCo10Text_6237b:: ; 8529a (21:529a)
+_SilphCo10Text_6237b::
 	text "The monitor has"
 	line "#MON on it!"
 	done
--- a/text/maps/silph_co_1f.asm
+++ b/text/maps/silph_co_1f.asm
@@ -1,4 +1,4 @@
-_SilphCo1Text1:: ; a245a (28:645a)
+_SilphCo1Text1::
 	text "Welcome!"
 
 	para "The PRESIDENT is"
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.asm
@@ -1,4 +1,4 @@
-_SilphCo2Text_59ded:: ; 82454 (20:6454)
+_SilphCo2Text_59ded::
 	text "Eeek!"
 	line "No! Stop! Help!"
 
@@ -9,13 +9,13 @@
 	cont "please take this!"
 	prompt
 
-_ReceivedTM36Text:: ; 824ba (20:64ba)
+_ReceivedTM36Text::
 	text $52, " got"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM36ExplanationText:: ; 824c9 (20:64c9)
+_TM36ExplanationText::
 	text "TM36 is"
 	line "SELFDESTRUCT!"
 
@@ -25,58 +25,54 @@
 	cont "Be careful."
 	done
 
-_TM36NoRoomText:: ; 8251c (20:651c)
+_TM36NoRoomText::
 	text "You don't have any"
 	line "room for this."
 	done
 
-_SilphCo2BattleText1:: ; 8253e (20:653e)
+_SilphCo2BattleText1::
 	text "Help! I'm a SILPH"
 	line "employee."
 	done
 
-_SilphCo2EndBattleText1:: ; 8255a (20:655a)
+_SilphCo2EndBattleText1::
 	text "How"
 	line "did you know I"
 	cont "was a ROCKET?"
 	prompt
 
-_SilphCo2AfterBattleText1:: ; 8257c (20:657c)
+_SilphCo2AfterBattleText1::
 	text "I work for both"
 	line "SILPH and TEAM"
 	cont "ROCKET!"
 	done
 
-_SilphCo2BattleText2:: ; 825a4 (20:65a4)
+_SilphCo2BattleText2::
 	text "It's off limits"
 	line "here! Go home!"
 	done
 
-_SilphCo2EndBattleText2:: ; 825c3 (20:65c3)
+_SilphCo2EndBattleText2::
 	text "You're"
 	line "good."
 	prompt
 
-_SilphCo2AfterBattleText2:: ; 825d0 (20:65d0)
+_SilphCo2AfterBattleText2::
 	text "Can you solve the"
 	line "maze in here?"
 	done
 
-_SilphCo2BattleText3:: ; 825f1 (20:65f1)
+_SilphCo2BattleText3::
 	text "No kids are"
 	line "allowed in here!"
 	done
 
-_SilphCo2EndBattleText3:: ; 8260f (20:660f)
+_SilphCo2EndBattleText3::
 	text "Tough!"
 	prompt
 
-_SilphCo2AfterBattleText3:: ; 82617 (20:6617)
-IF DEF(_YELLOW)
-	text "Diamond-shaped"
-ELSE
+_SilphCo2AfterBattleText3::
 	text "Diamond shaped"
-ENDC
 	line "tiles are"
 	cont "teleport blocks!"
 
@@ -84,16 +80,16 @@
 	line "transporters!"
 	done
 
-_SilphCo2BattleText4:: ; 8265f (20:665f)
+_SilphCo2BattleText4::
 	text "Hey kid! What are"
 	line "you doing here?"
 	done
 
-_SilphCo2EndBattleText4:: ; 82682 (20:6682)
+_SilphCo2EndBattleText4::
 	text "I goofed!"
 	prompt
 
-_SilphCo2AfterBattleText4:: ; 8268d (20:668d)
+_SilphCo2AfterBattleText4::
 	text "SILPH CO. will"
 	line "be merged with"
 	cont "TEAM ROCKET!"
--- a/text/maps/silph_co_3f.asm
+++ b/text/maps/silph_co_3f.asm
@@ -1,42 +1,42 @@
-_SilphCo3Text_59ff9:: ; 826b9 (20:66b9)
+_SilphCo3Text_59ff9::
 	text "I work for SILPH."
 	line "What should I do?"
 	done
 
-_SilphCo3Text_59ffe:: ; 826de (20:66de)
+_SilphCo3Text_59ffe::
 	text $52, "! You and"
 	line "your #MON"
 	cont "saved us!"
 	done
 
-_SilphCo3BattleText1:: ; 826fe (20:66fe)
+_SilphCo3BattleText1::
 	text "Quit messing with"
 	line "us, kid!"
 	done
 
-_SilphCo3EndBattleText1:: ; 8271a (20:671a)
+_SilphCo3EndBattleText1::
 	text "I give"
 	line "up!"
 	prompt
 
-_SilphCo3AfterBattleText1:: ; 82726 (20:6726)
+_SilphCo3AfterBattleText1::
 	text "A hint? You can"
 	line "open doors with a"
 	cont "CARD KEY!"
 	done
 
-_SilphCo3BattleText2:: ; 82753 (20:6753)
+_SilphCo3BattleText2::
 	text "I support TEAM"
 	line "ROCKET more than"
 	cont "I support SILPH!"
 	done
 
-_SilphCo3EndBattleText2:: ; 82785 (20:6785)
+_SilphCo3EndBattleText2::
 	text "You"
 	line "really got me!"
 	prompt
 
-_SilphCo3AfterBattleText2:: ; 82799 (20:6799)
+_SilphCo3AfterBattleText2::
 	text "Humph..."
 
 	para "TEAM ROCKET said"
--- a/text/maps/silph_co_4f.asm
+++ b/text/maps/silph_co_4f.asm
@@ -1,40 +1,40 @@
-_SilphCo4Text_19de0:: ; 827e4 (20:67e4)
+_SilphCo4Text_19de0::
 	text "Sssh! Can't you"
 	line "see I'm hiding?"
 	done
 
-_SilphCo4Text_19de5:: ; 82803 (20:6803)
+_SilphCo4Text_19de5::
 	text "Huh? TEAM ROCKET"
 	line "is gone?"
 	done
 
-_SilphCo4BattleText2:: ; 8281e (20:681e)
+_SilphCo4BattleText2::
 	text "TEAM ROCKET has"
 	line "taken command of"
 	cont "SILPH CO.!"
 	done
 
-_SilphCo4EndBattleText2:: ; 8284b (20:684b)
+_SilphCo4EndBattleText2::
 	text "Arrgh!"
 	prompt
 
-_SilphCo4AfterBattleText2:: ; 82853 (20:6853)
+_SilphCo4AfterBattleText2::
 	text "Fwahahaha!"
 	line "My BOSS has been"
 	cont "after this place!"
 	done
 
-_SilphCo4BattleText3:: ; 82882 (20:6882)
+_SilphCo4BattleText3::
 	text "My #MON are my"
 	line "loyal soldiers!"
 	done
 
-_SilphCo4EndBattleText3:: ; 828a2 (20:68a2)
+_SilphCo4EndBattleText3::
 	text "Darn!"
 	line "You weak #MON!"
 	prompt
 
-_SilphCo4AfterBattleText3:: ; 828b8 (20:68b8)
+_SilphCo4AfterBattleText3::
 	text "The doors are"
 	line "electronically"
 	cont "locked! A CARD"
@@ -41,16 +41,16 @@
 	cont "KEY opens them!"
 	done
 
-_SilphCo4BattleText4:: ; 828f5 (20:68f5)
+_SilphCo4BattleText4::
 	text "Intruder spotted!"
 	done
 
-_SilphCo4EndBattleText4:: ; 82908 (20:6908)
+_SilphCo4EndBattleText4::
 	text "Who"
 	line "are you?"
 	prompt
 
-_SilphCo4AfterBattleText4:: ; 82916 (20:6916)
+_SilphCo4AfterBattleText4::
 	text "I better tell the"
 	line "BOSS on 11F!"
 	done
--- a/text/maps/silph_co_5f_1.asm
+++ b/text/maps/silph_co_5f_1.asm
@@ -1,4 +1,4 @@
-_SilphCo5Text_1a010:: ; 82936 (20:6936)
+_SilphCo5Text_1a010::
 	text "TEAM ROCKET is"
 	line "in an uproar over"
 	cont "some intruder."
@@ -5,39 +5,39 @@
 	cont "That's you right?"
 	done
 
-_SilphCo5Text_1a015:: ; 82978 (20:6978)
+_SilphCo5Text_1a015::
 	text "TEAM ROCKET took"
 	line "off! You're our"
 	cont "hero! Thank you!"
 	done
 
-_SilphCo5BattleText2:: ; 829aa (20:69aa)
+_SilphCo5BattleText2::
 	text "I heard a kid was"
 	line "wandering around."
 	done
 
-_SilphCo5EndBattleText2:: ; 829cf (20:69cf)
+_SilphCo5EndBattleText2::
 	text "Boom!"
 	prompt
 
-_SilphCo5AfterBattleText2:: ; 829d6 (20:69d6)
+_SilphCo5AfterBattleText2::
 	text "It's not smart"
 	line "to pick a fight"
 	cont "with TEAM ROCKET!"
 	done
 
-_SilphCo5BattleText3:: ; 82a07 (20:6a07)
+_SilphCo5BattleText3::
 	text "We study #"
 	line "BALL technology"
 	cont "on this floor!"
 	done
 
-_SilphCo5EndBattleText3:: ; 82a32 (20:6a32)
+_SilphCo5EndBattleText3::
 	text "Dang!"
 	line "Blast it!"
 	prompt
 
-_SilphCo5AfterBattleText3:: ; 82a43 (20:6a43)
+_SilphCo5AfterBattleText3::
 	text "We worked on the"
 	line "ultimate #"
 	cont "BALL which would"
@@ -44,13 +44,8 @@
 	cont "catch anything!"
 	done
 
-_SilphCo5BattleText4:: ; 82a81 (20:6a81)
+_SilphCo5BattleText4::
 	text "Whaaat? There"
 	line "shouldn't be any"
-IF DEF(_YELLOW)
-	cont "children here!"
-ELSE
 	cont "children here?"
-ENDC
 	done
-
--- a/text/maps/silph_co_5f_2.asm
+++ b/text/maps/silph_co_5f_2.asm
@@ -1,25 +1,25 @@
-_SilphCo5EndBattleText4:: ; 84000 (21:4000)
+_SilphCo5EndBattleText4::
 	text "Oh"
 	line "goodness!"
 	prompt
 
-_SilphCo5AfterBattleText4:: ; 8400e (21:400e)
+_SilphCo5AfterBattleText4::
 	text "You're only on 5F."
 	line "It's a long way"
 	cont "to my BOSS!"
 	done
 
-_SilphCo5BattleText5:: ; 8403c (21:403c)
+_SilphCo5BattleText5::
 	text "Show TEAM ROCKET"
 	line "a little respect!"
 	done
 
-_SilphCo5EndBattleText5:: ; 84060 (21:4060)
+_SilphCo5EndBattleText5::
 	text "Cough..."
 	line "Cough..."
 	prompt
 
-_SilphCo5AfterBattleText5:: ; 84073 (21:4073)
+_SilphCo5AfterBattleText5::
 	text "Which reminds me."
 
 	para "KOFFING evolves"
@@ -26,7 +26,7 @@
 	line "into WEEZING!"
 	done
 
-_SilphCo5Text9:: ; 840a4 (21:40a4)
+_SilphCo5Text9::
 	text "It's a #MON"
 	line "REPORT!"
 
@@ -36,7 +36,7 @@
 	cont "reality #MON."
 	done
 
-_SilphCo5Text10:: ; 840f2 (21:40f2)
+_SilphCo5Text10::
 	text "It's a #MON"
 	line "REPORT!"
 
@@ -45,7 +45,7 @@
 	cont "been confirmed."
 	done
 
-_SilphCo5Text11:: ; 84134 (21:4134)
+_SilphCo5Text11::
 	text "It's a #MON"
 	line "REPORT!"
 
--- a/text/maps/silph_co_6f.asm
+++ b/text/maps/silph_co_6f.asm
@@ -1,36 +1,36 @@
-_SilphCo6Text_1a24a:: ; 84176 (21:4176)
+_SilphCo6Text_1a24a::
 	text "The ROCKETs came"
 	line "and took over the"
 	cont "building!"
 	done
 
-_SilphCo6Text_1a24f:: ; 841a4 (21:41a4)
+_SilphCo6Text_1a24f::
 	text "Well, better get"
 	line "back to work!"
 	done
 
-_SilphCo6Text_1a261:: ; 841c4 (21:41c4)
+_SilphCo6Text_1a261::
 	text "Oh dear, oh dear."
 	line "Help me please!"
 	done
 
-_SilphCo6Text_1a266:: ; 841e7 (21:41e7)
+_SilphCo6Text_1a266::
 	text "We got engaged!"
 	line "Heheh!"
 	done
 
-_SilphCo6Text_1a278:: ; 841ff (21:41ff)
+_SilphCo6Text_1a278::
 	text "Look at him! He's"
 	line "such a coward!"
 	done
 
-_SilphCo6Text_1a27d:: ; 84220 (21:4220)
+_SilphCo6Text_1a27d::
 	text "I feel so sorry"
 	line "for him, I have"
 	cont "to marry him!"
 	done
 
-_SilphCo6Text_1a28f:: ; 8424f (21:424f)
+_SilphCo6Text_1a28f::
 	text "TEAM ROCKET is"
 	line "trying to conquer"
 	cont "the world with"
@@ -37,12 +37,12 @@
 	cont "#MON!"
 	done
 
-_SilphCo6Text_1a294:: ; 84286 (21:4286)
+_SilphCo6Text_1a294::
 	text "TEAM ROCKET ran"
 	line "because of you!"
 	done
 
-_SilphCo6Text_1a2a6:: ; 842a7 (21:42a7)
+_SilphCo6Text_1a2a6::
 	text "They must have"
 	line "targeted SILPH"
 	cont "for our #MON"
@@ -49,29 +49,29 @@
 	cont "products."
 	done
 
-_SilphCo6Text_1a2ab:: ; 842dd (21:42dd)
+_SilphCo6Text_1a2ab::
 	text "Come work for"
 	line "SILPH when you"
 	cont "get older!"
 	done
 
-_SilphCo6BattleText2:: ; 84306 (21:4306)
+_SilphCo6BattleText2::
 	text "I am one of the 4"
 	line "ROCKET BROTHERS!"
 	done
 
-_SilphCo6EndBattleText2:: ; 8432a (21:432a)
+_SilphCo6EndBattleText2::
 	text "Flame"
 	line "out!"
 	prompt
 
-_SilphCo6AfterBattleText2:: ; 84336 (21:4336)
+_SilphCo6AfterBattleText2::
 	text "No matter!"
 	line "My brothers will"
 	cont "avenge me!"
 	done
 
-_SilphCo6BattleText3:: ; 8435e (21:435e)
+_SilphCo6BattleText3::
 	text "That rotten"
 	line "PRESIDENT!"
 
@@ -80,27 +80,27 @@
 	cont "TIKSI BRANCH!"
 	done
 
-_SilphCo6EndBattleText3:: ; 843a4 (21:43a4)
+_SilphCo6EndBattleText3::
 	text "Shoot!"
 	prompt
 
-_SilphCo6AfterBattleText3:: ; 843ac (21:43ac)
+_SilphCo6AfterBattleText3::
 	text "TIKSI BRANCH?"
 	line "It's in Russian"
 	cont "no man's land!"
 	done
 
-_SilphCo6BattleText4:: ; 843d8 (21:43d8)
+_SilphCo6BattleText4::
 	text "You dare betray"
 	line "TEAM ROCKET?"
 	done
 
-_SilphCo6EndBattleText4:: ; 843f6 (21:43f6)
+_SilphCo6EndBattleText4::
 	text "You"
 	line "traitor!"
 	prompt
 
-_SilphCo6AfterBattleText4:: ; 84404 (21:4404)
+_SilphCo6AfterBattleText4::
 	text "If you stand for"
 	line "justice, you"
 	cont "betray evil!"
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/silph_co_7f.asm
@@ -78,27 +78,23 @@
 	line "Oh thank you!"
 	done
 
-_SilphCo7BattleText1:: ; 846ff (21:46ff)
-IF DEF(_YELLOW)
-	text "Aha! I smell a"
-ELSE
+_SilphCo7BattleText1::
 	text "Oh ho! I smell a"
-ENDC
 	line "little rat!"
 	done
 
-_SilphCo7EndBattleText1:: ; 8471d (21:471d)
+_SilphCo7EndBattleText1::
 	text "Lights"
 	line "out!"
 	prompt
 
-_SilphCo7AfterBattleText1:: ; 8472a (21:472a)
+_SilphCo7AfterBattleText1::
 	text "You won't find my"
 	line "BOSS by just"
 	cont "scurrying around!"
 	done
 
-_SilphCo7BattleText2:: ; 8475b (21:475b)
+_SilphCo7BattleText2::
 	text "Heheh!"
 
 	para "You mistook me for"
@@ -105,55 +101,55 @@
 	line "a SILPH worker?"
 	done
 
-_SilphCo7EndBattleText2:: ; 84786 (21:4786)
+_SilphCo7EndBattleText2::
 	text "I'm"
 	line "done!"
 	prompt
 
-_SilphCo7AfterBattleText2:: ; 84790 (21:4790)
+_SilphCo7AfterBattleText2::
 	text "Despite your age,"
 	line "you are a skilled"
 	cont "trainer!"
 	done
 
-_SilphCo7BattleText3:: ; 847be (21:47be)
+_SilphCo7BattleText3::
 	text "I am one of the 4"
 	line "ROCKET BROTHERS!"
 	done
 
-_SilphCo7EndBattleText3:: ; 847e2 (21:47e2)
+_SilphCo7EndBattleText3::
 	text "Aack!"
 	line "Brothers, I lost!"
 	prompt
 
-_SilphCo7AfterBattleText3:: ; 847fb (21:47fb)
+_SilphCo7AfterBattleText3::
 	text "Doesn't matter."
 	line "My brothers will"
 	cont "repay the favor!"
 	done
 
-_SilphCo7BattleText4:: ; 8482d (21:482d)
+_SilphCo7BattleText4::
 	text "A child intruder?"
 	line "That must be you!"
 	done
 
-_SilphCo7EndBattleText4:: ; 84852 (21:4852)
+_SilphCo7EndBattleText4::
 	text "Fine!"
 	line "I lost!"
 	prompt
 
-_SilphCo7AfterBattleText4:: ; 84861 (21:4861)
+_SilphCo7AfterBattleText4::
 	text "Go on home"
 	line "before my BOSS"
 	cont "gets ticked off!"
 	done
 
-_SilphCo7Text_51ebe:: ; 8488d (21:488d)
+_SilphCo7Text_51ebe::
 	text $53, ": What"
 	line "kept you ", $52, "?"
 	done
 
-_SilphCo7Text_51ec3:: ; 848a2 (21:48a2)
+_SilphCo7Text_51ec3::
 	text $53, ": Hahaha!"
 	line "I thought you'd"
 	cont "turn up if I"
@@ -170,17 +166,13 @@
 	cont "you got better!"
 	done
 
-_SilphCo7Text_51ec8:: ; 8494a (21:494a)
-IF DEF(_YELLOW)
-	text "Oh-oh!"
-ELSE
+_SilphCo7Text_51ec8::
 	text "Oh ho!"
-ENDC
 	line "So, you are ready"
 	cont "for BOSS ROCKET!"
 	prompt
 
-_SilphCo7Text_51ecd:: ; 84975 (21:4975)
+_SilphCo7Text_51ecd::
 	text $53, ": How can"
 	line "I put this?"
 
@@ -189,7 +181,7 @@
 	cont "with us big boys!"
 	prompt
 
-_SilphCo7Text_51ed2:: ; 849bd (21:49bd)
+_SilphCo7Text_51ed2::
 	text "Well, ", $52, "!"
 
 	para "I'm moving on up"
--- a/text/maps/silph_co_8f.asm
+++ b/text/maps/silph_co_8f.asm
@@ -1,56 +1,56 @@
-_SilphCo8Text_565be:: ; 84ac4 (21:4ac4)
+_SilphCo8Text_565be::
 	text "I wonder if SILPH"
 	line "is finished..."
 	done
 
-_SilphCo8Text_565c3:: ; 84ae6 (21:4ae6)
+_SilphCo8Text_565c3::
 	text "Thanks for saving"
 	line "us!"
 	done
 
-_SilphCo8BattleText1:: ; 84afd (21:4afd)
+_SilphCo8BattleText1::
 	text "That's as far as"
 	line "you'll go!"
 	done
 
-_SilphCo8EndBattleText1:: ; 84b18 (21:4b18)
+_SilphCo8EndBattleText1::
 	text "Not"
 	line "enough grit!"
 	prompt
 
-_SilphCo8AfterBattleText1:: ; 84b2a (21:4b2a)
+_SilphCo8AfterBattleText1::
 	text "If you don't turn"
 	line "back, I'll call"
 	cont "for backup!"
 	done
 
-_SilphCo8BattleText2:: ; 84b57 (21:4b57)
+_SilphCo8BattleText2::
 	text "You're causing us"
 	line "problems!"
 	done
 
-_SilphCo8EndBattleText2:: ; 84b73 (21:4b73)
+_SilphCo8EndBattleText2::
 	text "Huh?"
 	line "I lost?"
 	prompt
 
-_SilphCo8AfterBattleText2:: ; 84b81 (21:4b81)
+_SilphCo8AfterBattleText2::
 	text "So, what do you"
 	line "think of SILPH"
 	cont "BUILDING's maze?"
 	done
 
-_SilphCo8BattleText3:: ; 84bb1 (21:4bb1)
+_SilphCo8BattleText3::
 	text "I am one of the 4"
 	line "ROCKET BROTHERS!"
 	done
 
-_SilphCo8EndBattleText3:: ; 84bd5 (21:4bd5)
+_SilphCo8EndBattleText3::
 	text "Whoo!"
 	line "Oh brothers!"
 	prompt
 
-_SilphCo8AfterBattleText3:: ; 84be9 (21:4be9)
+_SilphCo8AfterBattleText3::
 	text "I'll leave you up"
 	line "to my brothers!"
 	done
--- a/text/maps/silph_co_9f.asm
+++ b/text/maps/silph_co_9f.asm
@@ -1,45 +1,45 @@
-_SilphCo9Text_5d8e5:: ; 84c0b (21:4c0b)
+_SilphCo9Text_5d8e5::
 	text "You look tired!"
 	line "You should take a"
 	cont "quick nap!"
 	prompt
 
-_SilphCo9Text_5d8ea:: ; 84c39 (21:4c39)
+_SilphCo9Text_5d8ea::
 	text "Don't give up!"
 	done
 
-_SilphCo9Text_5d8ef:: ; 84c48 (21:4c48)
+_SilphCo9Text_5d8ef::
 	text "Thank you so"
 	line "much!"
 	done
 
-_SilphCo9BattleText1:: ; 84c5c (21:4c5c)
+_SilphCo9BattleText1::
 	text "Your #MON seem"
 	line "to adore you, kid!"
 	done
 
-_SilphCo9EndBattleText1:: ; 84c7f (21:4c7f)
+_SilphCo9EndBattleText1::
 	text "Ghaaah!"
 	prompt
 
-_SilphCo9AfterBattleText1:: ; 84c88 (21:4c88)
+_SilphCo9AfterBattleText1::
 	text "If I had started"
 	line "as a trainer at"
 	cont "your age..."
 	done
 
-_SilphCo9BattleText2:: ; 84cb6 (21:4cb6)
+_SilphCo9BattleText2::
 	text "Your #MON have"
 	line "weak points! I"
 	cont "can nail them!"
 	done
 
-_SilphCo9EndBattleText2:: ; 84ce4 (21:4ce4)
+_SilphCo9EndBattleText2::
 	text "You"
 	line "hammered me!"
 	prompt
 
-_SilphCo9AfterBattleText2:: ; 84cf6 (21:4cf6)
+_SilphCo9AfterBattleText2::
 	text "Exploiting weak"
 	line "spots does work!"
 	cont "Think about"
@@ -46,17 +46,17 @@
 	cont "element types!"
 	done
 
-_SilphCo9BattleText3:: ; 84d33 (21:4d33)
+_SilphCo9BattleText3::
 	text "I am one of the 4"
 	line "ROCKET BROTHERS!"
 	done
 
-_SilphCo9EndBattleText3:: ; 84d57 (21:4d57)
+_SilphCo9EndBattleText3::
 	text "Warg!"
 	line "Brothers, I lost!"
 	prompt
 
-_SilphCo9AfterBattleText3:: ; 84d70 (21:4d70)
+_SilphCo9AfterBattleText3::
 	text "My brothers will"
 	line "avenge me!"
 	done
--- a/text/maps/ss_anne_1.asm
+++ b/text/maps/ss_anne_1.asm
@@ -1,4 +1,4 @@
-_SSAnne1Text1:: ; 80c70 (20:4c70)
+_SSAnne1Text1::
 	text "Bonjour!"
 	line "I am le waiter on"
 	cont "this ship!"
@@ -11,7 +11,7 @@
 	line "silent type!"
 	done
 
-_SSAnne1Text2:: ; 80ce6 (20:4ce6)
+_SSAnne1Text2::
 	text "The passengers"
 	line "are restless!"
 
--- a/text/maps/ss_anne_10.asm
+++ b/text/maps/ss_anne_10.asm
@@ -1,88 +1,88 @@
-_SSAnne10Text8:: ; 81aaa (20:5aaa)
+_SSAnne10Text8::
 	text "MACHOKE: Gwoh!"
 	line "Goggoh!@@"
 
-_SSAnne10BattleText1:: ; 81ac3 (20:5ac3)
+_SSAnne10BattleText1::
 	text "You know what they"
 	line "say about sailors"
 	cont "and fighting!"
 	done
 
-_SSAnne10EndBattleText1:: ; 81af7 (20:5af7)
+_SSAnne10EndBattleText1::
 	text "Right!"
 	line "Good fight, mate!"
 	prompt
 
-_SSAnne10AfterBattleText1:: ; 81b11 (20:5b11)
+_SSAnne10AfterBattleText1::
 	text "Haha! Want to be"
 	line "a sailor, mate?"
 	done
 
-_SSAnne10BattleText2:: ; 81b33 (20:5b33)
+_SSAnne10BattleText2::
 	text "My sailor's pride"
 	line "is at stake!"
 	done
 
-_SSAnne10EndBattleText2:: ; 81b52 (20:5b52)
+_SSAnne10EndBattleText2::
 	text "Your"
 	line "spirit sank me!"
 	prompt
 
-_SSAnne10AfterBattleText2:: ; 81b68 (20:5b68)
+_SSAnne10AfterBattleText2::
 	text "Did you see the"
 	line "FISHING GURU in"
 	cont "VERMILION CITY?"
 	done
 
-_SSAnne10BattleText3:: ; 81b99 (20:5b99)
+_SSAnne10BattleText3::
 	text "Us sailors have"
 	line "#MON too!"
 	done
 
-_SSAnne10EndBattleText3:: ; 81bb4 (20:5bb4)
+_SSAnne10EndBattleText3::
 	text "OK, "
 	line "you're not bad."
 	prompt
 
-_SSAnne10AfterBattleText3:: ; 81bc9 (20:5bc9)
+_SSAnne10AfterBattleText3::
 	text "We caught all our"
 	line "#MON while"
 	cont "out at sea!"
 	done
 
-_SSAnne10BattleText4:: ; 81bf3 (20:5bf3)
+_SSAnne10BattleText4::
 	text "I like feisty"
 	line "kids like you!@@"
 
-_SSAnne10EndBattleText4:: ; 81c12 (20:5c12)
+_SSAnne10EndBattleText4::
 	text "Argh!"
 	line "Lost it!"
 	prompt
 
-_SSAnne10AfterBattleText4:: ; 81c22 (20:5c22)
+_SSAnne10AfterBattleText4::
 	text "Sea #MON live"
 	line "in deep water."
 	cont "You'll need a ROD!"
 	done
 
-_SSAnne10BattleText5:: ; 81c52 (20:5c52)
+_SSAnne10BattleText5::
 	text "Matey, you're"
 	line "walking the plank"
 	cont "if you lose!"
 	done
 
-_SSAnne10EndBattleText5:: ; 81c7f (20:5c7f)
+_SSAnne10EndBattleText5::
 	text "Argh!"
 	line "Beaten by a kid!"
 	prompt
 
-_SSAnne10AfterBattleText5:: ; 81c97 (20:5c97)
+_SSAnne10AfterBattleText5::
 	text "Jellyfish some-"
 	line "times drift into"
 	cont "the ship."
 	done
 
-_SSAnne10BattleText6:: ; 81cc3 (20:5cc3)
+_SSAnne10BattleText6::
 	text "Hello stranger!"
 	line "Stop and chat!"
 
@@ -90,19 +90,19 @@
 	line "are from the sea!"
 	done
 
-_SSAnne10EndBattleText6:: ; 81d01 (20:5d01)
+_SSAnne10EndBattleText6::
 	text "Darn!"
 	line "I let that one"
 	cont "get away!"
 	prompt
 
-_SSAnne10AfterBattleText6:: ; 81d21 (20:5d21)
+_SSAnne10AfterBattleText6::
 	text "I was going to"
 	line "make you my"
 	cont "assistant too!"
 	done
 
-_SSAnne10Text7:: ; 81d4c (20:5d4c)
+_SSAnne10Text7::
 	text "My buddy, MACHOKE,"
 	line "is super strong!"
 
--- a/text/maps/ss_anne_2.asm
+++ b/text/maps/ss_anne_2.asm
@@ -1,4 +1,4 @@
-_SSAnne2Text1:: ; 80d34 (20:4d34)
+_SSAnne2Text1::
 	text "This ship, she is"
 	line "a luxury liner"
 	cont "for trainers!"
@@ -8,7 +8,7 @@
 	cont "invited trainers!"
 	done
 
-_SSAnneRivalBeforeBattleText:: ; 80d9a (20:4d9a)
+_SSAnneRivalBeforeBattleText::
 	text $53, ": Bonjour!"
 	line $52, "!"
 
@@ -31,7 +31,7 @@
 	line "grassy areas!"
 	done
 
-_SSAnneRivalDefeatedText:: ; 80e57 (20:4e57)
+_SSAnneRivalDefeatedText::
 	text "Humph!"
 
 	para "At least you're"
@@ -39,7 +39,7 @@
 	cont "#MON!"
 	prompt
 
-_SSAnneRivalWonText:: ; 80e81 (20:4e81)
+_SSAnneRivalWonText::
 	text $52, "! What are"
 	line "you, seasick?"
 
@@ -47,7 +47,7 @@
 	line "up, pal!"
 	prompt
 
-_SSAnneRivalCaptainText:: ; 80eb6 (20:4eb6)
+_SSAnneRivalCaptainText::
 	text $53, ": I heard"
 	line "there was a CUT"
 	cont "master on board."
--- a/text/maps/ss_anne_3.asm
+++ b/text/maps/ss_anne_3.asm
@@ -1,4 +1,4 @@
-_SSAnne3Text1:: ; 80f4b (20:4f4b)
+_SSAnne3Text1::
 	text "Our CAPTAIN is a"
 	line "sword master!"
 
--- a/text/maps/ss_anne_5.asm
+++ b/text/maps/ss_anne_5.asm
@@ -1,15 +1,15 @@
-_SSAnne5Text1:: ; 80f88 (20:4f88)
+_SSAnne5Text1::
 	text "The party's over."
 	line "The ship will be"
 	cont "departing soon."
 	done
 
-_SSAnne5Text2:: ; 80fbb (20:4fbb)
+_SSAnne5Text2::
 	text "Scrubbing decks"
 	line "is hard work!"
 	done
 
-_SSAnne5Text3:: ; 80fda (20:4fda)
+_SSAnne5Text3::
 	text "Urf. I feel ill."
 
 	para "I stepped out to"
@@ -16,7 +16,7 @@
 	line "get some air."
 	done
 
-_SSAnne5BattleText1:: ; 8100b (20:500b)
+_SSAnne5BattleText1::
 	text "Hey matey!"
 
 	para "Let's do a little"
@@ -23,28 +23,28 @@
 	line "jig!"
 	done
 
-_SSAnne5EndBattleText1:: ; 8102d (20:502d)
+_SSAnne5EndBattleText1::
 	text "You're"
 	line "impressive!"
 	prompt
 
-_SSAnne5AfterBattleText1:: ; 81040 (20:5040)
+_SSAnne5AfterBattleText1::
 	text "How many kinds of"
 	line "#MON do you"
 	cont "think there are?"
 	done
 
-_SSAnne5BattleText2:: ; 81070 (20:5070)
+_SSAnne5BattleText2::
 	text "Ahoy there!"
 	line "Are you seasick?"
 	done
 
-_SSAnne5EndBattleText2:: ; 8108e (20:508e)
+_SSAnne5EndBattleText2::
 	text "I was"
 	line "just careless!"
 	prompt
 
-_SSAnne5AfterBattleText2:: ; 810a4 (20:50a4)
+_SSAnne5AfterBattleText2::
 	text "My Pa said there"
 	line "are 100 kinds of"
 	cont "#MON. I think"
--- a/text/maps/ss_anne_6.asm
+++ b/text/maps/ss_anne_6.asm
@@ -1,20 +1,20 @@
-_SSAnne6Text1:: ; 810e5 (20:50e5)
+_SSAnne6Text1::
 	text "You, mon petit!"
 	line "We're busy here!"
 	cont "Out of the way!"
 	done
 
-_SSAnne6Text2:: ; 81116 (20:5116)
+_SSAnne6Text2::
 	text "I saw an odd ball"
 	line "in the trash."
 	done
 
-_SSAnne6Text3:: ; 81137 (20:5137)
+_SSAnne6Text3::
 	text "I'm so busy I'm"
 	line "getting dizzy!"
 	done
 
-_SSAnne6Text4:: ; 81155 (20:5155)
+_SSAnne6Text4::
 	text "Hum-de-hum-de-"
 	line "ho..."
 
@@ -23,7 +23,7 @@
 	cont "Hum-hum..."
 	done
 
-_SSAnne6Text5:: ; 8118e (20:518e)
+_SSAnne6Text5::
 	text "Did you hear about"
 	line "SNORLAX?"
 
@@ -31,7 +31,7 @@
 	line "eat and sleep!"
 	done
 
-_SSAnne6Text6:: ; 811c9 (20:51c9)
+_SSAnne6Text6::
 	text "Snivel...Sniff..."
 
 	para "I only get to"
@@ -39,7 +39,7 @@
 	cont "Snivel..."
 	done
 
-_SSAnne6Text_61807:: ; 81203 (20:5203)
+_SSAnne6Text_61807::
 	text "Er-hem! Indeed I"
 	line "am le CHEF!"
 
@@ -46,12 +46,8 @@
 	para "Le main course is"
 	prompt
 
-_SSAnne6Text_6180c:: ; 81233 (20:5233)
-IF DEF(_YELLOW)
-	text "Salade de Salmon!"
-ELSE
+_SSAnne6Text_6180c::
 	text "Salmon du Salad!"
-ENDC
 
 	para "Les guests may"
 	line "gripe it's fish"
@@ -58,7 +54,7 @@
 	cont "again, however!"
 	done
 
-_SSAnne6Text_61811:: ; 81273 (20:5273)
+_SSAnne6Text_61811::
 	text "Eels au Barbecue!"
 
 	para "Les guests will"
@@ -65,7 +61,7 @@
 	line "mutiny, I fear."
 	done
 
-_SSAnne6Text_61816:: ; 812a6 (20:52a6)
+_SSAnne6Text_61816::
 	text "Prime Beef Steak!"
 
 	para "But, have I enough"
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.asm
@@ -1,4 +1,4 @@
-_SSAnne7RubText:: ; 812dd (20:52dd)
+_SSAnne7RubText::
 	text "CAPTAIN: Ooargh..."
 	line "I feel hideous..."
 	cont "Urrp! Seasick..."
@@ -10,7 +10,7 @@
 	para "Rub-rub..."
 	line "Rub-rub...@@"
 
-_ReceivingHM01Text:: ; 81347 (20:5347)
+_ReceivingHM01Text::
 	text "CAPTAIN: Whew!"
 	line "Thank you! I"
 	cont "feel much better!"
@@ -27,42 +27,34 @@
 	para "Teach it to your"
 	line "#MON and you"
 	cont "can see it CUT"
-IF DEF(_YELLOW)
-	cont "anytime!"
-ELSE
 	cont "any time!"
-ENDC
 	prompt
 
-_ReceivedHM01Text:: ; 8140d (20:540d)
+_ReceivedHM01Text::
 	text $52, " got"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_SSAnne7Text_61932:: ; 8141c (20:541c)
+_SSAnne7Text_61932::
 	text "CAPTAIN: Whew!"
 
 	para "Now that I'm not"
-IF DEF(_YELLOW)
-	line "sick anymore, I"
-ELSE
 	line "sick any more, I"
-ENDC
 	cont "guess it's time."
 	done
 
-_HM01NoRoomText:: ; 8145d (20:545d)
+_HM01NoRoomText::
 	text "Oh no! You have"
 	line "no room for this!"
 	done
 
-_SSAnne7Text2:: ; 81480 (20:5480)
+_SSAnne7Text2::
 	text "Yuck! Shouldn't"
 	line "have looked!"
 	done
 
-_SSAnne7Text3:: ; 8149d (20:549d)
+_SSAnne7Text3::
 	text "How to Conquer"
 	line "Seasickness..."
 	cont "The CAPTAIN's"
--- a/text/maps/ss_anne_8.asm
+++ b/text/maps/ss_anne_8.asm
@@ -1,8 +1,8 @@
-_SSAnne8Text8:: ; 814d7 (20:54d7)
+_SSAnne8Text8::
 	text "WIGGLYTUFF: Puup"
 	line "pupuu!@@"
 
-_SSAnne8BattleText1:: ; 814f1 (20:54f1)
+_SSAnne8BattleText1::
 	text "I travel alone"
 	line "on my journeys!"
 
@@ -10,42 +10,42 @@
 	line "only friends!"
 	done
 
-_SSAnne8EndBattleText1:: ; 8152e (20:552e)
+_SSAnne8EndBattleText1::
 	text "My, my"
 	line "friends..."
 	prompt
 
-_SSAnne8AfterBattleText1:: ; 81541 (20:5541)
+_SSAnne8AfterBattleText1::
 	text "You should be"
 	line "nice to friends!"
 	done
 
-_SSAnne8BattleText2:: ; 81561 (20:5561)
+_SSAnne8BattleText2::
 	text "You pup! How dare"
 	line "you barge in!"
 	done
 
-_SSAnne8EndBattleText2:: ; 81582 (20:5582)
+_SSAnne8EndBattleText2::
 	text "Humph!"
 	line "You rude child!"
 	prompt
 
-_SSAnne8AfterBattleText2:: ; 8159a (20:559a)
+_SSAnne8AfterBattleText2::
 	text "I wish to be left"
 	line "alone! Get out!"
 	done
 
-_SSAnne8BattleText3:: ; 815bd (20:55bd)
+_SSAnne8BattleText3::
 	text "I love #MON!"
 	line "Do you?"
 	done
 
-_SSAnne8EndBattleText3:: ; 815d3 (20:55d3)
+_SSAnne8EndBattleText3::
 	text "Wow! "
 	line "You're great!"
 	prompt
 
-_SSAnne8AfterBattleText3:: ; 815e7 (20:55e7)
+_SSAnne8AfterBattleText3::
 	text "Let me be your"
 	line "friend, OK?"
 
@@ -53,19 +53,19 @@
 	line "#MON!"
 	done
 
-_SSAnne8BattleText4:: ; 8161b (20:561b)
+_SSAnne8BattleText4::
 	text "I collected these"
 	line "#MON from all"
 	cont "around the world!"
 	done
 
-_SSAnne8EndBattleText4:: ; 8164e (20:564e)
+_SSAnne8EndBattleText4::
 	text "Oh no!"
 	line "I went around the"
 	cont "world for these!"
 	prompt
 
-_SSAnne8AfterBattleText4:: ; 81679 (20:5679)
+_SSAnne8AfterBattleText4::
 	text "You hurt my poor"
 	line "worldly #MON!"
 
@@ -74,28 +74,28 @@
 	cont "#MON CENTER!"
 	done
 
-_SSAnne8Text5:: ; 816c7 (20:56c7)
+_SSAnne8Text5::
 	text "Waiter, I would"
 	line "like a cherry pie"
 	cont "please!"
 	done
 
-_SSAnne8Text6:: ; 816f2 (20:56f2)
+_SSAnne8Text6::
 	text "A cruise is so"
 	line "elegant yet cozy!"
 	done
 
-_SSAnne8Text7:: ; 81714 (20:5714)
+_SSAnne8Text7::
 	text "I always travel"
 	line "with WIGGLYTUFF!"
 	done
 
-_SSAnne8Text9:: ; 81736 (20:5736)
+_SSAnne8Text9::
 	text "We are cruising"
 	line "around the world."
 	done
 
-_SSAnne8Text11:: ; 81759 (20:5759)
+_SSAnne8Text11::
 	text "Ssh! I'm a GLOBAL"
 	line "POLICE agent!"
 
--- a/text/maps/ss_anne_9.asm
+++ b/text/maps/ss_anne_9.asm
@@ -1,9 +1,5 @@
-_SSAnne9Text_61bf2:: ; 81799 (20:5799)
-IF DEF(_YELLOW)
-	text "In all my travels,"
-ELSE
+_SSAnne9Text_61bf2::
 	text "In all my travels"
-ENDC
 	line "I've never seen"
 	cont "any #MON sleep"
 	cont "like this one!"
@@ -12,7 +8,7 @@
 	line "like this!"
 	prompt
 
-_SSAnne9Text_61c01:: ; 817f5 (20:57f5)
+_SSAnne9Text_61c01::
 	text "Ah yes, I have"
 	line "seen some #MON"
 	cont "ferry people"
@@ -19,12 +15,12 @@
 	cont "across the water!"
 	done
 
-_SSAnne9Text_61c10:: ; 81833 (20:5833)
+_SSAnne9Text_61c10::
 	text "#MON can CUT"
 	line "down small bushes."
 	done
 
-_SSAnne9Text_61c1f:: ; 81854 (20:5854)
+_SSAnne9Text_61c1f::
 	text "Have you gone to"
 	line "the SAFARI ZONE"
 	cont "in FUCHSIA CITY?"
@@ -33,51 +29,51 @@
 	line "kinds of #MON!!"
 	done
 
-_SSAnne9Text_61c2e:: ; 818a8 (20:58a8)
+_SSAnne9Text_61c2e::
 	text "Me and my Daddy"
 	line "think the SAFARI"
 	cont "ZONE is awesome!"
 	done
 
-_SSAnne9Text_61c3d:: ; 818db (20:58db)
+_SSAnne9Text_61c3d::
 	text "The CAPTAIN looked"
 	line "really sick and"
 	cont "pale!"
 	done
 
-_SSAnne9Text_61c4c:: ; 81905 (20:5905)
+_SSAnne9Text_61c4c::
 	text "I hear many people"
 	line "get seasick!"
 	done
 
-_SSAnne9BattleText1:: ; 81926 (20:5926)
+_SSAnne9BattleText1::
 	text "Competing against"
 	line "the young keeps"
 	cont "me youthful."
 	done
 
-_SSAnne9EndBattleText1:: ; 81956 (20:5956)
+_SSAnne9EndBattleText1::
 	text "Good"
 	line "fight! Ah, I feel"
 	cont "young again!"
 	prompt
 
-_SSAnne9AfterBattleText1:: ; 8197b (20:597b)
+_SSAnne9AfterBattleText1::
 	text "15 years ago, I"
 	line "would have won!"
 	done
 
-_SSAnne9BattleText2:: ; 8199c (20:599c)
+_SSAnne9BattleText2::
 	text "Check out what I"
 	line "fished up!"
 	done
 
-_SSAnne9EndBattleText2:: ; 819b9 (20:59b9)
+_SSAnne9EndBattleText2::
 	text "I'm"
 	line "all out!"
 	prompt
 
-_SSAnne9AfterBattleText2:: ; 819c6 (20:59c6)
+_SSAnne9AfterBattleText2::
 	text "Party?"
 
 	para "The cruise ship's"
@@ -85,33 +81,33 @@
 	cont "over by now."
 	done
 
-_SSAnne9BattleText3:: ; 819fc (20:59fc)
+_SSAnne9BattleText3::
 	text "Which do you like,"
 	line "a strong or a"
 	cont "rare #MON?"
 	done
 
-_SSAnne9EndBattleText3:: ; 81a29 (20:5a29)
+_SSAnne9EndBattleText3::
 	text "I must"
 	line "salute you!"
 	prompt
 
-_SSAnne9AfterBattleText3:: ; 81a3d (20:5a3d)
+_SSAnne9AfterBattleText3::
 	text "I prefer strong"
 	line "and rare #MON."
 	done
 
-_SSAnne9BattleText4:: ; 81a5d (20:5a5d)
+_SSAnne9BattleText4::
 	text "I never saw you"
 	line "at the party."
 	done
 
-_SSAnne9EndBattleText4:: ; 81a7c (20:5a7c)
+_SSAnne9EndBattleText4::
 	text "Take"
 	line "it easy!"
 	prompt
 
-_SSAnne9AfterBattleText4:: ; 81a8b (20:5a8b)
+_SSAnne9AfterBattleText4::
 	text "Oh, I adore your"
 	line "strong #MON!"
 	done
--- a/text/maps/underground_path_route_6_entrance.asm
+++ b/text/maps/underground_path_route_6_entrance.asm
@@ -1,4 +1,4 @@
-_UndergrdTunnelEntRoute6Text1:: ; 8c0cb (23:40cb)
+_UndergrdTunnelEntRoute6Text1::
 	text "People often lose"
 	line "things in that"
 	cont "UNDERGROUND PATH."
--- a/text/maps/underground_path_route_7_entrance.asm
+++ b/text/maps/underground_path_route_7_entrance.asm
@@ -1,4 +1,4 @@
-_UndergroundPathEntRoute7Text1:: ; 8c0ff (23:40ff)
+_UndergroundPathEntRoute7Text1::
 	text "I heard a sleepy"
 	line "#MON appeared"
 	cont "near CELADON CITY."
--- a/text/maps/underground_path_route_7_entrance_unused.asm
+++ b/text/maps/underground_path_route_7_entrance_unused.asm
@@ -1,4 +1,4 @@
-_UGPathRoute7EntranceUnusedText_5d773:: ; 8c132 (23:4132)
+_UGPathRoute7EntranceUnusedText_5d773::
 	text "I want to shop at"
 	line "the dept. store"
 	cont "in CELADON but..."
@@ -8,13 +8,13 @@
 	cont "people there."
 	done
 
-_UGPathRoute7EntranceUnusedText_5d778:: ; 8c195 (23:4195)
+_UGPathRoute7EntranceUnusedText_5d778::
 	text "TEAM ROCKET had a"
 	line "secret hideout in"
 	cont "CELADON CITY?"
 	done
 
-_UGPathRoute7EntranceUnusedText_5d77d:: ; 8c1c8 (23:41c8)
+_UGPathRoute7EntranceUnusedText_5d77d::
 	text "You're here to"
 	line "shop in CELADON?"
 
@@ -22,7 +22,7 @@
 	line "and head west!"
 	done
 
-_UGPathRoute7EntranceUnusedText_5d782:: ; 8c209 (23:4209)
+_UGPathRoute7EntranceUnusedText_5d782::
 	text "The UNDERGROUND"
 	line "PATH goes beneath"
 	cont "SAFFRON and leads"
--- a/text/maps/underground_path_route_8_entrance.asm
+++ b/text/maps/underground_path_route_8_entrance.asm
@@ -1,4 +1,4 @@
-_UndergroundPathEntRoute8Text1:: ; 8c28d (23:428d)
+_UndergroundPathEntRoute8Text1::
 	text "The dept. store"
 	line "in CELADON has a"
 	cont "great selection!"
--- a/text/maps/unknown_dungeon_b1f.asm
+++ b/text/maps/unknown_dungeon_b1f.asm
@@ -1,3 +1,3 @@
-_UnknownDungeon3MewtwoText:: ; 85c72 (21:5c72)
+_UnknownDungeon3MewtwoText::
 	text "Mew!@@"
 
--- a/text/maps/vermilion_city.asm
+++ b/text/maps/vermilion_city.asm
@@ -1,4 +1,4 @@
-_VermilionCityText1:: ; a5668 (29:5668)
+_VermilionCityText1::
 	text "We're careful"
 	line "about pollution!"
 
@@ -7,13 +7,13 @@
 	cont "toxic sludge!"
 	done
 
-_VermilionCityText_198a7:: ; a56b5 (29:56b5)
+_VermilionCityText_198a7::
 	text "Did you see S.S."
 	line "ANNE moored in"
 	cont "the harbor?"
 	done
 
-_VermilionCityText_198ac:: ; a56e2 (29:56e2)
+_VermilionCityText_198ac::
 	text "So, S.S.ANNE has"
 	line "departed!"
 
@@ -21,12 +21,12 @@
 	line "about a year."
 	done
 
-_SSAnneWelcomeText4:: ; a571d (29:571d)
+_SSAnneWelcomeText4::
 	text "Welcome to S.S."
 	line "ANNE!"
 	done
 
-_SSAnneWelcomeText9:: ; a5734 (29:5734)
+_SSAnneWelcomeText9::
 	text "Welcome to S.S."
 	line "ANNE!"
 
@@ -34,7 +34,7 @@
 	line "have a ticket?"
 	prompt
 
-_SSAnneFlashedTicketText:: ; a576c (29:576c)
+_SSAnneFlashedTicketText::
 	text $52, " flashed"
 	line "the S.S.TICKET!"
 
@@ -42,7 +42,7 @@
 	line "S.S.ANNE!"
 	done
 
-_SSAnneNoTicketText:: ; a57a3 (29:57a3)
+_SSAnneNoTicketText::
 	text $52, " doesn't"
 	line "have the needed"
 	cont "S.S.TICKET."
@@ -53,11 +53,11 @@
 	line "to get aboard."
 	done
 
-_SSAnneNotHereText:: ; a57f1 (29:57f1)
+_SSAnneNotHereText::
 	text "The ship set sail."
 	done
 
-_VermilionCityText4:: ; a5805 (29:5805)
+_VermilionCityText4::
 	text "I'm putting up a"
 	line "building on this"
 	cont "plot of land."
@@ -66,11 +66,11 @@
 	line "tamping the land."
 	done
 
-_VermilionCityText5:: ; a5852 (29:5852)
+_VermilionCityText5::
 	text "MACHOP: Guoh!"
 	line "Gogogoh!@@"
 
-_VermilionCityText14:: ; a586b (29:586b)
+_VermilionCityText14::
 	db $0
 	para "A MACHOP is"
 	line "stomping the land"
@@ -77,7 +77,7 @@
 	cont "flat."
 	done
 
-_VermilionCityText6:: ; a5891 (29:5891)
+_VermilionCityText6::
 	text "S.S.ANNE is a"
 	line "famous luxury"
 	cont "cruise ship."
@@ -86,13 +86,13 @@
 	line "once a year."
 	done
 
-_VermilionCityText7:: ; a58db (29:58db)
+_VermilionCityText7::
 	text "VERMILION CITY"
 	line "The Port of"
 	cont "Exquisite Sunsets"
 	done
 
-_VermilionCityText8:: ; a5909 (29:5909)
+_VermilionCityText8::
 	text "NOTICE!"
 
 	para "ROUTE 12 may be"
@@ -106,13 +106,13 @@
 	para "VERMILION POLICE"
 	done
 
-_VermilionCityText11:: ; a5980 (29:5980)
+_VermilionCityText11::
 	text "#MON FAN CLUB"
 	line "All #MON fans"
 	cont "welcome!"
 	done
 
-_VermilionCityText12:: ; a59a6 (29:59a6)
+_VermilionCityText12::
 	text "VERMILION CITY"
 	line "#MON GYM"
 	cont "LEADER: LT.SURGE"
@@ -121,7 +121,7 @@
 	line "American!"
 	done
 
-_VermilionCityText13:: ; a59e9 (29:59e9)
+_VermilionCityText13::
 	text "VERMILION HARBOR"
 	done
 
--- a/text/maps/vermilion_dock.asm
+++ b/text/maps/vermilion_dock.asm
@@ -1,3 +1,3 @@
-_VermilionDockText1:: ; 9c50e (27:450e)
+_VermilionDockText1::
 	db $0, $57
 
--- a/text/maps/vermilion_fishing_house.asm
+++ b/text/maps/vermilion_fishing_house.asm
@@ -1,4 +1,4 @@
-_VermilionHouse2Text_560b1:: ; 9c510 (27:4510)
+_VermilionHouse2Text_560b1::
 	text "I'm the FISHING"
 	line "GURU!"
 
@@ -9,7 +9,7 @@
 	line "fish?"
 	done
 
-_VermilionHouse2Text_560b6:: ; 9c554 (27:4554)
+_VermilionHouse2Text_560b6::
 	text "Grand! I like"
 	line "your style!"
 
@@ -21,7 +21,7 @@
 	TX_RAM wcf4b
 	text "!@@"
 
-_VermilionHouse2Text_560bb:: ; 9c5a4 (27:45a4)
+_VermilionHouse2Text_560bb::
 	db $0
 	para "Fishing is a way"
 	line "of life!"
@@ -32,12 +32,12 @@
 	cont "one, young one!"
 	done
 
-_VermilionHouse2Text_560c0:: ; 9c601 (27:4601)
+_VermilionHouse2Text_560c0::
 	text "Oh... That's so"
 	line "disappointing..."
 	done
 
-_VermilionHouse2Text_560c5:: ; 9c622 (27:4622)
+_VermilionHouse2Text_560c5::
 	text "Hello there,"
 	line $52, "!"
 
@@ -45,7 +45,7 @@
 	line "biting?"
 	done
 
-_VermilionHouse2Text_560ca:: ; 9c64c (27:464c)
+_VermilionHouse2Text_560ca::
 	text "Oh no!"
 
 	para "You have no room"
--- a/text/maps/vermilion_gym_1.asm
+++ b/text/maps/vermilion_gym_1.asm
@@ -1,25 +1,4 @@
-_VermilionGymText_5cb6d:: ; 9aaa5 (26:6aa5)
-IF DEF(_YELLOW)
-	text "Ten-hut! Welcome"
-	line "to VERMILION GYM!"
-
-	para "Will you look at"
-	line "that, a pint-size"
-	cont "challenger!"
-
-	para "Hahaha! You've got"
-	line "big and brassy"
-	cont "nerves to take me"
-	cont "on with your puny"
-	cont "power!"
-
-	para "A #MON battle"
-	line "is war! I'll show"
-	cont "you, civilian!"
-
-	para "I'll shock you"
-	line "into surrender!"
-ELSE
+_VermilionGymText_5cb6d::
 	text "Hey, kid! What do"
 	line "you think you're"
 	cont "doing here?"
@@ -39,5 +18,4 @@
 
 	para "The same as I'll"
 	line "do to you!"
-ENDC
 	done
--- a/text/maps/vermilion_gym_2.asm
+++ b/text/maps/vermilion_gym_2.asm
@@ -1,4 +1,4 @@
-_VermilionGymText_5cb72:: ; 9c000 (27:4000)
+_VermilionGymText_5cb72::
 	text "A little word of"
 	line "advice, kid!"
 
@@ -10,17 +10,13 @@
 	cont "type #MON!"
 	done
 
-_VermilionGymText_5cb77:: ; 9c069 (27:4069)
+_VermilionGymText_5cb77::
 	text "The THUNDERBADGE"
 	line "cranks up your"
 	cont "#MON's SPEED!"
 
 	para "It also lets your"
-IF DEF(_YELLOW)
-	line "#MON FLY any-"
-ELSE
 	line "#MON FLY any"
-ENDC
 	cont "time, kid!"
 
 	para "You're special,"
@@ -27,13 +23,13 @@
 	line "kid! Take this!"
 	done
 
-_ReceivedTM24Text:: ; 9c0e0 (27:40e0)
+_ReceivedTM24Text::
 	text $52, " received "
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_TM24ExplanationText:: ; 9c0f5 (27:40f5)
+_TM24ExplanationText::
 	db $0
 	para "TM24 contains"
 	line "THUNDERBOLT!"
@@ -42,12 +38,12 @@
 	line "electric #MON!"
 	done
 
-_TM24NoRoomText:: ; 9c130 (27:4130)
+_TM24NoRoomText::
 	text "Yo kid, make room"
 	line "in your pack!"
 	done
 
-_ReceivedThunderbadgeText:: ; 9c151 (27:4151)
+_ReceivedThunderbadgeText::
 	text "Whoa!"
 
 	para "You're the real"
@@ -57,18 +53,18 @@
 	line "the THUNDERBADGE!"
 	prompt
 
-_VermilionGymBattleText1:: ; 9c194 (27:4194)
+_VermilionGymBattleText1::
 	text "When I was in the"
 	line "Army, LT.SURGE"
 	cont "was my strict CO!"
 	done
 
-_VermilionGymEndBattleText1:: ; 9c1c8 (27:41c8)
+_VermilionGymEndBattleText1::
 	text "Stop!"
 	line "You're very good!"
 	prompt
 
-_VermilionGymAfterBattleText1:: ; 9c1e0 (27:41e0)
+_VermilionGymAfterBattleText1::
 	text "The door won't"
 	line "open?"
 
@@ -76,17 +72,17 @@
 	line "was cautious!"
 	done
 
-_VermilionGymBattleText2:: ; 9c213 (27:4213)
+_VermilionGymBattleText2::
 	text "I'm a lightweight,"
 	line "but I'm good with"
 	cont "electricity!"
 	done
 
-_VermilionGymEndBattleText2:: ; 9c244 (27:4244)
+_VermilionGymEndBattleText2::
 	text "Fried!"
 	prompt
 
-_VermilionGymAfterBattleText2:: ; 9c24c (27:424c)
+_VermilionGymAfterBattleText2::
 	text "OK, I'll talk!"
 
 	para "LT.SURGE said he"
@@ -94,17 +90,17 @@
 	cont "inside something!"
 	done
 
-_VermilionGymBattleText3:: ; 9c290 (27:4290)
+_VermilionGymBattleText3::
 	text "This is no place"
 	line "for kids!"
 	done
 
-_VermilionGymEndBattleText3:: ; 9c2ac (27:42ac)
+_VermilionGymEndBattleText3::
 	text "Wow!"
 	line "Surprised me!"
 	prompt
 
-_VermilionGymAfterBattleText3:: ; 9c2c0 (27:42c0)
+_VermilionGymAfterBattleText3::
 	text "LT.SURGE set up"
 	line "double locks!"
 	cont "Here's a hint!"
@@ -115,7 +111,7 @@
 	cont "next to it!"
 	done
 
-_VermilionGymText_5cbf4:: ; 9c32b (27:432b)
+_VermilionGymText_5cbf4::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -141,7 +137,7 @@
 	cont "get to him!"
 	done
 
-_VermilionGymText_5cbf9:: ; 9c429 (27:4429)
+_VermilionGymText_5cbf9::
 	text "Whew! That match"
 	line "was electric!"
 	done
--- a/text/maps/vermilion_house.asm
+++ b/text/maps/vermilion_house.asm
@@ -1,4 +1,4 @@
-_VermilionHouse1Text1:: ; 9c449 (27:4449)
+_VermilionHouse1Text1::
 	text "I'm getting my"
 	line "PIDGEY to fly a"
 	cont "letter to SAFFRON"
@@ -5,10 +5,10 @@
 	cont "in the north!"
 	done
 
-_VermilionHouse1Text2:: ; 9c488 (27:4488)
+_VermilionHouse1Text2::
 	text "PIDGEY: Kurukkoo!@@"
 
-_VermilionHouse1Text3:: ; 9c49c (27:449c)
+_VermilionHouse1Text3::
 	text "Dear PIPPI, I hope"
 	line "to see you soon."
 
--- a/text/maps/vermilion_mart.asm
+++ b/text/maps/vermilion_mart.asm
@@ -1,4 +1,4 @@
-_VermilionMartText2:: ; 9a9c1 (26:69c1)
+_VermilionMartText2::
 	text "There are evil"
 	line "people who will"
 	cont "use #MON for"
@@ -15,7 +15,7 @@
 	cont "useful."
 	done
 
-_VermilionMartText3:: ; 9aa67 (26:6a67)
+_VermilionMartText3::
 	text "I think #MON"
 	line "can be good or"
 	cont "evil. It depends"
--- a/text/maps/vermilion_pokecenter.asm
+++ b/text/maps/vermilion_pokecenter.asm
@@ -1,5 +1,5 @@
-_VermilionPokecenterText2:: ; 9a4b2 (26:64b2)
-_VermilionPokecenterText1:: ; 9a4b2 (26:64b2)
+_VermilionPokecenterText2::
+_VermilionPokecenterText1::
 	text "Even if they are"
 	line "the same level,"
 	cont "#MON can have"
@@ -12,7 +12,7 @@
 	cont "in the wild."
 	done
 
-_VermilionPokecenterText3:: ; 9a539 (26:6539)
+_VermilionPokecenterText3::
 	text "My #MON was"
 	line "poisoned! It"
 	cont "fainted while we"
--- a/text/maps/victory_road_1f.asm
+++ b/text/maps/victory_road_1f.asm
@@ -1,31 +1,31 @@
-_VictoryRoad1BattleText1:: ; 85c79 (21:5c79)
+_VictoryRoad1BattleText1::
 	text "I wonder if you"
 	line "are good enough"
 	cont "for me!"
 	done
 
-_VictoryRoad1EndBattleText1:: ; 85ca2 (21:5ca2)
+_VictoryRoad1EndBattleText1::
 	text "I"
 	line "lost out!"
 	prompt
 
-_VictoryRoad1AfterBattleText1:: ; 85caf (21:5caf)
+_VictoryRoad1AfterBattleText1::
 	text "I never wanted to"
 	line "lose to anybody!"
 	done
 
-_VictoryRoad1BattleText2:: ; 85cd3 (21:5cd3)
+_VictoryRoad1BattleText2::
 	text "I can see you're"
 	line "good! Let me see"
 	cont "exactly how good!"
 	done
 
-_VictoryRoad1EndBattleText2:: ; 85d07 (21:5d07)
+_VictoryRoad1EndBattleText2::
 	text "I"
 	line "had a chance..."
 	prompt
 
-_VictoryRoad1AfterBattleText2:: ; 85d1a (21:5d1a)
+_VictoryRoad1AfterBattleText2::
 	text "I concede, you're"
 	line "better than me!"
 	done
--- a/text/maps/victory_road_2f.asm
+++ b/text/maps/victory_road_2f.asm
@@ -1,55 +1,55 @@
-_VictoryRoad2BattleText6:: ; 8d06e (23:506e)
+_VictoryRoad2BattleText6::
 	text "Gyaoo!@@"
 
-_VictoryRoad2BattleText1:: ; 8d077 (23:5077)
+_VictoryRoad2BattleText1::
 	text "VICTORY ROAD is"
 	line "the final test"
 	cont "for trainers!"
 	done
 
-_VictoryRoad2EndBattleText1:: ; 8d0a5 (23:50a5)
+_VictoryRoad2EndBattleText1::
 	text "Aiyah!"
 	prompt
 
-_VictoryRoad2AfterBattleText1:: ; 8d0ad (23:50ad)
+_VictoryRoad2AfterBattleText1::
 	text "If you get stuck,"
 	line "try moving some"
 	cont "boulders around!"
 	done
 
-_VictoryRoad2BattleText2:: ; 8d0e1 (23:50e1)
+_VictoryRoad2BattleText2::
 	text "Ah, so you wish"
 	line "to challenge the"
 	cont "ELITE FOUR?"
 	done
 
-_VictoryRoad2EndBattleText2:: ; 8d10f (23:510f)
+_VictoryRoad2EndBattleText2::
 	text "You"
 	line "got me!"
 	prompt
 
-_VictoryRoad2AfterBattleText2:: ; 8d11c (23:511c)
+_VictoryRoad2AfterBattleText2::
 	text $53, " also came"
 	line "through here!"
 	done
 
-_VictoryRoad2BattleText3:: ; 8d137 (23:5137)
+_VictoryRoad2BattleText3::
 	text "Come on!"
 	line "I'll whip you!"
 	done
 
-_VictoryRoad2EndBattleText3:: ; 8d14f (23:514f)
+_VictoryRoad2EndBattleText3::
 	text "I got"
 	line "whipped!"
 	prompt
 
-_VictoryRoad2AfterBattleText3:: ; 8d15f (23:515f)
+_VictoryRoad2AfterBattleText3::
 	text "You earned the"
 	line "right to be on"
 	cont "VICTORY ROAD!"
 	done
 
-_VictoryRoad2BattleText4:: ; 8d18c (23:518c)
+_VictoryRoad2BattleText4::
 	text "If you can get"
 	line "through here, you"
 	cont "can go meet the"
@@ -56,12 +56,12 @@
 	cont "ELITE FOUR!"
 	done
 
-_VictoryRoad2EndBattleText4:: ; 8d1ca (23:51ca)
+_VictoryRoad2EndBattleText4::
 	text "No!"
 	line "Unbelievable!"
 	prompt
 
-_VictoryRoad2AfterBattleText4:: ; 8d1dd (23:51dd)
+_VictoryRoad2AfterBattleText4::
 	text "I can beat you"
 	line "when it comes to"
 	cont "knowledge about"
@@ -68,17 +68,17 @@
 	cont "#MON!"
 	done
 
-_VictoryRoad2BattleText5:: ; 8d214 (23:5214)
+_VictoryRoad2BattleText5::
 	text "Is VICTORY ROAD"
 	line "too tough?"
 	done
 
-_VictoryRoad2EndBattleText5:: ; 8d230 (23:5230)
+_VictoryRoad2EndBattleText5::
 	text "Well"
 	line "done!"
 	prompt
 
-_VictoryRoad2AfterBattleText5:: ; 8d23c (23:523c)
+_VictoryRoad2AfterBattleText5::
 	text "Many trainers give"
 	line "up the challenge"
 	cont "here."
--- a/text/maps/victory_road_3f.asm
+++ b/text/maps/victory_road_3f.asm
@@ -1,44 +1,44 @@
-_VictoryRoad3BattleText2:: ; 81d9b (20:5d9b)
+_VictoryRoad3BattleText2::
 	text "I heard rumors of"
 	line "a child prodigy!"
 	done
 
-_VictoryRoad3EndBattleText2:: ; 81dbf (20:5dbf)
+_VictoryRoad3EndBattleText2::
 	text "The"
 	line "rumors were true!"
 	prompt
 
-_VictoryRoad3AfterBattleText2:: ; 81dd6 (20:5dd6)
+_VictoryRoad3AfterBattleText2::
 	text "You beat GIOVANNI"
 	line "of TEAM ROCKET?"
 	done
 
-_VictoryRoad3BattleText3:: ; 81df9 (20:5df9)
+_VictoryRoad3BattleText3::
 	text "I'll show you just"
 	line "how good you are!"
 	done
 
-_VictoryRoad3EndBattleText3:: ; 81e1e (20:5e1e)
+_VictoryRoad3EndBattleText3::
 	text "I'm"
 	line "furious!"
 	prompt
 
-_VictoryRoad3AfterBattleText3:: ; 81e2b (20:5e2b)
+_VictoryRoad3AfterBattleText3::
 	text "You showed me just"
 	line "how good I was!"
 	done
 
-_VictoryRoad3BattleText4:: ; 81e4f (20:5e4f)
+_VictoryRoad3BattleText4::
 	text "Only the chosen"
 	line "can pass here!"
 	done
 
-_VictoryRoad3EndBattleText4:: ; 81e6f (20:5e6f)
+_VictoryRoad3EndBattleText4::
 	text "I"
 	line "don't believe it!"
 	prompt
 
-_VictoryRoad3AfterBattleText4:: ; 81e83 (20:5e83)
+_VictoryRoad3AfterBattleText4::
 	text "All trainers here"
 	line "are headed to the"
 	cont "#MON LEAGUE!"
@@ -45,18 +45,18 @@
 	cont "Be careful!"
 	done
 
-_VictoryRoad3BattleText5:: ; 81ec1 (20:5ec1)
+_VictoryRoad3BattleText5::
 	text "Trainers live to"
 	line "seek stronger"
 	cont "opponents!"
 	done
 
-_VictoryRoad3EndBattleText5:: ; 81eec (20:5eec)
+_VictoryRoad3EndBattleText5::
 	text "Oh!"
 	line "So strong!"
 	prompt
 
-_VictoryRoad3AfterBattleText5:: ; 81efc (20:5efc)
+_VictoryRoad3AfterBattleText5::
 	text "By fighting tough"
 	line "battles, you get"
 	cont "stronger!"
--- a/text/maps/viridian_city.asm
+++ b/text/maps/viridian_city.asm
@@ -1,4 +1,4 @@
-_ViridianCityText1:: ; a43cc (29:43cc)
+_ViridianCityText1::
 	text "Those # BALLs"
 	line "at your waist!"
 	cont "You have #MON!"
@@ -9,7 +9,7 @@
 	cont "time, anywhere!"
 	done
 
-_ViridianCityText_19122:: ; a4437 (29:4437)
+_ViridianCityText_19122::
 	text "This #MON GYM"
 	line "is always closed."
 
@@ -17,12 +17,12 @@
 	line "LEADER is?"
 	done
 
-_ViridianCityText_19127:: ; a4474 (29:4474)
+_ViridianCityText_19127::
 	text "VIRIDIAN GYM's"
 	line "LEADER returned!"
 	done
 
-_ViridianCityText_1914d:: ; a4494 (29:4494)
+_ViridianCityText_1914d::
 	text "You want to know"
 	line "about the 2 kinds"
 	cont "of caterpillar"
@@ -29,11 +29,11 @@
 	cont "#MON?"
 	done
 
-_ViridianCityText_19152:: ; a44cd (29:44cd)
+_ViridianCityText_19152::
 	text "Oh, OK then!"
 	done
 
-_ViridianCityText_19157:: ; a44db (29:44db)
+_ViridianCityText_19157::
 	text "CATERPIE has no"
 	line "poison, but"
 	cont "WEEDLE does."
@@ -42,7 +42,7 @@
 	line "POISON STING!"
 	done
 
-_ViridianCityText_19175:: ; a4525 (29:4525)
+_ViridianCityText_19175::
 	text "Oh Grandpa! Don't"
 	line "be so mean!"
 	cont "He hasn't had his"
@@ -49,7 +49,7 @@
 	cont "coffee yet."
 	done
 
-_ViridianCityText_1917a:: ; a4560 (29:4560)
+_ViridianCityText_1917a::
 	text "When I go shop in"
 	line "PEWTER CITY, I"
 	cont "have to take the"
@@ -57,7 +57,7 @@
 	cont "VIRIDIAN FOREST."
 	done
 
-_ViridianCityText_19191:: ; a45b5 (29:45b5)
+_ViridianCityText_19191::
 	text "You can't go"
 	line "through here!"
 
@@ -65,7 +65,7 @@
 	line "property!"
 	done
 
-_ViridianCityText_191ca:: ; a45ea (29:45ea)
+_ViridianCityText_191ca::
 	text "Yawn!"
 	line "I must have dozed"
 	cont "off in the sun."
@@ -82,22 +82,22 @@
 	cont "have this TM."
 	prompt
 
-_ReceivedTM42Text:: ; a469a (29:469a)
+_ReceivedTM42Text::
 	text $52, " received"
 	line "TM42!@@"
 
-_TM42Explanation:: ; a46ad (29:46ad)
+_TM42Explanation::
 	text "TM42 contains"
 	line "DREAM EATER..."
 	cont "...Snore..."
 	done
 
-_TM42NoRoomText:: ; a46d7 (29:46d7)
+_TM42NoRoomText::
 	text "You have too much"
 	line "stuff already."
 	done
 
-_ViridianCityText_1920a:: ; a46f9 (29:46f9)
+_ViridianCityText_1920a::
 	text "Ahh, I've had my"
 	line "coffee now and I"
 	cont "feel great!"
@@ -109,7 +109,7 @@
 	line "hurry?"
 	done
 
-_ViridianCityText_1920f:: ; a4754 (29:4754)
+_ViridianCityText_1920f::
 	text "I see you're using"
 	line "a #DEX."
 
@@ -126,24 +126,24 @@
 	line "how to then."
 	done
 
-_ViridianCityText_19214:: ; a47e6 (29:47e6)
+_ViridianCityText_19214::
 	text "Time is money..."
 	line "Go along then."
 	done
 
-_ViridianCityText_19219:: ; a4807 (29:4807)
+_ViridianCityText_19219::
 	text "First, you need"
 	line "to weaken the"
 	cont "target #MON."
 	done
 
-_ViridianCityText8:: ; a4833 (29:4833)
+_ViridianCityText8::
 	text "VIRIDIAN CITY "
 	line "The Eternally"
 	cont "Green Paradise"
 	done
 
-_ViridianCityText9:: ; a4860 (29:4860)
+_ViridianCityText9::
 	text "TRAINER TIPS"
 
 	para "Catch #MON"
@@ -155,7 +155,7 @@
 	cont "to fight!"
 	done
 
-_ViridianCityText10:: ; a48c3 (29:48c3)
+_ViridianCityText10::
 	text "TRAINER TIPS"
 
 	para "The battle moves"
@@ -169,12 +169,12 @@
 	cont "#MON CENTER!"
 	done
 
-_ViridianCityText13:: ; a4949 (29:4949)
+_ViridianCityText13::
 	text "VIRIDIAN CITY"
 	line "#MON GYM"
 	done
 
-_ViridianCityText14:: ; a4961 (29:4961)
+_ViridianCityText14::
 	text "The GYM's doors"
 	line "are locked..."
 	done
--- a/text/maps/viridian_forest.asm
+++ b/text/maps/viridian_forest.asm
@@ -1,4 +1,4 @@
-_ViridianForestText1:: ; 8031d (20:431d)
+_ViridianForestText1::
 	text "I came here with"
 	line "some friends!"
 
@@ -6,57 +6,53 @@
 	line "#MON fights!"
 	done
 
-_ViridianForestBattleText1:: ; 80359 (20:4359)
+_ViridianForestBattleText1::
 	text "Hey! You have"
 	line "#MON! Come on!"
-IF DEF(_YELLOW)
-	cont "Let's battle 'em!"
-ELSE
 	cont "Let's battle'em!"
-ENDC
 	done
 
-_ViridianForestEndBattleText1:: ; 80387 (20:4387)
+_ViridianForestEndBattleText1::
 	text "No!"
 	line "CATERPIE can't"
 	cont "cut it!"
 	prompt
 
-_ViridianFrstAfterBattleText1:: ; 803a2 (20:43a2)
+_ViridianFrstAfterBattleText1::
 	text "Ssh! You'll scare"
 	line "the bugs away!"
 	done
 
-_ViridianForestBattleText2:: ; 803c3 (20:43c3)
+_ViridianForestBattleText2::
 	text "Yo! You can't jam"
 	line "out if you're a"
 	cont "#MON trainer!"
 	done
 
-_ViridianForestEndBattleText2:: ; 803f2 (20:43f2)
+_ViridianForestEndBattleText2::
 	text "Huh?"
 	line "I ran out of"
 	cont "#MON!"
 	prompt
 
-_ViridianFrstAfterBattleText2:: ; 8040b (20:440b)
+_ViridianFrstAfterBattleText2::
 	text "Darn! I'm going"
 	line "to catch some"
 	cont "stronger ones!"
 	done
 
-_ViridianForestBattleText3:: ; 80438 (20:4438)
+_ViridianForestBattleText3::
 	text "Hey, wait up!"
 	line "What's the hurry?"
 	done
 
-_ViridianForestEndBattleText3:: ; 80458 (20:4458)
+_ViridianForestEndBattleText3::
 	text "I"
 	line "give! You're good"
 	cont "at this!"
 	prompt
 
-_ViridianFrstAfterBattleText3:: ; 80475 (20:4475)
+_ViridianFrstAfterBattleText3::
 	text "Sometimes, you"
 	line "can find stuff on"
 	cont "the ground!"
@@ -66,43 +62,7 @@
 	cont "dropped!"
 	done
 
-if DEF(_YELLOW)
-_ViridianForestBattleTextPikaGirl::
-	text "Hi, do you have a"
-	line "PIKACHU?"
-	done
-
-_ViridianForestEndBattleTextPikaGirl::
-	text "Oh no,"
-	line "really?"
-	prompt
-
-_ViridianForestAfterBattleTextPikaGirl::
-	text "I looked forever,"
-	line "but I never found"
-	cont "a PIKACHU here!"
-	done
-
-_ViridianForestBattleTextSamurai::
-	text "I'm gonna be the"
-	line "best. You just"
-	cont "can't beat me!"
-	done
-
-_ViridianForestEndBattleTextSamurai::
-	text "After"
-	line "all I did..."
-	prompt
-
-_ViridianForestAfterBattleTextSamurai::
-	text "A METAPOD is cool"
-	line "because its"
-	cont "attack is its"
-	cont "defense!"
-	done
-ENDC
-
-_ViridianForestText8:: ; 804c7 (20:44c7)
+_ViridianForestText8::
 	text "I ran out of #"
 	line "BALLs to catch"
 	cont "#MON with!"
@@ -111,7 +71,7 @@
 	line "extras!"
 	done
 
-_ViridianForestText9:: ; 8050a (20:450a)
+_ViridianForestText9::
 	text "TRAINER TIPS"
 
 	para "If you want to"
@@ -120,13 +80,13 @@
 	cont "grassy areas!"
 	done
 
-_ViridianForestText10:: ; 80553 (20:4553)
+_ViridianForestText10::
 	text "For poison, use"
 	line "ANTIDOTE! Get it"
 	cont "at #MON MARTs!"
 	done
 
-_ViridianForestText11:: ; 80584 (20:4584)
+_ViridianForestText11::
 	text "TRAINER TIPS"
 
 	para "Contact PROF.OAK"
@@ -135,7 +95,7 @@
 	cont "evaluated!"
 	done
 
-_ViridianForestText12:: ; 805c6 (20:45c6)
+_ViridianForestText12::
 	text "TRAINER TIPS"
 
 	para "No stealing of"
@@ -145,7 +105,7 @@
 	cont "#MON!"
 	done
 
-_ViridianForestText13:: ; 80613 (20:4613)
+_ViridianForestText13::
 	text "TRAINER TIPS"
 
 	para "Weaken #MON"
@@ -156,7 +116,7 @@
 	line "they may escape!"
 	done
 
-_ViridianForestText14:: ; 80667 (20:4667)
+_ViridianForestText14::
 	text "LEAVING"
 	line "VIRIDIAN FOREST"
 	cont "PEWTER CITY AHEAD"
--- a/text/maps/viridian_forest_entrance.asm
+++ b/text/maps/viridian_forest_entrance.asm
@@ -1,4 +1,4 @@
-_ViridianForestEntranceText1:: ; 8a868 (22:6868)
+_ViridianForestEntranceText1::
 	text "Are you going to"
 	line "VIRIDIAN FOREST?"
 	cont "Be careful, it's"
@@ -5,20 +5,9 @@
 	cont "a natural maze!"
 	done
 
-_ViridianForestEntranceText2:: ; 8a8ab (22:68ab)
-IF DEF(_YELLOW)
-	text "You have to roam"
-	line "far to get new"
-	cont "kinds of #MON."
-
-	para "Look for other"
-	line "types outside of"
-	cont "VIRIDIAN FOREST."
-	done
-ELSE
+_ViridianForestEntranceText2::
 	text "RATTATA may be"
 	line "small, but its"
 	cont "bite is wicked!"
 	cont "Did you get one?"
 	done
-ENDC
--- a/text/maps/viridian_forest_exit.asm
+++ b/text/maps/viridian_forest_exit.asm
@@ -1,4 +1,4 @@
-_ViridianForestExitText1:: ; 8a6fd (22:66fd)
+_ViridianForestExitText1::
 	text "Many #MON live"
 	line "only in forests "
 	cont "and caves."
@@ -8,7 +8,7 @@
 	cont "different kinds!"
 	done
 
-_ViridianForestExitText2:: ; 8a75d (22:675d)
+_ViridianForestExitText2::
 	text "Have you noticed"
 	line "the bushes on the"
 	cont "roadside?"
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/viridian_gym.asm
@@ -1,4 +1,4 @@
-_ViridianGymText_74ace:: ; 95e09 (25:5e09)
+_ViridianGymText_74ace::
 	text "Fwahahaha! This is"
 	line "my hideout!"
 
@@ -18,7 +18,7 @@
 	cont "greatest trainer!"
 	done
 
-_ViridianGymText_74ad3:: ; 95ed5 (25:5ed5)
+_ViridianGymText_74ad3::
 	text "Ha!"
 	line "That was a truly"
 	cont "intense fight!"
@@ -26,7 +26,7 @@
 	cont "As proof, here is"
 	cont "the EARTHBADGE!@@"
 
-_ViridianGymText_74ad9:: ; 95f2b (25:5f2b)
+_ViridianGymText_74ad9::
 	text "Having lost, I"
 	line "cannot face my"
 	cont "underlings!"
@@ -38,14 +38,10 @@
 	cont "of #MON!"
 
 	para "Let us meet again"
-IF DEF(_YELLOW)
-	line "someday!"
-ELSE
 	line "some day!"
-ENDC
 	cont "Farewell!@@"
 
-_ViridianGymText12:: ; 95fcc (25:5fcc)
+_ViridianGymText12::
 	text "The EARTHBADGE"
 	line "makes #MON of"
 	cont "any level obey!"
@@ -63,11 +59,11 @@
 	cont "LEAGUE challenge!"
 	done
 
-_ReceivedTM27Text:: ; 96082 (25:6082)
+_ReceivedTM27Text::
 	text $52, " received"
 	line "TM27!@@"
 
-_TM27ExplanationText:: ; 96095 (25:6095)
+_TM27ExplanationText::
 	db $0
 	para "TM27 is FISSURE!"
 	line "It will take out"
@@ -79,124 +75,124 @@
 	cont "too long ago..."
 	done
 
-_TM27NoRoomText:: ; 96104 (25:6104)
+_TM27NoRoomText::
 	text "You do not have"
 	line "space for this!"
 	done
 
-_ViridianGymBattleText1:: ; 96125 (25:6125)
+_ViridianGymBattleText1::
 	text "Heh! You must be"
 	line "running out of"
 	cont "steam by now!"
 	done
 
-_ViridianGymEndBattleText1:: ; 96154 (25:6154)
+_ViridianGymEndBattleText1::
 	text "I"
 	line "ran out of gas!"
 	prompt
 
-_ViridianGymAfterBattleText1:: ; 96167 (25:6167)
+_ViridianGymAfterBattleText1::
 	text "You need power to"
 	line "keep up with our"
 	cont "GYM LEADER!"
 	done
 
-_ViridianGymBattleText2:: ; 96197 (25:6197)
+_ViridianGymBattleText2::
 	text "Rrrroar! I'm"
 	line "working myself"
 	cont "into a rage!"
 	done
 
-_ViridianGymEndBattleText2:: ; 961c0 (25:61c0)
+_ViridianGymEndBattleText2::
 	text "Wargh!"
 	prompt
 
-_ViridianGymAfterBattleText2:: ; 961c8 (25:61c8)
+_ViridianGymAfterBattleText2::
 	text "I'm still not"
 	line "worthy!"
 	done
 
-_ViridianGymBattleText3:: ; 961de (25:61de)
+_ViridianGymBattleText3::
 	text "#MON and I, we"
 	line "make wonderful"
 	cont "music together!"
 	done
 
-_ViridianGymEndBattleText3:: ; 9620d (25:620d)
+_ViridianGymEndBattleText3::
 	text "You are in"
 	line "perfect harmony!"
 	prompt
 
-_ViridianGymAfterBattleText3:: ; 9622a (25:622a)
+_ViridianGymAfterBattleText3::
 	text "Do you know the"
 	line "identity of our"
 	cont "GYM LEADER?"
 	done
 
-_ViridianGymBattleText4:: ; 96257 (25:6257)
+_ViridianGymBattleText4::
 	text "Karate is the"
 	line "ultimate form of"
 	cont "martial arts!"
 	done
 
-_ViridianGymEndBattleText4:: ; 96285 (25:6285)
+_ViridianGymEndBattleText4::
 	text "Atcho!"
 	prompt
 
-_ViridianGymAfterBattleText4:: ; 9628d (25:628d)
+_ViridianGymAfterBattleText4::
 	text "If my #MON"
 	line "were as good at"
 	cont "Karate as I..."
 	done
 
-_ViridianGymBattleText5:: ; 962b8 (25:62b8)
+_ViridianGymBattleText5::
 	text "The truly talented"
 	line "win with style!"
 	done
 
-_ViridianGymEndBattleText5:: ; 962dc (25:62dc)
+_ViridianGymEndBattleText5::
 	text "I"
 	line "lost my grip!"
 	prompt
 
-_ViridianGymAfterBattleText5:: ; 962ed (25:62ed)
+_ViridianGymAfterBattleText5::
 	text "The LEADER will"
 	line "scold me!"
 	done
 
-_ViridianGymBattleText6:: ; 96308 (25:6308)
+_ViridianGymBattleText6::
 	text "I'm the KARATE"
 	line "KING! Your fate"
 	cont "rests with me!"
 	done
 
-_ViridianGymEndBattleText6:: ; 96336 (25:6336)
+_ViridianGymEndBattleText6::
 	text "Ayah!"
 	prompt
 
-_ViridianGymAfterBattleText6:: ; 9633d (25:633d)
+_ViridianGymAfterBattleText6::
 	text "#MON LEAGUE?"
 	line "You? Don't get"
 	cont "cocky!"
 	done
 
-_ViridianGymBattleText7:: ; 96360 (25:6360)
+_ViridianGymBattleText7::
 	text "Your #MON will"
 	line "cower at the"
 	cont "crack of my whip!"
 	done
 
-_ViridianGymEndBattleText7:: ; 9638f (25:638f)
+_ViridianGymEndBattleText7::
 	text "Yowch!"
 	line "Whiplash!"
 	prompt
 
-_ViridianGymAfterBattleText7:: ; 963a1 (25:63a1)
+_ViridianGymAfterBattleText7::
 	text "Wait! I was just"
 	line "careless!"
 	done
 
-_ViridianGymBattleText8:: ; 963bd (25:63bd)
+_ViridianGymBattleText8::
 	text "VIRIDIAN GYM was"
 	line "closed for a long"
 	cont "time, but now our"
@@ -203,23 +199,19 @@
 	cont "LEADER is back!"
 	done
 
-_ViridianGymEndBattleText8:: ; 96403 (25:6403)
+_ViridianGymEndBattleText8::
 	text "I"
 	line "was beaten?"
 	prompt
 
-_ViridianGymAfterBattleText8:: ; 96412 (25:6412)
-IF DEF(_YELLOW)
-	text "You can go on to"
-ELSE
+_ViridianGymAfterBattleText8::
 	text "You can go onto"
-ENDC
 	line "#MON LEAGUE"
 	cont "only by defeating"
 	cont "our GYM LEADER!"
 	done
 
-_ViridianGymText_74bd4:: ; 96451 (25:6451)
+_ViridianGymText_74bd4::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -237,7 +229,7 @@
 	cont "#MON!"
 	done
 
-_ViridianGymText_74bd9:: ; 964fb (25:64fb)
+_ViridianGymText_74bd9::
 	text "Blow me away!"
 	line "GIOVANNI was the"
 	cont "GYM LEADER here?"
--- a/text/maps/viridian_house.asm
+++ b/text/maps/viridian_house.asm
@@ -1,4 +1,4 @@
-_ViridianHouseText1:: ; 95d71 (25:5d71)
+_ViridianHouseText1::
 	text "Coming up with"
 	line "nicknames is fun,"
 	cont "but hard."
@@ -8,16 +8,16 @@
 	cont "remember."
 	done
 
-_ViridianHouseText2:: ; 95dc7 (25:5dc7)
+_ViridianHouseText2::
 	text "My Daddy loves"
 	line "#MON too."
 	done
 
-_ViridianHouseText_1d5b1:: ; 95de1 (25:5de1)
+_ViridianHouseText_1d5b1::
 	text "SPEARY: Tetweet!"
 	done
 
-_ViridianHouseText4:: ; 95df3 (25:5df3)
+_ViridianHouseText4::
 	text "SPEAROW"
 	line "Name: SPEARY"
 	done
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/viridian_mart.asm
@@ -1,5 +1,5 @@
-_ViridianPokeCenterText2:: ; 95ba1 (25:5ba1)
-_ViridianPokeCenterText1:: ; 95ba1 (25:5ba1)
+_ViridianPokeCenterText2::
+_ViridianPokeCenterText1::
 	text "You can use that"
 	line "PC in the corner."
 
@@ -7,7 +7,7 @@
 	line "told me. So kind!"
 	done
 
-_ViridianPokeCenterText3:: ; 95be8 (25:5be8)
+_ViridianPokeCenterText3::
 	text "There's a #MON"
 	line "CENTER in every"
 	cont "town ahead."
@@ -16,17 +16,17 @@
 	line "any money either!"
 	done
 
-_ViridianMartText1:: ; 95c36 (25:5c36)
+_ViridianMartText1::
 	text "Okay! Say hi to"
 	line "PROF.OAK for me!"
 	done
 
-_ViridianMartText4:: ; 95c58 (25:5c58)
+_ViridianMartText4::
 	text "Hey! You came from"
 	line "PALLET TOWN?"
 	done
 
-ViridianMartParcelQuestText:: ; 95c79 (25:5c79)
+ViridianMartParcelQuestText::
 	text "You know PROF."
 	line "OAK, right?"
 
@@ -37,24 +37,12 @@
 	para $52, " got"
 	line "OAK's PARCEL!@@"
 
-_ViridianMartText2:: ; 95cd5 (25:5cd5)
-IF DEF(_YELLOW)
-	text "This shop sells a"
-	line "lot of PARLYZ"
-	cont "HEALs."
-ELSE
+_ViridianMartText2::
 	text "This shop sells"
 	line "many ANTIDOTEs."
-ENDC
 	done
 
-_ViridianMartText3:: ; 95cf6 (25:5cf6)
-IF DEF(_YELLOW)
-	text "The shop finally"
-	line "has some POTIONs"
-	cont "in stock."
-ELSE
+_ViridianMartText3::
 	text "No! POTIONs are"
 	line "all sold out."
-ENDC
 	done
--- a/text/maps/wardens_house.asm
+++ b/text/maps/wardens_house.asm
@@ -1,4 +1,4 @@
-_WardenGibberishText1:: ; 9e444 (27:6444)
+_WardenGibberishText1::
 	text "WARDEN: Hif fuff"
 	line "hefifoo!"
 
@@ -7,28 +7,28 @@
 	cont "hee fwee!"
 	done
 
-_WardenGibberishText2:: ; 9e48b (27:648b)
+_WardenGibberishText2::
 	text "Ah howhee ho hoo!"
 	line "Eef ee hafahi ho!"
 	done
 
-_WardenGibberishText3:: ; 9e4b0 (27:64b0)
+_WardenGibberishText3::
 	text "Ha? He ohay heh"
 	line "ha hoo ee haheh!"
 	done
 
-_WardenTeethText1:: ; 9e4d2 (27:64d2)
+_WardenTeethText1::
 	text $52, " gave the"
 	line "GOLD TEETH to the"
 	cont "WARDEN!@@"
 
-_WardenTeethText2:: ; 9e4f9 (27:64f9)
+_WardenTeethText2::
 	db $0
 	para "The WARDEN popped"
 	line "in his teeth!"
 	prompt
 
-_WardenThankYouText:: ; 9e51b (27:651b)
+_WardenThankYouText::
 	text "WARDEN: Thanks,"
 	line "kid! No one could"
 	cont "understand a word"
@@ -41,13 +41,13 @@
 	cont "your trouble."
 	prompt
 
-_ReceivedHM04Text:: ; 9e5a2 (27:65a2)
+_ReceivedHM04Text::
 	text $52, " received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_HM04ExplanationText:: ; 9e5b6 (27:65b6)
+_HM04ExplanationText::
 	text "WARDEN: HM04"
 	line "teaches STRENGTH!"
 
@@ -67,17 +67,17 @@
 	line "rare SURF HM."
 	done
 
-_HM04NoRoomText:: ; 9e67a (27:667a)
+_HM04NoRoomText::
 	text "Your pack is"
 	line "stuffed full!"
 	done
 
-_FuchsiaHouse2Text_75176:: ; 9e696 (27:6696)
+_FuchsiaHouse2Text_75176::
 	text "#MON photos"
 	line "and fossils."
 	done
 
-_FuchsiaHouse2Text_7517b:: ; 9e6b0 (27:66b0)
+_FuchsiaHouse2Text_7517b::
 	text "Old #MON"
 	line "merchandise."
 	done