diff options
Diffstat (limited to 'text/maps')
91 files changed, 1622 insertions, 1184 deletions
diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index 4957f4d4..45a4692d 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -23,7 +23,7 @@ _AgathaBeforeBattleText:: done _AgathaEndBattleText:: - text "Oh ho!" + text "Woo-hoo!" line "You're something" cont "special, child!" prompt diff --git a/text/maps/beach_house.asm b/text/maps/beach_house.asm new file mode 100644 index 00000000..bc50b837 --- /dev/null +++ b/text/maps/beach_house.asm @@ -0,0 +1,103 @@ +_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 "It's some sort of" + line "a machine...@@" + +_BeachHousePrinterText2:: + text "SUMMER BEACH HOUSE" + line "PRINTER, it says.@@" + +_BeachHousePrinterText3:: + text "The Hi-Score is" + line "shown." + + para "PRINT it out?" + done + +_BeachHousePrinterText4:: + text "SUMMER BEACH HOUSE" + line "PRINTER, it says." + + para "The Hi-Score is" + line "shown." + + para "PRINT it out?" + done + +_BeachHousePrinterText5:: + text "PRINT completed.@@" + +_BeachHousePrinterText6:: + text "PRINT error!@@" diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 33f53ee9..1717c552 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -25,13 +25,13 @@ _BikeShopText_1d81f:: prompt _BikeShopText_1d824:: - text $52, " exchanged" + text "<PLAYER> exchanged" line "the BIKE VOUCHER" cont "for a BICYCLE.@@" _BikeShopComeAgainText:: text "Come back again" - line "some time!" + line "sometime!" done _BikeShopText_1d82f:: diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm index 463b13e6..dd556a7b 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -1,3 +1,8 @@ +_BillsHouseDontLeaveText:: + text "Whoa, don't go" + line "anywhere, wait!" + done + _BillsHouseText_1e865:: text "Hiya! I'm a" line "#MON..." diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm index b676ea69..c7db0b2c 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/blues_house.asm @@ -29,10 +29,10 @@ _DaisyUseMapText:: done _BluesHouseText2:: - text "#MON are living" - line "things! If they" - cont "get tired, give" - cont "them a rest!" + text "Spending time" + line "with your #MON" + cont "makes them more" + cont "friendly to you." done _BluesHouseText3:: diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index e2470ec1..908fcbb4 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -1,10 +1,10 @@ _CeladonCityText1:: text "I got my KOFFING" - line "in CINNABAR!" + line "from my friend!" - para "It's nice, but it" - line "breathes poison" - cont "when it's angry!" + para "We get along now," + line "because I was" + cont "very nice to it!" done _CeladonCityText2:: @@ -84,22 +84,6 @@ _CeladonCityText9:: line "ROCKET's way!" done -_CeladonCityText10:: - text "TRAINER TIPS" - - para "X ACCURACY boosts" - line "the accuracy of" - cont "techniques!" - - para "DIRE HIT jacks up" - line "the likelihood of" - cont "critical hits!" - - para "Get your items at" - line "CELADON DEPT." - cont "STORE!" - done - _CeladonCityText11:: text "CELADON CITY" line "The City of" @@ -111,7 +95,7 @@ _CeladonCityText13:: line "#MON GYM" cont "LEADER: ERIKA" - para "The Nature Loving" + para "The Nature-Loving" line "Princess!" done @@ -148,5 +132,21 @@ _CeladonCityText17:: _CeladonCityText18:: text "ROCKET GAME CORNER" line "The playground" - cont "for grown-ups!" + cont "for grownups!" + done + +_CeladonCityText10:: + text "TRAINER TIPS" + + para "X ACCURACY boosts" + line "the accuracy of" + cont "techniques!" + + para "DIRE HIT jacks up" + line "the likelihood of" + cont "critical hits!" + + para "Get your items at" + line "CELADON DEPT." + cont "STORE!" done diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index 1aad756f..4006a3bb 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -1,30 +1,3 @@ -_TM18PreReceiveText:: - text "Oh, hi! I finally" - line "finished #MON!" - - para "Not done yet?" - line "This might be" - cont "useful!" - prompt - -_ReceivedTM18Text:: - text $52, " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM18ExplanationText:: - text "TM18 is COUNTER!" - line "Not like the one" - cont "I'm leaning on," - cont "mind you!" - done - -_TM18NoRoomText:: - text "Your pack is full" - line "of items!" - done - _CeladonMart3Text2:: text "Captured #MON" line "are registered" @@ -96,3 +69,30 @@ _CeladonMart3Text15:: text "Red and Blue!" line "Both are #MON!" done + +_TM18PreReceiveText:: + text "Oh, hi! I finally" + line "finished #MON!" + + para "Not done yet?" + line "This might be" + cont "useful!" + prompt + +_ReceivedTM18Text:: + text $52, " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM18ExplanationText:: + text "TM18 is COUNTER!" + line "Not like the one" + cont "I'm leaning on," + cont "mind you!" + done + +_TM18NoRoomText:: + text "Your pack is full" + line "of items!" + done diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm index 78fa0b66..c17483c1 100644 --- a/text/maps/celadon_dept_store_4f.asm +++ b/text/maps/celadon_dept_store_4f.asm @@ -1,7 +1,11 @@ _CeladonMart4Text2:: text "I'm getting a" - line "# DOLL for my" - cont "girl friend!" + line "gift for COPYCAT" + cont "in CERULEAN CITY." + + para "It's got to be a" + line "# DOLL. They" + cont "are trendy!" done _CeladonMart4Text3:: diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm index 4689b023..319ca3f0 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/celadon_dept_store_roof.asm @@ -50,10 +50,7 @@ _CeladonMartRoofText_4850f:: para "@" TX_RAM wcf4b text " contains" - line "ROCK SLIDE!" - - para "It can spook the" - line "target sometimes!@@" + line "ROCK SLIDE!@@" _CeladonMartRoofText_48515:: text "Yay!" diff --git a/text/maps/celadon_game_corner.asm b/text/maps/celadon_game_corner_1.asm index 2d263e80..ad8a82b2 100644 --- a/text/maps/celadon_game_corner.asm +++ b/text/maps/celadon_game_corner_1.asm @@ -179,8 +179,3 @@ _CeladonGameCornerText_48f09:: para "A switch behind" line "the poster!?" cont "Let's push it!@@" - -_CeladonGameCornerText_48f19:: - text "Oops! Forgot the" - line "COIN CASE!" - done diff --git a/text/maps/celadon_game_corner_2.asm b/text/maps/celadon_game_corner_2.asm new file mode 100755 index 00000000..c288464d --- /dev/null +++ b/text/maps/celadon_game_corner_2.asm @@ -0,0 +1,4 @@ +_CeladonGameCornerText_48f19:: + text "Oops! Forgot the" + line "COIN CASE!" + done diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/celadon_mansion_1f.asm index fc175cd5..23123892 100644 --- a/text/maps/celadon_mansion_1f.asm +++ b/text/maps/celadon_mansion_1f.asm @@ -1,14 +1,6 @@ _CeladonMansion1Text1:: text "MEOWTH: Meow!@@" -_CeladonMansion1Text2:: - text "My dear #MON" - line "keep me company." - - para "MEOWTH even brings" - line "money home!" - done - _CeladonMansion1Text3:: text "CLEFAIRY: Pi" line "pippippi!@@" @@ -21,3 +13,52 @@ _CeladonMansion1Text5:: text "CELADON MANSION" line "Manager's Suite" done + +_CeladonMansion1Text2:: + text "My dear #MON" + line "keep me company." + + para "MEOWTH even brings" + line "money home!" + done + +_CeladonMansion1Text6:: + text "Oh, you have an" + line "adorable PIKACHU" + cont "with you.@@" + +_CeladonMansion1Text7:: + text "It seems like it" + line "hasn't been tamed" + cont "at all." + done + +_CeladonMansion1Text8:: + text "Why don't you" + line "take more care" + cont "with PIKACHU?" + done + +_CeladonMansion1Text9:: + text "You must be happy" + line "to have a #MON" + cont "that cute." + done + +_CeladonMansion1Text10:: + text "Your PIKACHU seems" + line "tamed." + done + +_CeladonMansion1Text11:: + text "Your PIKACHU looks" + line "happy with you." + done + +_CeladonMansion1Text12:: + text "You look like a" + line "fantastic duo." + + para "You're making me" + line "jealous!" + done diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/celadon_mansion_3f.asm index c8858281..baf86186 100644 --- a/text/maps/celadon_mansion_3f.asm +++ b/text/maps/celadon_mansion_3f.asm @@ -3,12 +3,48 @@ _ProgrammerText:: line "programmer!" done +_ProgrammerText2:: + text "Me? I'm the" + line "programmer!" + + para "What a surprise!" + line "I never expected" + cont "anyone to fill a" + cont "#DEX." + done + _GraphicArtistText:: text "I'm the graphic" line "artist!" cont "I drew you!" done +_GraphicArtistText2:: + text "I'm the graphic" + line "artist!" + + para "Wow, you finished" + line "your #DEX!" + cont "Want me to PRINT" + cont "out a DIPLOMA" + cont "as proof?" + done + +_GraphicArtistText3:: + text "Just tell me if" + line "you want to PRINT" + cont "out a DIPLOMA." + done + +_GraphicArtistText4:: + text "All done!" + done + +_GraphicArtistText5:: + text "OK, let's not" + line "PRINT." + done + _WriterText:: text "I wrote the story!" line "Isn't ERIKA cute?" @@ -20,6 +56,14 @@ _WriterText:: line "I like her!" done +_WriterText2:: + text "I wrote the story!" + + para "It's great you" + line "caught all the" + cont "#MON! Thanks!" + done + _GameDesignerText:: text "Is that right?" @@ -41,6 +85,13 @@ _CompletedDexText:: cont "Congratulations!" cont "...@@" +_CompletedDexText2:: + text "Go show off your" + line "DIPLOMA to" + cont "the development" + cont "crew." + done + _CeladonMansion3Text5:: text "It's the game" line "program! Messing" diff --git a/text/maps/cerulean_badge_house.asm b/text/maps/cerulean_badge_house_1.asm index 9d701443..4bba10cd 100644 --- a/text/maps/cerulean_badge_house.asm +++ b/text/maps/cerulean_badge_house_1.asm @@ -19,7 +19,7 @@ _CeruleanHouse2Text_74e7c:: done _CeruleanHouse2Text_74e81:: - text "Come visit me any" + text "Come visit me any-" line "time you wish." done @@ -29,7 +29,7 @@ _CeruleanHouse2Text_74e96:: cont "a little bit." para "It also lets you" - line "use FLASH any" + line "use FLASH any-" cont "time you desire." prompt @@ -66,32 +66,3 @@ _CeruleanHouse2Text_74ea5:: line "use STRENGTH out-" cont "side of battle." prompt - -_CeruleanHouse2Text_74eaa:: - text "The DEFENSE of all" - line "#MON increases" - cont "a little bit." - - para "It also lets you" - line "use SURF outside" - cont "of battle." - prompt - -_CeruleanHouse2Text_74eaf:: - text "#MON up to L70" - line "will obey you." - - para "Any higher, they" - line "become unruly!" - prompt - -_CeruleanHouse2Text_74eb4:: - text "Your #MON's" - line "SPECIAL abilities" - cont "increase a bit." - prompt - -_CeruleanHouse2Text_74eb9:: - text "All #MON will" - line "obey you!" - prompt diff --git a/text/maps/cerulean_badge_house_2.asm b/text/maps/cerulean_badge_house_2.asm new file mode 100755 index 00000000..e5da0622 --- /dev/null +++ b/text/maps/cerulean_badge_house_2.asm @@ -0,0 +1,28 @@ +_CeruleanHouse2Text_74eaa:: + text "The DEFENSE of all" + line "#MON increases" + cont "a little bit." + + para "It also lets you" + line "use SURF outside" + cont "of battle." + prompt + +_CeruleanHouse2Text_74eaf:: + text "#MON up to L70" + line "will obey you." + + para "Any higher, they" + line "become unruly!" + prompt + +_CeruleanHouse2Text_74eb4:: + text "Your #MON's" + line "SPECIAL abilities" + cont "increase a bit." + prompt + +_CeruleanHouse2Text_74eb9:: + text "All #MON will" + line "obey you!" + prompt diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm index 48d97e05..4c51c5e0 100644 --- a/text/maps/cerulean_city.asm +++ b/text/maps/cerulean_city.asm @@ -120,38 +120,38 @@ _CeruleanCityText5:: done _CeruleanCityText6:: - text "The people here" - line "were robbed." + text "These poor people" + line "here were robbed." - para "It's obvious that" - line "TEAM ROCKET is" - cont "behind this most" - cont "heinous crime!" + para "We're positive" + line "that TEAM ROCKET" + cont "is behind this" + cont "terrible deed." para "Even our POLICE" - line "force has trouble" + line "FORCE has trouble" cont "with the ROCKETs!" done _CeruleanCityText_19730:: - text "OK! SLOWBRO!" + text "OK! ELECTRODE!" line "Use SONICBOOM!" - cont "Come on, SLOWBRO" + cont "Please ELECTRODE," cont "pay attention!" done _CeruleanCityText_19735:: - text "SLOWBRO punch!" + text "ELECTRODE, TACKLE!" line "No! You blew it" cont "again!" done _CeruleanCityText_1973a:: - text "SLOWBRO, WITHDRAW!" + text "ELECTRODE, SWIFT!" line "No! That's wrong!" - para "It's so hard to" - line "control #MON!" + para "Training #MON" + line "is difficult!" para "Your #MON's" line "obedience depends" @@ -160,22 +160,22 @@ _CeruleanCityText_1973a:: done _CeruleanCityText_1976f:: - text "SLOWBRO took a" + text "ELECTRODE took a" line "snooze..." done _CeruleanCityText_19774:: - text "SLOWBRO is" + text "ELECTRODE is" line "loafing around..." done _CeruleanCityText_19779:: - text "SLOWBRO turned" + text "ELECTRODE turned" line "away..." done _CeruleanCityText_1977e:: - text "SLOWBRO" + text "ELECTRODE" line "ignored orders..." done diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm index dd6baaff..70cbdf0d 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/cerulean_gym.asm @@ -2,19 +2,21 @@ _CeruleanGymText_5c7be:: text "Hi, you're a new" line "face!" - 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?" + para "What's your policy" + line "on #MON? What" + cont "is your approach?" para "My policy is an" line "all-out offensive" cont "with water-type" cont "#MON!" + + para "MISTY, the world-" + line "famous beauty, is" + cont "your host!" + + para "Are you ready," + line "sweetie?" done _CeruleanGymText_5c7c3:: @@ -35,7 +37,7 @@ _CeruleanGymText_5c7c8:: para "There's more, you" line "can now use CUT" - cont "any time!" + cont "anytime!" para "You can CUT down" line "small bushes to" @@ -55,14 +57,15 @@ _CeruleanGymText_5c7d3:: done _CeruleanGymText_5c7d8:: - text "Wow!" - line "You're too much!" + text "I can't" + line "believe I lost!" para "All right!" para "You can have the" line "CASCADEBADGE to" - cont "show you beat me!@@" + cont "show you beat me!" + prompt _CeruleanGymBattleText1:: text "I'm more than good" @@ -125,7 +128,7 @@ _CeruleanGymText_5c82f:: text "You beat MISTY!" line "What'd I tell ya?" - para "You and me kid," + para "You and me, kid," 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 b606613b..791c11d5 100644 --- a/text/maps/cerulean_trade_house.asm +++ b/text/maps/cerulean_trade_house.asm @@ -1,9 +1,39 @@ -_CeruleanHouse1Text1:: - text "My husband likes" - line "trading #MON." - - para "If you are a" - line "collector, would" - cont "you please trade" - cont "with him?" +MelanieText1:: + text "I take care of" + line "injured #MON." + + para "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!@@" diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm index b14f6f60..58873c2a 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/cinnabar_gym.asm @@ -207,3 +207,46 @@ _CinnabarGymText_75ac7:: text $52, "! You beat" line "that fire brand!" done + +_CinnabarGymText_1:: + text "This GYM is also" + line "known as the QUIZ" + cont "GYM." + + para "You have to take a" + line "quiz if you want" + cont "to see BLAINE." + + para "You don't have to" + line "fight us if you" + cont "get it right." + done + +_CinnabarGymText_2:: + text "Think you can do" + line "it?" + done + +_CinnabarGymText_3:: + text "This one's tricky!" + done + +_CinnabarGymText_4:: + text "#MON enjoy" + line "quizzes too!" + done + +_CinnabarGymText_5:: + text "I like it here at" + line "QUIZ GYM." + done + +_CinnabarGymText_6:: + text "This is the last" + line "question." + done + +_CinnabarGymText_7:: + text "Come on, answer" + line "the question!" + done diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm index 352ab8ea..54552a46 100644 --- a/text/maps/cinnabar_island.asm +++ b/text/maps/cinnabar_island.asm @@ -13,7 +13,7 @@ _CinnabarIslandText1:: _CinnabarIslandText2:: text "Scientists conduct" line "experiments in" - cont "the burned out" + cont "the burned-out" cont "building." done diff --git a/text/maps/copycats_house_1f.asm b/text/maps/copycats_house_1f.asm index 3ec2b151..bd3029fd 100644 --- a/text/maps/copycats_house_1f.asm +++ b/text/maps/copycats_house_1f.asm @@ -16,5 +16,5 @@ _CopycatsHouse1FText2:: done _CopycatsHouse1FText3:: - text "CHANSEY: Chaan!" - line "Sii!@@" + text "CHANSEY: Chaaan" + line "sey!@@" diff --git a/text/maps/daycare_1.asm b/text/maps/daycare.asm index 6e3c5737..8375ead0 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/daycare.asm @@ -17,18 +17,15 @@ _DayCareWillLookAfterMonText:: db $0 cont "for a while." prompt - _DayCareComeSeeMeInAWhileText:: text "Come see me in" line "a while." done - _DayCareMonHasGrownText:: text "Your @" TX_RAM wcd6d db $0 line "has grown a lot!" - para "By level, it's" line "grown by @" TX_NUM wDayCareNumLevelsGrown,$1,$3 @@ -36,7 +33,6 @@ _DayCareMonHasGrownText:: para "Aren't I great?" prompt - _DayCareOweMoneyText:: text "You owe me ¥@" TX_BCD wDayCareTotalCost, $c2 @@ -60,3 +56,37 @@ _DayCareMonNeedsMoreTimeText:: cont "needs some more" cont "time with me." prompt + +_DayCareAllRightThenText:: + text "All right then," + line "@@" + +_DayCareComeAgainText:: + text "Come again." + done + +_DayCareNoRoomForMonText:: + text "You have no room" + line "for this #MON!" + done + +_DayCareOnlyHaveOneMonText:: + text "You only have one" + line "#MON with you." + done + +_DayCareCantAcceptMonWithHMText:: + text "I can't accept a" + line "#MON that" + cont "knows an HM move." + done + +_DayCareHeresYourMonText:: + text "Thank you! Here's" + line "your #MON!" + prompt + +_DayCareNotEnoughMoneyText:: + text "Hey, you don't" + line "have enough ¥!" + done diff --git a/text/maps/daycare_2.asm b/text/maps/daycare_2.asm deleted file mode 100644 index 20c0e5ad..00000000 --- a/text/maps/daycare_2.asm +++ /dev/null @@ -1,33 +0,0 @@ -_DayCareAllRightThenText:: - text "All right then," - line "@@" - -_DayCareComeAgainText:: - text "come again." - done - -_DayCareNoRoomForMonText:: - text "You have no room" - line "for this #MON!" - done - -_DayCareOnlyHaveOneMonText:: - text "You only have one" - line "#MON with you." - done - -_DayCareCantAcceptMonWithHMText:: - text "I can't accept a" - line "#MON that" - cont "knows an HM move." - done - -_DayCareHeresYourMonText:: - text "Thank you! Here's" - line "your #MON!" - prompt - -_DayCareNotEnoughMoneyText:: - text "Hey, you don't" - line "have enough ¥!" - done diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index 7477405c..5fcd469d 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -1,15 +1,25 @@ PikachuFanText:: text "Won't you admire" - line "my PIKACHU's" + line "my CLEFAIRY's" cont "adorable tail?" done PikachuFanBetterText:: - text "Humph! My PIKACHU" + text "Humph! My CLEFAIRY" line "is twice as cute" cont "as that one!" done +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 + SeelFanText:: text "I just love my" line "SEEL!" @@ -25,9 +35,15 @@ SeelFanBetterText:: line "more attractive!" done +SeelFanPrintText:: + text "I'm going to hook" + line "up the cable to" + cont "get a photo PRINT" + cont "of my SEEL!" + done + FanClubPikachuText:: - text "PIKACHU: Chu!" - line "Pikachu!" + text "CLEFAIRY: Pippii!" done FanClubSeelText:: @@ -38,8 +54,9 @@ FanClubMeetChairText:: text "I chair the" line "#MON Fan Club!" - para "I have collected" - line "over 100 #MON!" + para "I have more than" + line "100 #MON. I" + cont "love them all!" para "I'm very fussy" line "when it comes to" @@ -47,8 +64,8 @@ FanClubMeetChairText:: para "So..." - para "Did you come" - line "visit to hear" + para "Did you come to" + line "hear me brag" cont "about my #MON?" done @@ -69,7 +86,7 @@ FanClubChairStoryText:: cont "love it!" para "Hug it...when..." - cont "sleeping...warm" + line "sleeping...warm" cont "and cuddly..." cont "spectacular..." cont "ravishing..." @@ -83,13 +100,13 @@ FanClubChairStoryText:: prompt ReceivedBikeVoucherText:: - text $52, " received" + text "<PLAYER> received" line "a @" TX_RAM wcf4b text "!@@" ExplainBikeVoucherText:: - db $0 + text "" para "Exchange that for" line "a BICYCLE!" @@ -111,7 +128,7 @@ FanClubNoStoryText:: done FanClubChairFinalText:: - text "Hello, ", $52, "!" + text "Hello, <PLAYER>!" para "Did you come see" line "me about my" @@ -125,19 +142,37 @@ FanClubBagFullText:: line "this!" done -_FanClubText6:: - text "Our Chairman is" - line "very vocal about" - cont "#MON." +FanClubChairPrintText1:: + text "Hi there, <PLAYER>!" + 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 -_FanClubText7:: - text "Let's all listen" - line "politely to other" - cont "trainers!" +FanClubChairPrintText2:: + text "No? That's really" + line "disappointing." done -_FanClubText8:: - text "If someone brags," - line "brag right back!" +FanClubChairPrintText3:: + text "OK, I'm done." + done + +FanClubChairPrintText4:: + text "Maybe we won't" + line "PRINT this now." + done + +_FanClubText6:: + text "Our CHAIRMAN is" + line "very vocal about" + cont "#MON." done diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm index 3df069c1..a6ccc8c3 100644 --- a/text/maps/fighting_dojo.asm +++ b/text/maps/fighting_dojo.asm @@ -114,13 +114,13 @@ _FightingDojoAfterBattleText4:: _WantHitmonleeText:: text "You want the" - line "hard kicking" + line "hard-kicking" cont "HITMONLEE?" done _WantHitmonchanText:: text "You want the" - line "piston punching" + line "piston-punching" cont "HITMONCHAN?" done diff --git a/text/maps/fuchsia_city.asm b/text/maps/fuchsia_city.asm index a90d0021..0392a1ed 100644 --- a/text/maps/fuchsia_city.asm +++ b/text/maps/fuchsia_city.asm @@ -58,7 +58,7 @@ _FuchsiaCityText18:: cont "LEADER: KOGA" para "The Poisonous" - line "Ninja Master" + line "Ninja Master!" done _FuchsiaCityChanseyText:: diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym.asm index ba1970e6..6beebc69 100644 --- a/text/maps/fuchsia_gym_2.asm +++ b/text/maps/fuchsia_gym.asm @@ -1,3 +1,30 @@ +_KogaBeforeBattleText:: + text "KOGA: Fwahahaha!" + + para "A mere child like" + line "you dares to" + cont "challenge me?" + + para "Very well, I" + line "shall show you" + cont "true terror as a" + cont "ninja master!" + + para "You shall feel" + line "the despair of" + cont "poison and sleep" + cont "techniques!" + done + +_KogaAfterBattleText:: + text "Humph!" + line "You have proven" + cont "your worth!" + + para "Here! Take the" + line "SOULBADGE!" + prompt + _KogaExplainToxicText:: text "When afflicted by" line "TOXIC, #MON" @@ -51,7 +78,6 @@ _FuchsiaGymBattleText1:: cont "#MON!" para "It's strategy!" - para "I'll show you how" line "strategy can beat" cont "brute strength!" @@ -78,14 +104,12 @@ _FuchsiaGymEndBattleText2:: text "I'm done" line "for!" prompt - _FuchsiaGymAfterBattleText2:: text "I will keep on" line "training under" cont "KOGA, my ninja" cont "master!" done - _FuchsiaGymBattleText3:: text "Let's see you" line "beat my special" @@ -116,7 +140,6 @@ _FuchsiaGymEndBattleText4:: text "Whoa!" line "He's got it!" prompt - _FuchsiaGymAfterBattleText4:: text "You impressed me!" line "Here's a hint!" @@ -180,12 +203,10 @@ _FuchsiaGymText_7564e:: para "KOGA might appear" line "close, but he's" cont "blocked off!" - para "You have to find" line "gaps in the walls" cont "to reach him!" done - _FuchsiaGymText_75653:: text "It's amazing how" line "ninja can terrify" diff --git a/text/maps/fuchsia_gym_1.asm b/text/maps/fuchsia_gym_1.asm deleted file mode 100644 index 9108fc79..00000000 --- a/text/maps/fuchsia_gym_1.asm +++ /dev/null @@ -1,26 +0,0 @@ -_KogaBeforeBattleText:: - text "KOGA: Fwahahaha!" - - para "A mere child like" - line "you dares to" - cont "challenge me?" - - para "Very well, I" - line "shall show you" - cont "true terror as a" - cont "ninja master!" - - para "You shall feel" - line "the despair of" - cont "poison and sleep" - cont "techniques!" - done - -_KogaAfterBattleText:: - text "Humph!" - line "You have proven" - cont "your worth!" - - para "Here! Take the" - line "SOULBADGE!" - prompt diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index 6c5dd40e..8faefd3f 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -1,7 +1,7 @@ _HallofFameRoomText1:: text "OAK: Er-hem!" - line "Congratulations" - cont $52, "!" + line "Congratulations," + cont "<PLAYER>!" para "This floor is the" line "#MON HALL OF" @@ -16,13 +16,13 @@ _HallofFameRoomText1:: line "also recorded in" cont "the HALL OF FAME!" - para $52, "! You have" + para "<PLAYER>! You have" line "endeavored hard" cont "to become the new" cont "LEAGUE champion!" para "Congratulations," - line $52, ", you and" + line "<PLAYER>, you and" cont "your #MON are" cont "HALL OF FAMERs!" done diff --git a/text/maps/lance.asm b/text/maps/lance.asm index 3c75ce47..9c7bd677 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -1,6 +1,6 @@ _LanceBeforeBattleText:: text "Ah! I heard about" - line "you ", $52, "!" + line "you, ", $52, "!" para "I lead the ELITE" line "FOUR! You can" diff --git a/text/maps/lorelei.asm b/text/maps/lorelei.asm index fdbb55b4..666aa47f 100644 --- a/text/maps/lorelei.asm +++ b/text/maps/lorelei.asm @@ -30,7 +30,6 @@ _LoreleiAfterBattleText:: text "You're better" line "than I thought!" cont "Go on ahead!" - para "You only got a" line "taste of #MON" cont "LEAGUE power!" diff --git a/text/maps/mt_moon_1f.asm b/text/maps/mt_moon_1f.asm index 761a5240..2e8c960e 100644 --- a/text/maps/mt_moon_1f.asm +++ b/text/maps/mt_moon_1f.asm @@ -115,5 +115,5 @@ _MtMoon1AfterBattleText8:: _MtMoon1Text14:: text "Beware! ZUBAT is" - line "a blood sucker!" + line "a bloodsucker!" done diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm index 462c9d3c..9ad1d706 100644 --- a/text/maps/mt_moon_b2f.asm +++ b/text/maps/mt_moon_b2f.asm @@ -1,3 +1,24 @@ +_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!@@" + _MtMoon3Text_49f24:: text "You want the" line "DOME FOSSIL?" @@ -52,24 +73,6 @@ _MtMoon3Text_49f99:: text "All right. Then" line "this is mine!@@" -_MtMoon3BattleText2:: - text "TEAM ROCKET will" - line "find the fossils," - cont "revive and sell" - cont "them for cash!" - done - -_MtMoon3EndBattleText2:: - text "Urgh!" - line "Now I'm mad!" - prompt - -_MtMoon3AfterBattleText2:: - text "You made me mad!" - line "TEAM ROCKET will" - cont "blacklist you!" - done - _MtMoon3BattleText3:: text "We, TEAM ROCKET," line "are #MON" diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/mt_moon_pokecenter.asm index 90fd811e..ebcada87 100644 --- a/text/maps/mt_moon_pokecenter.asm +++ b/text/maps/mt_moon_pokecenter.asm @@ -16,6 +16,10 @@ _MtMoonPokecenterText3:: cont "news!" done +_MtMoonPokecenterText5:: + db $0 + done + _MagikarpSalesmanText1:: text "MAN: Hello, there!" line "Have I got a deal" @@ -42,7 +46,3 @@ _MagikarpSalesmanText2:: text "MAN: Well, I don't" line "give refunds!" done - -_MtMoonPokecenterText5:: - db $0 - done diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm index 46b4484c..ecb511aa 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/museum_1f.asm @@ -72,7 +72,7 @@ _Museum1FText_5c28e:: para "But, my colleagues" line "just ignore me!" - para "So I have a favor" + para "So, I have a favor" line "to ask!" para "Take this to a" @@ -81,7 +81,7 @@ _Museum1FText_5c28e:: prompt _ReceivedOldAmberText:: - text $52, " received" + text "<PLAYER> received" line "OLD AMBER!@@" _Museum1FText_5c299:: diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm index 4f34a249..12cfe8b2 100644 --- a/text/maps/museum_2f.asm +++ b/text/maps/museum_2f.asm @@ -33,6 +33,20 @@ _Museum2FText5:: line "soon, I promise!" done +_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." + done + _Museum2FText6:: text "SPACE SHUTTLE" line "COLUMBIA" diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm index 65d3e8a4..7194a927 100644 --- a/text/maps/name_rater.asm +++ b/text/maps/name_rater.asm @@ -43,7 +43,7 @@ _NameRaterText_1dac7:: done _NameRaterText_1dacc:: - text "Fine! Come any" + text "Fine! Come any-" line "time you like!" done diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 52af450d..097fa931 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -1,68 +1,34 @@ _OaksLabGaryText1:: - text $53,": Yo" - line $52,"! Gramps" + text "<RIVAL>: Yo" + line "<PLAYER>! Gramps" cont "isn't around!" + + para "I ran here 'cos" + line "he said he had a" + cont "#MON for me." done _OaksLabText40:: - text $53,": Heh, I" - line "don't need to be" - cont "greedy like you!" - - para "Go ahead and" - line "choose, ", $52, "!" + text "<RIVAL>: Humph!" + line "I'll get a better" + cont "#MON than you!" done _OaksLabText41:: - text $53,": My" + text "<RIVAL>: Heh, my" line "#MON looks a" cont "lot stronger." done _OaksLabText39:: - text "Those are #" - line "BALLs. They" - cont "contain #MON!" - done - -_OaksLabCharmanderText:: - text "So! You want the" - line "fire #MON," - cont "CHARMANDER?" - done - -_OaksLabSquirtleText:: - text "So! You want the" - line "water #MON," - cont "SQUIRTLE?" - done - -_OaksLabBulbasaurText:: - text "So! You want the" - line "plant #MON," - cont "BULBASAUR?" - done - -_OaksLabMonEnergeticText:: - text "This #MON is" - line "really energetic!" - prompt - -_OaksLabReceivedMonText:: - text $52, " received" - line "a @" - TX_RAM wcd6d - text "!@@" - -_OaksLabLastMonText:: - text "That's PROF.OAK's" - line "last #MON!" + text "That's a #" + line "BALL. There's a" + cont "#MON inside!" done -_OaksLabText_1d2f0:: - text "OAK: Now, ", $52, "," - line "which #MON do" - cont "you want?" +_OaksLabPikachuText:: + text "OAK: Go ahead," + line "it's yours!" done _OaksLabText_1d2f5:: @@ -70,17 +36,19 @@ _OaksLabText_1d2f5:: line "#MON appears," cont "your #MON can" cont "fight against it!" + + para "Afterward, go on" + line "to the next town." done _OaksLabText_1d2fa:: - text "OAK: ", $52, "," - line "raise your young" - cont "#MON by making" - cont "it fight!" + text "OAK: You should" + line "talk to it and" + cont "see how it feels." done _OaksLabDeliverParcelText1:: - text "OAK: Oh, ", $52, "!" + text "OAK: Oh, <PLAYER>!" para "How is my old" line "#MON?" @@ -95,21 +63,25 @@ _OaksLabDeliverParcelText1:: para "What? You have" line "something for me?" - para $52, " delivered" + para "<PLAYER> delivered" line "OAK's PARCEL.@@" _OaksLabDeliverParcelText2:: - db $0 + text "" para "Ah! This is the" line "custom # BALL" cont "I ordered!" - cont "Thank you!" + cont "Thanks, <PLAYER>!" + + para "By the way, I must" + line "ask you to do" + cont "something for me." done _OaksLabAroundWorldText:: text "#MON around the" line "world wait for" - cont "you, ", $52, "!" + cont "you, <PLAYER>!" done _OaksLabGivePokeballsText1:: @@ -123,18 +95,19 @@ _OaksLabGivePokeballsText1:: cont "to capture wild" cont "#MON." - para $52, " got 5" + para "<PLAYER> got 5" line "# BALLs!@@" _OaksLabGivePokeballsText2:: - db $0 + text "" para "When a wild" line "#MON appears," cont "it's fair game." - para "Just throw a #" - line "BALL at it and try" - line "to catch it!" + para "Just like I showed" + line "you, throw a #" + cont "BALL at it and try" + cont "to catch it!" para "This won't always" line "work, though." @@ -182,70 +155,105 @@ _OaksLabText_1d340:: done _OaksLabRivalWaitingText:: - text $53, ": Gramps!" + text "<RIVAL>: Gramps!" line "I'm fed up with" cont "waiting!" done _OaksLabChooseMonText:: - text "OAK: ", $53, "?" - line "Let me think..." - - para "Oh, that's right," - line "I told you to" - cont "come! Just wait!" + text "OAK: Hmm? <RIVAL>?" + line "Why are you here" + cont "already?" - para "Here, ", $52, "!" + para "I said for you to" + line "come by later..." - para "There are 3" - line "#MON here!" + para "Ah, whatever!" + line "Just wait there." - para "Haha!" + para "Look, <PLAYER>! Do" + line "you see that ball" + cont "on the table?" - para "They are inside" - line "the # BALLs." + para "It's called a #" + line "BALL. It holds a" + cont "#MON inside." - para "When I was young," - line "I was a serious" - cont "#MON trainer!" - - para "In my old age, I" - line "have only 3 left," - cont "but you can have" - cont "one! Choose!" + para "You may have it!" + line "Go on, take it!" done _OaksLabRivalInterjectionText:: - text $53, ": Hey!" + text "<RIVAL>: Hey!" line "Gramps! What" cont "about me?" done _OaksLabBePatientText:: - text "OAK: Be patient!" - line $53, ", you can" - cont "have one too!" + text "OAK: Be patient," + line "<RIVAL>, I'll give" + cont "you one later." done -_OaksLabLeavingText:: - text "OAK: Hey! Don't go" - line "away yet!" - done +_OaksLabRivalTakesText1:: + text "<RIVAL>: No way!" + line "<PLAYER>, I want" + cont "this #MON!" + prompt + +_OaksLabRivalTakesText2:: + text "<RIVAL> snatched" + line "the #MON!@@" + +_OaksLabRivalTakesText3:: + text "OAK: <RIVAL>! What" + line "are you doing?" + prompt + +_OaksLabRivalTakesText4:: + text "<RIVAL>: 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..." -_OaksLabRivalPickingMonText:: - text $53, ": I'll take" - line "this one, then!" + para "<PLAYER>, come over" + line "here." done -_OaksLabRivalReceivedMonText:: - text $53, " received" +_OaksLabOakGivesText:: + text "OAK: <PLAYER>, 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 "<PLAYER> received" line "a @" TX_RAM wcd6d text "!@@" +_OaksLabLeavingText:: + text "OAK: Hey! Don't go" + line "away yet!" + done + _OaksLabRivalChallengeText:: - text $53, ": Wait" - line $52, "!" + text "<RIVAL>: Wait" + line "<PLAYER>!" cont "Let's check out" cont "our #MON!" @@ -261,33 +269,62 @@ _OaksLabText_1d3be:: prompt _OaksLabText_1d3c3:: - text $53, ": Yeah! Am" + text "<RIVAL>: Yeah! Am" line "I great or what?" prompt _OaksLabRivalToughenUpText:: - text $53, ": Okay!" + text "<RIVAL>: Okay!" line "I'll make my" cont "#MON fight to" cont "toughen it up!" - para $52, "! Gramps!" + para "<PLAYER>! Gramps!" line "Smell you later!" done +_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 + _OaksLabText21:: - text $53, ": Gramps!" + text "<RIVAL>: Gramps!" done _OaksLabText22:: - text $53, ": What did" - line "you call me for?" + text "<RIVAL>: Gramps," + line "my #MON has" + cont "grown stronger!" + cont "Check it out!" done _OaksLabText23:: - text "OAK: Oh right! I" - line "have a request" - cont "of you two." + text "OAK: Ah, <RIVAL>," + line "good timing!" + + para "I needed to ask" + line "both of you to do" + cont "something for me." done _OaksLabText24:: @@ -305,11 +342,11 @@ _OaksLabText24:: done _OaksLabText25:: - text "OAK: ", $52, " and" - line $53, "! Take" + text "OAK: <PLAYER> and" + line "<RIVAL>! Take" cont "these with you!" - para $52, " got" + para "<PLAYER> got" line "#DEX from OAK!@@" _OaksLabText26:: @@ -336,11 +373,11 @@ _OaksLabText26:: done _OaksLabText27:: - text $53, ": Alright" + text "<RIVAL>: Alright" line "Gramps! Leave it" cont "all to me!" - para $52, ", I hate to" + para "<PLAYER>, I hate to" line "say it, but I" cont "don't need you!" @@ -350,128 +387,10 @@ _OaksLabText27:: para "I'll tell her not" line "to lend you one," - cont $52, "! Hahaha!" + cont "<PLAYER>! Hahaha!" done _OaksLabText_1d405:: text "I study #MON as" line "PROF.OAK's AIDE." done - -_OaksLabText_441cc:: - text "#DEX comp-" - line "letion is:" - - para "@" - TX_NUM hDexRatingNumMonsSeen, 1, 3 - text " #MON seen" - line "@" - TX_NUM hDexRatingNumMonsOwned, 1, 3 - text " #MON owned" - - para "PROF.OAK's" - line "Rating:" - prompt - -_OaksLabText_44201:: - text "You still have" - line "lots to do." - cont "Look for #MON" - cont "in grassy areas!" - done - -_OaksLabText_44206:: - text "You're on the" - line "right track! " - cont "Get a FLASH HM" - cont "from my AIDE!" - done - -_OaksLabText_4420b:: - text "You still need" - line "more #MON!" - cont "Try to catch" - cont "other species!" - done - -_OaksLabText_44210:: - text "Good, you're" - line "trying hard!" - cont "Get an ITEMFINDER" - cont "from my AIDE!" - done - -_OaksLabText_44215:: - text "Looking good!" - line "Go find my AIDE" - cont "when you get 50!" - done - -_OaksLabText_4421a:: - text "You finally got at" - line "least 50 species!" - cont "Be sure to get" - cont "EXP.ALL from my" - cont "AIDE!" - done - -_OaksLabText_4421f:: - text "Ho! This is geting" - line "even better!" - done - -_OaksLabText_44224:: - text "Very good!" - line "Go fish for some" - cont "marine #MON!" - done - -_OaksLabText_44229:: - text "Wonderful!" - line "Do you like to" - cont "collect things?" - done - -_OaksLabText_4422e:: - text "I'm impressed!" - line "It must have been" - cont "difficult to do!" - done - -_OaksLabText_44233:: - text "You finally got at" - line "least 100 species!" - cont "I can't believe" - cont "how good you are!" - done - -_OaksLabText_44238:: - text "You even have the" - line "evolved forms of" - cont "#MON! Super!" - done - -_OaksLabText_4423d:: - text "Excellent! Trade" - line "with friends to" - cont "get some more!" - done - -_OaksLabText_44242:: - text "Outstanding!" - line "You've become a" - cont "real pro at this!" - done - -_OaksLabText_44247:: - text "I have nothing" - line "left to say!" - cont "You're the" - cont "authority now!" - done - -_OaksLabText_4424c:: - text "Your #DEX is" - line "entirely complete!" - cont "Congratulations!" - done diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm index 64b3325b..741ad529 100644 --- a/text/maps/pallet_town.asm +++ b/text/maps/pallet_town.asm @@ -3,9 +3,21 @@ _OakAppearsText:: line "Don't go out!@@" _OakWalksUpText:: - text "OAK: It's unsafe!" - line "Wild #MON live" - cont "in tall grass!" + text "OAK: That was" + line "close!" + + para "Wild #MON live" + line "in tall grass!" + done + +_OakWhewText:: + text "OAK: Whew..." + done + +_OakGrassText:: + text "OAK: A #MON can" + line "appear anytime in" + cont "tall grass." para "You need your own" line "#MON for your" diff --git a/text/maps/pewter_gym_2.asm b/text/maps/pewter_gym.asm index ff5f7242..a8781b4d 100644 --- a/text/maps/pewter_gym_2.asm +++ b/text/maps/pewter_gym.asm @@ -1,14 +1,40 @@ +_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!" + + para "Do you still want" + line "to challenge me?" + cont "Fine then! Show" + cont "me your best!" + done + _PewterGymText_5c4a3:: text "There are all" line "kinds of trainers" cont "in the world!" - para "You appear to be" - line "very gifted as a" - cont "#MON trainer!" + 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 "Go to the GYM in" - line "CERULEAN and test" + para "If you take your" + line "#MON training" + cont "seriously, go" + cont "visit the GYM in" + cont "CERULEAN and test" cont "your abilities!" done @@ -72,7 +98,7 @@ _PewterGymText_5c4c1:: para "The technique" line "FLASH can now be" - cont "used any time!" + cont "used anytime!" prompt _PewterGymBattleText1:: @@ -140,3 +166,17 @@ _PewterGymText_5c529:: line "You're #MON" cont "champ material!" done + +_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 diff --git a/text/maps/pewter_gym_1.asm b/text/maps/pewter_gym_1.asm deleted file mode 100644 index 6426dd72..00000000 --- a/text/maps/pewter_gym_1.asm +++ /dev/null @@ -1,18 +0,0 @@ -_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!" - - para "Do you still want" - line "to challenge me?" - cont "Fine then! Show" - cont "me your best!" - done diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm index 0d5b07a2..4dbc3c02 100644 --- a/text/maps/pewter_mart.asm +++ b/text/maps/pewter_mart.asm @@ -1,5 +1,5 @@ _PewterMartText2:: - text "A shady, old man" + text "A shady old man" 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 6a1b373e..968f6af0 100644 --- a/text/maps/pewter_pokecenter.asm +++ b/text/maps/pewter_pokecenter.asm @@ -8,6 +8,19 @@ _PewterPokecenterText2:: para "Scram!" done +_PewterPokecenterText3:: + 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 + _PewterJigglypuffText:: text "JIGGLYPUFF: Puu" line "pupuu!" diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm index 704a71eb..652cf37a 100644 --- a/text/maps/pokemon_tower_7f.asm +++ b/text/maps/pokemon_tower_7f.asm @@ -1,3 +1,27 @@ +_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!@@" + _TowerRescueFujiText:: text "MR.FUJI: Heh? You" line "came to save me?" @@ -23,56 +47,3 @@ _TowerRescueFujiText:: cont "HOUSE at the foot" cont "of this tower." done - -_PokemonTower7BattleText1:: - text "What do you want?" - line "Why are you here?" - done - -_PokemonTower7EndBattleText1:: - text "I give up!" - prompt - -_PokemonTower7AfterBattleText1:: - text "I'm not going to" - line "forget this!" - done - -_PokemonTower7BattleText2:: - text "This old guy came" - line "and complained" - cont "about us harming" - cont "useless #MON!" - - para "We're talking it" - line "over as adults!" - done - -_PokemonTower7EndBattleText2:: - text "Please!" - line "No more!" - prompt - -_PokemonTower7AfterBattleText2:: - text "#MON are only" - line "good for making" - cont "money!" - - para "Stay out of our" - line "business!" - done - -_PokemonTower7BattleText3:: - text "You're not saving" - line "anyone, kid!" - done - -_PokemonTower7EndBattleText3:: - text "Don't" - line "fight us ROCKETs!" - prompt - -_PokemonTower7AfterBattleText3:: - text "You're not getting" - line "away with this!" - done diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index 8b82f2de..e93450da 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -1,7 +1,7 @@ _MomWakeUpText:: text "MOM: Right." line "All boys leave" - cont "home some day." + cont "home someday." cont "It said so on TV." para "PROF.OAK, next" @@ -10,9 +10,14 @@ _MomWakeUpText:: done _MomHealText1:: - text "MOM: ",$52,"!" - line "You should take a" - cont "quick rest." + text "MOM: ",$52,", if" + line "you drive your" + cont "#MON too hard," + cont "they'll dislike" + cont "you." + + para "You should take a" + line "rest." prompt _MomHealText2:: diff --git a/text/maps/rock_tunnel_b2f_1.asm b/text/maps/rock_tunnel_b2f.asm index 1a565eb3..d0437de7 100644 --- a/text/maps/rock_tunnel_b2f_1.asm +++ b/text/maps/rock_tunnel_b2f.asm @@ -106,3 +106,24 @@ _RockTunnel2EndBattleText8:: text "Fired" line "away!" prompt + +_RockTunnel2AfterBattleText8:: + text "I'll raise my" + line "#MON to beat" + cont "yours, kid!" + done + +_RockTunnel2BattleText9:: + text "I draw #MON" + line "when I'm home." + done + +_RockTunnel2EndBattleText9:: + text "Whew!" + line "I'm exhausted!" + prompt + +_RockTunnel2AfterBattleText9:: + text "I'm an artist," + line "not a fighter." + done diff --git a/text/maps/rock_tunnel_b2f_2.asm b/text/maps/rock_tunnel_b2f_2.asm deleted file mode 100644 index e8e45a7f..00000000 --- a/text/maps/rock_tunnel_b2f_2.asm +++ /dev/null @@ -1,20 +0,0 @@ -_RockTunnel2AfterBattleText8:: - text "I'll raise my" - line "#MON to beat" - cont "yours, kid!" - done - -_RockTunnel2BattleText9:: - text "I draw #MON" - line "when I'm home." - done - -_RockTunnel2EndBattleText9:: - text "Whew!" - line "I'm exhausted!" - prompt - -_RockTunnel2AfterBattleText9:: - text "I'm an artist," - line "not a fighter." - done diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm index f3ba43f3..d9e13457 100644 --- a/text/maps/rocket_hideout_b4f.asm +++ b/text/maps/rocket_hideout_b4f.asm @@ -1,3 +1,26 @@ +_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!@@" + _RocketHideout4Text_4557a:: text "So! I must say, I" line "am impressed you" @@ -26,38 +49,6 @@ _RocketHideout4Text_45584:: line "again..." done -_RocketHideout4BattleText2:: - text "I know you! You" - line "ruined our plans" - cont "at MT.MOON!" - done - -_RocketHideout4EndBattleText2:: - text "Burned" - line "again!" - prompt - -_RocketHide4AfterBattleText2:: - text "Do you have" - line "something against" - cont "TEAM ROCKET?" - done - -_RocketHideout4BattleText3:: - text "How can you not" - line "see the beauty of" - cont "our evil?" - done - -_RocketHideout4EndBattleText3:: - text "Ayaya!" - prompt - -_RocketHide4AfterBattleText3:: - text "BOSS! I'm sorry I" - line "failed you!" - done - _RocketHideout4BattleText4:: text "The elevator" line "doesn't work? Who" diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm index 057ddcb5..a56018f0 100644 --- a/text/maps/route_10.asm +++ b/text/maps/route_10.asm @@ -33,7 +33,7 @@ _Route10AfterBattleText2:: done _Route10BattleText3:: - text "Hi kid, want to" + text "Hi, kid, want to" line "see my #MON?" done diff --git a/text/maps/route_11_1.asm b/text/maps/route_11.asm index 13e37bdf..451d2bec 100644 --- a/text/maps/route_11_1.asm +++ b/text/maps/route_11.asm @@ -131,3 +131,32 @@ _Route11BattleText9:: text "Watch out for" line "live wires!" done + +_Route11EndBattleText9:: + text "Whoa!" + line "You spark plug!" + prompt + +_Route11AfterBattleText9:: + text "Well, better get" + line "back to work." + done + +_Route11BattleText10:: + text "My #MON should" + line "be ready by now!" + done + +_Route11EndBattleText10:: + text "Too" + line "much, too young!" + prompt + +_Route11AfterBattleText10:: + text "I better go find" + line "stronger ones!" + done + +_Route11Text11:: + text "DIGLETT's CAVE" + done diff --git a/text/maps/route_11_2.asm b/text/maps/route_11_2.asm deleted file mode 100644 index b9b68d6d..00000000 --- a/text/maps/route_11_2.asm +++ /dev/null @@ -1,28 +0,0 @@ -_Route11EndBattleText9:: - text "Whoa!" - line "You spark plug!" - prompt - -_Route11AfterBattleText9:: - text "Well, better get" - line "back to work." - done - -_Route11BattleText10:: - text "My #MON should" - line "be ready by now!" - done - -_Route11EndBattleText10:: - text "Too" - line "much, too young!" - prompt - -_Route11AfterBattleText10:: - text "I better go find" - line "stronger ones!" - done - -_Route11Text11:: - text "DIGLETT's CAVE" - done diff --git a/text/maps/route_12.asm b/text/maps/route_12.asm index 82696fda..27befda5 100644 --- a/text/maps/route_12.asm +++ b/text/maps/route_12.asm @@ -109,7 +109,7 @@ _Route12EndBattleText6:: _Route12AfterBattleText6:: text "It's all right." line "Losing doesn't" - cont "bug me any more." + cont "bug me anymore." done _Route12BattleText7:: diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm index 1f2af788..a18e3d57 100644 --- a/text/maps/route_12_gate_upstairs.asm +++ b/text/maps/route_12_gate_upstairs.asm @@ -5,7 +5,7 @@ _TM39PreReceiveText:: para "You can have this" line "TM. I don't need" - cont "it any more..." + cont "it anymore..." prompt _ReceivedTM39Text:: diff --git a/text/maps/route_14.asm b/text/maps/route_14.asm index 18e85ed4..9a9de78c 100644 --- a/text/maps/route_14.asm +++ b/text/maps/route_14.asm @@ -10,7 +10,7 @@ _Route14EndBattleText1:: prompt _Route14AfterBattleText1:: - text "You have some HMs" + text "You have some HMs," 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 45265829..2ef6b02a 100644 --- a/text/maps/route_16.asm +++ b/text/maps/route_16.asm @@ -19,7 +19,7 @@ _Route16BattleText2:: done _Route16EndBattleText2:: - text "Knock" + text "Knock-" line "out!" prompt diff --git a/text/maps/route_17.asm b/text/maps/route_17.asm index a0affd90..f7f59683 100644 --- a/text/maps/route_17.asm +++ b/text/maps/route_17.asm @@ -133,7 +133,7 @@ _Route17AfterBattleText9:: done _Route17BattleText10:: - text "Get lost kid!" + text "Get lost, kid!" line "I'm bushed!" done diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index f2d7ae96..52d1a4c7 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -1,3 +1,36 @@ +_Route22RivalDefeatedText1:: + text "Awww!" + line "You just lucked" + cont "out!" + prompt + +_Route22Text_511bc:: + text $53, ": What?" + line "Why do I have 2" + cont "#MON?" + + para "You should catch" + cont "some more too!" + prompt + +_Route22RivalDefeatedText2:: + text "What!?" + + para "I was just" + line "careless!" + prompt + +_Route22Text_511d0:: + text $53, ": Hahaha!" + line $52, "! That's" + cont "your best? You're" + cont "nowhere near as" + cont "good as me, pal!" + + para "Go train some" + line "more! You loser!" + prompt + _Route22RivalBeforeBattleText1:: text $53, ": Hey!" line $52, "!" @@ -31,21 +64,6 @@ _Route22RivalAfterBattleText1:: cont "a move on!" done -_Route22RivalDefeatedText1:: - text "Awww!" - line "You just lucked" - cont "out!" - prompt - -_Route22Text_511bc:: - text $53, ": What?" - line "Why do I have 2" - cont "#MON?" - - para "You should catch" - cont "some more too!" - prompt - _Route22RivalBeforeBattleText2:: text $53, ": What?" line $52, "! What a" @@ -59,9 +77,9 @@ _Route22RivalBeforeBattleText2:: line "the BADGEs too?" cont "That's cool!" - para "Then I'll whip you" - line $52, " as a" - cont "warm up for" + para "Then I'll whip" + line "you, ", $52, ", as" + cont "a warmup for" cont "#MON LEAGUE!" para "Come on!" @@ -80,24 +98,6 @@ _Route22RivalAfterBattleText2:: cont "here. Smell ya!" done -_Route22RivalDefeatedText2:: - text "What!?" - - para "I was just" - line "careless!" - prompt - -_Route22Text_511d0:: - text $53, ": Hahaha!" - line $52, "! That's" - cont "your best? You're" - cont "nowhere near as" - cont "good as me, pal!" - - para "Go train some" - line "more! You loser!" - prompt - _Route22FrontGateText:: text "#MON LEAGUE" line "Front Gate" diff --git a/text/maps/route_24.asm b/text/maps/route_24.asm new file mode 100644 index 00000000..475a2602 --- /dev/null +++ b/text/maps/route_24.asm @@ -0,0 +1,183 @@ +_Route24Text_51510:: + text "Congratulations!" + line "You beat our 5" + cont "contest trainers!@@" + +_Route24Text_51515:: + text "" + para "You just earned a" + line "fabulous prize!" + prompt + +_Route24Text_5151a:: + text "<PLAYER> received" + line "a @" + TX_RAM wcf4b + text "!@@" + +_Route24Text_51521:: + text "You don't have" + line "any room!" + done + +_Route24Text_51526:: + text "By the way, would" + line "you like to join" + cont "TEAM ROCKET?" + + para "We're a group" + line "dedicated to evil" + cont "using #MON!" + + para "Want to join?" + + para "Are you sure?" + + para "Come on, join us!" + + para "I'm telling you" + line "to join!" + + para "OK, you need" + line "convincing!" + + para "I'll make you an" + line "offer you can't" + cont "refuse!" + done + +_Route24Text_5152b:: + text "Arrgh!" + line "You are good!" + prompt + +_Route24Text_51530:: + text "With your ability," + line "you could become" + cont "a top leader in" + cont "TEAM ROCKET!" + done + +_Route24BattleText1:: + text "I saw your feat" + line "from the grass!" + done + +_Route24EndBattleText1:: + text "I" + line "thought not!" + prompt + +_Route24AfterBattleText1:: + text "I hid because the" + line "people on the" + cont "bridge scared me!" + done + +_Route24BattleText2:: + text "OK! I'm No. 5!" + line "I'll stomp you!" + done + +_Route24EndBattleText2:: + text "Whoa!" + line "Too much!" + prompt + +_Route24AfterBattleText2:: + text "I did my best, I" + line "have no regrets!" + done + +_Route24BattleText3:: + text "I'm No. 4!" + line "Getting tired?" + done + +_Route24EndBattleText3:: + text "I lost" + line "too!" + prompt + +_Route24AfterBattleText3:: + text "I did my best, so" + line "I've no regrets!" + done + +_Route24BattleText4:: + text "Here's No. 3!" + line "I won't be easy!" + done + +_Route24EndBattleText4:: + text "Ow!" + line "Stomped flat!" + prompt + +_Route24AfterBattleText4:: + text "I did my best, I" + line "have no regrets!" + done + +_Route24BattleText5:: + text "I'm second!" + line "Now it's serious!" + done + +_Route24EndBattleText5:: + text "How could I" + line "lose?" + prompt + +_Route24AfterBattleText5:: + text "I did my best, I" + line "have no regrets!" + done + +_Route24BattleText6:: + text "This is NUGGET" + line "BRIDGE! Beat us 5" + cont "trainers and win" + cont "a fabulous prize!" + + para "Think you got" + line "what it takes?" + done + +_Route24EndBattleText6:: + text "Whoo!" + line "Good stuff!" + prompt + +_Route24AfterBattleText6:: + text "I did my best, I" + line "have no regrets!" + done + +_Route24DamianText1:: + 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 + +_Route24DamianText2:: + text "Take good care of" + line "my CHARMANDER!@@" + +_Route24DamianText3:: + text "Oh... I'd better" + line "release it then." + done + +_Route24DamianText4:: + text "How's CHARMANDER" + line "doing?" + done diff --git a/text/maps/route_24_1.asm b/text/maps/route_24_1.asm deleted file mode 100644 index 25079b2f..00000000 --- a/text/maps/route_24_1.asm +++ /dev/null @@ -1,64 +0,0 @@ -_Route24Text_51510:: - text "Congratulations!" - line "You beat our 5" - cont "contest trainers!@@" - -_Route24Text_51515:: - db $0 - para "You just earned a" - line "fabulous prize!" - prompt - -_Route24Text_5151a:: - text $52, " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_Route24Text_51521:: - text "You don't have" - line "any room!" - done - -_Route24Text_51526:: - text "By the way, would" - line "you like to join" - cont "TEAM ROCKET?" - - para "We're a group" - line "dedicated to evil" - cont "using #MON!" - - para "Want to join?" - - para "Are you sure?" - - para "Come on, join us!" - - para "I'm telling you" - line "to join!" - - para "OK, you need" - line "convincing!" - - para "I'll make you an" - line "offer you can't" - cont "refuse!" - done - -_Route24Text_5152b:: - text "Arrgh!" - line "You are good!" - prompt - -_Route24Text_51530:: - text "With your ability," - line "you could become" - cont "a top leader in" - cont "TEAM ROCKET!" - done - -_Route24BattleText1:: - text "I saw your feat" - line "from the grass!" - done diff --git a/text/maps/route_24_2.asm b/text/maps/route_24_2.asm deleted file mode 100644 index 325dea13..00000000 --- a/text/maps/route_24_2.asm +++ /dev/null @@ -1,90 +0,0 @@ -_Route24EndBattleText1:: - text "I" - line "thought not!" - prompt - -_Route24AfterBattleText1:: - text "I hid because the" - line "people on the" - cont "bridge scared me!" - done - -_Route24BattleText2:: - text "OK! I'm No. 5!" - line "I'll stomp you!" - done - -_Route24EndBattleText2:: - text "Whoa!" - line "Too much!" - prompt - -_Route24AfterBattleText2:: - text "I did my best, I" - line "have no regrets!" - done - -_Route24BattleText3:: - text "I'm No. 4!" - line "Getting tired?" - done - -_Route24EndBattleText3:: - text "I lost" - line "too!" - prompt - -_Route24AfterBattleText3:: - text "I did my best, so" - line "I've no regrets!" - done - -_Route24BattleText4:: - text "Here's No. 3!" - line "I won't be easy!" - done - -_Route24EndBattleText4:: - text "Ow!" - line "Stomped flat!" - prompt - -_Route24AfterBattleText4:: - text "I did my best, I" - line "have no regrets!" - done - -_Route24BattleText5:: - text "I'm second!" - line "Now it's serious!" - done - -_Route24EndBattleText5:: - text "How could I" - line "lose?" - prompt - -_Route24AfterBattleText5:: - text "I did my best, I" - line "have no regrets!" - done - -_Route24BattleText6:: - text "This is NUGGET" - line "BRIDGE! Beat us 5" - cont "trainers and win" - cont "a fabulous prize!" - - para "Think you got" - line "what it takes?" - done - -_Route24EndBattleText6:: - text "Whoo!" - line "Good stuff!" - prompt - -_Route24AfterBattleText6:: - text "I did my best, I" - line "have no regrets!" - done diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm index 325ab348..4786d830 100644 --- a/text/maps/route_25.asm +++ b/text/maps/route_25.asm @@ -56,8 +56,8 @@ _Route25BattleText4:: done _Route25EndBattleText4:: - text "I was in" - line "bad condition!" + text "I'm in" + line "a slump!" prompt _Route25AfterBattleText4:: diff --git a/text/maps/route_3.asm b/text/maps/route_3.asm index 966a0786..14d44e64 100644 --- a/text/maps/route_3.asm +++ b/text/maps/route_3.asm @@ -66,8 +66,8 @@ _Route3BattleText4:: _Route3EndBattleText4:: text "If I" - line "had new #MON I" - cont "would've won!" + line "had new #MON," + cont "I would've won!" prompt _Route3AfterBattleText4:: diff --git a/text/maps/route_6.asm b/text/maps/route_6.asm index c48b5d3d..71760449 100644 --- a/text/maps/route_6.asm +++ b/text/maps/route_6.asm @@ -1,30 +1,37 @@ _Route6BattleText1:: - text "Who's there?" - line "Quit listening in" - cont "on us!" + text "I'm doing this" + line "out of love." + cont "Leave me alone!" done _Route6EndBattleText1:: - text "I" - line "just can't win!" + text "No," + line "this can't be..." prompt _Route6AfterBattleText1:: - text "Whisper..." - line "whisper..." + text "My love will leave" + line "me in disgust." done _Route6BattleText2:: - text "Excuse me! This" - line "is a private" - cont "conversation!" + text "I'm training for" + line "my love. Don't" + cont "bother me!" done _Route6EndBattleText2:: - text "Ugh!" - line "I hate losing!" + text "My" + line "textbook never..." prompt +_Route6AfterBattleText2:: + text "Now I understand," + line "#MON isn't" + cont "about calculated" + cont "numbers." + done + _Route6BattleText3:: text "There aren't many" line "bugs out here." diff --git a/text/maps/route_8.asm b/text/maps/route_8.asm index 57a9a5f9..c0988d70 100644 --- a/text/maps/route_8.asm +++ b/text/maps/route_8.asm @@ -104,7 +104,7 @@ _Route8EndBattleText7:: prompt _Route8AfterBattleText7:: - text "SAFFRON's gate" + text "SAFFRON's gate-" 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_1.asm index 9975000d..741c990c 100644 --- a/text/maps/route_9.asm +++ b/text/maps/route_9_1.asm @@ -15,19 +15,20 @@ _Route9AfterBattleText1:: cont "dark tunnel ahead." done -_Route9BattleText2:: - text "Who's that walking" - line "with those good" - cont "looking #MON?" +_Route9BattleTextAJ:: + text "I aim to be the" + line "ultimate trainer!" done -_Route9EndBattleText2:: - text "Out" - line "like a light!" +_Route9EndBattleTextAJ:: + text "My" + line "SANDSHREW lost?" prompt -_Route9AfterBattleText2:: - text "Keep walking!" +_Route9AfterBattleTextAJ:: + text "I'll restart my" + line "100-win streak" + cont "with SANDSHREW." done _Route9BattleText3:: @@ -133,25 +134,3 @@ _Route9AfterBattleText8:: line "Us hearty guys" cont "always laugh!" done - -_Route9BattleText9:: - text "Go, my super bug" - line "#MON!" - done - -_Route9EndBattleText9:: - text "My" - line "bugs..." - prompt - -_Route9AfterBattleText9:: - text "If you don't like" - line "bug #MON, you" - cont "bug me!" - done - -_Route9Text11:: - text "ROUTE 9" - line "CERULEAN CITY-" - cont "ROCK TUNNEL" - done diff --git a/text/maps/route_9_2.asm b/text/maps/route_9_2.asm new file mode 100755 index 00000000..f3803618 --- /dev/null +++ b/text/maps/route_9_2.asm @@ -0,0 +1,21 @@ +_Route9BattleText9:: + text "Go, my super bug" + line "#MON!" + done + +_Route9EndBattleText9:: + text "My" + line "bugs..." + prompt + +_Route9AfterBattleText9:: + text "If you don't like" + line "bug #MON, you" + cont "bug me!" + done + +_Route9Text11:: + text "ROUTE 9" + line "CERULEAN CITY-" + cont "ROCK TUNNEL" + done diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm index 8a018b2d..065de6a9 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/safari_zone_entrance.asm @@ -3,6 +3,25 @@ _SafariZoneEntranceText1:: line "SAFARI ZONE!" done +SafariZoneEntranceText_9e814:: + text "Leaving early?@@" + +_SafariZoneEntranceText_753bb:: + text "Please return any" + line "SAFARI BALLs you" + cont "have left." + done + +_SafariZoneEntranceText_753c0:: + text "Good Luck!" + done + +_SafariZoneEntranceText_753c5:: + text "Did you get a" + line "good haul?" + cont "Come again!" + done + SafariZoneEntranceText_9e6e4:: text "For just ¥500," line "you can catch all" @@ -13,7 +32,9 @@ SafariZoneEntranceText_9e6e4:: line "join the hunt?@@" SafariZoneEntranceText_9e747:: - text "That'll be ¥500" + text "That'll be ¥@" + TX_BCD wPriceTemp, $c3 + text "," line "please!" para "We only use a" @@ -41,25 +62,6 @@ _SafariZoneEntranceText_7536a:: line "money!" done -SafariZoneEntranceText_9e814:: - text "Leaving early?@@" - -_SafariZoneEntranceText_753bb:: - text "Please return any" - line "SAFARI BALLs you" - cont "have left." - done - -_SafariZoneEntranceText_753c0:: - text "Good Luck!" - done - -_SafariZoneEntranceText_753c5:: - text "Did you get a" - line "good haul?" - cont "Come again!" - done - _SafariZoneEntranceText_753e6:: text "Hi! Is it your" line "first time here?" @@ -91,3 +93,48 @@ _SafariZoneEntranceText_753f0:: text "Sorry, you're a" line "regular here!" done + +_SafariZoneLowCostText1:: + db 0 + para "Oh, all right, pay" + line "me what you have." + prompt + +_SafariZoneLowCostText2:: + text "But, I can't give" + line "you all 30 BALLs." + done + +_SafariZoneLowCostText3:: + db 0 + para "You're persistent," + line "aren't you?" + + para "OK, you can go in" + line "for free, but" + cont "just this once!@@" + +_SafariZoneLowCostText4:: + db 0 + done + +_SafariZoneLowCostText5:: + text "I'm sorry, but you" + line "have to pay to" + cont "enter." + done + +_SafariZoneLowCostText6:: + text "You can't enter" + line "without paying!" + done + +_SafariZoneLowCostText7:: + text "I said, no money," + line "no entry!" + done + +_SafariZoneLowCostText8:: + text "Read my lips, NO!" + line "Get it?" + done diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm index c16e880e..0fd11d88 100644 --- a/text/maps/saffron_gates.asm +++ b/text/maps/saffron_gates.asm @@ -3,7 +3,7 @@ _SaffronGateText_1dfe7:: line "Gee, I'm thirsty," cont "though!" - para "Oh wait there," + para "Oh, wait there," line "the road's closed." done @@ -18,7 +18,7 @@ _SaffronGateText_8aaa9:: _SaffronGateText_1dff1:: db $0 para "..." - line "Glug glug..." + line "Glug, glug..." cont "..." cont "Gulp..." cont "If you want to go" diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm index ba57e35d..23cc211b 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/saffron_gym.asm @@ -131,8 +131,7 @@ _SaffronGymEndBattleText2:: _SaffronGymAfterBattleText2:: text "Psychic #MON" - line "fear only ghosts" - cont "and bugs!" + line "fear only bugs!" done _SaffronGymBattleText3:: diff --git a/text/maps/school.asm b/text/maps/school.asm index f6041e0d..3c5f6379 100644 --- a/text/maps/school.asm +++ b/text/maps/school.asm @@ -4,6 +4,13 @@ _SchoolText1:: cont "my notes." done +_SchoolText3:: + text "Sis says #MON" + line "will become tame" + cont "if you treat them" + cont "nicely." + done + _SchoolText2:: text "Okay!" diff --git a/text/maps/silph_co_10f.asm b/text/maps/silph_co_10f.asm index e916c64a..09894764 100644 --- a/text/maps/silph_co_10f.asm +++ b/text/maps/silph_co_10f.asm @@ -1,6 +1,6 @@ _SilphCo10Text_5a1d3:: text "Waaaaa!" - cont "I'm scared!" + line "I'm scared!" done _SilphCo10Text_5a1d8:: @@ -40,3 +40,27 @@ _SilphCo10AfterBattleText2:: line "with beating me?" cont "Then go on home!" done + +_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...@@" diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 7fccab4f..6be83c5d 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -58,7 +58,7 @@ _SilphCo11Text2:: done _SilphCo11Text3:: - text "Ah ", $52, "!" + text "Ah, ", $52, "!" line "So we meet again!" para "The PRESIDENT and" @@ -70,7 +70,7 @@ _SilphCo11Text3:: line "out of grown-up" cont "matters..." - para "Or, experience a" + para "or, experience a" line "world of pain!" done @@ -96,21 +96,6 @@ _SilphCo10Text_62335:: line "shall return!" done -_SilphCo11BattleText1:: - text "Stop right there!" - line "Don't you move!" - done - -_SilphCo11EndBattleText1:: - text "Don't..." - line "Please!" - prompt - -_SilphCo11AfterBattleText1:: - text "So, you want to" - line "see my BOSS?" - done - _SilphCo11BattleText2:: text "Halt! Do you have" line "an appointment" @@ -127,8 +112,3 @@ _SilphCo11AfterBattleText2:: line "my BOSS likes his" cont "#MON tough!" done - -_SilphCo10Text_6237b:: - text "The monitor has" - line "#MON on it!" - done diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm index a48ebd23..5ef349d5 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -72,7 +72,7 @@ _SilphCo2EndBattleText3:: prompt _SilphCo2AfterBattleText3:: - text "Diamond shaped" + text "Diamond-shaped" line "tiles are" cont "teleport blocks!" diff --git a/text/maps/silph_co_5f.asm b/text/maps/silph_co_5f.asm new file mode 100644 index 00000000..9c8bfd41 --- /dev/null +++ b/text/maps/silph_co_5f.asm @@ -0,0 +1,107 @@ +_SilphCo5Text_1a010:: + text "TEAM ROCKET is" + line "in an uproar over" + cont "some intruder." + cont "That's you right?" + done + +_SilphCo5Text_1a015:: + text "TEAM ROCKET took" + line "off! You're our" + cont "hero! Thank you!" + done + +_SilphCo5BattleText2:: + text "I heard a kid was" + line "wandering around." + done + +_SilphCo5EndBattleText2:: + text "Boom!" + prompt + +_SilphCo5AfterBattleText2:: + text "It's not smart" + line "to pick a fight" + cont "with TEAM ROCKET!" + done + +_SilphCo5BattleText3:: + text "We study #" + line "BALL technology" + cont "on this floor!" + done + +_SilphCo5EndBattleText3:: + text "Dang!" + line "Blast it!" + prompt + +_SilphCo5AfterBattleText3:: + text "We worked on the" + line "ultimate #" + cont "BALL which would" + cont "catch anything!" + done + +_SilphCo5BattleText4:: + text "Whaaat? There" + line "shouldn't be any" + cont "children here!" + done + +_SilphCo5EndBattleText4:: + text "Oh" + line "goodness!" + prompt + +_SilphCo5AfterBattleText4:: + text "You're only on 5F." + line "It's a long way" + cont "to my BOSS!" + done + +_SilphCo5BattleText5:: + text "Show TEAM ROCKET" + line "a little respect!" + done + +_SilphCo5EndBattleText5:: + text "Cough..." + line "Cough..." + prompt + +_SilphCo5AfterBattleText5:: + text "Which reminds me." + + para "KOFFING evolves" + line "into WEEZING!" + done + +_SilphCo5Text9:: + text "It's a #MON" + line "REPORT!" + + para "#MON LAB" + line "created PORYGON," + cont "the first virtual" + cont "reality #MON." + done + +_SilphCo5Text10:: + text "It's a #MON" + line "REPORT!" + + para "Over 160 #MON" + line "techniques have" + cont "been confirmed." + done + +_SilphCo5Text11:: + text "It's a #MON" + line "REPORT!" + + para "4 #MON evolve" + line "only when traded" + cont "by link-cable." + done diff --git a/text/maps/silph_co_5f_1.asm b/text/maps/silph_co_5f_1.asm deleted file mode 100644 index dab42539..00000000 --- a/text/maps/silph_co_5f_1.asm +++ /dev/null @@ -1,51 +0,0 @@ -_SilphCo5Text_1a010:: - text "TEAM ROCKET is" - line "in an uproar over" - cont "some intruder." - cont "That's you right?" - done - -_SilphCo5Text_1a015:: - text "TEAM ROCKET took" - line "off! You're our" - cont "hero! Thank you!" - done - -_SilphCo5BattleText2:: - text "I heard a kid was" - line "wandering around." - done - -_SilphCo5EndBattleText2:: - text "Boom!" - prompt - -_SilphCo5AfterBattleText2:: - text "It's not smart" - line "to pick a fight" - cont "with TEAM ROCKET!" - done - -_SilphCo5BattleText3:: - text "We study #" - line "BALL technology" - cont "on this floor!" - done - -_SilphCo5EndBattleText3:: - text "Dang!" - line "Blast it!" - prompt - -_SilphCo5AfterBattleText3:: - text "We worked on the" - line "ultimate #" - cont "BALL which would" - cont "catch anything!" - done - -_SilphCo5BattleText4:: - text "Whaaat? There" - line "shouldn't be any" - cont "children here?" - done diff --git a/text/maps/silph_co_5f_2.asm b/text/maps/silph_co_5f_2.asm deleted file mode 100644 index 3c1b8ead..00000000 --- a/text/maps/silph_co_5f_2.asm +++ /dev/null @@ -1,55 +0,0 @@ -_SilphCo5EndBattleText4:: - text "Oh" - line "goodness!" - prompt - -_SilphCo5AfterBattleText4:: - text "You're only on 5F." - line "It's a long way" - cont "to my BOSS!" - done - -_SilphCo5BattleText5:: - text "Show TEAM ROCKET" - line "a little respect!" - done - -_SilphCo5EndBattleText5:: - text "Cough..." - line "Cough..." - prompt - -_SilphCo5AfterBattleText5:: - text "Which reminds me." - - para "KOFFING evolves" - line "into WEEZING!" - done - -_SilphCo5Text9:: - text "It's a #MON" - line "REPORT!" - - para "#MON LAB" - line "created PORYGON," - cont "the first virtual" - cont "reality #MON." - done - -_SilphCo5Text10:: - text "It's a #MON" - line "REPORT!" - - para "Over 160 #MON" - line "techniques have" - cont "been confirmed." - done - -_SilphCo5Text11:: - text "It's a #MON" - line "REPORT!" - - para "4 #MON evolve" - line "only when traded" - cont "by link-cable." - done diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm index e6ad11c1..0373355a 100644 --- a/text/maps/silph_co_7f.asm +++ b/text/maps/silph_co_7f.asm @@ -79,7 +79,7 @@ _SilphCo7Text_51e4b:: done _SilphCo7BattleText1:: - text "Oh ho! I smell a" + text "Aha! I smell a" line "little rat!" done @@ -167,7 +167,7 @@ _SilphCo7Text_51ec3:: done _SilphCo7Text_51ec8:: - text "Oh ho!" + text "Oh-oh!" 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 7fcc9973..b7784019 100644 --- a/text/maps/ss_anne_6.asm +++ b/text/maps/ss_anne_6.asm @@ -47,7 +47,7 @@ _SSAnne6Text_61807:: prompt _SSAnne6Text_6180c:: - text "Salmon du Salad!" + text "Salade de Salmon!" 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 bb8ca042..a046e600 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/ss_anne_7.asm @@ -27,7 +27,7 @@ _ReceivingHM01Text:: para "Teach it to your" line "#MON and you" cont "can see it CUT" - cont "any time!" + cont "anytime!" prompt _ReceivedHM01Text:: @@ -40,7 +40,7 @@ _SSAnne7Text_61932:: text "CAPTAIN: Whew!" para "Now that I'm not" - line "sick any more, I" + line "sick anymore, I" cont "guess it's time." done diff --git a/text/maps/ss_anne_9.asm b/text/maps/ss_anne_9.asm index a9be8cee..c9b29119 100644 --- a/text/maps/ss_anne_9.asm +++ b/text/maps/ss_anne_9.asm @@ -1,5 +1,5 @@ _SSAnne9Text_61bf2:: - text "In all my travels" + text "In all my travels," line "I've never seen" cont "any #MON sleep" cont "like this one!" @@ -20,32 +20,6 @@ _SSAnne9Text_61c10:: line "down small bushes." done -_SSAnne9Text_61c1f:: - text "Have you gone to" - line "the SAFARI ZONE" - cont "in FUCHSIA CITY?" - - para "It had many rare" - line "kinds of #MON!!" - done - -_SSAnne9Text_61c2e:: - text "Me and my Daddy" - line "think the SAFARI" - cont "ZONE is awesome!" - done - -_SSAnne9Text_61c3d:: - text "The CAPTAIN looked" - line "really sick and" - cont "pale!" - done - -_SSAnne9Text_61c4c:: - text "I hear many people" - line "get seasick!" - done - _SSAnne9BattleText1:: text "Competing against" line "the young keeps" @@ -111,3 +85,29 @@ _SSAnne9AfterBattleText4:: text "Oh, I adore your" line "strong #MON!" done + +_SSAnne9Text_61c1f:: + text "Have you gone to" + line "the SAFARI ZONE" + cont "in FUCHSIA CITY?" + + para "It had many rare" + line "kinds of #MON!!" + done + +_SSAnne9Text_61c2e:: + text "Me and my Daddy" + line "think the SAFARI" + cont "ZONE is awesome!" + done + +_SSAnne9Text_61c3d:: + text "The CAPTAIN looked" + line "really sick and" + cont "pale!" + done + +_SSAnne9Text_61c4c:: + text "I hear many people" + line "get seasick!" + done diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/underground_path_route_7_entrance_unused.asm index 4e0dc3ca..02c95a5c 100644 --- a/text/maps/underground_path_route_7_entrance_unused.asm +++ b/text/maps/underground_path_route_7_entrance_unused.asm @@ -17,17 +17,14 @@ _UGPathRoute7EntranceUnusedText_5d778:: _UGPathRoute7EntranceUnusedText_5d77d:: text "You're here to" line "shop in CELADON?" - para "Just step outside" line "and head west!" done - _UGPathRoute7EntranceUnusedText_5d782:: text "The UNDERGROUND" line "PATH goes beneath" cont "SAFFRON and leads" cont "to LAVENDER." - para "If you're heading" line "to CERULEAN, go" cont "to the building" diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index ff90cbef..2b2d125f 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -35,7 +35,7 @@ _SSAnneWelcomeText9:: prompt _SSAnneFlashedTicketText:: - text $52, " flashed" + text "<PLAYER> flashed" line "the S.S.TICKET!" para "Great! Welcome to" @@ -43,7 +43,7 @@ _SSAnneFlashedTicketText:: done _SSAnneNoTicketText:: - text $52, " doesn't" + text "<PLAYER> doesn't" line "have the needed" cont "S.S.TICKET." @@ -70,8 +70,8 @@ _VermilionCityText5:: text "MACHOP: Guoh!" line "Gogogoh!@@" -_VermilionCityText14:: - db $0 +_VermilionCityText15:: + text "" para "A MACHOP is" line "stomping the land" cont "flat." @@ -86,13 +86,54 @@ _VermilionCityText6:: line "once a year." done -_VermilionCityText7:: +_OfficerJennyText1:: + text "I just caught a" + line "SQUIRTLE that was" + cont "always getting" + cont "into mischief." + + para "I think it needs a" + line "good trainer to" + cont "set it straight." + done + +_OfficerJennyText2:: + text "You have the" + line "THUNDERBADGE!?" + + para "You must be a" + line "good trainer!" + + para "I just caught a" + line "SQUIRTLE that was" + cont "always getting" + cont "into mischief." + + para "Would you take" + line "good care of it?" + done + +_OfficerJennyText3:: + text "OK! Please treat" + line "SQUIRTLE right!@@" + +_OfficerJennyText4:: + text "Oh... What am I" + line "to do now?" + done + +_OfficerJennyText5:: + text "How is SQUIRTLE" + line "doing?" + done + +_VermilionCityText8:: text "VERMILION CITY" line "The Port of" cont "Exquisite Sunsets" done -_VermilionCityText8:: +_VermilionCityText9:: text "NOTICE!" para "ROUTE 12 may be" @@ -106,13 +147,13 @@ _VermilionCityText8:: para "VERMILION POLICE" done -_VermilionCityText11:: +_VermilionCityText12:: text "#MON FAN CLUB" line "All #MON fans" cont "welcome!" done -_VermilionCityText12:: +_VermilionCityText13:: text "VERMILION CITY" line "#MON GYM" cont "LEADER: LT.SURGE" @@ -121,6 +162,6 @@ _VermilionCityText12:: line "American!" done -_VermilionCityText13:: +_VermilionCityText14:: text "VERMILION HARBOR" done diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm index 5d998e82..034de399 100644 --- a/text/maps/vermilion_dock.asm +++ b/text/maps/vermilion_dock.asm @@ -1,3 +1,2 @@ _VermilionDockText1:: - text "" - done + db $0, $57 diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym.asm index 4fd5e159..a7cce733 100644 --- a/text/maps/vermilion_gym_2.asm +++ b/text/maps/vermilion_gym.asm @@ -1,3 +1,25 @@ +_VermilionGymText_5cb6d:: + 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!" + done + _VermilionGymText_5cb72:: text "A little word of" line "advice, kid!" @@ -16,7 +38,7 @@ _VermilionGymText_5cb77:: cont "#MON's SPEED!" para "It also lets your" - line "#MON FLY any" + line "#MON FLY any-" cont "time, kid!" para "You're special," diff --git a/text/maps/vermilion_gym_1.asm b/text/maps/vermilion_gym_1.asm deleted file mode 100644 index f718d899..00000000 --- a/text/maps/vermilion_gym_1.asm +++ /dev/null @@ -1,21 +0,0 @@ -_VermilionGymText_5cb6d:: - text "Hey, kid! What do" - line "you think you're" - cont "doing here?" - - para "You won't live" - line "long in combat!" - cont "That's for sure!" - - para "I tell you kid," - line "electric #MON" - cont "saved me during" - cont "the war!" - - para "They zapped my" - line "enemies into" - cont "paralysis!" - - para "The same as I'll" - line "do to you!" - done diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm index 17b2ec91..0cfd1fe8 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -1,3 +1,40 @@ +_ViridianCityText_19219:: ; 2d:4478 + text "First, you need" + line "to weaken the" + cont "target #MON." + done + +_ViridianCityText_1920a:: + text "Ahh, I've had my" + line "coffee now and I" + cont "feel great!" + + para "Sure, you can go" + line "through!" + + para "I'm sorry I was" + line "so rude to you!" + + para "I see you're using" + line "a #DEX." + + para "I'll show you how" + line "to catch #MON" + cont "as my apology." + done + +_OldManTextAfterBattle:: + text "That didn't work!" + line "I must be losing" + cont "my touch." + + para "I've run out of" + line "# BALLs too." + + para "I have to get some" + line "at #MON MART." + done + _ViridianCityText1:: text "Those # BALLs" line "at your waist!" @@ -5,7 +42,7 @@ _ViridianCityText1:: para "It's great that" line "you can carry and" - cont "use #MON any" + cont "use #MON any-" cont "time, anywhere!" done @@ -97,44 +134,21 @@ _TM42NoRoomText:: line "stuff already." done -_ViridianCityText_1920a:: - text "Ahh, I've had my" - line "coffee now and I" - cont "feel great!" - - para "Sure you can go" - line "through!" - - para "Are you in a" - line "hurry?" +_OldManAgainText1:: + text "Hmm? You want me" + line "to show you how" + cont "to catch #MON" + cont "again?" done -_ViridianCityText_1920f:: - text "I see you're using" - line "a #DEX." - - para "When you catch a" - line "#MON, #DEX" - cont "is automatically" - cont "updated." - - para "What? Don't you" - line "know how to catch" - cont "#MON?" - - para "I'll show you" - line "how to then." +_OldManAgainText2:: + text "Dandy! Watch what" + line "I do closely now!" done -_ViridianCityText_19214:: - text "Time is money..." - line "Go along then." - done - -_ViridianCityText_19219:: - text "First, you need" - line "to weaken the" - cont "target #MON." +_OldManAgainText3:: + text "Oh... I'm not good" + line "enough for you." done _ViridianCityText8:: diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm index 813b193a..f88a484c 100644 --- a/text/maps/viridian_forest.asm +++ b/text/maps/viridian_forest.asm @@ -9,7 +9,7 @@ _ViridianForestText1:: _ViridianForestBattleText1:: text "Hey! You have" line "#MON! Come on!" - cont "Let's battle'em!" + cont "Let's battle 'em!" done _ViridianForestEndBattleText1:: @@ -62,6 +62,40 @@ _ViridianFrstAfterBattleText3:: cont "dropped!" done +_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 + _ViridianForestText8:: 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 c1a8df22..a5278742 100644 --- a/text/maps/viridian_forest_entrance.asm +++ b/text/maps/viridian_forest_entrance.asm @@ -6,8 +6,11 @@ _ViridianForestEntranceText1:: done _ViridianForestEntranceText2:: - text "RATTATA may be" - line "small, but its" - cont "bite is wicked!" - cont "Did you get one?" + 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 diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm index df04e6d6..795447a5 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/viridian_gym.asm @@ -38,7 +38,7 @@ _ViridianGymText_74ad9:: cont "of #MON!" para "Let us meet again" - line "some day!" + line "someday!" cont "Farewell!@@" _ViridianGymText12:: @@ -205,7 +205,7 @@ _ViridianGymEndBattleText8:: prompt _ViridianGymAfterBattleText8:: - text "You can go onto" + text "You can go on to" 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 aa199335..5f4e147c 100644 --- a/text/maps/viridian_mart.asm +++ b/text/maps/viridian_mart.asm @@ -20,11 +20,13 @@ ViridianMartParcelQuestText:: line "OAK's PARCEL!@@" _ViridianMartText2:: - text "This shop sells" - line "many ANTIDOTEs." + text "This shop sells a" + line "lot of PARLYZ" + cont "HEALs." done _ViridianMartText3:: - text "No! POTIONs are" - line "all sold out." + text "The shop finally" + line "has some POTIONs" + cont "in stock." done diff --git a/text/maps/viridian_pokecenter.asm b/text/maps/viridian_pokecenter.asm index 4ac18bf6..4ac18bf6 100644..100755 --- a/text/maps/viridian_pokecenter.asm +++ b/text/maps/viridian_pokecenter.asm |