diff options
Diffstat (limited to 'text')
71 files changed, 298 insertions, 193 deletions
diff --git a/text/BikeShop.asm b/text/BikeShop.asm index 86799865..5d71133c 100644 --- a/text/BikeShop.asm +++ b/text/BikeShop.asm @@ -27,7 +27,8 @@ _BikeShopText_1d81f:: _BikeShopText_1d824:: text "<PLAYER> exchanged" line "the BIKE VOUCHER" - cont "for a BICYCLE.@@" + cont "for a BICYCLE.@" + text_end _BikeShopComeAgainText:: text "Come back again" diff --git a/text/BillsHouse.asm b/text/BillsHouse.asm index 5ece48d7..11bb3200 100644 --- a/text/BillsHouse.asm +++ b/text/BillsHouse.asm @@ -56,8 +56,9 @@ _BillThankYouText:: _SSTicketReceivedText:: text "<PLAYER> received" line "an @" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _SSTicketNoRoomText:: text "You've got too" diff --git a/text/BluesHouse.asm b/text/BluesHouse.asm index 1898636a..a9b9ca47 100644 --- a/text/BluesHouse.asm +++ b/text/BluesHouse.asm @@ -14,8 +14,9 @@ _DaisyOfferMapText:: _GotMapText:: text "<PLAYER> got a" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _DaisyBagFullText:: text "You have too much" diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index 1dbd5cdf..76fa1775 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -42,8 +42,9 @@ _TM41PreText:: _ReceivedTM41Text:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM41ExplanationText:: text "TM41 teaches" @@ -72,7 +73,8 @@ _CeladonCityText6:: _CeladonCityText7:: text "POLIWRATH: Ribi" - line "ribit!@@" + line "ribit!@" + text_end _CeladonCityText8:: text "What are you" diff --git a/text/CeladonDiner.asm b/text/CeladonDiner.asm index dc5e9350..dd86a0c1 100644 --- a/text/CeladonDiner.asm +++ b/text/CeladonDiner.asm @@ -44,8 +44,9 @@ _CeladonDinerText_491a7:: _ReceivedCoinCaseText:: text "<PLAYER> received" line "a @" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _CoinCaseNoRoomText:: text "Make room for" diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index d6586035..5d354bbb 100644 --- a/text/CeladonGym.asm +++ b/text/CeladonGym.asm @@ -64,11 +64,12 @@ _CeladonGymText9:: _ReceivedTM21Text:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM21ExplanationText:: - text "" + text_start para "TM21 contains" line "MEGA DRAIN." diff --git a/text/CeladonMansion1F.asm b/text/CeladonMansion1F.asm index fc175cd5..14a48a81 100644 --- a/text/CeladonMansion1F.asm +++ b/text/CeladonMansion1F.asm @@ -1,5 +1,6 @@ _CeladonMansion1Text1:: - text "MEOWTH: Meow!@@" + text "MEOWTH: Meow!@" + text_end _CeladonMansion1Text2:: text "My dear #MON" @@ -11,11 +12,13 @@ _CeladonMansion1Text2:: _CeladonMansion1Text3:: text "CLEFAIRY: Pi" - line "pippippi!@@" + line "pippippi!@" + text_end _CeladonMansion1Text4:: text "NIDORAN: Kya" - line "kyaoo!@@" + line "kyaoo!@" + text_end _CeladonMansion1Text5:: text "CELADON MANSION" diff --git a/text/CeladonMansion3F.asm b/text/CeladonMansion3F.asm index c8858281..714ecf19 100644 --- a/text/CeladonMansion3F.asm +++ b/text/CeladonMansion3F.asm @@ -39,7 +39,8 @@ _CompletedDexText:: line "You completed" cont "your #DEX!" cont "Congratulations!" - cont "...@@" + cont "...@" + text_end _CeladonMansion3Text5:: text "It's the game" diff --git a/text/CeladonMart3F.asm b/text/CeladonMart3F.asm index 8211750d..9871a5ae 100644 --- a/text/CeladonMart3F.asm +++ b/text/CeladonMart3F.asm @@ -10,8 +10,9 @@ _TM18PreReceiveText:: _ReceivedTM18Text:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM18ExplanationText:: text "TM18 is COUNTER!" diff --git a/text/CeladonMartRoof.asm b/text/CeladonMartRoof.asm index 1ed52e86..15bf8c04 100644 --- a/text/CeladonMartRoof.asm +++ b/text/CeladonMartRoof.asm @@ -11,24 +11,27 @@ _CeladonMartRoofText_484f3:: para "Thank you!" para "You can have this" - line "from me!@@" + line "from me!@" + text_end _CeladonMartRoofText_484f9:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _CeladonMartRoofText_484fe:: - text "" + text_start para "@" - TX_RAM wcf4b + text_ram wcf4b text " contains" line "ICE BEAM!" para "It can freeze the" - line "target sometimes!@@" + line "target sometimes!@" + text_end _CeladonMartRoofText_48504:: text "Yay!" @@ -38,24 +41,27 @@ _CeladonMartRoofText_48504:: para "Thank you!" para "You can have this" - line "from me!@@" + line "from me!@" + text_end _CeladonMartRoofText_4850a:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _CeladonMartRoofText_4850f:: - text "" + text_start para "@" - TX_RAM wcf4b + text_ram wcf4b text " contains" line "ROCK SLIDE!" para "It can spook the" - line "target sometimes!@@" + line "target sometimes!@" + text_end _CeladonMartRoofText_48515:: text "Yay!" @@ -65,26 +71,31 @@ _CeladonMartRoofText_48515:: para "Thank you!" para "You can have this" - line "from me!@@" + line "from me!@" + text_end _ReceivedTM49Text:: text "<PLAYER> received" - line "TM49!@@" + line "TM49!@" + text_end _CeladonMartRoofText_48520:: - text "" + text_start para "TM49 contains" - line "TRI ATTACK!@@" + line "TRI ATTACK!@" + text_end _CeladonMartRoofText_48526:: text "You don't have" - line "space for this!@@" + line "space for this!@" + text_end _CeladonMartRoofText_4852c:: text "No thank you!" line "I'm not thirsty" - cont "after all!@@" + cont "after all!@" + text_end _CeladonMartRoofText1:: text "My sister is a" @@ -126,8 +137,8 @@ _VendingMachineText4:: done _VendingMachineText5:: - TX_RAM wcf4b - text "" + text_ram wcf4b + text_start line "popped out!" done diff --git a/text/CeruleanCaveB1F.asm b/text/CeruleanCaveB1F.asm index 0918a3ce..cb407c60 100644 --- a/text/CeruleanCaveB1F.asm +++ b/text/CeruleanCaveB1F.asm @@ -1,2 +1,3 @@ _MewtwoBattleText:: - text "Mew!@@" + text "Mew!@" + text_end diff --git a/text/CeruleanCity.asm b/text/CeruleanCity.asm index f0d2c29e..d0884a39 100644 --- a/text/CeruleanCity.asm +++ b/text/CeruleanCity.asm @@ -70,13 +70,15 @@ _CeruleanCityText_196d9:: _ReceivedTM28Text:: text "<PLAYER> recovered" - line "TM28!@@" + line "TM28!@" + text_end _ReceivedTM28Text2:: - text "" + text_start para "I better get" - line "moving! Bye!@@" + line "moving! Bye!@" + text_end _TM28NoRoomText:: text "Make room for" diff --git a/text/CeruleanGym.asm b/text/CeruleanGym.asm index 1d1d6d1c..d302ec3a 100644 --- a/text/CeruleanGym.asm +++ b/text/CeruleanGym.asm @@ -47,7 +47,8 @@ _CeruleanGymText_5c7c8:: _ReceivedTM11Text:: text "<PLAYER> received" - line "TM11!@@" + line "TM11!@" + text_end _CeruleanGymText_5c7d3:: text "You better make" @@ -62,7 +63,8 @@ _CeruleanGymText_5c7d8:: para "You can have the" line "CASCADEBADGE to" - cont "show you beat me!@@" + cont "show you beat me!@" + text_end _CeruleanGymBattleText1:: text "I'm more than good" diff --git a/text/ChampionsRoom.asm b/text/ChampionsRoom.asm index 61050565..575b7da4 100644 --- a/text/ChampionsRoom.asm +++ b/text/ChampionsRoom.asm @@ -96,7 +96,7 @@ _GaryText_76120:: line "much since you" cont "first left with" cont "@" - TX_RAM wcd6d + text_ram wcd6d text "!" para "<PLAYER>, you have" diff --git a/text/CinnabarGym.asm b/text/CinnabarGym.asm index 1b531571..bf6cc0fb 100644 --- a/text/CinnabarGym.asm +++ b/text/CinnabarGym.asm @@ -18,7 +18,8 @@ _BlaineEndBattleText:: line "burnt out!" para "You have earned" - line "the VOLCANOBADGE!@@" + line "the VOLCANOBADGE!@" + text_end _BlaineFireBlastText:: text "FIRE BLAST is the" @@ -44,11 +45,12 @@ _BlaineBadgeText:: _ReceivedTM38Text:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM38ExplanationText:: - text "" + text_start para "TM38 contains" line "FIRE BLAST!" diff --git a/text/CinnabarLabFossilRoom.asm b/text/CinnabarLabFossilRoom.asm index 95bde685..e7983fe9 100644 --- a/text/CinnabarLabFossilRoom.asm +++ b/text/CinnabarLabFossilRoom.asm @@ -30,20 +30,20 @@ _Lab4Text_75dd5:: line "back to life!" para "It was @" - TX_RAM wcf4b - text "" + text_ram wcf4b + text_start line "like I think!" prompt _Lab4Text_610ae:: text "Oh! That is" line "@" - TX_RAM wcd6d + text_ram wcd6d text "!" para "It is fossil of" line "@" - TX_RAM wcf4b + text_ram wcf4b text ", a" cont "#MON that is" cont "already extinct!" @@ -60,7 +60,7 @@ _Lab4Text_610b3:: para "<PLAYER> handed" line "over @" - TX_RAM wcd6d + text_ram wcd6d text "!" prompt diff --git a/text/CinnabarLabMetronomeRoom.asm b/text/CinnabarLabMetronomeRoom.asm index fa04677f..f9b2c5d5 100644 --- a/text/CinnabarLabMetronomeRoom.asm +++ b/text/CinnabarLabMetronomeRoom.asm @@ -9,8 +9,9 @@ _TM35PreReceiveText:: _ReceivedTM35Text:: text "<PLAYER> received " line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM35ExplanationText:: text "Tch-tch-tch!" diff --git a/text/CopycatsHouse1F.asm b/text/CopycatsHouse1F.asm index 3ec2b151..0bf84558 100644 --- a/text/CopycatsHouse1F.asm +++ b/text/CopycatsHouse1F.asm @@ -17,4 +17,5 @@ _CopycatsHouse1FText2:: _CopycatsHouse1FText3:: text "CHANSEY: Chaan!" - line "Sii!@@" + line "Sii!@" + text_end diff --git a/text/CopycatsHouse2F.asm b/text/CopycatsHouse2F.asm index 561b2ac5..7d1aa0ad 100644 --- a/text/CopycatsHouse2F.asm +++ b/text/CopycatsHouse2F.asm @@ -29,17 +29,19 @@ _TM31PreReceiveText:: _ReceivedTM31Text:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM31ExplanationText1:: - text "" + text_start para "TM31 contains my" line "favorite, MIMIC!" para "Use it on a good" - line "#MON!@@" + line "#MON!@" + text_end _TM31ExplanationText2:: text "<PLAYER>: Hi!" @@ -57,7 +59,8 @@ _TM31ExplanationText2:: _TM31NoRoomText:: text "Don't you want" - line "this?@@" + line "this?@" + text_end _CopycatsHouse2FText2:: text "DODUO: Giiih!" diff --git a/text/Daycare.asm b/text/Daycare.asm index 2759c798..197927dd 100644 --- a/text/Daycare.asm +++ b/text/Daycare.asm @@ -13,8 +13,8 @@ _DayCareWhichMonText:: _DayCareWillLookAfterMonText:: text "Fine, I'll look" line "after @" - TX_RAM wcd6d - text "" + text_ram wcd6d + text_start cont "for a while." prompt @@ -25,13 +25,13 @@ _DayCareComeSeeMeInAWhileText:: _DayCareMonHasGrownText:: text "Your @" - TX_RAM wcd6d - text "" + text_ram wcd6d + text_start line "has grown a lot!" para "By level, it's" line "grown by @" - TX_NUM wDayCareNumLevelsGrown,$1,$3 + text_decimal wDayCareNumLevelsGrown, 1, 3 text "!" para "Aren't I great?" @@ -39,8 +39,8 @@ _DayCareMonHasGrownText:: _DayCareOweMoneyText:: text "You owe me ¥@" - TX_BCD wDayCareTotalCost, $c2 - text "" + text_bcd wDayCareTotalCost, 2 | LEADING_ZEROES | LEFT_ALIGN + text_start line "for the return" cont "of this #MON." done @@ -48,15 +48,15 @@ _DayCareOweMoneyText:: _DayCareGotMonBackText:: text "<PLAYER> got" line "@" - TX_RAM wDayCareMonName + text_ram wDayCareMonName text " back!" done _DayCareMonNeedsMoreTimeText:: text "Back already?" line "Your @" - TX_RAM wcd6d - text "" + text_ram wcd6d + text_start cont "needs some more" cont "time with me." prompt diff --git a/text/Daycare_2.asm b/text/Daycare_2.asm index 20c0e5ad..7efb200e 100644 --- a/text/Daycare_2.asm +++ b/text/Daycare_2.asm @@ -1,6 +1,7 @@ _DayCareAllRightThenText:: text "All right then," - line "@@" + line "@" + text_end _DayCareComeAgainText:: text "come again." diff --git a/text/FuchsiaGoodRodHouse.asm b/text/FuchsiaGoodRodHouse.asm index b1b8b2f2..142c2837 100644 --- a/text/FuchsiaGoodRodHouse.asm +++ b/text/FuchsiaGoodRodHouse.asm @@ -19,8 +19,9 @@ _FuchsiaHouse3Text_561c2:: para "<PLAYER> received" line "a @" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _FuchsiaHouse3Text_56212:: text "Oh... That's so" diff --git a/text/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm index f7b39d9c..e8043e24 100644 --- a/text/FuchsiaGym_2.asm +++ b/text/FuchsiaGym_2.asm @@ -27,11 +27,12 @@ _FuchsiaGymText9:: _ReceivedTM06Text:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM06ExplanationText:: - text "" + text_start para "TM06 contains" line "TOXIC!" diff --git a/text/GameCorner.asm b/text/GameCorner.asm index 1e59f83e..1868daf8 100644 --- a/text/GameCorner.asm +++ b/text/GameCorner.asm @@ -65,7 +65,8 @@ _CeladonGameCornerText_48d9c:: _Received10CoinsText:: text "<PLAYER> received" - line "10 coins!@@" + line "10 coins!@" + text_end _CeladonGameCornerText_48da7:: text "You don't need my" @@ -122,7 +123,8 @@ _CeladonGameCornerText_48e26:: _Received20CoinsText:: text "<PLAYER> received" - line "20 coins!@@" + line "20 coins!@" + text_end _CeladonGameCornerText_48e31:: text "You have lots of" @@ -144,7 +146,8 @@ _CeladonGameCornerText_48e88:: _CeladonGameCornerText_48e8d:: text "<PLAYER> received" - line "20 coins!@@" + line "20 coins!@" + text_end _CeladonGameCornerText_48e93:: text "You've got your" @@ -178,7 +181,8 @@ _CeladonGameCornerText_48f09:: para "A switch behind" line "the poster!?" - cont "Let's push it!@@" + cont "Let's push it!@" + text_end _CeladonGameCornerText_48f19:: text "Oops! Forgot the" diff --git a/text/LancesRoom.asm b/text/LancesRoom.asm index ed3dcada..2531b638 100644 --- a/text/LancesRoom.asm +++ b/text/LancesRoom.asm @@ -60,4 +60,5 @@ _LanceAfterBattleText:: para "He is the real" line "#MON LEAGUE" - cont "champion!@@" + cont "champion!@" + text_end diff --git a/text/LavenderCuboneHouse.asm b/text/LavenderCuboneHouse.asm index 66cc85a5..77b8598d 100644 --- a/text/LavenderCuboneHouse.asm +++ b/text/LavenderCuboneHouse.asm @@ -1,5 +1,6 @@ _LavenderHouse2Text1:: - text "CUBONE: Kyarugoo!@@" + text "CUBONE: Kyarugoo!@" + text_end _LavenderHouse2Text_1d9dc:: text "I hate those" diff --git a/text/MrFujisHouse.asm b/text/MrFujisHouse.asm index f903eb6a..2f76ad94 100644 --- a/text/MrFujisHouse.asm +++ b/text/MrFujisHouse.asm @@ -28,10 +28,12 @@ _LavenderHouse1Text_1d8f9:: done _LavenderHouse1Text3:: - text "PSYDUCK: Gwappa!@@" + text "PSYDUCK: Gwappa!@" + text_end _LavenderHouse1Text4:: - text "NIDORINO: Gaoo!@@" + text "NIDORINO: Gaoo!@" + text_end _LavenderHouse1Text_1d94c:: text "MR.FUJI: <PLAYER>." @@ -48,11 +50,12 @@ _LavenderHouse1Text_1d94c:: _ReceivedFluteText:: text "<PLAYER> received" line "a @" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _FluteExplanationText:: - text "" + text_start para "Upon hearing #" line "FLUTE, sleeping" diff --git a/text/MrPsychicsHouse.asm b/text/MrPsychicsHouse.asm index 7be2e11e..5ac2c9af 100644 --- a/text/MrPsychicsHouse.asm +++ b/text/MrPsychicsHouse.asm @@ -8,8 +8,9 @@ _TM29PreReceiveText:: _ReceivedTM29Text:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM29ExplanationText:: text "TM29 is PSYCHIC!" diff --git a/text/MtMoonB1F.asm b/text/MtMoonB1F.asm index 755fa583..968b845f 100644 --- a/text/MtMoonB1F.asm +++ b/text/MtMoonB1F.asm @@ -1,3 +1,3 @@ _MtMoonText1:: - text "" + text_start done diff --git a/text/MtMoonB2F.asm b/text/MtMoonB2F.asm index 472649b9..f920e0fb 100644 --- a/text/MtMoonB2F.asm +++ b/text/MtMoonB2F.asm @@ -11,12 +11,14 @@ _MtMoon3Text_49f64:: _MtMoon3Text_49f6f:: text "<PLAYER> got the" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _MtMoon3Text_49f7f:: text "Look, you've got" - line "no room for this.@@" + line "no room for this.@" + text_end _MtMoon3Text_49f85:: text "Hey, stop!" @@ -50,7 +52,8 @@ _MtMoon3Text_49f94:: _MtMoon3Text_49f99:: text "All right. Then" - line "this is mine!@@" + line "this is mine!@" + text_end _MtMoon3BattleText2:: text "TEAM ROCKET will" diff --git a/text/MtMoonPokecenter.asm b/text/MtMoonPokecenter.asm index 7bc99dae..dda62044 100644 --- a/text/MtMoonPokecenter.asm +++ b/text/MtMoonPokecenter.asm @@ -44,5 +44,5 @@ _MagikarpSalesmanText2:: done _MtMoonPokecenterText5:: - text "" + text_start done diff --git a/text/Museum1F.asm b/text/Museum1F.asm index 16431bda..be1bb2f7 100644 --- a/text/Museum1F.asm +++ b/text/Museum1F.asm @@ -82,7 +82,8 @@ _Museum1FText_5c28e:: _ReceivedOldAmberText:: text "<PLAYER> received" - line "OLD AMBER!@@" + line "OLD AMBER!@" + text_end _Museum1FText_5c299:: text "Ssh! Get the OLD" diff --git a/text/NameRatersHouse.asm b/text/NameRatersHouse.asm index 65d3e8a4..b5032144 100644 --- a/text/NameRatersHouse.asm +++ b/text/NameRatersHouse.asm @@ -14,7 +14,7 @@ _NameRaterText_1dab8:: prompt _NameRaterText_1dabd:: - TX_RAM wcd6d + text_ram wcd6d text ", is it?" line "That is a decent" cont "nickname!" @@ -35,7 +35,7 @@ _NameRaterText_1dac7:: text "OK! This #MON" line "has been renamed" cont "@" - TX_RAM wBuffer + text_ram wBuffer text "!" para "That's a better" @@ -48,13 +48,13 @@ _NameRaterText_1dacc:: done _NameRaterText_1dad1:: - TX_RAM wcd6d + text_ram wcd6d text ", is it?" line "That is a truly" cont "impeccable name!" para "Take good care of" line "@" - TX_RAM wcd6d + text_ram wcd6d text "!" done diff --git a/text/OaksLab.asm b/text/OaksLab.asm index 7a6f57b7..18ecadb7 100644 --- a/text/OaksLab.asm +++ b/text/OaksLab.asm @@ -51,8 +51,9 @@ _OaksLabMonEnergeticText:: _OaksLabReceivedMonText:: text "<PLAYER> received" line "a @" - TX_RAM wcd6d - text "!@@" + text_ram wcd6d + text "!@" + text_end _OaksLabLastMonText:: text "That's PROF.OAK's" @@ -96,10 +97,11 @@ _OaksLabDeliverParcelText1:: line "something for me?" para "<PLAYER> delivered" - line "OAK's PARCEL.@@" + line "OAK's PARCEL.@" + text_end _OaksLabDeliverParcelText2:: - text "" + text_start para "Ah! This is the" line "custom # BALL" cont "I ordered!" @@ -124,10 +126,11 @@ _OaksLabGivePokeballsText1:: cont "#MON." para "<PLAYER> got 5" - line "# BALLs!@@" + line "# BALLs!@" + text_end _OaksLabGivePokeballsText2:: - text "" + text_start para "When a wild" line "#MON appears," cont "it's fair game." @@ -240,8 +243,9 @@ _OaksLabRivalPickingMonText:: _OaksLabRivalReceivedMonText:: text "<RIVAL> received" line "a @" - TX_RAM wcd6d - text "!@@" + text_ram wcd6d + text "!@" + text_end _OaksLabRivalChallengeText:: text "<RIVAL>: Wait" @@ -310,7 +314,8 @@ _OaksLabText25:: cont "these with you!" para "<PLAYER> got" - line "#DEX from OAK!@@" + line "#DEX from OAK!@" + text_end _OaksLabText26:: text "To make a complete" @@ -363,10 +368,10 @@ _OaksLabText_441cc:: line "letion is:" para "@" - TX_NUM hDexRatingNumMonsSeen, 1, 3 + text_decimal hDexRatingNumMonsSeen, 1, 3 text " #MON seen" line "@" - TX_NUM hDexRatingNumMonsOwned, 1, 3 + text_decimal hDexRatingNumMonsOwned, 1, 3 text " #MON owned" para "PROF.OAK's" diff --git a/text/PalletTown.asm b/text/PalletTown.asm index d5eda74f..caaed3ac 100644 --- a/text/PalletTown.asm +++ b/text/PalletTown.asm @@ -1,6 +1,7 @@ _OakAppearsText:: text "OAK: Hey! Wait!" - line "Don't go out!@@" + line "Don't go out!@" + text_end _OakWalksUpText:: text "OAK: It's unsafe!" diff --git a/text/PewterGym_2.asm b/text/PewterGym_2.asm index 5312e4f2..b3c079a4 100644 --- a/text/PewterGym_2.asm +++ b/text/PewterGym_2.asm @@ -19,10 +19,11 @@ _TM34PreReceiveText:: _ReceivedTM34Text:: text "<PLAYER> received" - line "TM34!@@" + line "TM34!@" + text_end _TM34ExplanationText:: - text "" + text_start para "A TM contains a" line "technique that" @@ -59,10 +60,11 @@ _PewterGymText_5c4bc:: cont "the BOULDERBADGE!" para "<PLAYER> received" - line "the BOULDERBADGE!@@" + line "the BOULDERBADGE!@" + text_end _PewterGymText_5c4c1:: - text "" + text_start para "That's an official" line "#MON LEAGUE" diff --git a/text/PewterNidoranHouse.asm b/text/PewterNidoranHouse.asm index 450e8372..d4a092c8 100644 --- a/text/PewterNidoranHouse.asm +++ b/text/PewterNidoranHouse.asm @@ -1,5 +1,6 @@ _PewterHouse1Text1:: - text "NIDORAN: Bowbow!@@" + text "NIDORAN: Bowbow!@" + text_end _PewterHouse1Text2:: text "NIDORAN sit!" diff --git a/text/PokemonFanClub.asm b/text/PokemonFanClub.asm index 4827f2e8..87c273a6 100644 --- a/text/PokemonFanClub.asm +++ b/text/PokemonFanClub.asm @@ -85,11 +85,12 @@ FanClubChairStoryText:: ReceivedBikeVoucherText:: text "<PLAYER> received" line "a @" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end ExplainBikeVoucherText:: - text "" + text_start para "Exchange that for" line "a BICYCLE!" diff --git a/text/PowerPlant.asm b/text/PowerPlant.asm index e5df6674..dcdcd739 100644 --- a/text/PowerPlant.asm +++ b/text/PowerPlant.asm @@ -3,4 +3,5 @@ _VoltorbBattleText:: done _ZapdosBattleText:: - text "Gyaoo!@@" + text "Gyaoo!@" + text_end diff --git a/text/RocketHideoutB1F.asm b/text/RocketHideoutB1F.asm index 36117804..c4fcb4b1 100644 --- a/text/RocketHideoutB1F.asm +++ b/text/RocketHideoutB1F.asm @@ -1,5 +1,6 @@ _RocketHideout1EndBattleText6:: - text "Why...?@@" + text "Why...?@" + text_end _RocketHideout1BattleText2:: text "Who are you? How" diff --git a/text/RocketHideoutElevator.asm b/text/RocketHideoutElevator.asm index 6f2aa638..1b8ba561 100644 --- a/text/RocketHideoutElevator.asm +++ b/text/RocketHideoutElevator.asm @@ -1,3 +1,4 @@ _RocketElevatorText_4578b:: text "It appears to" - line "need a key.@@" + line "need a key.@" + text_end diff --git a/text/Route1.asm b/text/Route1.asm index 73188f09..bf32af26 100644 --- a/text/Route1.asm +++ b/text/Route1.asm @@ -15,8 +15,9 @@ _Route1ViridianMartSampleText:: _Route1Text_1cae8:: text "<PLAYER> got" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _Route1Text_1caee:: text "We also carry" diff --git a/text/Route12Gate2F.asm b/text/Route12Gate2F.asm index 95a89527..b5a6465f 100644 --- a/text/Route12Gate2F.asm +++ b/text/Route12Gate2F.asm @@ -10,7 +10,8 @@ _TM39PreReceiveText:: _ReceivedTM39Text:: text "<PLAYER> received" - line "TM39!@@" + line "TM39!@" + text_end _TM39ExplanationText:: text "TM39 is a move" diff --git a/text/Route12SuperRodHouse.asm b/text/Route12SuperRodHouse.asm index 7dfaa74f..ff633d3a 100644 --- a/text/Route12SuperRodHouse.asm +++ b/text/Route12SuperRodHouse.asm @@ -18,11 +18,12 @@ _Route12HouseText_564c5:: para "<PLAYER> received" line "a @" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _Route12HouseText_564ca:: - text "" + text_start para "Fishing is a way" line "of life!" diff --git a/text/Route15.asm b/text/Route15.asm index a23b8500..9dc0e6ba 100644 --- a/text/Route15.asm +++ b/text/Route15.asm @@ -162,7 +162,8 @@ _Route15EndBattleText10:: _Route15AfterBattleText10:: text "I'll go train with" - line "weaker people.@@" + line "weaker people.@" + text_end _Route15Text12:: text "ROUTE 15" diff --git a/text/Route16FlyHouse.asm b/text/Route16FlyHouse.asm index 77efde87..89f76e51 100644 --- a/text/Route16FlyHouse.asm +++ b/text/Route16FlyHouse.asm @@ -10,7 +10,8 @@ _Route16HouseText3:: _ReceivedHM02Text:: text "<PLAYER> received" - line "HM02!@@" + line "HM02!@" + text_end _HM02ExplanationText:: text "HM02 is FLY." diff --git a/text/Route22Gate.asm b/text/Route22Gate.asm index ce3f6824..33893d6e 100644 --- a/text/Route22Gate.asm +++ b/text/Route22Gate.asm @@ -4,10 +4,11 @@ _Route22GateText_1e704:: cont "allowed through." para "You don't have the" - line "BOULDERBADGE yet!@@" + line "BOULDERBADGE yet!@" + text_end _Route22GateText_1e715:: - text "" + text_start para "The rules are" line "rules. I can't" @@ -17,4 +18,5 @@ _Route22GateText_1e715:: _Route22GateText_1e71a:: text "Oh! That is the" line "BOULDERBADGE!" - cont "Go right ahead!@@" + cont "Go right ahead!@" + text_end diff --git a/text/Route23.asm b/text/Route23.asm index a7e534de..f21857b3 100644 --- a/text/Route23.asm +++ b/text/Route23.asm @@ -2,32 +2,34 @@ _VictoryRoadGuardText1:: text "You can pass here" line "only if you have" cont "the @" - TX_RAM wcd6d + text_ram wcd6d text "!" para "You don't have the" line "@" - TX_RAM wcd6d + text_ram wcd6d text " yet!" para "You have to have" line "it to get to" - cont "#MON LEAGUE!@@" + cont "#MON LEAGUE!@" + text_end _VictoryRoadGuardText2:: text "You can pass here" line "only if you have" cont "the @" - TX_RAM wcd6d + text_ram wcd6d text "!" para "Oh! That is the" line "@" - TX_RAM wcd6d - text "!@@" + text_ram wcd6d + text "!@" + text_end _VictoryRoadGuardText_513a3:: - text "" + text_start para "OK then! Please," line "go right ahead!" diff --git a/text/Route24.asm b/text/Route24.asm index c14b689a..6792c401 100644 --- a/text/Route24.asm +++ b/text/Route24.asm @@ -1,10 +1,11 @@ _Route24Text_51510:: text "Congratulations!" line "You beat our 5" - cont "contest trainers!@@" + cont "contest trainers!@" + text_end _Route24Text_51515:: - text "" + text_start para "You just earned a" line "fabulous prize!" @@ -13,8 +14,9 @@ _Route24Text_51515:: _Route24Text_5151a:: text "<PLAYER> received" line "a @" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _Route24Text_51521:: text "You don't have" diff --git a/text/SSAnne1FRooms.asm b/text/SSAnne1FRooms.asm index 7a09303e..da672f8d 100644 --- a/text/SSAnne1FRooms.asm +++ b/text/SSAnne1FRooms.asm @@ -1,6 +1,7 @@ _SSAnne8Text8:: text "WIGGLYTUFF: Puup" - line "pupuu!@@" + line "pupuu!@" + text_end _SSAnne8BattleText1:: text "I travel alone" diff --git a/text/SSAnneB1FRooms.asm b/text/SSAnneB1FRooms.asm index 7df629b5..8072fc85 100644 --- a/text/SSAnneB1FRooms.asm +++ b/text/SSAnneB1FRooms.asm @@ -1,6 +1,7 @@ _SSAnne10Text8:: text "MACHOKE: Gwoh!" - line "Goggoh!@@" + line "Goggoh!@" + text_end _SSAnne10BattleText1:: text "You know what they" @@ -52,7 +53,8 @@ _SSAnne10AfterBattleText3:: _SSAnne10BattleText4:: text "I like feisty" - line "kids like you!@@" + line "kids like you!@" + text_end _SSAnne10EndBattleText4:: text "Argh!" diff --git a/text/SSAnneCaptainsRoom.asm b/text/SSAnneCaptainsRoom.asm index 7bf004da..5216cf04 100644 --- a/text/SSAnneCaptainsRoom.asm +++ b/text/SSAnneCaptainsRoom.asm @@ -8,7 +8,8 @@ _SSAnne7RubText:: cont "back!" para "Rub-rub..." - line "Rub-rub...@@" + line "Rub-rub...@" + text_end _ReceivingHM01Text:: text "CAPTAIN: Whew!" @@ -33,8 +34,9 @@ _ReceivingHM01Text:: _ReceivedHM01Text:: text "<PLAYER> got" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _SSAnne7Text_61932:: text "CAPTAIN: Whew!" diff --git a/text/SafariZoneGate.asm b/text/SafariZoneGate.asm index 5c143891..59a7c2af 100644 --- a/text/SafariZoneGate.asm +++ b/text/SafariZoneGate.asm @@ -10,7 +10,8 @@ SafariZoneEntranceText_9e6e4:: cont "want in the park!" para "Would you like to" - line "join the hunt?@@" + line "join the hunt?@" + text_end SafariZoneEntranceText_9e747:: text "That'll be ¥500" @@ -21,10 +22,11 @@ SafariZoneEntranceText_9e747:: cont "here." para "<PLAYER> received" - line "30 SAFARI BALLs!@@" + line "30 SAFARI BALLs!@" + text_end _SafariZoneEntranceText_75360:: - text "" + text_start para "We'll call you on" line "the PA when you" @@ -43,7 +45,8 @@ _SafariZoneEntranceText_7536a:: done SafariZoneEntranceText_9e814:: - text "Leaving early?@@" + text "Leaving early?@" + text_end _SafariZoneEntranceText_753bb:: text "Please return any" diff --git a/text/SafariZoneSecretHouse.asm b/text/SafariZoneSecretHouse.asm index 3df79d90..8aff18b7 100644 --- a/text/SafariZoneSecretHouse.asm +++ b/text/SafariZoneSecretHouse.asm @@ -17,8 +17,9 @@ _SecretHouseText_4a350:: _ReceivedHM03Text:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _HM03ExplanationText:: text "HM03 is SURF!" diff --git a/text/SaffronCity.asm b/text/SaffronCity.asm index a0422c8c..ae9c44f2 100644 --- a/text/SaffronCity.asm +++ b/text/SaffronCity.asm @@ -65,7 +65,8 @@ _SaffronCityText11:: done _SaffronCityText12:: - text "PIDGEOT: Bi bibii!@@" + text "PIDGEOT: Bi bibii!@" + text_end _SaffronCityText13:: text "I saw ROCKET" diff --git a/text/SaffronGates.asm b/text/SaffronGates.asm index 9bb4601f..4f53553a 100644 --- a/text/SaffronGates.asm +++ b/text/SaffronGates.asm @@ -13,10 +13,11 @@ _SaffronGateText_8aaa9:: cont "..." cont "Huh? I can have" cont "this drink?" - cont "Gee, thanks!@@" + cont "Gee, thanks!@" + text_end _SaffronGateText_1dff1:: - text "" + text_start para "..." line "Glug glug..." diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index 6f49a331..ae8556c0 100644 --- a/text/SaffronGym.asm +++ b/text/SaffronGym.asm @@ -27,7 +27,8 @@ _SaffronGymText_5d167:: cont "to win!" para "You earned the" - line "MARSHBADGE!@@" + line "MARSHBADGE!@" + text_end _SaffronGymText_5d16e:: text "Everyone has" @@ -56,10 +57,11 @@ _SaffronGymText_5d173:: ReceivedTM46Text:: text "<PLAYER> received" - line "TM46!@@" + line "TM46!@" + text_end _TM46ExplanationText:: - text "" + text_start para "TM46 is PSYWAVE!" line "It uses powerful" diff --git a/text/SaffronPidgeyHouse.asm b/text/SaffronPidgeyHouse.asm index 214bf089..d8666a07 100644 --- a/text/SaffronPidgeyHouse.asm +++ b/text/SaffronPidgeyHouse.asm @@ -8,7 +8,8 @@ _SaffronHouse1Text1:: done _SaffronHouse1Text2:: - text "PIDGEY: Kurukkoo!@@" + text "PIDGEY: Kurukkoo!@" + text_end _SaffronHouse1Text3:: text "The COPYCAT is" diff --git a/text/SeafoamIslandsB4F.asm b/text/SeafoamIslandsB4F.asm index 608d165f..ea7eeaa2 100644 --- a/text/SeafoamIslandsB4F.asm +++ b/text/SeafoamIslandsB4F.asm @@ -1,5 +1,6 @@ _ArticunoBattleText:: - text "Gyaoo!@@" + text "Gyaoo!@" + text_end _SeafoamIslands5Text4:: text "Boulders might" diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm index fbaa6086..36adf7d9 100644 --- a/text/SilphCo11F.asm +++ b/text/SilphCo11F.asm @@ -22,8 +22,9 @@ _SilphCoPresidentText:: _ReceivedSilphCoMasterBallText:: text "<PLAYER> got a" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _SilphCo10Text_6231c:: text "PRESIDENT: You" diff --git a/text/SilphCo2F.asm b/text/SilphCo2F.asm index bd87630a..b0cce269 100644 --- a/text/SilphCo2F.asm +++ b/text/SilphCo2F.asm @@ -12,8 +12,9 @@ _SilphCo2Text_59ded:: _ReceivedTM36Text:: text "<PLAYER> got" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM36ExplanationText:: text "TM36 is" diff --git a/text/VermilionCity.asm b/text/VermilionCity.asm index 1cbc535c..2f60eb97 100644 --- a/text/VermilionCity.asm +++ b/text/VermilionCity.asm @@ -68,10 +68,11 @@ _VermilionCityText4:: _VermilionCityText5:: text "MACHOP: Guoh!" - line "Gogogoh!@@" + line "Gogogoh!@" + text_end _VermilionCityText14:: - text "" + text_start para "A MACHOP is" line "stomping the land" cont "flat." diff --git a/text/VermilionDock.asm b/text/VermilionDock.asm index 5d998e82..aaf1ed34 100644 --- a/text/VermilionDock.asm +++ b/text/VermilionDock.asm @@ -1,3 +1,3 @@ _VermilionDockText1:: - text "" + text_start done diff --git a/text/VermilionGym_2.asm b/text/VermilionGym_2.asm index 50da9719..bf50422d 100644 --- a/text/VermilionGym_2.asm +++ b/text/VermilionGym_2.asm @@ -26,11 +26,12 @@ _LTSurgeThunderbadgeInfoText:: _ReceivedTM24Text:: text "<PLAYER> received " line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM24ExplanationText:: - text "" + text_start para "TM24 contains" line "THUNDERBOLT!" diff --git a/text/VermilionOldRodHouse.asm b/text/VermilionOldRodHouse.asm index 32526e36..d9a94cd4 100644 --- a/text/VermilionOldRodHouse.asm +++ b/text/VermilionOldRodHouse.asm @@ -18,11 +18,12 @@ _VermilionHouse2Text_560b6:: para "<PLAYER> received" line "an @" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _VermilionHouse2Text_560bb:: - text "" + text_start para "Fishing is a way" line "of life!" diff --git a/text/VermilionPidgeyHouse.asm b/text/VermilionPidgeyHouse.asm index 91c18708..858e84f3 100644 --- a/text/VermilionPidgeyHouse.asm +++ b/text/VermilionPidgeyHouse.asm @@ -6,7 +6,8 @@ _VermilionHouse1Text1:: done _VermilionHouse1Text2:: - text "PIDGEY: Kurukkoo!@@" + text "PIDGEY: Kurukkoo!@" + text_end _VermilionHouse1Text3:: text "Dear PIPPI, I hope" diff --git a/text/VictoryRoad2F.asm b/text/VictoryRoad2F.asm index ec9dcf4f..ff72afaa 100644 --- a/text/VictoryRoad2F.asm +++ b/text/VictoryRoad2F.asm @@ -1,5 +1,6 @@ _MoltresBattleText:: - text "Gyaoo!@@" + text "Gyaoo!@" + text_end _VictoryRoad2BattleText1:: text "VICTORY ROAD is" diff --git a/text/ViridianCity.asm b/text/ViridianCity.asm index 67ab5c40..8ee81348 100644 --- a/text/ViridianCity.asm +++ b/text/ViridianCity.asm @@ -84,7 +84,8 @@ _ViridianCityText_191ca:: _ReceivedTM42Text:: text "<PLAYER> received" - line "TM42!@@" + line "TM42!@" + text_end _TM42Explanation:: text "TM42 contains" diff --git a/text/ViridianGym.asm b/text/ViridianGym.asm index 4c7b5207..2b1f67ae 100644 --- a/text/ViridianGym.asm +++ b/text/ViridianGym.asm @@ -24,7 +24,8 @@ _ViridianGymText_74ad3:: cont "intense fight!" cont "You have won!" cont "As proof, here is" - cont "the EARTHBADGE!@@" + cont "the EARTHBADGE!@" + text_end _ViridianGymText_74ad9:: text "Having lost, I" @@ -39,7 +40,8 @@ _ViridianGymText_74ad9:: para "Let us meet again" line "some day!" - cont "Farewell!@@" + cont "Farewell!@" + text_end _ViridianGymText12:: text "The EARTHBADGE" @@ -61,10 +63,11 @@ _ViridianGymText12:: _ReceivedTM27Text:: text "<PLAYER> received" - line "TM27!@@" + line "TM27!@" + text_end _TM27ExplanationText:: - text "" + text_start para "TM27 is FISSURE!" line "It will take out" diff --git a/text/ViridianMart.asm b/text/ViridianMart.asm index 61750afe..640d7fd1 100644 --- a/text/ViridianMart.asm +++ b/text/ViridianMart.asm @@ -17,7 +17,8 @@ ViridianMartParcelQuestText:: cont "to him?" para "<PLAYER> got" - line "OAK's PARCEL!@@" + line "OAK's PARCEL!@" + text_end _ViridianMartText2:: text "This shop sells" diff --git a/text/WardensHouse.asm b/text/WardensHouse.asm index 7efddb90..47612904 100644 --- a/text/WardensHouse.asm +++ b/text/WardensHouse.asm @@ -20,10 +20,11 @@ _WardenGibberishText3:: _WardenTeethText1:: text "<PLAYER> gave the" line "GOLD TEETH to the" - cont "WARDEN!@@" + cont "WARDEN!@" + text_end _WardenTeethText2:: - text "" + text_start para "The WARDEN popped" line "in his teeth!" @@ -45,8 +46,9 @@ _WardenThankYouText:: _ReceivedHM04Text:: text "<PLAYER> received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _HM04ExplanationText:: text "WARDEN: HM04" |