From 72b5bd7b0e7b3f2302be6724ea6edfeb13971948 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sat, 30 Dec 2023 15:39:34 +0000 Subject: [PATCH] Fixing some text inconsistencies --- data/text/item_descriptions.asm | 2 +- text/BrunswickTrail.asm | 4 ++-- text/CeladonCity.asm | 6 +++-- text/CeladonGym.asm | 21 ++++++++--------- text/CeruleanGym.asm | 12 +++++----- text/CinnabarGym.asm | 40 +++++++++++++++++++-------------- text/CitrineCity.asm | 2 +- text/CitrineTradebackHouse.asm | 2 +- text/FightingDojo.asm | 3 ++- text/FuchsiaGym_2.asm | 2 +- text/GameCorner.asm | 5 +++-- text/LoreleisRoom.asm | 2 +- text/OaksLab.asm | 12 +++++----- text/PewterCity.asm | 2 +- text/PewterGym.asm | 2 +- text/PokemonMansionB2F.asm | 2 +- text/RockTunnelB1F.asm | 2 +- text/Route1.asm | 2 +- text/Route9.asm | 6 ++--- text/SaffronCity.asm | 2 +- text/SaffronGym.asm | 11 ++++----- text/VermilionGym_2.asm | 13 ++++++----- text/ViridianGym.asm | 10 +++------ 23 files changed, 88 insertions(+), 77 deletions(-) diff --git a/data/text/item_descriptions.asm b/data/text/item_descriptions.asm index 1c7744a0..96404035 100644 --- a/data/text/item_descriptions.asm +++ b/data/text/item_descriptions.asm @@ -524,7 +524,7 @@ _TM26Description:: prompt _TM27Description:: - text "A ground-type," + text "A GROUND-type," next "one-hit KO attack." prompt diff --git a/text/BrunswickTrail.asm b/text/BrunswickTrail.asm index f59e7135..40c97b8f 100644 --- a/text/BrunswickTrail.asm +++ b/text/BrunswickTrail.asm @@ -41,7 +41,7 @@ _Lover2:: _BrunswickBattleText1:: text "I'm searching" - line "for rare BIRD" + line "for rare bird" cont "#MON!" done @@ -69,7 +69,7 @@ _BrunswickEndBattleText2:: prompt _BrunswickAfterBattleText2:: - text "I saw a BIRD" + text "I saw a bird" line "#MON with huge" cont "legs sprint past" cont "me!" diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index a0e4826e..6d05a2b0 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -67,7 +67,8 @@ _CeladonCityText6:: para "It evolved from" line "POLIWHIRL when I" - cont "used WATER STONE!" + cont "gave it a WATER" + cont "STONE!" done _CeladonCityText7:: @@ -138,7 +139,8 @@ _CeladonCityText16:: line "protects #MON" cont "against SPECIAL" cont "attacks such as" - cont "fire and water!" + cont "FIRE- and WATER-" + cont "type techniques!" para "It even improves" line "their own!" diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index 80bfd30a..fea9feee 100644 --- a/text/CeladonGym.asm +++ b/text/CeladonGym.asm @@ -14,7 +14,7 @@ _ErikaPreBattleText:: para "I teach the art of" line "flower arranging." cont "My #MON are of" - cont "the grass-type." + cont "the GRASS-type." para "Oh, I'm sorry, I" line "had no idea that" @@ -110,13 +110,14 @@ _CeladonGymEndBattleText3:: prompt _CeladonGymAfterBattleText3:: - text "Grass-type #MON" + text "GRASS-type #MON" line "are tough against" - cont "the water-type!" + cont "the WATER-type!" para "They also have an" - line "edge on rock and" - cont "ground #MON!" + line "advantage against" + cont "ROCK- and GROUND-" + cont "type #MON!" done _CeladonGymBattleText4:: @@ -137,8 +138,8 @@ _CeladonGymAfterBattleText4:: done _CeladonGymBattleText5:: - text "Look at my grass" - line "#MON!" + text "Look at my GRASS-" + line "type #MON!" para "They're so easy" line "to raise!" @@ -149,7 +150,7 @@ _CeladonGymEndBattleText5:: prompt _CeladonGymAfterBattleText5:: - text "We only use grass-" + text "We only use GRASS-" line "type #MON at" cont "our GYM!" @@ -160,8 +161,8 @@ _CeladonGymAfterBattleText5:: _CeladonGymBattleText6:: text "Don't bring any" - line "bugs or fire" - cont "#MON in here!" + line "BUG- or FIRE-" + cont "type #MON!" done _CeladonGymEndBattleText6:: diff --git a/text/CeruleanGym.asm b/text/CeruleanGym.asm index d8643b6c..f71453b1 100644 --- a/text/CeruleanGym.asm +++ b/text/CeruleanGym.asm @@ -13,7 +13,7 @@ _MistyPreBattleText:: para "My policy is an" line "all-out offensive" - cont "with water-type" + cont "with WATER-type" cont "#MON!" done @@ -111,8 +111,8 @@ _CeruleanGymEndBattleText3:: _CeruleanGymAfterBattleText3:: text "Why is a FIRE-" line "FIGHTER in a" - cont "GYM for water" - cont "#MON?" + cont "GYM for WATER-" + cont "type #MON?" para "Haha! You have to" ; Actually happens in real life! line "check for short" @@ -121,13 +121,13 @@ _CeruleanGymAfterBattleText3:: _CeruleanGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "Here's my advice!" para "The LEADER, MISTY," line "is a pro who uses" - cont "water #MON!" + cont "WATER-types!" para "You can drain all" line "their water with" @@ -141,7 +141,7 @@ _CeruleanGymGuidePostBattleText:: 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/CinnabarGym.asm b/text/CinnabarGym.asm index 7328f9e5..703a5a19 100644 --- a/text/CinnabarGym.asm +++ b/text/CinnabarGym.asm @@ -23,11 +23,11 @@ _ReceivedVolcanoBadgeText:: _BlainePostBattleAdviceText:: text "FIRE BLAST is the" - line "ultimate fire" + line "ultimate fiery" cont "technique!" para "Don't waste it on" - line "water #MON!" + line "WATER-types!" done _BlaineVolcanoBadgeInfoText:: @@ -55,7 +55,7 @@ _TM38ExplanationText:: para "TM38 contains" line "FIRE BLAST!" - para "Teach it to fire-" + para "Teach it to FIRE-" line "type #MON!" para "CHARMELEON or" @@ -124,7 +124,7 @@ _CinnabarGymAfterBattleText3:: _CinnabarGymBattleText4:: text "I just like using" - line "fire #MON!" + line "the FIRE-type!" done _CinnabarGymEndBattleText4:: @@ -133,9 +133,9 @@ _CinnabarGymEndBattleText4:: prompt _CinnabarGymAfterBattleText4:: - text "I wish there was" - line "a thief #MON!" - cont "I'd use that!" + text "I wonder...does a" + line "FIRE-type thief" + cont "#MON exist?" done _CinnabarGymBattleText5:: @@ -170,9 +170,9 @@ _CinnabarGymEndBattleText6:: prompt _CinnabarGymAfterBattleText6:: - text "Us fire #MON" - line "fans like PONYTA" - cont "and NINETALES!" + text "Us FIRE-type fans" + line "like PONYTA and" + cont "NINETALES a lot!" done _CinnabarGymBattleText7:: @@ -186,21 +186,27 @@ _CinnabarGymEndBattleText7:: prompt _CinnabarGymAfterBattleText7:: - text "Water beats fire!" - line "But, fire melts" - cont "ice #MON!" + text "Water beats fire," + line "but fire easily" + cont "melts ice!" + + para "WATER- and ICE-" + line "type #MON like" + cont "DEWGONG can be" + cont "tricky..." done _CinnabarGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "The hot-headed" - line "BLAINE is a fire" - cont "#MON pro!" + line "BLAINE is a FIRE-" + cont "type #MON pro!" para "Douse his spirits" - line "with water!" + line "with WATER-type" + cont "techniques!" para "You better take" line "some BURN HEALs!" diff --git a/text/CitrineCity.asm b/text/CitrineCity.asm index 10525626..fc9d55f4 100644 --- a/text/CitrineCity.asm +++ b/text/CitrineCity.asm @@ -75,7 +75,7 @@ _CitrineCityText3:: done _CitrineCityText4:: - text "Some BIRD #MON" + text "Some bird #MON" line "roost on the" cont "hill north of" cont "here every year." diff --git a/text/CitrineTradebackHouse.asm b/text/CitrineTradebackHouse.asm index 5efef4ea..fc1604f8 100644 --- a/text/CitrineTradebackHouse.asm +++ b/text/CitrineTradebackHouse.asm @@ -10,6 +10,6 @@ _CitrineTradebackHouseGuy:: _CitrineTradebackHouseBooklet:: text "It's a book showing" - line "two strange BIRD" + line "two strange bird" cont "#MON." done diff --git a/text/FightingDojo.asm b/text/FightingDojo.asm index 7d7ba24a..d9c56be9 100644 --- a/text/FightingDojo.asm +++ b/text/FightingDojo.asm @@ -28,7 +28,8 @@ _FightingDojoText_5ce98:: para "In return, I will" line "give you a prized" - cont "fighting #MON!" + cont "FIGHTING-type" + cont "#MON!" para "Choose whichever" line "one you like!" diff --git a/text/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm index c256e019..4f76173c 100644 --- a/text/FuchsiaGym_2.asm +++ b/text/FuchsiaGym_2.asm @@ -172,7 +172,7 @@ _FuchsiaGymAfterBattleText6:: _FuchsiaGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "FUCHSIA GYM is" line "riddled with" diff --git a/text/GameCorner.asm b/text/GameCorner.asm index 1868daf8..a237090c 100644 --- a/text/GameCorner.asm +++ b/text/GameCorner.asm @@ -88,11 +88,12 @@ _CeladonGameCornerText_48dca:: para "You have better" line "things to do," - cont "champ in making!" + cont "champ in the" + cont "making!" para "CELADON GYM's" line "LEADER is ERIKA!" - cont "She uses grass-" + cont "She uses GRASS-" cont "type #MON!" para "She might appear" diff --git a/text/LoreleisRoom.asm b/text/LoreleisRoom.asm index 868cb7f3..b9bb8a17 100644 --- a/text/LoreleisRoom.asm +++ b/text/LoreleisRoom.asm @@ -60,7 +60,7 @@ _LoreleiRematchAfterBattleText:: text "I may have lost" line "to you, but I'll" cont "never give up on" - cont "ice #MON!" + cont "icy #MON!" para "You should aim to" line "win using #MON" diff --git a/text/OaksLab.asm b/text/OaksLab.asm index f384f56c..c40f65c2 100644 --- a/text/OaksLab.asm +++ b/text/OaksLab.asm @@ -27,32 +27,32 @@ _OaksLabText39:: _OaksLabCharmanderText:: text "So! You want the" - line "fire #MON," + line "FIRE #MON," cont "CHARMANDER?" done _OaksLabSquirtleText:: text "So! You want the" - line "water #MON," + line "WATER #MON," cont "SQUIRTLE?" done _OaksLabBulbasaurText:: text "So! You want the" - line "plant #MON," + line "GRASS #MON," cont "BULBASAUR?" done _OaksLabPikachuText:: text "So! You want the" - line "electric #MON," + line "mouse #MON," cont "PIKACHU?" done _OaksLabEeveeText:: text "So! You want the" - line "normal #MON," - cont "EEVEE?" + line "evolution #-" + cont "MON, EEVEE?" done _OaksLabMonEnergeticText:: diff --git a/text/PewterCity.asm b/text/PewterCity.asm index 14240c9e..3e579462 100644 --- a/text/PewterCity.asm +++ b/text/PewterCity.asm @@ -1,6 +1,6 @@ _PewterCityText1:: text "It's rumored that" - line "CLEFAIRYs came" + line "CLEFAIRY came" cont "from the moon!" para "They appeared " diff --git a/text/PewterGym.asm b/text/PewterGym.asm index 8110b116..47293b6a 100644 --- a/text/PewterGym.asm +++ b/text/PewterGym.asm @@ -9,7 +9,7 @@ _BrockPreBattleText:: para "That's why my" line "#MON are all" - cont "the rock-type!" + cont "the ROCK-type!" para "Do you still want" line "to challenge me?" diff --git a/text/PokemonMansionB2F.asm b/text/PokemonMansionB2F.asm index 01974718..9242d0f9 100644 --- a/text/PokemonMansionB2F.asm +++ b/text/PokemonMansionB2F.asm @@ -6,7 +6,7 @@ _B2FBook1:: para "We are getting" line "high energy" cont "readings from" - cont "MEWTWO's PSYCHIC" + cont "MEWTWO's psychic" cont "power!" para "But..." diff --git a/text/RockTunnelB1F.asm b/text/RockTunnelB1F.asm index 1a565eb3..bbfd98b6 100644 --- a/text/RockTunnelB1F.asm +++ b/text/RockTunnelB1F.asm @@ -77,7 +77,7 @@ _RockTunnel2EndBattleText6:: _RockTunnel2AfterBattleText6:: text "In mountains," line "you'll often find" - cont "rock-type #MON." + cont "ROCK-type #MON." done _RockTunnel2BattleText7:: diff --git a/text/Route1.asm b/text/Route1.asm index da7ba7c2..85b6a7a2 100644 --- a/text/Route1.asm +++ b/text/Route1.asm @@ -146,7 +146,7 @@ _OakCitrineExplain:: cont "go to become far" cont "stronger." - para "Some strange BIRD" + para "Some strange bird" line "#MON are said" cont "to roost there," cont "but they are so" diff --git a/text/Route9.asm b/text/Route9.asm index 9975000d..cbdc42e5 100644 --- a/text/Route9.asm +++ b/text/Route9.asm @@ -135,8 +135,8 @@ _Route9AfterBattleText8:: done _Route9BattleText9:: - text "Go, my super bug" - line "#MON!" + text "Go, my super BUG-" + line "type #MON!" done _Route9EndBattleText9:: @@ -146,7 +146,7 @@ _Route9EndBattleText9:: _Route9AfterBattleText9:: text "If you don't like" - line "bug #MON, you" + line "bugs, you really" cont "bug me!" done diff --git a/text/SaffronCity.asm b/text/SaffronCity.asm index 3b8cc3e0..0fc7ee73 100644 --- a/text/SaffronCity.asm +++ b/text/SaffronCity.asm @@ -102,7 +102,7 @@ _SaffronCityText18:: cont "LEADER: SABRINA" para "The Master of" - line "Psychic #MON!" + line "PSI #MON!" done _SaffronCityText20:: diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index 8a39e02f..517ec61e 100644 --- a/text/SaffronGym.asm +++ b/text/SaffronGym.asm @@ -72,15 +72,15 @@ _TM46NoRoomText:: _SaffronGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "SABRINA's #MON" line "use psychic power" cont "instead of force!" - para "Fighting #MON" + para "FIGHTING-types" line "are weak against" - cont "psychic #MON!" + cont "psychic power!" para "They get creamed" line "before they can" @@ -129,8 +129,9 @@ _SaffronGymEndBattleText2:: prompt _SaffronGymAfterBattleText2:: - text "Psychic #MON" - line "fear only bugs!" ; changed to the Yellow version because this guy LIES in RGB + text "PSYCHIC-types are" + line "afraid of DARK-" + cont "and BUG-types!" done _SaffronGymBattleText3:: diff --git a/text/VermilionGym_2.asm b/text/VermilionGym_2.asm index be6198df..5f7a113e 100644 --- a/text/VermilionGym_2.asm +++ b/text/VermilionGym_2.asm @@ -6,7 +6,7 @@ _LTSurgePostBattleAdviceText:: line "sure powerful!" para "But, it's useless" - line "against ground-" + line "against GROUND-" cont "type #MON!" done @@ -37,7 +37,9 @@ _TM24ExplanationText:: line "THUNDERBOLT!" para "Teach it to an" - line "electric #MON!" + line "ELECTRIC-type," + cont "like PIKACHU or" + cont "GAOTORA!" done _TM24NoRoomText:: @@ -119,7 +121,7 @@ _VermilionGymAfterBattleText3:: _VermilionGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "LT.SURGE has a" line "nickname. People" @@ -128,9 +130,10 @@ _VermilionGymGuidePreBattleText:: cont "American!" para "He's an expert on" - line "electric #MON!" + line "ELECTRIC-type" + cont "#MON!" - para "Birds and water" + para "Birds and aquatic" line "#MON are at" cont "risk! Beware of" cont "paralysis too!" diff --git a/text/ViridianGym.asm b/text/ViridianGym.asm index 5544e433..d02a6f9f 100644 --- a/text/ViridianGym.asm +++ b/text/ViridianGym.asm @@ -143,7 +143,7 @@ _ViridianGymEndBattleText4:: _ViridianGymAfterBattleText4:: text "If my #MON" line "were as good at" - cont "Karate as I..." + cont "karate as I..." done _ViridianGymBattleText5:: @@ -214,11 +214,7 @@ _ViridianGymAfterBattleText8:: _ViridianGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" - - para "Even I don't know" - line "VIRIDIAN LEADER's" - cont "identity!" + line "the making!" para "This will be the" line "toughest of all" @@ -226,7 +222,7 @@ _ViridianGymGuidePreBattleText:: para "I heard that the" line "trainers here" - cont "like ground-type" + cont "like GROUND-type" cont "#MON!" done