Build only Yellow

Conflicts:
	gfx/intro_nido_1.6x6.png
	gfx/intro_nido_2.6x6.png
	gfx/intro_nido_3.6x6.png
	gfx/redgreenversion.png
	text.asm
	text/maps/cerulean_trade_house.asm
	text/maps/copycats_house_1f.asm
	text/maps/daycare_2.asm
	text/maps/museum_2f.asm
	text/maps/oaks_lab.asm
	text/maps/pewter_gym.asm
	text/maps/route_9_1.asm
	text/maps/school.asm
	text/maps/vermilion_gym_1.asm
	yellow/main.asm

53 files changed, 12 insertions, 393 deletions

diff --git a/text/credits_text.asm b/text/credits_text.asm
index 2c638b9e..02614c6a 100755
--- a/text/credits_text.asm
+++ b/text/credits_text.asm
@@ -65,12 +65,7 @@ CreditsTextPointers: ; 742c3 (1d:42c3)
 	dw CredPAAD
 
 CredVersion: ; 74343 (1d:4343) ; this 1 byte difference makes all bank addresses offset by 1 in the blue version
-IF DEF(_RED)
 	db -8, "RED VERSION STAFF@"
-ENDC
-IF DEF(_BLUE)
-	db -8, "BLUE VERSION STAFF@"
-ENDC
 CredTajiri: ; 74356 (1d:4356)
 	db -6, "SATOSHI TAJIRI@"
 CredTaOota: ; 74366 (1d:4366)
diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm
index 9e20b7aa..36b74504 100644
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -23,11 +23,7 @@ _AgathaBeforeBattleText:: ; 8686b (21:686b)
 	done
 
 _AgathaEndBattleText:: ; 86970 (21:6970)
-IF DEF(_YELLOW)
 	text "Woo-hoo!"
-ELSE
-	text "Oh ho!"
-ENDC
 	line "You're something"
 	cont "special, child!"
 	prompt
diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm
index 3ec1e3f3..257a7128 100644
--- a/text/maps/bills_house.asm
+++ b/text/maps/bills_house.asm
@@ -1,9 +1,7 @@
-IF DEF(_YELLOW)
 _BillsHouseDontLeaveText::
 	text "Whoa, don't go"
 	line "anywhere, wait!"
 	done
-ENDC
 
 _BillsHouseText_1e865:: ; 8d267 (23:5267)
 	text "Hiya! I'm a"
diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm
index a5b155f2..9891ce26 100644
--- a/text/maps/blues_house.asm
+++ b/text/maps/blues_house.asm
@@ -29,19 +29,11 @@ _DaisyUseMapText::
 	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!"
diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm
index 0a4c5333..b84cd345 100644
--- a/text/maps/celadon_city.asm
+++ b/text/maps/celadon_city.asm
@@ -1,18 +1,10 @@
 _CeladonCityText1:: ; a59fb (29:59fb)
 	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)
@@ -103,11 +95,7 @@ _CeladonCityText13:: ; a5d41 (29:5d41)
 	line "#MON GYM"
 	cont "LEADER: ERIKA"
 
-IF DEF(_YELLOW)
 	para "The Nature-Loving"
-ELSE
-	para "The Nature Loving"
-ENDC
 	line "Princess!"
 	done
 
@@ -144,11 +132,7 @@ _CeladonCityText17:: ; a5e3e (29:5e3e)
 _CeladonCityText18:: ; a5e6a (29:5e6a)
 	text "ROCKET GAME CORNER"
 	line "The playground"
-IF DEF(_YELLOW)
 	cont "for grownups!"
-ELSE
-	cont "for grown-ups!"
-ENDC
 	done
 
 _CeladonCityText10:: ; a5c82 (29:5c82)
diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm
index de33021b..514d4921 100644
--- a/text/maps/celadon_dept_store_4f.asm
+++ b/text/maps/celadon_dept_store_4f.asm
@@ -1,16 +1,11 @@
 _CeladonMart4Text2:: ; 9cad4 (27:4ad4)
 	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)
diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm
index f2eef613..665bf491 100644
--- a/text/maps/celadon_dept_store_roof.asm
+++ b/text/maps/celadon_dept_store_roof.asm
@@ -50,14 +50,7 @@ _CeladonMartRoofText_4850f:: ; 9cca5 (27:4ca5)
 	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)
 	text "Yay!"
diff --git a/text/maps/cerulean_badge_house_1.asm b/text/maps/cerulean_badge_house_1.asm
index ad57f00e..c3f93152 100644
--- a/text/maps/cerulean_badge_house_1.asm
+++ b/text/maps/cerulean_badge_house_1.asm
@@ -19,11 +19,7 @@ _CeruleanHouse2Text_74e7c:: ; 9913a (26:513a)
 	done
 
 _CeruleanHouse2Text_74e81:: ; 99170 (26:5170)
-IF DEF(_YELLOW)
 	text "Come visit me any-"
-ELSE
-	text "Come visit me any"
-ENDC
 	line "time you wish."
 	done
 
@@ -33,11 +29,7 @@ _CeruleanHouse2Text_74e96:: ; 99192 (26:5192)
 	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
 
diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm
index f014ee5d..52b308a4 100644
--- a/text/maps/cerulean_city.asm
+++ b/text/maps/cerulean_city.asm
@@ -120,7 +120,6 @@ _CeruleanCityText5:: ; a50ba (29:50ba)
 	done
 
 _CeruleanCityText6:: ; a50f6 (29:50f6)
-IF DEF(_YELLOW)
 	text "These poor people"
 	line "here were robbed."
 
@@ -128,65 +127,31 @@ IF DEF(_YELLOW)
 	line "that TEAM ROCKET"
 	cont "is behind this"
 	cont "terrible deed."
-ELSE
-	text "The people here"
-	line "were robbed."
-
-	para "It's obvious that"
-	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
-	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
-	text "SLOWBRO punch!"
-ENDC
 	line "No! You blew it"
 	cont "again!"
 	done
 
 _CeruleanCityText_1973a:: ; a51ec (29:51ec)
-IF DEF(_YELLOW)
 	text "ELECTRODE, SWIFT!"
-ELSE
-	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"
@@ -195,38 +160,22 @@ ENDC
 	done
 
 _CeruleanCityText_1976f:: ; a526b (29:526b)
-IF DEF(_YELLOW)
 	text "ELECTRODE took a"
-ELSE
-	text "SLOWBRO took a"
-ENDC
 	line "snooze..."
 	done
 
 _CeruleanCityText_19774:: ; a5285 (29:5285)
-IF DEF(_YELLOW)
 	text "ELECTRODE is"
-ELSE
-	text "SLOWBRO is"
-ENDC
 	line "loafing around..."
 	done
 
 _CeruleanCityText_19779:: ; a52a3 (29:52a3)
-IF DEF(_YELLOW)
 	text "ELECTRODE turned"
-ELSE
-	text "SLOWBRO turned"
-ENDC
 	line "away..."
 	done
 
 _CeruleanCityText_1977e:: ; a52bb (29:52bb)
-IF DEF(_YELLOW)
 	text "ELECTRODE"
-ELSE
-	text "SLOWBRO"
-ENDC
 	line "ignored orders..."
 	done
 
diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm
index 359d8d1c..280d6bc6 100644
--- a/text/maps/cerulean_gym.asm
+++ b/text/maps/cerulean_gym.asm
@@ -2,34 +2,21 @@ _CeruleanGymText_5c7be:: ; 989c1 (26:49c1)
 	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"
-	cont "about #MON!"
-
-	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)
@@ -50,11 +37,7 @@ _CeruleanGymText_5c7c8:: ; 98ab0 (26:4ab0)
 
 	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"
@@ -74,13 +57,8 @@ _CeruleanGymText_5c7d3:: ; 98b90 (26:4b90)
 	done
 
 _CeruleanGymText_5c7d8:: ; 98bb0 (26:4bb0)
-IF DEF(_YELLOW)
 	text "I can't"
 	line "believe I lost!"
-ELSE
-	text "Wow!"
-	line "You're too much!"
-ENDC
 
 	para "All right!"
 
@@ -150,11 +128,7 @@ _CeruleanGymText_5c82f:: ; 98db0 (26:4db0)
 	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
diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm
index 897368d2..608a7ace 100644
--- a/text/maps/cinnabar_island.asm
+++ b/text/maps/cinnabar_island.asm
@@ -13,11 +13,7 @@ _CinnabarIslandText1:: ; a61e6 (29:61e6)
 _CinnabarIslandText2:: ; a622a (29:622a)
 	text "Scientists conduct"
 	line "experiments in"
-IF DEF(_YELLOW)
 	cont "the burned-out"
-ELSE
-	cont "the burned out"
-ENDC
 	cont "building."
 	done
 
diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm
index cb47a8f0..7199255e 100644
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -1,24 +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"
@@ -28,7 +19,6 @@ PikachuFanPrintText::
 	line "PRINT of my cute"
 	cont "CLEFAIRY."
 	done
-ENDC
 
 SeelFanText::
 	text "I just love my"
@@ -45,22 +35,15 @@ SeelFanBetterText::
 	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 +54,9 @@ FanClubMeetChairText::
 	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 +64,8 @@ ENDC
 
 	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,7 +142,6 @@ FanClubBagFullText::
 	line "this!"
 	done
 
-IF DEF(_YELLOW)
 FanClubChairPrintText1::
 	text "Hi there, ",$52,"!"
 	line "Have you seen my"
@@ -198,14 +170,9 @@ FanClubChairPrintText4::
 	text "Maybe we won't"
 	line "PRINT this now."
 	done
-ENDC
 
 _FanClubText6:: ; 9a948 (26:6948)
-IF DEF(_YELLOW)
 	text "Our CHAIRMAN is"
-ELSE
-	text "Our Chairman is"
-ENDC
 	line "very vocal about"
 	cont "#MON."
 	done
diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm
index 9cf7ba4e..334346b1 100644
--- a/text/maps/fighting_dojo.asm
+++ b/text/maps/fighting_dojo.asm
@@ -114,21 +114,13 @@ _FightingDojoAfterBattleText4:: ; a1b1a (28:5b1a)
 
 _WantHitmonleeText:: ; a1b4a (28:5b4a)
 	text "You want the"
-IF DEF(_YELLOW)
 	line "hard-kicking"
-ELSE
-	line "hard kicking"
-ENDC
 	cont "HITMONLEE?"
 	done
 
 _WantHitmonchanText:: ; a1b70 (28:5b70)
 	text "You want the"
-IF DEF(_YELLOW)
 	line "piston-punching"
-ELSE
-	line "piston punching"
-ENDC
 	cont "HITMONCHAN?"
 	done
 
diff --git a/text/maps/fuchsia_city.asm b/text/maps/fuchsia_city.asm
index bcb80d0e..2a0dddea 100644
--- a/text/maps/fuchsia_city.asm
+++ b/text/maps/fuchsia_city.asm
@@ -58,11 +58,7 @@ _FuchsiaCityText18:: ; a6011 (29:6011)
 	cont "LEADER: KOGA"
 
 	para "The Poisonous"
-IF DEF(_YELLOW)
 	line "Ninja Master!"
-ELSE
-	line "Ninja Master"
-ENDC
 	done
 
 _FuchsiaCityChanseyText:: ; a6050 (29:6050)
diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm
index cb0cc622..4cd26004 100644
--- a/text/maps/hall_of_fame.asm
+++ b/text/maps/hall_of_fame.asm
@@ -1,10 +1,6 @@
 _HallofFameRoomText1:: ; 85fb5 (21:5fb5)
 	text "OAK: Er-hem!"
-IF DEF(_YELLOW)
 	line "Congratulations,"
-ELSE
-	line "Congratulations"
-ENDC
 	cont $52, "!"
 
 	para "This floor is the"
diff --git a/text/maps/lance.asm b/text/maps/lance.asm
index 35ef3546..dd290681 100644
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -1,10 +1,6 @@
 _LanceBeforeBattleText:: ; 85d3c (21:5d3c)
 	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"
diff --git a/text/maps/mt_moon_1f.asm b/text/maps/mt_moon_1f.asm
index 0577adf3..625f1c6d 100644
--- a/text/maps/mt_moon_1f.asm
+++ b/text/maps/mt_moon_1f.asm
@@ -115,9 +115,5 @@ _MtMoon1AfterBattleText8:: ; 80901 (20:4901)
 
 _MtMoon1Text14:: ; 8093a (20:493a)
 	text "Beware! ZUBAT is"
-IF DEF(_YELLOW)
 	line "a bloodsucker!"
-ELSE
-	line "a blood sucker!"
-ENDC
 	done
diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm
index d661e590..a564148e 100644
--- a/text/maps/mt_moon_b2f.asm
+++ b/text/maps/mt_moon_b2f.asm
@@ -1,4 +1,3 @@
-IF DEF(_YELLOW)
 _MtMoonJessieJamesText1::
 	text "Stop right there!@@"
 
@@ -19,7 +18,6 @@ _MtMoonJessieJamesText4::
 	text "TEAM ROCKET, blast"
 	line "off at the speed"
 	cont "of light!@@"
-ENDC
 
 _MtMoon3Text_49f24:: ; 8095e (20:495e)
 	text "You want the"
diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm
index 7371a312..ca042705 100644
--- a/text/maps/museum_1f.asm
+++ b/text/maps/museum_1f.asm
@@ -72,11 +72,7 @@ _Museum1FText_5c28e:: ; 966b4 (25:66b4)
 	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"
diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm
index 2baec727..8adc7e61 100644
--- a/text/maps/name_rater.asm
+++ b/text/maps/name_rater.asm
@@ -43,11 +43,7 @@ _NameRaterText_1dac7:: ; 9a404 (26:6404)
 	done
 
 _NameRaterText_1dacc:: ; 9a44c (26:644c)
-IF DEF(_YELLOW)
 	text "Fine! Come any-"
-ELSE
-	text "Fine! Come any"
-ENDC
 	line "time you like!"
 	done
 
diff --git a/text/maps/pewter_gym.asm b/text/maps/pewter_gym.asm
index 48d97e9d..a8781b4d 100644
--- a/text/maps/pewter_gym.asm
+++ b/text/maps/pewter_gym.asm
@@ -2,9 +2,11 @@ _PewterGymText_5c49e::
 	text "I'm BROCK!"
 	line "I'm PEWTER's GYM"
 	cont "LEADER!"
+
 	para "I believe in rock"
 	line "hard defense and"
 	cont "determination!"
+
 	para "That's why my"
 	line "#MON are all"
 	cont "the rock-type!"
@@ -72,9 +74,11 @@ _TM34NoRoomText::
 	text "You don't have"
 	line "room for this!"
 	done
+
 _PewterGymText_5c4bc::
 	text "I took"
 	line "you for granted."
+
 	para "As proof of your"
 	line "victory, here's"
 	cont "the BOULDERBADGE!"
@@ -105,8 +109,10 @@ _PewterGymBattleText1::
 	line "years from facing"
 	cont "BROCK!"
 	done
+
 _PewterGymEndBattleText1::
 	text "Darn!"
+
 	para "Light years isn't"
 	line "time! It measures"
 	cont "distance!"
@@ -117,6 +123,7 @@ _PewterGymAfterBattleText1::
 	line "but not as hot"
 	cont "as BROCK!"
 	done
+
 _PewterGymText_5c515::
 	text "Hiya! I can tell"
 	line "you have what it"
@@ -126,9 +133,11 @@ _PewterGymText_5c515::
 	para "I'm no trainer,"
 	line "but I can tell"
 	cont "you how to win!"
+
 	para "Let me take you"
 	line "to the top!"
 	done
+
 _PewterGymText_5c51a::
 	text "All right! Let's"
 	line "get happening!"
@@ -161,11 +170,13 @@ _PewterGymText_5c529::
 _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
\ No newline at end of file
+	done
diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm
index 71760b7b..e817fd9f 100644
--- 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
-	text "A shady, old man"
-ENDC
 	line "got me to buy"
 	cont "this really weird"
 	cont "fish #MON!"
diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/pewter_pokecenter.asm
index 114fed16..5e03f55a 100644
--- a/text/maps/pewter_pokecenter.asm
+++ b/text/maps/pewter_pokecenter.asm
@@ -8,7 +8,6 @@ _PewterPokecenterText1:: ; 98704 (26:4704)
 	para "Scram!"
 	done
 
-IF DEF(_YELLOW)
 _PewterPokecenterText2::
 	text "#MON CENTERS"
 	line "are wonderful!"
@@ -21,7 +20,6 @@ _PewterPokecenterText2::
 	cont "poison and others"
 	cont "are cured."
 	done
-ENDC
 
 _PewterPokecenterText5:: ; 98744 (26:4744)
 	text "JIGGLYPUFF: Puu"
diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm
index aab07f9c..8ac300ab 100644
--- a/text/maps/pokemon_tower_7f.asm
+++ b/text/maps/pokemon_tower_7f.asm
@@ -1,4 +1,3 @@
-IF DEF(_YELLOW)
 _PokemonTowerJessieJamesText1::
 	text "Stop right there!@@"
 
@@ -22,7 +21,6 @@ _PokemonTowerJessieJamesText4::
 	text "Looks like TEAM"
 	line "ROCKET's blasting"
 	cont "off again!@@"
-ENDC
 
 _TowerRescueFujiText:: ; 99c1a (26:5c1a)
 	text "MR.FUJI: Heh? You"
diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm
index f6b6007e..9d03f166 100644
--- 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,7 +10,6 @@ ENDC
 	done
 
 _MomHealText1::
-IF DEF(_YELLOW)
 	text "MOM: ",$52,", if"
 	line "you drive your"
 	cont "#MON too hard,"
@@ -24,12 +19,6 @@ IF DEF(_YELLOW)
 	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!"
diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm
index 0e8fca91..61c522fa 100644
--- a/text/maps/rocket_hideout_b4f.asm
+++ b/text/maps/rocket_hideout_b4f.asm
@@ -1,4 +1,3 @@
-IF DEF(_YELLOW)
 _RocketHideoutJessieJamesText1::
 	text "Not another step,"
 	line "brat!@@"
@@ -21,7 +20,6 @@ _RocketHideoutJessieJamesText4::
 	text "Looks like TEAM"
 	line "ROCKET's blasting"
 	cont "off again!@@"
-ENDC
 
 _RocketHideout4Text_4557a:: ; 8223e (20:623e)
 	text "So! I must say, I"
diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm
index 795f7e69..9b1c1ba4 100644
--- a/text/maps/route_10.asm
+++ b/text/maps/route_10.asm
@@ -33,11 +33,7 @@ _Route10AfterBattleText2:: ; 8e6f5 (23:66f5)
 	done
 
 _Route10BattleText3:: ; 8e71c (23:671c)
-IF DEF(_YELLOW)
 	text "Hi, kid, want to"
-ELSE
-	text "Hi kid, want to"
-ENDC
 	line "see my #MON?"
 	done
 
diff --git a/text/maps/route_12.asm b/text/maps/route_12.asm
index 12925104..edbfa748 100644
--- a/text/maps/route_12.asm
+++ b/text/maps/route_12.asm
@@ -109,11 +109,7 @@ _Route12EndBattleText6:: ; 90318 (24:4318)
 _Route12AfterBattleText6:: ; 90329 (24:4329)
 	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)
diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm
index 3e8fb60c..8f18e9d4 100644
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/route_12_gate_upstairs.asm
@@ -5,11 +5,7 @@ _TM39PreReceiveText:: ; 8c86b (23:486b)
 
 	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)
diff --git a/text/maps/route_14.asm b/text/maps/route_14.asm
index b542274e..b479e3eb 100644
--- a/text/maps/route_14.asm
+++ b/text/maps/route_14.asm
@@ -10,11 +10,7 @@ _Route14EndBattleText1:: ; 9083f (24:483f)
 	prompt
 
 _Route14AfterBattleText1:: ; 90851 (24:4851)
-IF DEF(_YELLOW)
 	text "You have some HMs,"
-ELSE
-	text "You have some HMs"
-ENDC
 	line "right? #MON"
 	cont "can't ever forget"
 	cont "those moves."
diff --git a/text/maps/route_16.asm b/text/maps/route_16.asm
index ec77ec6f..38d5e565 100644
--- a/text/maps/route_16.asm
+++ b/text/maps/route_16.asm
@@ -19,11 +19,7 @@ _Route16BattleText2:: ; 910d7 (24:50d7)
 	done
 
 _Route16EndBattleText2:: ; 910f1 (24:50f1)
-IF DEF(_YELLOW)
 	text "Knock-"
-ELSE
-	text "Knock"
-ENDC
 	line "out!"
 	prompt
 
diff --git a/text/maps/route_17.asm b/text/maps/route_17.asm
index b053b473..c5897c41 100644
--- a/text/maps/route_17.asm
+++ b/text/maps/route_17.asm
@@ -133,11 +133,7 @@ _Route17AfterBattleText9:: ; 915dd (24:55dd)
 	done
 
 _Route17BattleText10:: ; 91600 (24:5600)
-IF DEF(_YELLOW)
 	text "Get lost, kid!"
-ELSE
-	text "Get lost kid!"
-ENDC
 	line "I'm bushed!"
 	done
 
diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm
index 052fd331..791eb2d4 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -77,15 +77,9 @@ _Route22RivalBeforeBattleText2:: ; 92450 (24:6450)
 	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!"
diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm
index d73611f2..4ee90dc0 100644
--- a/text/maps/route_25.asm
+++ b/text/maps/route_25.asm
@@ -1,4 +1,3 @@
-IF DEF(_YELLOW)
 _Route25DamianText1::
 	text "I'm not good at"
 	line "raising #MON."
@@ -26,7 +25,6 @@ _Route25DamianText4::
 	text "How's CHARMANDER"
 	line "doing?"
 	done
-ENDC
 
 _Route25BattleText1:: ; 9421e (25:421e)
 	text "Local trainers"
@@ -86,13 +84,8 @@ _Route25BattleText4:: ; 94369 (25:4369)
 	done
 
 _Route25EndBattleText4:: ; 94385 (25:4385)
-IF DEF(_YELLOW)
 	text "I'm in"
 	line "a slump!"
-ELSE
-	text "I was in"
-	line "bad condition!"
-ENDC
 	prompt
 
 _Route25AfterBattleText4:: ; 9439e (25:439e)
diff --git a/text/maps/route_3.asm b/text/maps/route_3.asm
index 95612425..2ee5a696 100644
--- a/text/maps/route_3.asm
+++ b/text/maps/route_3.asm
@@ -66,13 +66,8 @@ _Route3BattleText4:: ; 8d924 (23:5924)
 
 _Route3EndBattleText4:: ; 8d944 (23:5944)
 	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)
diff --git a/text/maps/route_6.asm b/text/maps/route_6.asm
index 3a54f461..2e6a7c6a 100644
--- a/text/maps/route_6.asm
+++ b/text/maps/route_6.asm
@@ -1,4 +1,3 @@
-IF DEF(_YELLOW)
 _Route6BattleText1::
 	text "I'm doing this"
 	line "out of love."
@@ -32,34 +31,6 @@ _Route6AfterBattleText2::
 	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)
-	text "I"
-	line "just can't win!"
-	prompt
-
-_Route6AfterBattleText1:: ; 8dc70 (23:5c70)
-	text "Whisper..."
-	line "whisper..."
-	done
-
-_Route6BattleText2:: ; 8dc87 (23:5c87)
-	text "Excuse me! This"
-	line "is a private"
-	cont "conversation!"
-	done
-
-_Route6EndBattleText2:: ; 8dcb3 (23:5cb3)
-	text "Ugh!"
-	line "I hate losing!"
-	prompt
-ENDC
 
 _Route6BattleText3:: ; 8dcc8 (23:5cc8)
 	text "There aren't many"
diff --git a/text/maps/route_8.asm b/text/maps/route_8.asm
index 62e2aff3..0dbf1ec3 100644
--- a/text/maps/route_8.asm
+++ b/text/maps/route_8.asm
@@ -104,11 +104,7 @@ _Route8EndBattleText7:: ; 8e116 (23:6116)
 	prompt
 
 _Route8AfterBattleText7:: ; 8e12a (23:612a)
-if DEF(_YELLOW)
 	text "SAFFRON's gate-"
-ELSE
-	text "SAFFRON's gate"
-ENDC
 	line "keeper won't let"
 	cont "us through."
 	cont "He's so mean!"
diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm
index f0498280..17417e38 100644
--- a/text/maps/safari_zone_entrance.asm
+++ b/text/maps/safari_zone_entrance.asm
@@ -94,7 +94,6 @@ _SafariZoneEntranceText_753f0:: ; 9e993 (27:6993)
 	line "regular here!"
 	done
 
-IF DEF(_OPTION_LOWCOST_SAFARI)
 _SafariZoneLowCostText1::
 	db 0
 	para "Oh, all right, pay"
@@ -139,4 +138,3 @@ _SafariZoneLowCostText8::
 	text "Read my lips, NO!"
 	line "Get it?"
 	done
-ENDC
diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm
index b7db1751..dfc3faaf 100644
--- a/text/maps/saffron_gates.asm
+++ b/text/maps/saffron_gates.asm
@@ -3,11 +3,7 @@ _SaffronGateText_1dfe7:: ; 8aa5c (22:6a5c)
 	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
 
@@ -22,11 +18,7 @@ _SaffronGateText_8aaa9:: ; 8aaa9 (22:6aa9)
 _SaffronGateText_1dff1:: ; 8aaef (22:6aef)
 	db $0
 	para "..."
-IF DEF(_YELLOW)
 	line "Glug, glug..."
-ELSE
-	line "Glug glug..."
-ENDC
 	cont "..."
 	cont "Gulp..."
 	cont "If you want to go"
diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm
index 3236c7b2..1d4901f9 100644
--- a/text/maps/saffron_gym.asm
+++ b/text/maps/saffron_gym.asm
@@ -131,12 +131,7 @@ _SaffronGymEndBattleText2:: ; a2002 (28:6002)
 
 _SaffronGymAfterBattleText2:: ; a2019 (28:6019)
 	text "Psychic #MON"
-IF DEF(_YELLOW)
 	line "fear only bugs!"
-ELSE
-	line "fear only ghosts"
-	cont "and bugs!"
-ENDC
 	done
 
 _SaffronGymBattleText3:: ; a2042 (28:6042)
diff --git a/text/maps/silph_co_10f.asm b/text/maps/silph_co_10f.asm
index ef7eb2f6..937318a6 100644
--- a/text/maps/silph_co_10f.asm
+++ b/text/maps/silph_co_10f.asm
@@ -41,7 +41,6 @@ _SilphCo10AfterBattleText2:: ; 84e66 (21:4e66)
 	cont "Then go on home!"
 	done
 
-IF DEF(_YELLOW)
 _SilphCoJessieJamesText1::
 	text "Hold it right"
 	line "there, brat!@@"
@@ -65,4 +64,3 @@ _SilphCoJessieJamesText4::
 	cont "of light!"
 
 	para "Again...@@"
-ENDC
diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm
index 1df04c5c..fcef667b 100644
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -58,11 +58,7 @@ _SilphCo11Text2:: ; 8502f (21:502f)
 	done
 
 _SilphCo11Text3:: ; 85075 (21:5075)
-IF DEF(_YELLOW)
 	text "Ah, ", $52, "!"
-ELSE
-	text "Ah ", $52, "!"
-ENDC
 	line "So we meet again!"
 
 	para "The PRESIDENT and"
@@ -74,11 +70,7 @@ ENDC
 	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
 
diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm
index 4437880c..dccf6e04 100644
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.asm
@@ -72,11 +72,7 @@ _SilphCo2EndBattleText3:: ; 8260f (20:660f)
 	prompt
 
 _SilphCo2AfterBattleText3:: ; 82617 (20:6617)
-IF DEF(_YELLOW)
 	text "Diamond-shaped"
-ELSE
-	text "Diamond shaped"
-ENDC
 	line "tiles are"
 	cont "teleport blocks!"
 
diff --git a/text/maps/silph_co_5f.asm b/text/maps/silph_co_5f.asm
index cea48d51..d86c370a 100644
--- a/text/maps/silph_co_5f.asm
+++ b/text/maps/silph_co_5f.asm
@@ -47,11 +47,7 @@ _SilphCo5AfterBattleText3:: ; 82a43 (20:6a43)
 _SilphCo5BattleText4:: ; 82a81 (20:6a81)
 	text "Whaaat? There"
 	line "shouldn't be any"
-IF DEF(_YELLOW)
 	cont "children here!"
-ELSE
-	cont "children here?"
-ENDC
 	done
 
 _SilphCo5EndBattleText4:: ; 84000 (21:4000)
diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm
index 5b56ad43..0b71b8c7 100644
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/silph_co_7f.asm
@@ -79,11 +79,7 @@ _SilphCo7Text_51e4b::
 	done
 
 _SilphCo7BattleText1:: ; 846ff (21:46ff)
-IF DEF(_YELLOW)
 	text "Aha! I smell a"
-ELSE
-	text "Oh ho! I smell a"
-ENDC
 	line "little rat!"
 	done
 
@@ -171,11 +167,7 @@ _SilphCo7Text_51ec3:: ; 848a2 (21:48a2)
 	done
 
 _SilphCo7Text_51ec8:: ; 8494a (21:494a)
-IF DEF(_YELLOW)
 	text "Oh-oh!"
-ELSE
-	text "Oh ho!"
-ENDC
 	line "So, you are ready"
 	cont "for BOSS ROCKET!"
 	prompt
diff --git a/text/maps/ss_anne_6.asm b/text/maps/ss_anne_6.asm
index 59828a51..33123206 100644
--- a/text/maps/ss_anne_6.asm
+++ b/text/maps/ss_anne_6.asm
@@ -47,11 +47,7 @@ _SSAnne6Text_61807:: ; 81203 (20:5203)
 	prompt
 
 _SSAnne6Text_6180c:: ; 81233 (20:5233)
-IF DEF(_YELLOW)
 	text "Salade de Salmon!"
-ELSE
-	text "Salmon du Salad!"
-ENDC
 
 	para "Les guests may"
 	line "gripe it's fish"
diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm
index 2a770464..f4d6f695 100644
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.asm
@@ -27,11 +27,7 @@ _ReceivingHM01Text:: ; 81347 (20:5347)
 	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)
@@ -44,11 +40,7 @@ _SSAnne7Text_61932:: ; 8141c (20:541c)
 	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
 
diff --git a/text/maps/ss_anne_9.asm b/text/maps/ss_anne_9.asm
index adbfe345..17efbcd0 100644
--- 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
-	text "In all my travels"
-ENDC
 	line "I've never seen"
 	cont "any #MON sleep"
 	cont "like this one!"
diff --git a/text/maps/vermilion_gym.asm b/text/maps/vermilion_gym.asm
index 952e06eb..009b5f5d 100644
--- a/text/maps/vermilion_gym.asm
+++ b/text/maps/vermilion_gym.asm
@@ -38,11 +38,7 @@ _VermilionGymText_5cb77:: ; 9c069 (27:4069)
 	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,"
diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm
index aa6ab4ab..47c12e9b 100644
--- a/text/maps/viridian_forest.asm
+++ b/text/maps/viridian_forest.asm
@@ -9,11 +9,7 @@ _ViridianForestText1:: ; 8031d (20:431d)
 _ViridianForestBattleText1:: ; 80359 (20:4359)
 	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)
@@ -66,7 +62,6 @@ _ViridianFrstAfterBattleText3:: ; 80475 (20:4475)
 	cont "dropped!"
 	done
 
-if DEF(_YELLOW)
 _ViridianForestBattleTextPikaGirl::
 	text "Hi, do you have a"
 	line "PIKACHU?"
@@ -100,7 +95,6 @@ _ViridianForestAfterBattleTextSamurai::
 	cont "attack is its"
 	cont "defense!"
 	done
-ENDC
 
 _ViridianForestText8:: ; 804c7 (20:44c7)
 	text "I ran out of #"
diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/viridian_forest_entrance.asm
index 770f2b5b..f8a0df6d 100644
--- a/text/maps/viridian_forest_entrance.asm
+++ b/text/maps/viridian_forest_entrance.asm
@@ -6,7 +6,6 @@ _ViridianForestEntranceText1:: ; 8a868 (22:6868)
 	done
 
 _ViridianForestEntranceText2:: ; 8a8ab (22:68ab)
-IF DEF(_YELLOW)
 	text "You have to roam"
 	line "far to get new"
 	cont "kinds of #MON."
@@ -15,10 +14,3 @@ IF DEF(_YELLOW)
 	line "types outside of"
 	cont "VIRIDIAN FOREST."
 	done
-ELSE
-	text "RATTATA may be"
-	line "small, but its"
-	cont "bite is wicked!"
-	cont "Did you get one?"
-	done
-ENDC
diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm
index 10a2a597..b947e8f2 100644
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/viridian_gym.asm
@@ -38,11 +38,7 @@ _ViridianGymText_74ad9:: ; 95f2b (25:5f2b)
 	cont "of #MON!"
 
 	para "Let us meet again"
-IF DEF(_YELLOW)
 	line "someday!"
-ELSE
-	line "some day!"
-ENDC
 	cont "Farewell!@@"
 
 _ViridianGymText12:: ; 95fcc (25:5fcc)
@@ -209,11 +205,7 @@ _ViridianGymEndBattleText8:: ; 96403 (25:6403)
 	prompt
 
 _ViridianGymAfterBattleText8:: ; 96412 (25:6412)
-IF DEF(_YELLOW)
 	text "You can go on to"
-ELSE
-	text "You can go onto"
-ENDC
 	line "#MON LEAGUE"
 	cont "only by defeating"
 	cont "our GYM LEADER!"
diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm
index ed3343f1..99dd2640 100644
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/viridian_mart.asm
@@ -38,23 +38,13 @@ ViridianMartParcelQuestText:: ; 95c79 (25:5c79)
 	line "OAK's PARCEL!@@"
 
 _ViridianMartText2:: ; 95cd5 (25:5cd5)
-IF DEF(_YELLOW)
 	text "This shop sells a"
 	line "lot of PARLYZ"
 	cont "HEALs."
-ELSE
-	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
-	text "No! POTIONs are"
-	line "all sold out."
-ENDC
 	done