ref: 6e14461fa6d5085349e4746b61c526f3c94be19f
parent: 906bd59e778243f84cb6fa7b06ae48019fc5805a
author: IIMarckus <iimarckus@gmail.com>
date: Thu Oct 9 21:46:06 EDT 2014
Add a lot of Yellow text changes.
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,5 +1,17 @@
TradeMons: ; 71b7b (1c:5b7b)
; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
+IF _YELLOW
+ db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@"
+ db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@"
+ db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@"
+ db KANGASKHAN,MUK, 0,"STICKY@@@@@"
+ db MEW, MEW, 2,"BART@@@@@@@"
+ db TANGELA, PARASECT, 0,"SPIKE@@@@@@"
+ db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@"
+ db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@"
+ db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@"
+ db CUBONE, MACHOKE, 2,"RICKY@@@@@@"
+ELSE
db NIDORINO, NIDORINA, 0,"TERRY@@@@@@"
db ABRA, MR_MIME, 0,"MARCEL@@@@@"
db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@"
@@ -10,3 +22,4 @@
db RAICHU, ELECTRODE, 1,"DORIS@@@@@@"
db VENONAT, TANGELA, 2,"CRINKLES@@@"
db NIDORAN_M, NIDORAN_F, 2,"SPOT@@@@@@@"
+ENDC
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2954,7 +2954,11 @@
jp Delay3
DisabledText: ; 3d555 (f:5555)
+IF _YELLOW
+ db "Disabled!@"
+ELSE
db "disabled!@"
+ENDC
TypeText: ; 3d55f (f:555f)
db "TYPE@"
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -345,6 +345,9 @@
next "DEPOSIT ", $4a
next "RELEASE ", $4a
next "CHANGE BOX"
+IF _YELLOW
+ next "PRINT BOX"
+ENDC
next "SEE YA!"
db "@"
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -366,6 +366,9 @@
db "DATA"
next "CRY"
next "AREA"
+IF _YELLOW
+ next "PRNT"
+ENDC
next "QUIT@"
; tests if a pokemon's bit is set in the seen or owned pokemon bit fields
--- a/preprocessor.py
+++ b/preprocessor.py
@@ -176,6 +176,9 @@
"№": 0x74,
+"′": 0x71,
+"″": 0x73,
+
" ": 0x7F,
"A": 0x80,
"B": 0x81,
--- a/text.asm
+++ b/text.asm
@@ -166,6 +166,13 @@
text "."
done
+IF DEF(_YELLOW)
+_NurseChanseyText::
+ text "CHANSEY: Chaaan"
+ line "sey!
+ done
+ENDC
+
INCLUDE "text/maps/viridian_forest.asm"
INCLUDE "text/maps/mt_moon_1f.asm"
INCLUDE "text/maps/mt_moon_b1f.asm"
@@ -573,6 +580,12 @@
line "Here we go!"
prompt
+IF DEF(_YELLOW)
+ text "#MON Quiz!"
+ line "Test your skill!"
+ done
+ENDC
+
_CinnabarQuizQuestionsText1:: ; 8886d (22:486d)
text "CATERPIE evolves"
line "into BUTTERFREE?"
@@ -834,6 +847,16 @@
cont "rare #MON."
done
+IF DEF(_YELLOW)
+_FanClubPicture1Text::
+ text "My cute RAPIDASH."
+ done
+
+_FanClubPicture2Text::
+ text "My beloved FEAROW."
+ done
+ENDC
+
_LinkCableHelpText1:: ; 89001 (22:5001)
text "TRAINER TIPS"
@@ -1172,6 +1195,12 @@
text "Got away safely!"
prompt
+IF DEF(_YELLOW)
+_RunAwayText::
+ text "Hurry, get away!"
+ prompt
+ENDC
+
_ItemsCantBeUsedHereText:: ; 89831 (22:5831)
text "Items can't be"
line "used here."
@@ -1565,6 +1594,13 @@
line "you want? "
done
+IF DEF(_YELLOW)
+_SleepingPikachuText1::
+ text "There isn't any"
+ line "response..."
+ prompt
+ENDC
+
_PartyMenuNormalText:: ; 89dc8 (22:5dc8)
text "Choose a #MON."
done
@@ -1580,7 +1616,11 @@
done
_PartyMenuUseTMText:: ; 89e08 (22:5e08)
+IF DEF(_YELLOW)
+ text "Teach to which"
+ELSE
text "Use TM on which"
+ENDC
line "#MON?"
done
@@ -1752,6 +1792,13 @@
line "OF FAME List."
prompt
+IF DEF(_YELLOW)
+_SleepingPikachuText2::
+ text "There isn't any"
+ line "response..."
+ prompt
+ENDC
+
_SwitchOnText:: ; 0x8a131
text "Switch on!"
prompt
@@ -1805,6 +1852,14 @@
line "first."
prompt
+IF DEF(_YELLOW)
+_PikachuUnhappyText::
+ TX_RAM $cd6d
+ text "looks"
+ line "unhappy about it!"
+ prompt
+ENDC
+
_ReleaseWhichMonText:: ; 0x8a228
text "Release which"
line "#MON?"
@@ -1926,6 +1981,111 @@
cont "be traded."
done
+IF DEF(_YELLOW)
+_Colosseum3MonsText::
+ text "You need 3 #MON"
+ line "to fight!"
+ prompt
+
+_ColosseumMewText::
+ text "Sorry, MEW can't"
+ line "attend!"
+ prompt
+
+_ColosseumDifferentMonsText::
+ text "Your #MON must"
+ line "all be different!"
+ prompt
+
+_ColosseumMaxL55Text::
+ text "No #MON can"
+ line "exceed L55!"
+ prompt
+
+_ColosseumMinL50Text::
+ text "All #MON must"
+ line "be at least L50!"
+ prompt
+
+_ColosseumTotalL155Text::
+ text "Your total levels"
+ line "exceed 155!"
+ prompt
+
+_ColosseumMaxL30Text::
+ text "No #MON can"
+ line "exceed L30!"
+ prompt
+
+_ColosseumMinL25Text::
+ text "All #MON must"
+ line "be at least L25!"
+ prompt
+
+_ColosseumTotalL80Text::
+ text "Your total levels"
+ line "exceed 80!"
+ prompt
+
+_ColosseumMaxL20Text::
+ text "No #MON can"
+ line "exceed L20!"
+ prompt
+
+_ColosseumMinL15Text::
+ text "All #MON must"
+ line "be at least L15!"
+ prompt
+
+_ColosseumTotalL50Text::
+ text "Your total levels"
+ line "exceed 50!"
+ prompt
+
+_ColosseumHeightText::
+ TX_RAM $CD6D
+ text " is over"
+ line "6′8″ tall!"
+ prompt
+
+_ColosseumWeightText::
+ TX_RAM $CD6D
+ text " weighs"
+ line "over 44 pounds!"
+ prompt
+
+_ColosseumEvolvedText::
+ TX_RAM $CD6D
+ text " is an"
+ line "evolved #MON!"
+ prompt
+
+_ColosseumIneligibleText::
+ text "Your opponent is"
+ line "ineligible."
+ prompt
+
+_ColosseumWhereToText::
+ text "Where would you"
+ line "like to go?"
+ prompt
+
+_ColosseumPleaseWaitText::
+ text "OK, please wait"
+ line "just a moment."
+ prompt
+
+_ColosseumCanceledText::
+ text "The link was"
+ line "canceled."
+ prompt
+
+_ColosseumVersionText::
+ text "The game versions"
+ line "don't match."
+ prompt
+ENDC
+
_Char00Text:: ; 8a696 (22:6696)
TX_NUM $FF8C,1,2
text " ERROR."
@@ -1934,6 +2094,13 @@
_Char55Text:: ; 8a6a3 (22:66a3)
text $4B,"@@"
+IF DEF(_YELLOW)
+_NoPokemonText::
+ text "There are no"
+ line "#MON here!"
+ prompt
+ENDC
+
INCLUDE "text/maps/digletts_cave_route_2_entrance.asm"
INCLUDE "text/maps/viridian_forest_exit.asm"
INCLUDE "text/maps/route_2_house.asm"
@@ -1968,6 +2135,9 @@
INCLUDE "text/maps/route_16_house.asm"
INCLUDE "text/maps/route_18_gate.asm"
INCLUDE "text/maps/route_18_gate_upstairs.asm"
+IF DEF(_YELLOW)
+INCLUDE "text/maps/surf_house.asm"
+ENDC
INCLUDE "text/maps/pokemon_league_gate.asm"
INCLUDE "text/maps/victory_road_2f.asm"
INCLUDE "text/maps/bills_house.asm"
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -23,7 +23,11 @@
done
_AgathaEndBattleText:: ; 86970 (21:6970)
+IF DEF(_YELLOW)
+ text "Woo-hoo!
+ELSE
text "Oh ho!"
+ENDC
line "You're something"
cont "special, child!"
prompt
--- 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..."
--- a/text/maps/blues_house.asm
+++ b/text/maps/blues_house.asm
@@ -29,11 +29,19 @@
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/daycare_2.asm
+++ b/text/maps/daycare_2.asm
@@ -3,7 +3,11 @@
line "@@"
_DayCareMText_5643b:: ; 8c013 (23:4013)
+IF DEF(_YELLOW)
+ text "Come again."
+ELSE
text "come again."
+ENDC
done
_DayCareMText_56440:: ; 8c020 (23:4020)
--- 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"
--- 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"
--- a/text/maps/mt_moon_1f.asm
+++ b/text/maps/mt_moon_1f.asm
@@ -115,6 +115,9 @@
_MtMoon1Text14:: ; 8093a (20:493a)
text "Beware! ZUBAT is"
+IF DEF(_YELLOW)
+ line "a bloodsucker!"
+ELSE
line "a blood sucker!"
+ENDC
done
-
--- 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 @@
line "here long before"
cont "people came."
done
-
--- a/text/maps/museum_1f.asm
+++ b/text/maps/museum_1f.asm
@@ -72,7 +72,11 @@
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"
--- a/text/maps/museum_2f.asm
+++ b/text/maps/museum_2f.asm
@@ -33,6 +33,21 @@
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 @@
line "fell on MT.MOON."
cont "(MOON STONE?)"
done
-
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -1,11 +1,23 @@
_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!"
@@ -12,19 +24,38 @@
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"
line "fire #MON,"
@@ -70,14 +101,26 @@
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 @@
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 @@
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 @@
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 @@
cont "but you can have"
cont "one! Choose!"
done
+ENDC
_OaksLabRivalInterjectionText:: ; 953dc (25:53dc)
text $53, ": Hey!"
@@ -222,11 +302,71 @@
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"
line "away yet!"
@@ -275,20 +415,64 @@
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 @@
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_4424c:: ; 95b6f (25:5b6f)
text "Your #DEX is"
+IF DEF(_YELLOW)
+ line "fully complete!"
+ELSE
line "entirely complete!"
+ENDC
cont "Congratulations!"
done
--- a/text/maps/pewter_gym_2.asm
+++ b/text/maps/pewter_gym_2.asm
@@ -3,6 +3,23 @@
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 @@
line "CERULEAN and test"
cont "your abilities!"
done
+ENDC
_TM34PreReceiveText:: ; 98092 (26:4092)
text "Wait! Take this"
@@ -72,7 +90,11 @@
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 @@
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_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!"
--- a/text/maps/pewter_pokecenter.asm
+++ b/text/maps/pewter_pokecenter.asm
@@ -8,8 +8,22 @@
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
-
--- 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 @@
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/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"
--- a/text/maps/route_10.asm
+++ b/text/maps/route_10.asm
@@ -33,7 +33,11 @@
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
--- a/text/maps/route_12.asm
+++ b/text/maps/route_12.asm
@@ -109,7 +109,11 @@
_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)
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/route_12_gate_upstairs.asm
@@ -5,7 +5,11 @@
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)
--- a/text/maps/route_14.asm
+++ b/text/maps/route_14.asm
@@ -10,7 +10,11 @@
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."
--- a/text/maps/route_16.asm
+++ b/text/maps/route_16.asm
@@ -19,7 +19,11 @@
done
_Route16EndBattleText2:: ; 910f1 (24:50f1)
+IF DEF(_YELLOW)
+ text "Knock-"
+ELSE
text "Knock"
+ENDC
line "out!"
prompt
--- a/text/maps/route_17.asm
+++ b/text/maps/route_17.asm
@@ -133,7 +133,11 @@
done
_Route17BattleText10:: ; 91600 (24:5600)
+IF DEF(_YELLOW)
+ text "Get lost, kid!"
+ELSE
text "Get lost kid!"
+ENDC
line "I'm bushed!"
done
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -59,9 +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!"
--- 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 @@
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)
--- a/text/maps/route_3.asm
+++ b/text/maps/route_3.asm
@@ -66,8 +66,13 @@
_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)
--- 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 @@
text "Ugh!"
line "I hate losing!"
prompt
+ENDC
_Route6BattleText3:: ; 8dcc8 (23:5cc8)
text "There aren't many"
--- a/text/maps/route_8.asm
+++ b/text/maps/route_8.asm
@@ -104,7 +104,11 @@
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!"
--- a/text/maps/route_9.asm
+++ b/text/maps/route_9.asm
@@ -15,6 +15,23 @@
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"
--- a/text/maps/saffron_gates.asm
+++ b/text/maps/saffron_gates.asm
@@ -3,7 +3,11 @@
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_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"
--- a/text/maps/school.asm
+++ b/text/maps/school.asm
@@ -4,6 +4,14 @@
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 @@
line "the blackboard"
cont "carefully!"
done
-
--- a/text/maps/silph_co_10f.asm
+++ b/text/maps/silph_co_10f.asm
@@ -41,3 +41,28 @@
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
@@ -58,7 +58,11 @@
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 @@
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
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.asm
@@ -72,7 +72,11 @@
prompt
_SilphCo2AfterBattleText3:: ; 82617 (20:6617)
+IF DEF(_YELLOW)
+ text "Diamond-shaped"
+ELSE
text "Diamond shaped"
+ENDC
line "tiles are"
cont "teleport blocks!"
--- a/text/maps/silph_co_5f_1.asm
+++ b/text/maps/silph_co_5f_1.asm
@@ -47,6 +47,10 @@
_SilphCo5BattleText4:: ; 82a81 (20:6a81)
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_7f.asm
+++ b/text/maps/silph_co_7f.asm
@@ -79,7 +79,11 @@
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 @@
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
--- a/text/maps/ss_anne_6.asm
+++ b/text/maps/ss_anne_6.asm
@@ -47,7 +47,11 @@
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"
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.asm
@@ -27,7 +27,11 @@
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 @@
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
--- 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!"
--- /dev/null
+++ b/text/maps/surf_house.asm
@@ -1,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!@@"
--- a/text/maps/viridian_forest.asm
+++ b/text/maps/viridian_forest.asm
@@ -9,7 +9,11 @@
_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)
@@ -61,6 +65,42 @@
line "the stuff I"
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 #"
--- a/text/maps/viridian_forest_entrance.asm
+++ b/text/maps/viridian_forest_entrance.asm
@@ -6,9 +6,19 @@
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
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/viridian_gym.asm
@@ -38,7 +38,11 @@
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 @@
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!"
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/viridian_mart.asm
@@ -38,12 +38,23 @@
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
-
--
⑨