Add more text changes from Yellow.

18 files changed, 327 insertions, 3 deletions

diff --git a/text.asm b/text.asm
index 61c8675f..2c15004c 100644
--- a/text.asm
+++ b/text.asm
@@ -3305,12 +3305,20 @@ _Thanks2Text:: ; a8209 (2a:4209)
 	done
 
 _AfterTrade2Text:: ; a8212 (2a:4212)
+IF DEF(_YELLOW)
+	text "Hello there! Your"
+	line "old @"
+	TX_RAM wcd13
+	db " is"
+	cont "magnificent!"
+ELSE
 	text "The @"
 	TX_RAM wcd13
 	text " you"
 	line "traded to me"
 
 	para "went and evolved!"
+ENDC
 	done
 
 _WannaTrade3Text:: ; a8240 (2a:4240)
@@ -3340,7 +3348,11 @@ _WrongMon3Text:: ; a8284 (2a:4284)
 	done
 
 _Thanks3Text:: ; a82bc (2a:42bc)
+IF DEF(_YELLOW)
+	text "Thanks, pal!"
+ELSE
 	text "Thanks pal!"
+ENDC
 	done
 
 _AfterTrade3Text:: ; a82c9 (2a:42c9)
diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm
index 585ece03..6a02d125 100644
--- a/text/maps/celadon_city.asm
+++ b/text/maps/celadon_city.asm
@@ -1,10 +1,18 @@
 _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)
@@ -111,7 +119,11 @@ _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
 
@@ -148,6 +160,10 @@ _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
 
diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm
index ed489842..de33021b 100644
--- a/text/maps/celadon_dept_store_4f.asm
+++ b/text/maps/celadon_dept_store_4f.asm
@@ -1,7 +1,16 @@
 _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 851afc41..f2eef613 100644
--- a/text/maps/celadon_dept_store_roof.asm
+++ b/text/maps/celadon_dept_store_roof.asm
@@ -50,10 +50,14 @@ _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.asm b/text/maps/cerulean_badge_house.asm
index cc0be659..d546066a 100644
--- a/text/maps/cerulean_badge_house.asm
+++ b/text/maps/cerulean_badge_house.asm
@@ -19,7 +19,11 @@ _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
 
@@ -29,7 +33,11 @@ _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 1daf3166..f014ee5d 100644
--- a/text/maps/cerulean_city.asm
+++ b/text/maps/cerulean_city.asm
@@ -120,6 +120,15 @@ _CeruleanCityText5:: ; a50ba (29:50ba)
 	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
 	text "The people here"
 	line "were robbed."
 
@@ -127,31 +136,57 @@ _CeruleanCityText6:: ; a50f6 (29:50f6)
 	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"
@@ -160,22 +195,38 @@ _CeruleanCityText_1973a:: ; a51ec (29:51ec)
 	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 b0d2d3d1..f4234fc4 100644
--- a/text/maps/cerulean_gym.asm
+++ b/text/maps/cerulean_gym.asm
@@ -2,6 +2,11 @@ _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"
@@ -10,11 +15,21 @@ _CeruleanGymText_5c7be:: ; 989c1 (26:49c1)
 	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)
@@ -35,7 +50,11 @@ _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"
@@ -55,8 +74,13 @@ _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!"
 
@@ -125,7 +149,11 @@ _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/cerulean_trade_house.asm b/text/maps/cerulean_trade_house.asm
index 78c9f76a..c22f24a9 100644
--- a/text/maps/cerulean_trade_house.asm
+++ b/text/maps/cerulean_trade_house.asm
@@ -1,3 +1,42 @@
+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)
 	text "My husband likes"
 	line "trading #MON."
@@ -7,4 +46,3 @@ _CeruleanHouse1Text1:: ; 9888c (26:488c)
 	cont "you please trade"
 	cont "with him?"
 	done
-
diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm
index dea97d10..897368d2 100644
--- a/text/maps/cinnabar_island.asm
+++ b/text/maps/cinnabar_island.asm
@@ -13,7 +13,11 @@ _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/copycats_house_1f.asm b/text/maps/copycats_house_1f.asm
index 0af104a4..419fa250 100644
--- a/text/maps/copycats_house_1f.asm
+++ b/text/maps/copycats_house_1f.asm
@@ -16,6 +16,10 @@ _CopycatsHouse1FText2:: ; a1535 (28:5535)
 	done
 
 _CopycatsHouse1FText3:: ; a1596 (28:5596)
+IF DEF(_YELLOW)
+	text "CHANSEY: Chaan
+	line "sey!@@"
+ELSE
 	text "CHANSEY: Chaan!"
 	line "Sii!@@"
-
+ENDC
diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm
index b623fa4a..bb1ca0f0 100644
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -1,15 +1,35 @@
 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!"
@@ -25,9 +45,22 @@ 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::
@@ -38,8 +71,14 @@ 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"
@@ -47,8 +86,13 @@ FanClubMeetChairText::
 
 	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
 
@@ -125,8 +169,43 @@ FanClubBagFullText::
 	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
 	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 6f01e5fa..9cf7ba4e 100644
--- a/text/maps/fighting_dojo.asm
+++ b/text/maps/fighting_dojo.asm
@@ -114,13 +114,21 @@ _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 aa35c16d..bcb80d0e 100644
--- a/text/maps/fuchsia_city.asm
+++ b/text/maps/fuchsia_city.asm
@@ -58,7 +58,11 @@ _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/name_rater.asm b/text/maps/name_rater.asm
index 4a81ecf1..2baec727 100644
--- a/text/maps/name_rater.asm
+++ b/text/maps/name_rater.asm
@@ -43,7 +43,11 @@ _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/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm
index 235fc218..c049dce1 100644
--- a/text/maps/pokemon_tower_7f.asm
+++ b/text/maps/pokemon_tower_7f.asm
@@ -1,3 +1,29 @@
+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
+
 _PokemonTower7Text_60ec4:: ; 99c1a (26:5c1a)
 	text "MR.FUJI: Heh? You"
 	line "came to save me?"
diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm
index d85e1b1a..3236c7b2 100644
--- a/text/maps/saffron_gym.asm
+++ b/text/maps/saffron_gym.asm
@@ -131,8 +131,12 @@ _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/vermilion_gym_1.asm b/text/maps/vermilion_gym_1.asm
index 10868bd4..dfa45279 100644
--- a/text/maps/vermilion_gym_1.asm
+++ b/text/maps/vermilion_gym_1.asm
@@ -1,4 +1,25 @@
 _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
 	text "Hey, kid! What do"
 	line "you think you're"
 	cont "doing here?"
@@ -18,5 +39,5 @@ _VermilionGymText_5cb6d:: ; 9aaa5 (26:6aa5)
 
 	para "The same as I'll"
 	line "do to you!"
+ENDC
 	done
-
diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym_2.asm
index 2788d840..ee7d14ee 100644
--- a/text/maps/vermilion_gym_2.asm
+++ b/text/maps/vermilion_gym_2.asm
@@ -16,7 +16,11 @@ _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,"