Add a lot of Yellow text changes.

43 files changed, 749 insertions, 11 deletions

diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm
index cd0b1bb5..295a4d84 100644
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -23,7 +23,11 @@ _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 5963d7ea..3ec1e3f3 100644
--- a/text/maps/bills_house.asm
+++ b/text/maps/bills_house.asm
@@ -1,3 +1,10 @@
+IF DEF(_YELLOW)
+_BillsHouseDontLeaveText::
+	text "Whoa, don't go"
+	line "anywhere, wait!"
+	done
+ENDC
+
 _BillsHouseText_1e865:: ; 8d267 (23:5267)
 	text "Hiya! I'm a"
 	line "#MON..."
diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm
index 147b23fb..a5b155f2 100644
--- a/text/maps/blues_house.asm
+++ b/text/maps/blues_house.asm
@@ -29,11 +29,19 @@ _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/daycare_2.asm b/text/maps/daycare_2.asm
index ac9720ba..c6478a76 100644
--- a/text/maps/daycare_2.asm
+++ b/text/maps/daycare_2.asm
@@ -3,7 +3,11 @@ _DayCareMText_56437:: ; 8c000 (23:4000)
 	line "@@"
 
 _DayCareMText_5643b:: ; 8c013 (23:4013)
+IF DEF(_YELLOW)
+	text "Come again."
+ELSE
 	text "come again."
+ENDC
 	done
 
 _DayCareMText_56440:: ; 8c020 (23:4020)
diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm
index ab5b9b15..cb0cc622 100644
--- a/text/maps/hall_of_fame.asm
+++ b/text/maps/hall_of_fame.asm
@@ -1,6 +1,10 @@
 _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 1da4e8f1..35ef3546 100644
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -1,6 +1,10 @@
 _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 ad9c8598..0577adf3 100644
--- a/text/maps/mt_moon_1f.asm
+++ b/text/maps/mt_moon_1f.asm
@@ -115,6 +115,9 @@ _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 f8357f00..64823871 100644
--- a/text/maps/mt_moon_b2f.asm
+++ b/text/maps/mt_moon_b2f.asm
@@ -1,3 +1,26 @@
+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)
 	text "You want the"
 	line "DOME FOSSIL?"
@@ -120,4 +143,3 @@ _MtMoon3AfterBattleText5:: ; 80c46 (20:4c46)
 	line "here long before"
 	cont "people came."
 	done
-
diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm
index f5f847d3..7371a312 100644
--- a/text/maps/museum_1f.asm
+++ b/text/maps/museum_1f.asm
@@ -72,7 +72,11 @@ _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/museum_2f.asm b/text/maps/museum_2f.asm
index 7594c797..46238725 100644
--- a/text/maps/museum_2f.asm
+++ b/text/maps/museum_2f.asm
@@ -33,6 +33,21 @@ _Museum2FText5:: ; 96911 (25:6911)
 	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)
 	text "SPACE SHUTTLE"
 	line "COLUMBIA"
@@ -43,4 +58,3 @@ _Museum2FText7:: ; 9694b (25:694b)
 	line "fell on MT.MOON."
 	cont "(MOON STONE?)"
 	done
-
diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm
index 8b45742c..58f55b85 100644
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -1,29 +1,60 @@
 _OaksLabGaryText1:: ; 94d5b (25:4d5b)
-	text $53, ": Yo"
-	line $52, "! Gramps"
+	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)
-	text $53, ": Heh, I"
+IF DEF(_YELLOW)
+	text $53,": Humph!"
+	line "I'll get a better"
+	cont "#MON than you!"
+	done
+ELSE
+	text $53,": Heh, I"
 	line "don't need to be"
 	cont "greedy like you!"
 
 	para "Go ahead and"
 	line "choose, ", $52, "!"
 	done
+ENDC
 
 _OaksLabText41:: ; 94dbd (25:4dbd)
-	text $53, ": My"
+IF DEF(_YELLOW)
+	text $53,": Heh, my"
+ELSE
+	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
 	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)
 	text "So! You want the"
@@ -70,14 +101,26 @@ _OaksLabText_1d2f5:: ; 94ef8 (25:4ef8)
 	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
 	text "OAK: ", $52, ","
 	line "raise your young"
 	cont "#MON by making"
 	cont "it fight!"
 	done
+ENDC
 
 _OaksLabDeliverParcelText1:: ; 94f69 (25:4f69)
 	text "OAK: Oh, ", $52, "!"
@@ -103,7 +146,15 @@ _OaksLabDeliverParcelText2:: ; 9500f (25:500f)
 	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)
@@ -132,7 +183,12 @@ _OaksLabGivePokeballsText2:: ; 950f2 (25:50f2)
 	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!"
 
@@ -188,6 +244,29 @@ _OaksLabRivalWaitingText:: ; 952bb (25:52bb)
 	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
 	text "OAK: ", $53, "?"
 	line "Let me think..."
 
@@ -214,6 +293,7 @@ _OaksLabChooseMonText:: ; 952df (25:52df)
 	cont "but you can have"
 	cont "one! Choose!"
 	done
+ENDC
 
 _OaksLabRivalInterjectionText:: ; 953dc (25:53dc)
 	text $53, ": Hey!"
@@ -222,10 +302,70 @@ _OaksLabRivalInterjectionText:: ; 953dc (25:53dc)
 	done
 
 _OaksLabBePatientText:: ; 953fc (25:53fc)
+IF DEF(_YELLOW)
+	text "OAK: Be patient,"
+	line $53,", I'll give"
+	cont "you one later."
+	done
+ELSE
 	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)
 	text "OAK: Hey! Don't go"
@@ -275,20 +415,64 @@ _OaksLabRivalToughenUpText:: ; 95502 (25:5502)
 	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)
 	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
 	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
 	text "OAK: Oh right! I"
 	line "have a request"
 	cont "of you two."
 	done
+ENDC
 
 _OaksLabText24:: ; 955a8 (25:55a8)
 	text "On the desk there"
@@ -416,8 +600,13 @@ _OaksLabText_4421a:: ; 9596d (25:596d)
 	done
 
 _OaksLabText_4421f:: ; 959b8 (25:59b8)
+IF DEF(_YELLOW)
+	text "Oh! This is get-"
+	line "ting even better!"
+ELSE
 	text "Ho! This is geting"
 	line "even better!"
+ENDC
 	done
 
 _OaksLabText_44224:: ; 959d9 (25:59d9)
@@ -472,7 +661,11 @@ _OaksLabText_44247:: ; 95b39 (25:5b39)
 
 _OaksLabText_4424c:: ; 95b6f (25:5b6f)
 	text "Your #DEX is"
+IF DEF(_YELLOW)
+	line "fully complete!"
+ELSE
 	line "entirely complete!"
+ENDC
 	cont "Congratulations!"
 	done
 
diff --git a/text/maps/pewter_gym_2.asm b/text/maps/pewter_gym_2.asm
index a503f755..433fd649 100644
--- a/text/maps/pewter_gym_2.asm
+++ b/text/maps/pewter_gym_2.asm
@@ -3,6 +3,23 @@ _PewterGymText_5c4a3:: ; 98000 (26:4000)
 	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!"
@@ -11,6 +28,7 @@ _PewterGymText_5c4a3:: ; 98000 (26:4000)
 	line "CERULEAN and test"
 	cont "your abilities!"
 	done
+ENDC
 
 _TM34PreReceiveText:: ; 98092 (26:4092)
 	text "Wait! Take this"
@@ -72,7 +90,11 @@ _PewterGymText_5c4c1:: ; 98232 (26:4232)
 
 	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)
@@ -141,3 +163,18 @@ _PewterGymText_5c529:: ; 9849f (26:449f)
 	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
diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm
index a33974db..71760b7b 100644
--- a/text/maps/pewter_mart.asm
+++ b/text/maps/pewter_mart.asm
@@ -1,5 +1,9 @@
 _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 4493c079..114fed16 100644
--- a/text/maps/pewter_pokecenter.asm
+++ b/text/maps/pewter_pokecenter.asm
@@ -8,8 +8,22 @@ _PewterPokecenterText1:: ; 98704 (26:4704)
 	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)
 	text "JIGGLYPUFF: Puu"
 	line "pupuu!"
 	done
-
diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm
index 729c5b46..16cf5129 100644
--- a/text/maps/reds_house_1f.asm
+++ b/text/maps/reds_house_1f.asm
@@ -1,7 +1,11 @@
 _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"
@@ -10,10 +14,22 @@ _MomWakeUpText::
 	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!"
diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm
index ecf01ec8..e069e4a9 100644
--- a/text/maps/rocket_hideout_b4f.asm
+++ b/text/maps/rocket_hideout_b4f.asm
@@ -1,3 +1,28 @@
+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)
 	text "So! I must say, I"
 	line "am impressed you"
diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm
index f6e4e394..795f7e69 100644
--- a/text/maps/route_10.asm
+++ b/text/maps/route_10.asm
@@ -33,7 +33,11 @@ _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 ef71d279..12925104 100644
--- a/text/maps/route_12.asm
+++ b/text/maps/route_12.asm
@@ -109,7 +109,11 @@ _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 3d22e389..3e8fb60c 100644
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/route_12_gate_upstairs.asm
@@ -5,7 +5,11 @@ _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 d58630a8..b542274e 100644
--- a/text/maps/route_14.asm
+++ b/text/maps/route_14.asm
@@ -10,7 +10,11 @@ _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 d98aaa12..ec77ec6f 100644
--- a/text/maps/route_16.asm
+++ b/text/maps/route_16.asm
@@ -19,7 +19,11 @@ _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 d07c3a86..b053b473 100644
--- a/text/maps/route_17.asm
+++ b/text/maps/route_17.asm
@@ -133,7 +133,11 @@ _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 5ce0b879..9935ce80 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -59,9 +59,15 @@ _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 fb65cad8..d73611f2 100644
--- a/text/maps/route_25.asm
+++ b/text/maps/route_25.asm
@@ -1,3 +1,33 @@
+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)
 	text "Local trainers"
 	line "come here to"
@@ -56,8 +86,13 @@ _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 248a11dd..95612425 100644
--- a/text/maps/route_3.asm
+++ b/text/maps/route_3.asm
@@ -66,8 +66,13 @@ _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 7d0a6097..3a54f461 100644
--- a/text/maps/route_6.asm
+++ b/text/maps/route_6.asm
@@ -1,3 +1,38 @@
+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"
@@ -24,6 +59,7 @@ _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 1f3f74fd..62e2aff3 100644
--- a/text/maps/route_8.asm
+++ b/text/maps/route_8.asm
@@ -104,7 +104,11 @@ _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/route_9.asm b/text/maps/route_9.asm
index 978a5a3f..353eb779 100644
--- a/text/maps/route_9.asm
+++ b/text/maps/route_9.asm
@@ -15,6 +15,23 @@ _Route9AfterBattleText1:: ; 8e2c8 (23:62c8)
 	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)
 	text "Who's that walking"
 	line "with those good"
diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm
index 0212a7dd..b7db1751 100644
--- a/text/maps/saffron_gates.asm
+++ b/text/maps/saffron_gates.asm
@@ -3,7 +3,11 @@ _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
 
@@ -18,7 +22,11 @@ _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/school.asm b/text/maps/school.asm
index ce0c0175..9bdd9004 100644
--- a/text/maps/school.asm
+++ b/text/maps/school.asm
@@ -4,6 +4,14 @@ _SchoolText1:: ; 95d15 (25:5d15)
 	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)
 	text "Okay!"
 
@@ -11,4 +19,3 @@ _SchoolText2:: ; 95d40 (25:5d40)
 	line "the blackboard"
 	cont "carefully!"
 	done
-
diff --git a/text/maps/silph_co_10f.asm b/text/maps/silph_co_10f.asm
index a5a3877e..75aa6003 100644
--- a/text/maps/silph_co_10f.asm
+++ b/text/maps/silph_co_10f.asm
@@ -41,3 +41,28 @@ _SilphCo10AfterBattleText2:: ; 84e66 (21:4e66)
 	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
diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm
index caacd757..3dbeee95 100644
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -58,7 +58,11 @@ _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"
@@ -70,7 +74,11 @@ _SilphCo11Text3:: ; 85075 (21:5075)
 	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 8096d806..4437880c 100644
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.asm
@@ -72,7 +72,11 @@ _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_1.asm b/text/maps/silph_co_5f_1.asm
index 8a406e67..7435c910 100644
--- a/text/maps/silph_co_5f_1.asm
+++ b/text/maps/silph_co_5f_1.asm
@@ -47,6 +47,10 @@ _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
 
diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm
index b3c92aaf..5b56ad43 100644
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/silph_co_7f.asm
@@ -79,7 +79,11 @@ _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
 
@@ -167,7 +171,11 @@ _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 5909c8b9..59828a51 100644
--- a/text/maps/ss_anne_6.asm
+++ b/text/maps/ss_anne_6.asm
@@ -47,7 +47,11 @@ _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 daef3e4a..2a770464 100644
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.asm
@@ -27,7 +27,11 @@ _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)
@@ -40,7 +44,11 @@ _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 e133fc2c..c96a7581 100644
--- a/text/maps/ss_anne_9.asm
+++ b/text/maps/ss_anne_9.asm
@@ -1,5 +1,9 @@
 _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/surf_house.asm b/text/maps/surf_house.asm
new file mode 100644
index 00000000..b43df5cf
--- /dev/null
+++ b/text/maps/surf_house.asm
@@ -0,0 +1,99 @@
+SurfinDudeText1::
+	text "Whoa!"
+
+	para "Your PIKACHU knows"
+	line "how to SURF! So,"
+	cont "I'm not alone..."
+
+	para "Great! You earned"
+	line "the right to SURF"
+	cont "with the DUDE!"
+
+	para "Give it a go?"
+	done
+
+SurfinDudeText2::
+	text "Come SURF anytime,"
+	line "my friend!"
+	done
+
+SurfinDudeText3::
+	text "Wanna go SURF?"
+	done
+
+SurfinDudeText4::
+	text "Dogs and burgers"
+	line "on special today!"
+	done
+
+BeachHousePikachuText::
+	text "PIKACHU: Pikaa."
+	done
+
+BeachHouseSign1Text1::
+	text "SURFIN' DUDE's"
+	line "scribbles..."
+
+	para "When I shoot the"
+	line "tube, the tunes"
+	cont "hit the groove!"
+	done
+
+BeachHouseSign1Text2::
+	text "30 years of waves!"
+	line "SURFIN' DUDE"
+	done
+
+BeachHouseSign2Text1::
+	text "SURFING TIP 1!"
+
+	para "After flips, line"
+	line "the board up with"
+	cont "a wave for a cool"
+	cont "effect!"
+	done
+
+BeachHouseSign2Text2::
+	text "SUMMER BEACH HOUSE"
+	line "#MON welcome!"
+	done
+
+BeachHouseSign3Text1::
+	text "SURFING TIP 2!"
+
+	para "Pulling flips in"
+	line "a jump is totally"
+	cont "rad!"
+	done
+
+BeachHouseSign3Text2::
+	text "The sea unites"
+	line "all in surfdom!"
+	done
+
+BeachHousePrinterText1::
+	text "SUMMER BEACH HOUSE"
+	line "PRINTER, it says.@@"
+
+BeachHousePrinterText2::
+	text "The Hi.Score is"
+	line "shown."
+
+	para "PRINT it out?"
+	done
+
+BeachHousePrinterText3::
+	text "SUMMER BEACH HOUSE"
+	line "PRINTER, it says."
+
+	para "The Hi.Score is"
+	line "shown."
+
+	para "PRINT it out?"
+	done
+
+BeachHousePrinterText4::
+	text "PRINT completed.@@"
+
+BeachHousePrinterText5::
+	text "PRINT error!@@"
diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm
index 9b0f6d99..aa6ab4ab 100644
--- a/text/maps/viridian_forest.asm
+++ b/text/maps/viridian_forest.asm
@@ -9,7 +9,11 @@ _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)
@@ -62,6 +66,42 @@ _ViridianFrstAfterBattleText3:: ; 80475 (20:4475)
 	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)
 	text "I ran out of #"
 	line "BALLs to catch"
diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/viridian_forest_entrance.asm
index dcba02b4..770f2b5b 100644
--- a/text/maps/viridian_forest_entrance.asm
+++ b/text/maps/viridian_forest_entrance.asm
@@ -6,9 +6,19 @@ _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."
+
+	para "Look for other"
+	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 e1828c32..10a2a597 100644
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/viridian_gym.asm
@@ -38,7 +38,11 @@ _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)
@@ -205,7 +209,11 @@ _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 6cddaeaf..ed3343f1 100644
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/viridian_mart.asm
@@ -38,12 +38,23 @@ 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
-