diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /text | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'text')
204 files changed, 1879 insertions, 1880 deletions
diff --git a/text/AgathasRoom.asm b/text/AgathasRoom.asm index 82cbcd81..dda9cd9b 100644 --- a/text/AgathasRoom.asm +++ b/text/AgathasRoom.asm @@ -38,7 +38,7 @@ _AgathaAfterBattleText:: cont "along now, child!" done -_AgathaDontRunAwayText:: +_AgathasRoomAgathaDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/BikeShop.asm b/text/BikeShop.asm index 254da08c..14861653 100644 --- a/text/BikeShop.asm +++ b/text/BikeShop.asm @@ -1,4 +1,4 @@ -_BikeShopText_1d810:: +_BikeShopClerkWelcomeText:: text "Hi! Welcome to" line "our BIKE SHOP." @@ -6,7 +6,7 @@ _BikeShopText_1d810:: line "the BIKE for you!" prompt -_BikeShopText_1d815:: +_BikeShopClerkDoYouLikeItText:: text "It's a cool BIKE!" line "Do you want it?" done @@ -16,7 +16,7 @@ _BikeShopCantAffordText:: line "afford it!" prompt -_BikeShopText_1d81f:: +_BikeShopClerkOhThatsAVoucherText:: text "Oh, that's..." para "A BIKE VOUCHER!" @@ -24,7 +24,7 @@ _BikeShopText_1d81f:: para "OK! Here you go!" prompt -_BikeShopText_1d824:: +_BikeShopExchangedVoucherText:: text "<PLAYER> exchanged" line "the BIKE VOUCHER" cont "for a BICYCLE.@" @@ -35,7 +35,7 @@ _BikeShopComeAgainText:: line "sometime!" done -_BikeShopText_1d82f:: +_BikeShopClerkHowDoYouLikeYourBicycleText:: text "How do you like" line "your new BICYCLE?" @@ -44,12 +44,12 @@ _BikeShopText_1d82f:: cont "and in caves!" done -_BikeShopText_1d834:: +_BikeShopBagFullText:: text "You better make" line "room for this!" done -_BikeShopText_1d843:: +_BikeShopMiddleAgedWomanText:: text "A plain city BIKE" line "is good enough" cont "for me!" @@ -59,13 +59,13 @@ _BikeShopText_1d843:: cont "on an MTB!" done -_BikeShopText_1d85c:: +_BikeShopYoungsterTheseBikesAreExpensiveText:: text "These BIKEs are" line "cool, but they're" cont "way expensive!" done -_BikeShopText_1d861:: +_BikeShopYoungsterCoolBikeText:: text "Wow. Your BIKE is" line "really cool!" done diff --git a/text/BillsHouse.asm b/text/BillsHouse.asm index 080b425b..9298c986 100644 --- a/text/BillsHouse.asm +++ b/text/BillsHouse.asm @@ -1,9 +1,9 @@ -_BillsHouseDontLeaveText:: +_BillsHouseBillDontLeaveText:: text "Whoa, don't go" line "anywhere, wait!" done -_BillsHouseText_1e865:: +_BillsHouseBillImNotAPokemonText:: text "Hiya! I'm a" line "#MON..." cont "...No I'm not!" @@ -24,7 +24,7 @@ _BillsHouseText_1e865:: line "Help me out here!" done -_BillsHouseText_1e86a:: +_BillsHouseBillUseSeparationSystemText:: text "When I'm in the" line "TELEPORTER, go to" cont "my PC and run the" @@ -32,7 +32,7 @@ _BillsHouseText_1e86a:: cont "System!" done -_BillsHouseText_1e86f:: +_BillsHouseBillNoYouGottaHelpText:: text "No!? Come on, you" line "gotta help a guy" cont "in deep trouble!" @@ -42,7 +42,7 @@ _BillsHouseText_1e86f:: cont "OK? All right!" prompt -_BillThankYouText:: +_BillsHouseBillThankYouText:: text "BILL: Yeehah!" line "Thanks, bud! I" cont "owe you one!" @@ -70,7 +70,7 @@ _SSTicketNoRoomText:: line "much stuff, bud!" done -_BillsHouseText_1e8cb:: +_BillsHouseBillWhyDontYouGoInsteadOfMeText:: text "That cruise ship," line "S.S.ANNE, is in" cont "VERMILION CITY." @@ -85,7 +85,7 @@ _BillsHouseText_1e8cb:: cont "instead of me?" done -_BillsHouseText_1e8da:: +_BillsHouseBillCheckOutMyRarePokemonText:: text "BILL: Look, bud," line "just check out" cont "some of my rare" diff --git a/text/BluesHouse.asm b/text/BluesHouse.asm index 782685fe..ca768345 100644 --- a/text/BluesHouse.asm +++ b/text/BluesHouse.asm @@ -1,10 +1,10 @@ -_DaisyInitialText:: +_BluesHouseDaisyRivalAtLabText:: text "Hi <PLAYER>!" line "<RIVAL> is out at" cont "Grandpa's lab." done -_DaisyOfferMapText:: +_BluesHouseDaisyOfferMapText:: text "Grandpa asked you" line "to run an errand?" cont "Here, this will" @@ -18,12 +18,12 @@ _GotMapText:: text "!@" text_end -_DaisyBagFullText:: +_BluesHouseDaisyBagFullText:: text "You have too much" line "stuff with you." done -_DaisyUseMapText:: +_BluesHouseDaisyUseMapText:: text "Use the TOWN MAP" line "to find out where" cont "you are." diff --git a/text/BrunosRoom.asm b/text/BrunosRoom.asm index 9c493c4a..ac00ae60 100644 --- a/text/BrunosRoom.asm +++ b/text/BrunosRoom.asm @@ -31,7 +31,7 @@ _BrunoAfterBattleText:: cont "challenge!" done -_BrunoDontRunAwayText:: +_BrunosRoomBrunoDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/CeladonChiefHouse.asm b/text/CeladonChiefHouse.asm index 19e59bd6..075b8d49 100644 --- a/text/CeladonChiefHouse.asm +++ b/text/CeladonChiefHouse.asm @@ -1,10 +1,10 @@ -_CeladonHouseText1:: +_CeladonChiefHouseChiefText:: text "Hehehe! The slots" line "just reel in the" cont "dough, big time!" done -_CeladonHouseText2:: +_CeladonChiefHouseRocketText:: text "CHIEF!" para "We just shipped" @@ -12,7 +12,7 @@ _CeladonHouseText2:: cont "slot prizes!" done -_CeladonHouseText3:: +_CeladonChiefHouseSailorText:: text "Don't touch the" line "poster at the" cont "GAME CORNER!" diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index e34a09b9..90912950 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -1,4 +1,4 @@ -_CeladonCityText1:: +_CeladonCityLittleGirlText:: text "I got my KOFFING" line "from my friend!" @@ -7,19 +7,19 @@ _CeladonCityText1:: cont "very nice to it!" done -_CeladonCityText2:: +_CeladonCityGramps1Text:: text "Heheh! This GYM" line "is great! It's" cont "full of women!" done -_CeladonCityText3:: +_CeladonCityGirlText:: text "The GAME CORNER" line "is bad for our" cont "city's image!" done -_CeladonCityText4:: +_CeladonCityGramps2Text:: text "Moan! I blew it" line "all at the slots!" @@ -28,7 +28,7 @@ _CeladonCityText4:: cont "coins for prizes!" done -_TM41PreText:: +_CeladonCityGramps3Text:: text "Hello, there!" para "I've seen you," @@ -39,14 +39,14 @@ _TM41PreText:: line "dropping by!" prompt -_ReceivedTM41Text:: +_CeladonCityGramps3ReceivedTM41Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer text "!@" text_end -_TM41ExplanationText:: +_CeladonCityGramps3TM41ExplanationText:: text "TM41 teaches" line "SOFTBOILED!" @@ -57,12 +57,12 @@ _TM41ExplanationText:: line "CHANSEY!" done -_TM41NoRoomText:: +_CeladonCityGramps3TM41NoRoomText:: text "Oh, your pack is" line "full of items!" done -_CeladonCityText6:: +_CeladonCityFisherText:: text "This is my trusted" line "pal, POLIWRATH!" @@ -71,28 +71,28 @@ _CeladonCityText6:: cont "used WATER STONE!" done -_CeladonCityText7:: +_CeladonCityPoliwrathText:: text "POLIWRATH: Ribi" line "ribit!@" text_end -_CeladonCityText8:: +_CeladonCityRocket1Text:: text "What are you" line "staring at?" done -_CeladonCityText9:: +_CeladonCityRocket2Text:: text "Keep out of TEAM" line "ROCKET's way!" done -_CeladonCityText11:: +_CeladonCitySignText:: text "CELADON CITY" line "The City of" cont "Rainbow Dreams" done -_CeladonCityText13:: +_CeladonCityGymSignText:: text "CELADON CITY" line "#MON GYM" cont "LEADER: ERIKA" @@ -101,17 +101,17 @@ _CeladonCityText13:: line "Princess!" done -_CeladonCityText14:: +_CeladonCityMansionSignText:: text "CELADON MANSION" done -_CeladonCityText15:: +_CeladonCityDeptStoreSignText:: text "Find what you" line "need at CELADON" cont "DEPT. STORE!" done -_CeladonCityText16:: +_CeladonCityTrainerTips2Text:: text "TRAINER TIPS" para "GUARD SPEC." @@ -125,19 +125,19 @@ _CeladonCityText16:: cont "STORE!" done -_CeladonCityText17:: +_CeladonCityPrizeExchangeSignText:: text "Coins exchanged" line "for prizes!" cont "PRIZE EXCHANGE" done -_CeladonCityText18:: +_CeladonCityGameCornerSignText:: text "ROCKET GAME CORNER" line "The playground" cont "for grownups!" done -_CeladonCityText10:: +_CeladonCityTrainerTips1Text:: text "TRAINER TIPS" para "X ACCURACY boosts" diff --git a/text/CeladonDiner.asm b/text/CeladonDiner.asm index b91cb5a9..c46811f7 100644 --- a/text/CeladonDiner.asm +++ b/text/CeladonDiner.asm @@ -1,24 +1,24 @@ -_CeladonDinerText1:: +_CeladonDinerCookText:: text "Hi!" para "We're taking a" line "break now." done -_CeladonDinerText2:: +_CeladonDinerMiddleAgedWomanText:: text "My #MON are" line "weak, so I often" cont "have to go to the" cont "DRUG STORE." done -_CeladonDinerText3:: +_CeladonDinerMiddleAgedManText:: text "Psst! There's a" line "basement under" cont "the GAME CORNER." done -_CeladonDinerText4:: +_CeladonDinerFisherText:: text "Munch..." para "The man at that" @@ -26,7 +26,7 @@ _CeladonDinerText4:: cont "at the slots." done -_CeladonDinerText_491a7:: +_CeladonDinerGymGuideImFlatOutBustedText:: text "Go ahead! Laugh!" para "I'm flat out" @@ -41,19 +41,19 @@ _CeladonDinerText_491a7:: cont "more!" prompt -_ReceivedCoinCaseText:: +_CeladonDinerGymGuideReceivedCoinCaseText:: text "<PLAYER> received" line "a @" text_ram wStringBuffer text "!@" text_end -_CoinCaseNoRoomText:: +_CeladonDinerGymGuideCoinCaseNoRoomText:: text "Make room for" line "this!" done -_CeladonDinerText_491b7:: +_CeladonDinerGymGuideWinItBackText:: text "I always thought" line "I was going to" cont "win it back..." diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index f4ca049a..6f6b2cc3 100644 --- a/text/CeladonGym.asm +++ b/text/CeladonGym.asm @@ -1,4 +1,4 @@ -_ErikaPreBattleText:: +_CeladonGymErikaPreBattleText:: text "Hello. Lovely" line "weather isn't it?" cont "It's so pleasant." @@ -25,7 +25,7 @@ _ErikaPreBattleText:: line "shall not lose." done -_ReceivedRainbowBadgeText:: +_CeladonGymErikaReceivedRainbowBadgeText:: text "Oh!" line "I concede defeat." @@ -36,7 +36,7 @@ _ReceivedRainbowBadgeText:: line "the RAINBOWBADGE." prompt -_ErikaPostBattleAdviceText:: +_CeladonGymErikaPostBattleAdviceText:: text "You are cataloging" line "#MON? I must" cont "say I'm impressed." @@ -47,7 +47,7 @@ _ErikaPostBattleAdviceText:: cont "unattractive." done -_ErikaRainbowBadgeInfoText:: +_CeladonGymRainbowBadgeInfoText:: text "The RAINBOWBADGE" line "will make #MON" cont "up to L50 obey." @@ -61,7 +61,7 @@ _ErikaRainbowBadgeInfoText:: line "this with you." done -_ReceivedTM21Text:: +_CeladonGymReceivedTM21Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer @@ -80,7 +80,7 @@ _TM21ExplanationText:: cont "your #MON!" done -_TM21NoRoomText:: +_CeladonGymTM21NoRoomText:: text "You should make" line "room for this." done diff --git a/text/CeladonHotel.asm b/text/CeladonHotel.asm index f2eb059e..4753178f 100644 --- a/text/CeladonHotel.asm +++ b/text/CeladonHotel.asm @@ -1,4 +1,4 @@ -_CeladonHotelText1:: +_CeladonHotelGrannyText:: text "#MON? No, this" line "is a hotel for" cont "people." @@ -6,7 +6,7 @@ _CeladonHotelText1:: para "We're full up." done -_CeladonHotelText2:: +_CeladonHotelBeautyText:: text "I'm on vacation" line "with my brother" cont "and boy friend." @@ -15,7 +15,7 @@ _CeladonHotelText2:: line "pretty city!" done -_CeladonHotelText3:: +_CeladonHotelSuperNerdText:: text "Why did she bring" line "her brother?" done diff --git a/text/CeladonMansion1F.asm b/text/CeladonMansion1F.asm index 52946a41..1d725074 100644 --- a/text/CeladonMansion1F.asm +++ b/text/CeladonMansion1F.asm @@ -1,18 +1,18 @@ -_CeladonMansion1Text1:: +_CeladonMansion1FMeowthText:: text "MEOWTH: Meow!@" text_end -_CeladonMansion1Text3:: +_CeladonMansion1FClefairyText:: text "CLEFAIRY: Pi" line "pippippi!@" text_end -_CeladonMansion1Text4:: +_CeladonMansion1FNidoranFText:: text "NIDORAN: Kya" line "kyaoo!@" text_end -_CeladonMansion1Text5:: +_CeladonMansion1FManagersSuiteSignText:: text "CELADON MANSION" line "Manager's Suite" done diff --git a/text/CeladonMansion2F.asm b/text/CeladonMansion2F.asm index b2ecb4fa..b057b3e8 100644 --- a/text/CeladonMansion2F.asm +++ b/text/CeladonMansion2F.asm @@ -1,4 +1,4 @@ -_CeladonMansion2Text1:: +_CeladonMansion2FMeetingRoomSignText:: text "GAME FREAK" line "Meeting Room" done diff --git a/text/CeladonMansion3F.asm b/text/CeladonMansion3F.asm index 4381c60f..0ad4501e 100644 --- a/text/CeladonMansion3F.asm +++ b/text/CeladonMansion3F.asm @@ -1,9 +1,9 @@ -_ProgrammerText:: +_CeladonMansion3FProgrammerText:: text "Me? I'm the" line "programmer!" done -_ProgrammerText2:: +_CeladonMansion3FProgrammerText2:: text "Me? I'm the" line "programmer!" @@ -13,13 +13,13 @@ _ProgrammerText2:: cont "#DEX." done -_GraphicArtistText:: +_CeladonMansion3FGraphicArtistText:: text "I'm the graphic" line "artist!" cont "I drew you!" done -_GraphicArtistText2:: +_CeladonMansion3FGraphicArtistText2:: text "I'm the graphic" line "artist!" @@ -30,22 +30,22 @@ _GraphicArtistText2:: cont "as proof?" done -_GraphicArtistText3:: +_CeladonMansion3FGraphicArtistText3:: text "Just tell me if" line "you want to PRINT" cont "out a DIPLOMA." done -_GraphicArtistText4:: +_CeladonMansion3FGraphicArtistText4:: text "All done!" done -_GraphicArtistText5:: +_CeladonMansion3FGraphicArtistText5:: text "OK, let's not" line "PRINT." done -_WriterText:: +_CeladonMansion3FWriterText:: text "I wrote the story!" line "Isn't ERIKA cute?" @@ -56,7 +56,7 @@ _WriterText:: line "I like her!" done -_WriterText2:: +_CeladonMansion3FWriterText2:: text "I wrote the story!" para "It's great you" @@ -64,7 +64,7 @@ _WriterText2:: cont "#MON! Thanks!" done -_GameDesignerText:: +_CeladonMansion3FGameDesignerText:: text "Is that right?" para "I'm the game" @@ -78,7 +78,7 @@ _GameDesignerText:: line "come tell me!" done -_CompletedDexText:: +_CeladonMansion3FGameDesignerCompletedDexText:: text "Wow! Excellent!" line "You completed" cont "your #DEX!" @@ -86,33 +86,33 @@ _CompletedDexText:: cont "...@" text_end -_CompletedDexText2:: +_CeladonMansion3FGameDesignerCompletedDexText2:: text "Go show off your" line "DIPLOMA to" cont "the development" cont "crew." done -_CeladonMansion3Text5:: +_CeladonMansion3FGameProgramPCText:: text "It's the game" line "program! Messing" cont "with it could bug" cont "out the game!" done -_CeladonMansion3Text6:: +_CeladonMansion3FPlayingGamePCText:: text "Someone's playing" line "a game instead of" cont "working!" done -_CeladonMansion3Text7:: +_CeladonMansion3FGameScriptPCText:: text "It's the script!" line "Better not look" cont "at the ending!" done -_CeladonMansion3Text8:: +_CeladonMansion3FDevRoomSignText:: text "GAME FREAK" line "Development Room" done diff --git a/text/CeladonMansionRoof.asm b/text/CeladonMansionRoof.asm index c8fd7ec8..67963cb3 100644 --- a/text/CeladonMansionRoof.asm +++ b/text/CeladonMansionRoof.asm @@ -1,3 +1,3 @@ -_CeladonMansion4Text1:: +_CeladonMansionRoofHouseSignText:: text "I KNOW EVERYTHING!" done diff --git a/text/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm index dab81a8d..c3cef1ba 100644 --- a/text/CeladonMansionRoofHouse.asm +++ b/text/CeladonMansionRoofHouse.asm @@ -1,4 +1,4 @@ -_CeladonMansion5Text1:: +_CeladonMansionRoofHouseHikerText:: text "I know everything" line "about the world" cont "of #MON in" diff --git a/text/CeladonMart1F.asm b/text/CeladonMart1F.asm index 8d805edc..c9975da9 100644 --- a/text/CeladonMart1F.asm +++ b/text/CeladonMart1F.asm @@ -1,4 +1,4 @@ -_CeladonMart1Text1:: +_CeladonMart1FReceptionistText:: text "Hello! Welcome to" line "CELADON DEPT." cont "STORE." @@ -8,7 +8,7 @@ _CeladonMart1Text1:: cont "the store layout." done -_CeladonMart1Text2:: +_CeladonMart1FDirectorySignText:: text "1F: SERVICE" line " COUNTER" @@ -25,7 +25,7 @@ _CeladonMart1Text2:: line "VENDING MACHINES" done -_CeladonMart1Text3:: +_CeladonMart1FCurrentFloorSignText:: text "1F: SERVICE" line " COUNTER" done diff --git a/text/CeladonMart2F.asm b/text/CeladonMart2F.asm index 74869902..05cf93f9 100644 --- a/text/CeladonMart2F.asm +++ b/text/CeladonMart2F.asm @@ -1,4 +1,4 @@ -_CeladonMart2Text3:: +_CeladonMart2FMiddleAgedManText:: text "SUPER REPEL keeps" line "weak #MON at" cont "bay..." @@ -7,13 +7,13 @@ _CeladonMart2Text3:: line "powerful REPEL!" done -_CeladonMart2Text4:: +_CeladonMart2FGirlText:: text "For long outings," line "you should buy" cont "REVIVE." done -_CeladonMart2Text5:: +_CeladonMart2FCurrentFloorSignText:: text "Top Grade Items" line "for Trainers!" diff --git a/text/CeladonMart3F.asm b/text/CeladonMart3F.asm index 3b6013e5..01d12a9b 100644 --- a/text/CeladonMart3F.asm +++ b/text/CeladonMart3F.asm @@ -1,4 +1,4 @@ -_CeladonMart3Text2:: +_CeladonMart3FGameBoyKid1Text:: text "Captured #MON" line "are registered" cont "with an ID No." @@ -8,7 +8,7 @@ _CeladonMart3Text2:: cont "caught it!" done -_CeladonMart3Text3:: +_CeladonMart3FGameBoyKid2Text:: text "All right!" para "My buddy's going" @@ -17,7 +17,7 @@ _CeladonMart3Text3:: cont "GRAVELER!" done -_CeladonMart3Text4:: +_CeladonMart3FGameBoyKid3Text:: text "Come on GRAVELER!" para "I love GRAVELER!" @@ -30,47 +30,47 @@ _CeladonMart3Text4:: cont "#MON!" done -_CeladonMart3Text5:: +_CeladonMart3FLittleBoyText:: text "You can identify" line "#MON you got" cont "in trades by" cont "their ID Numbers!" done -_CeladonMart3Text6:: +_CeladonMart3FSNESText:: text "It's an SNES!" done -_CeladonMart3Text7:: +_CeladonMart3FRPGText:: text "An RPG! There's" line "no time for that!" done -_CeladonMart3Text9:: +_CeladonMart3FSportsGameText:: text "A sports game!" line "Dad'll like that!" done -_CeladonMart3Text11:: +_CeladonMart3FPuzzleGameText:: text "A puzzle game!" line "Looks addictive!" done -_CeladonMart3Text13:: +_CeladonMart3FFightingGameText:: text "A fighting game!" line "Looks tough!" done -_CeladonMart3Text14:: +_CeladonMart3FCurrentFloorSignText:: text "3F: TV GAME SHOP" done -_CeladonMart3Text15:: +_CeladonMart3FPokemonPosterText:: text "Red and Blue!" line "Both are #MON!" done -_TM18PreReceiveText:: +_CeladonMart3FClerkTM18PreReceiveText:: text "Oh, hi! I finally" line "finished #MON!" @@ -79,21 +79,21 @@ _TM18PreReceiveText:: cont "useful!" prompt -_ReceivedTM18Text:: +_CeladonMart3FClerkReceivedTM18Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer text "!@" text_end -_TM18ExplanationText:: +_CeladonMart3FClerkTM18ExplanationText:: text "TM18 is COUNTER!" line "Not like the one" cont "I'm leaning on," cont "mind you!" done -_TM18NoRoomText:: +_CeladonMart3FClerkTM18NoRoomText:: text "Your pack is full" line "of items!" done diff --git a/text/CeladonMart4F.asm b/text/CeladonMart4F.asm index c17483c1..1538d3a3 100644 --- a/text/CeladonMart4F.asm +++ b/text/CeladonMart4F.asm @@ -1,4 +1,4 @@ -_CeladonMart4Text2:: +_CeladonMart4FSuperNerdText:: text "I'm getting a" line "gift for COPYCAT" cont "in CERULEAN CITY." @@ -8,7 +8,7 @@ _CeladonMart4Text2:: cont "are trendy!" done -_CeladonMart4Text3:: +_CeladonMart4FYoungsterText:: text "I heard something" line "useful." @@ -18,7 +18,7 @@ _CeladonMart4Text3:: cont "with a # DOLL!" done -_CeladonMart4Text4:: +_CeladonMart4FCurrentFloorSignText:: text "Express yourself" line "with gifts!" diff --git a/text/CeladonMart5F.asm b/text/CeladonMart5F.asm index 1871194b..7d3193a6 100644 --- a/text/CeladonMart5F.asm +++ b/text/CeladonMart5F.asm @@ -1,4 +1,4 @@ -_CeladonMart5Text1:: +_CeladonMart5FGentlemanText:: text "#MON ability" line "enhancers can be" cont "bought only here." @@ -11,7 +11,7 @@ _CeladonMart5Text1:: line "increase SPEED." done -_CeladonMart5Text2:: +_CeladonMart5FSailorText:: text "I'm here for" line "#MON ability" cont "enhancers." @@ -23,6 +23,6 @@ _CeladonMart5Text2:: line "DEFENSE!" done -_CeladonMart5Text5:: +_CeladonMart5FCurrentFloorSignText:: text "5F: DRUG STORE" done diff --git a/text/CeladonMartRoof.asm b/text/CeladonMartRoof.asm index 68a5e64d..7281b529 100644 --- a/text/CeladonMartRoof.asm +++ b/text/CeladonMartRoof.asm @@ -1,9 +1,9 @@ -_CeladonMartRoofText_484ee:: +_CeladonMartRoofLittleGirlGiveHerWhichDrinkText:: text "Give her which" line "drink?" done -_CeladonMartRoofText_484f3:: +_CeladonMartRoofLittleGirlYayFreshWaterText:: text "Yay!" para "FRESH WATER!" @@ -14,14 +14,14 @@ _CeladonMartRoofText_484f3:: line "from me!@" text_end -_CeladonMartRoofText_484f9:: +_CeladonMartRoofLittleGirlReceivedTM13Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer text "!@" text_end -_CeladonMartRoofText_484fe:: +_CeladonMartRoofLittleGirlTM13ExplanationText:: text_start para "@" @@ -33,7 +33,7 @@ _CeladonMartRoofText_484fe:: line "target sometimes!@" text_end -_CeladonMartRoofText_48504:: +_CeladonMartRoofLittleGirlYaySodaPopText:: text "Yay!" para "SODA POP!" @@ -44,14 +44,14 @@ _CeladonMartRoofText_48504:: line "from me!@" text_end -_CeladonMartRoofText_4850a:: +_CeladonMartRoofLittleGirlReceivedTM48Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer text "!@" text_end -_CeladonMartRoofText_4850f:: +_CeladonMartRoofLittleGirlTM48ExplanationText:: text_start para "@" @@ -60,7 +60,7 @@ _CeladonMartRoofText_4850f:: line "ROCK SLIDE!@" text_end -_CeladonMartRoofText_48515:: +_CeladonMartRoofLittleGirlYayLemonadeText:: text "Yay!" para "LEMONADE!" @@ -71,30 +71,30 @@ _CeladonMartRoofText_48515:: line "from me!@" text_end -_ReceivedTM49Text:: +_CeladonMartRoofLittleGirlReceivedTM49Text:: text "<PLAYER> received" line "TM49!@" text_end -_CeladonMartRoofText_48520:: +_CeladonMartRoofLittleGirlTM49ExplanationText:: text_start para "TM49 contains" line "TRI ATTACK!@" text_end -_CeladonMartRoofText_48526:: +_CeladonMartRoofLittleGirlNoRoomText:: text "You don't have" line "space for this!@" text_end -_CeladonMartRoofText_4852c:: +_CeladonMartRoofLittleGirlImNotThirstyText:: text "No thank you!" line "I'm not thirsty" cont "after all!@" text_end -_CeladonMartRoofText1:: +_CeladonMartRoofSuperNerdText:: text "My sister is a" line "trainer, believe" cont "it or not." @@ -104,13 +104,13 @@ _CeladonMartRoofText1:: cont "drives me nuts!" done -_CeladonMartRoofText_48598:: +_CeladonMartRoofLittleGirlImThirstyText:: text "I'm thirsty!" line "I want something" cont "to drink!" done -_CeladonMartRoofText4:: +_CeladonMartRoofLittleGirlGiveHerADrinkText:: text "I'm thirsty!" line "I want something" cont "to drink!" @@ -118,7 +118,7 @@ _CeladonMartRoofText4:: para "Give her a drink?" done -_CeladonMartRoofText6:: +_CeladonMartRoofCurrentFloorSignText:: text "ROOFTOP SQUARE:" line "VENDING MACHINES" done diff --git a/text/CeladonPokecenter.asm b/text/CeladonPokecenter.asm index a04f51c9..38ceaf2f 100644 --- a/text/CeladonPokecenter.asm +++ b/text/CeladonPokecenter.asm @@ -1,11 +1,11 @@ -_CeladonPokecenterText2:: +_CeladonPokecenterGentlemanText:: text "# FLUTE awakens" line "#MON with a" cont "sound that only" cont "they can hear!" done -_CeladonPokecenterText3:: +_CeladonPokecenterBeautyText:: text "I rode uphill on" line "CYCLING ROAD from" cont "FUCHSIA!" diff --git a/text/CeruleanBadgeHouse.asm b/text/CeruleanBadgeHouse.asm index 4bba10cd..578583da 100644 --- a/text/CeruleanBadgeHouse.asm +++ b/text/CeruleanBadgeHouse.asm @@ -1,4 +1,4 @@ -_CeruleanHouse2Text_74e77:: +_CeruleanBadgeHouseMiddleAgedManText:: text "#MON BADGEs" line "are owned only by" cont "skilled trainers." @@ -10,7 +10,7 @@ _CeruleanHouse2Text_74e77:: line "amazing secrets!" prompt -_CeruleanHouse2Text_74e7c:: +_CeruleanBadgeHouseMiddleAgedManWhichBadgeText:: text "Now then..." para "Which of the 8" @@ -18,12 +18,12 @@ _CeruleanHouse2Text_74e7c:: cont "describe?" done -_CeruleanHouse2Text_74e81:: +_CeruleanBadgeHouseMiddleAgedManVisitAnyTimeText:: text "Come visit me any-" line "time you wish." done -_CeruleanHouse2Text_74e96:: +_CeruleanBadgeHouseBoulderBadgeText:: text "The ATTACK of all" line "#MON increases" cont "a little bit." @@ -33,7 +33,7 @@ _CeruleanHouse2Text_74e96:: cont "time you desire." prompt -_CeruleanHouse2Text_74e9b:: +_CeruleanBadgeHouseCascadeBadgeText:: text "#MON up to L30" line "will obey you." @@ -45,7 +45,7 @@ _CeruleanHouse2Text_74e9b:: cont "of battle." prompt -_CeruleanHouse2Text_74ea0:: +_CeruleanBadgeHouseThunderBadgeText:: text "The SPEED of all" line "#MON increases" cont "a little bit." @@ -55,7 +55,7 @@ _CeruleanHouse2Text_74ea0:: cont "of battle." prompt -_CeruleanHouse2Text_74ea5:: +_CeruleanBadgeHouseRainbowBadgeText:: text "#MON up to L50" line "will obey you." diff --git a/text/CeruleanBadgeHouse_2.asm b/text/CeruleanBadgeHouse_2.asm index e5da0622..d3ddeffb 100644 --- a/text/CeruleanBadgeHouse_2.asm +++ b/text/CeruleanBadgeHouse_2.asm @@ -1,4 +1,4 @@ -_CeruleanHouse2Text_74eaa:: +_CeruleanBadgeHouseSoulBadgeText:: text "The DEFENSE of all" line "#MON increases" cont "a little bit." @@ -8,7 +8,7 @@ _CeruleanHouse2Text_74eaa:: cont "of battle." prompt -_CeruleanHouse2Text_74eaf:: +_CeruleanBadgeHouseMarshBadgeText:: text "#MON up to L70" line "will obey you." @@ -16,13 +16,13 @@ _CeruleanHouse2Text_74eaf:: line "become unruly!" prompt -_CeruleanHouse2Text_74eb4:: +_CeruleanBadgeHouseVolcanoBadgeText:: text "Your #MON's" line "SPECIAL abilities" cont "increase a bit." prompt -_CeruleanHouse2Text_74eb9:: +_CeruleanBadgeHouseEarthBadgeText:: text "All #MON will" line "obey you!" prompt diff --git a/text/CeruleanCity.asm b/text/CeruleanCity.asm index 955dca89..fbbb1021 100644 --- a/text/CeruleanCity.asm +++ b/text/CeruleanCity.asm @@ -1,4 +1,4 @@ -_CeruleanCityText_19668:: +_CeruleanCityRivalPreBattleText:: text "<RIVAL>: Yo!" line "<PLAYER>!" @@ -16,19 +16,19 @@ _CeruleanCityText_19668:: cont "<PLAYER>!" done -_CeruleanCityText_1966d:: +_CeruleanCityRivalDefeatedText:: text "Hey!" line "Take it easy!" cont "You won already!" prompt -_CeruleanCityText_19672:: +_CeruleanCityRivalVictoryText:: text "Heh!" line "You're no match" cont "for my genius!" prompt -_CeruleanCityText_19677:: +_CeruleanCityRivalIWentToBillsText:: text "<RIVAL>: Hey," line "guess what?" @@ -58,7 +58,7 @@ _CeruleanCityText_19677:: cont "Smell ya later!" done -_CeruleanCityText_196d9:: +_CeruleanCityRocketText:: text "Hey! Stay out!" line "It's not your" cont "yard! Huh? Me?" @@ -68,19 +68,19 @@ _CeruleanCityText_196d9:: cont "you believe me?" done -_ReceivedTM28Text:: +_CeruleanCityRocketReceivedTM28Text:: text "<PLAYER> recovered" line "TM28!@" text_end -_ReceivedTM28Text2:: +_CeruleanCityRocketIBetterGetMovingText:: text_start para "I better get" line "moving! Bye!@" text_end -_TM28NoRoomText:: +_CeruleanCityRocketTM28NoRoomText:: text "Make room for" line "this!" @@ -88,25 +88,25 @@ _TM28NoRoomText:: line "I give it to you!" done -_CeruleanCityText_196ee:: +_CeruleanCityRocketIGiveUpText:: text "Stop!" line "I give up! I'll" cont "leave quietly!" prompt -_CeruleanCityText_196f3:: +_CeruleanCityRocketIllReturnTheTMText:: text "OK! I'll return" line "the TM I stole!" prompt -_CeruleanCityText3:: +_CeruleanCityCooltrainerMText:: text "You're a trainer" line "too? Collecting," cont "fighting, it's a" cont "tough life." done -_CeruleanCityText4:: +_CeruleanCitySuperNerd1Text:: text "That bush in" line "front of the shop" cont "is in the way." @@ -115,14 +115,14 @@ _CeruleanCityText4:: line "way around." done -_CeruleanCityText5:: +_CeruleanCitySuperNerd2Text:: text "You're making an" line "encyclopedia on" cont "#MON? That" cont "sounds amusing." done -_CeruleanCityText6:: +_CeruleanCityGuardText:: text "These poor people" line "here were robbed." @@ -136,20 +136,20 @@ _CeruleanCityText6:: cont "with the ROCKETs!" done -_CeruleanCityText_19730:: +_CeruleanCityCooltrainerF1ElectrodeUseSonicboomText:: text "OK! ELECTRODE!" line "Use SONICBOOM!" cont "Please ELECTRODE," cont "pay attention!" done -_CeruleanCityText_19735:: +_CeruleanCityCooltrainerF1ElectrodePunchText:: text "ELECTRODE, TACKLE!" line "No! You blew it" cont "again!" done -_CeruleanCityText_1973a:: +_CeruleanCityCooltrainerF1ElectrodeWithdrawText:: text "ELECTRODE, SWIFT!" line "No! That's wrong!" @@ -162,27 +162,27 @@ _CeruleanCityText_1973a:: cont "as a trainer!" done -_CeruleanCityText_1976f:: +_CeruleanCityElectrodeTookASnoozeText:: text "ELECTRODE took a" line "snooze..." done -_CeruleanCityText_19774:: +_CeruleanCityElectrodeIsLoafingAroundText:: text "ELECTRODE is" line "loafing around..." done -_CeruleanCityText_19779:: +_CeruleanCityElectrodeTurnedAwayText:: text "ELECTRODE turned" line "away..." done -_CeruleanCityText_1977e:: +_CeruleanCityElectrodeIgnoredOrdersText:: text "ELECTRODE" line "ignored orders..." done -_CeruleanCityText9:: +_CeruleanCityCooltrainerF2Text:: text "I want a bright" line "red BICYCLE!" @@ -191,7 +191,7 @@ _CeruleanCityText9:: cont "get dirty!" done -_CeruleanCityText10:: +_CeruleanCitySuperNerd3Text:: text "This is CERULEAN" line "CAVE! Horribly" cont "strong #MON" @@ -203,14 +203,14 @@ _CeruleanCityText10:: cont "is allowed in!" done -_CeruleanCityText12:: +_CeruleanCitySignText:: text "CERULEAN CITY" line "A Mysterious," cont "Blue Aura" cont "Surrounds It" done -_CeruleanCityText13:: +_CeruleanCityTrainerTipsText:: text "TRAINER TIPS" para "Pressing B Button" @@ -219,13 +219,13 @@ _CeruleanCityText13:: cont "process." done -_CeruleanCityText16:: +_CeruleanCityBikeShopSign:: text "Grass and caves" line "handled easily!" cont "BIKE SHOP" done -_CeruleanCityText17:: +_CeruleanCityGymSign:: text "CERULEAN CITY" line "#MON GYM" cont "LEADER: MISTY" diff --git a/text/CeruleanGym.asm b/text/CeruleanGym.asm index c201984f..1cd7d677 100644 --- a/text/CeruleanGym.asm +++ b/text/CeruleanGym.asm @@ -1,4 +1,4 @@ -_MistyPreBattleText:: +_CeruleanGymMistyPreBattleText:: text "Hi, you're a new" line "face!" @@ -19,7 +19,7 @@ _MistyPreBattleText:: line "sweetie?" done -_TM11ExplanationText:: +_CeruleanGymMistyTM11ExplanationText:: text "TM11 teaches" line "BUBBLEBEAM!" @@ -27,7 +27,7 @@ _TM11ExplanationText:: line "aquatic #MON!" done -_MistyCascadeBadgeInfoText:: +_CeruleanGymMistyCascadeBadgeInfoText:: text "The CASCADEBADGE" line "makes all #MON" cont "up to L30 obey!" @@ -47,17 +47,17 @@ _MistyCascadeBadgeInfoText:: line "my favorite TM!" done -_ReceivedTM11Text:: +_CeruleanGymMistyReceivedTM11Text:: text "<PLAYER> received" line "TM11!@" text_end -_TM11NoRoomText:: +_CeruleanGymMistyTM11NoRoomText:: text "You better make" line "room for this!" done -_ReceivedCascadeBadgeText:: +_CeruleanGymMistyReceivedCascadeBadgeText:: text "I can't" line "believe I lost!" @@ -107,7 +107,7 @@ _CeruleanGymAfterBattleText2:: line "someone like you!" done -_CeruleanGymGuidePreBattleText:: +_CeruleanGymGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -125,7 +125,7 @@ _CeruleanGymGuidePreBattleText:: line "electricity!" done -_CeruleanGymGuidePostBattleText:: +_CeruleanGymGymGuideBeatMistyText:: text "You beat MISTY!" line "What'd I tell ya?" diff --git a/text/CeruleanMart.asm b/text/CeruleanMart.asm index 86a74588..0039b933 100644 --- a/text/CeruleanMart.asm +++ b/text/CeruleanMart.asm @@ -1,4 +1,4 @@ -_CeruleanMartText2:: +_CeruleanMartCooltrainerMText:: text "Use REPEL to keep" line "bugs and weak" cont "#MON away." @@ -9,7 +9,7 @@ _CeruleanMartText2:: cont "for best results!" done -_CeruleanMartText3:: +_CeruleanMartCooltrainerFText:: text "Have you seen any" line "RARE CANDY?" diff --git a/text/CeruleanPokecenter.asm b/text/CeruleanPokecenter.asm index 497fbce3..5c93a5bd 100644 --- a/text/CeruleanPokecenter.asm +++ b/text/CeruleanPokecenter.asm @@ -1,4 +1,4 @@ -_CeruleanPokecenterText2:: +_CeruleanPokecenterSuperNerdText:: text "That BILL!" para "I heard that" @@ -7,7 +7,7 @@ _CeruleanPokecenterText2:: cont "rare #MON!" done -_CeruleanPokecenterText3:: +_CeruleanPokecenterGentlemanText:: text "Have you heard" line "about BILL?" diff --git a/text/CeruleanTrashedHouse.asm b/text/CeruleanTrashedHouse.asm index f79540ae..7d93703d 100644 --- a/text/CeruleanTrashedHouse.asm +++ b/text/CeruleanTrashedHouse.asm @@ -1,4 +1,4 @@ -_CeruleanTrashedText_1d6ab:: +_CeruleanTrashedHouseFishingGuruTheyStoleATMText:: text "Those miserable" line "ROCKETs!" @@ -14,7 +14,7 @@ _CeruleanTrashedText_1d6ab:: line "bundle, it did!" done -_CeruleanTrashedText_1d6b0:: +_CeruleanTrashedHouseFishingGuruWhatsLostIsLostText:: text "I figure what's" line "lost is lost!" @@ -23,14 +23,14 @@ _CeruleanTrashedText_1d6b0:: cont "DIG without a TM!" done -_CeruleanHouseTrashedText2:: +_CeruleanTrashedHouseGirlText:: text "TEAM ROCKET must" line "be trying to DIG" cont "their way into no" cont "good!" done -_CeruleanHouseTrashedText3:: +_CeruleanTrashedHouseWallHoleText:: text "TEAM ROCKET left" line "a way out!" done diff --git a/text/ChampionsRoom.asm b/text/ChampionsRoom.asm index 575b7da4..92f23f69 100644 --- a/text/ChampionsRoom.asm +++ b/text/ChampionsRoom.asm @@ -1,4 +1,4 @@ -_GaryChampionIntroText:: +_ChampionsRoomRivalIntroText:: text "<RIVAL>: Hey!" para "I was looking" @@ -35,7 +35,7 @@ _GaryChampionIntroText:: cont "in the world!" done -_GaryDefeatedText:: +_RivalDefeatedText:: text "NO!" line "That can't be!" cont "You beat my best!" @@ -49,7 +49,7 @@ _GaryDefeatedText:: cont "It's not fair!" prompt -_GaryVictoryText:: +_RivalVictoryText:: text "Hahaha!" line "I won, I won!" @@ -65,7 +65,7 @@ _GaryVictoryText:: line "Hahaha!" prompt -_GaryText_76103:: +_ChampionsRoomRivalAfterBattleText:: text "Why?" line "Why did I lose?" @@ -81,11 +81,11 @@ _GaryText_76103:: line "like to admit it." done -_GaryText2:: +_ChampionsRoomOakText:: text "OAK: <PLAYER>!" done -_GaryText_76120:: +_ChampionsRoomOakCongratulatesPlayerText:: text "OAK: So, you won!" line "Congratulations!" cont "You're the new" @@ -103,7 +103,7 @@ _GaryText_76120:: line "come of age!" done -_GaryText_76125:: +_ChampionsRoomOakDisappointedWithRivalText:: text "OAK: <RIVAL>! I'm" line "disappointed!" @@ -129,7 +129,7 @@ _GaryText_76125:: cont "a champ again!" done -_GaryText_7612a:: +_ChampionsRoomOakComeWithMeText:: text "OAK: <PLAYER>!" para "You understand" diff --git a/text/CinnabarGym.asm b/text/CinnabarGym.asm index 8cdbe0a5..84139abc 100644 --- a/text/CinnabarGym.asm +++ b/text/CinnabarGym.asm @@ -1,4 +1,4 @@ -_BlainePreBattleText:: +_CinnabarGymBlainePreBattleText:: text "Hah!" para "I am BLAINE! I" @@ -13,7 +13,7 @@ _BlainePreBattleText:: line "have BURN HEAL!" done -_ReceivedVolcanoBadgeText:: +_CinnabarGymBlaineReceivedVolcanoBadgeText:: text "I have" line "burnt out!" @@ -21,7 +21,7 @@ _ReceivedVolcanoBadgeText:: line "the VOLCANOBADGE!@" text_end -_BlainePostBattleAdviceText:: +_CinnabarGymBlainePostBattleAdviceText:: text "FIRE BLAST is the" line "ultimate fire" cont "technique!" @@ -30,7 +30,7 @@ _BlainePostBattleAdviceText:: line "water #MON!" done -_BlaineVolcanoBadgeInfoText:: +_CinnabarGymBlaineVolcanoBadgeInfoText:: text "Hah!" para "The VOLCANOBADGE" @@ -42,14 +42,14 @@ _BlaineVolcanoBadgeInfoText:: line "have this too!" done -_ReceivedTM38Text:: +_CinnabarGymBlaineReceivedTM38Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer text "!@" text_end -_TM38ExplanationText:: +_CinnabarGymBlaineTM38ExplanationText:: text_start para "TM38 contains" @@ -63,23 +63,23 @@ _TM38ExplanationText:: cont "good bets!" done -_TM38NoRoomText:: +_CinnabarGymBlaineTM38NoRoomText:: text "Make room for my" line "gift!" done -_CinnabarGymBattleText2:: +_CinnabarGymSuperNerd1BattleText:: text "Do you know how" line "hot #MON fire" cont "breath can get?" done -_CinnabarGymEndBattleText2:: +_CinnabarGymSuperNerd1EndBattleText:: text "Yow!" line "Hot, hot, hot!" prompt -_CinnabarGymAfterBattleText2:: +_CinnabarGymSuperNerd1AfterBattleText:: text "Fire, or to be" line "more precise," cont "combustion..." @@ -88,66 +88,66 @@ _CinnabarGymAfterBattleText2:: line "blah..." done -_CinnabarGymBattleText1:: +_CinnabarGymSuperNerd2BattleText:: text "I was a thief, but" line "I became straight" cont "as a trainer!" done -_CinnabarGymEndBattleText1:: +_CinnabarGymSuperNerd2EndBattleText:: text "I" line "surrender!" prompt -_CinnabarGymAfterBattleText1:: +_CinnabarGymSuperNerd2AfterBattleText:: text "I can't help" line "stealing other" cont "people's #MON!" done -_CinnabarGymBattleText3:: +_CinnabarGymSuperNerd3BattleText:: text "You can't win!" line "I have studied" cont "#MON totally!" done -_CinnabarGymEndBattleText3:: +_CinnabarGymSuperNerd3EndBattleText:: text "Waah!" line "My studies!" prompt -_CinnabarGymAfterBattleText3:: +_CinnabarGymSuperNerd3AfterBattleText:: text "My theories are" line "too complicated" cont "for you!" done -_CinnabarGymBattleText4:: +_CinnabarGymSuperNerd4BattleText:: text "I just like using" line "fire #MON!" done -_CinnabarGymEndBattleText4:: +_CinnabarGymSuperNerd4EndBattleText:: text "Too hot" line "to handle!" prompt -_CinnabarGymAfterBattleText4:: +_CinnabarGymSuperNerd4AfterBattleText:: text "I wish there was" line "a thief #MON!" cont "I'd use that!" done -_CinnabarGymBattleText5:: +_CinnabarGymSuperNerd5BattleText:: text "I know why BLAINE" line "became a trainer!" done -_CinnabarGymEndBattleText5:: +_CinnabarGymSuperNerd5EndBattleText:: text "Ow!" prompt -_CinnabarGymAfterBattleText5:: +_CinnabarGymSuperNerd5AfterBattleText:: text "BLAINE was lost" line "in the mountains" cont "when a fiery bird" @@ -158,40 +158,40 @@ _CinnabarGymAfterBattleText5:: cont "his way down!" done -_CinnabarGymBattleText6:: +_CinnabarGymSuperNerd6BattleText:: text "I've been to many" line "GYMs, but this is" cont "my favorite!" done -_CinnabarGymEndBattleText6:: +_CinnabarGymSuperNerd6EndBattleText:: text "Yowza!" line "Too hot!" prompt -_CinnabarGymAfterBattleText6:: +_CinnabarGymSuperNerd6AfterBattleText:: text "Us fire #MON" line "fans like PONYTA" cont "and NINETALES!" done -_CinnabarGymBattleText7:: +_CinnabarGymSuperNerd7BattleText:: text "Fire is weak" line "against H2O!" done -_CinnabarGymEndBattleText7:: +_CinnabarGymSuperNerd7EndBattleText:: text "Oh!" line "Snuffed out!" prompt -_CinnabarGymAfterBattleText7:: +_CinnabarGymSuperNerd7AfterBattleText:: text "Water beats fire!" line "But, fire melts" cont "ice #MON!" done -_CinnabarGymGuidePreBattleText:: +_CinnabarGymGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -206,7 +206,7 @@ _CinnabarGymGuidePreBattleText:: line "some BURN HEALs!" done -_CinnabarGymGuidePostBattleText:: +_CinnabarGymGymGuideBeatBlaineText:: text "<PLAYER>! You beat" line "that fire brand!" done diff --git a/text/CinnabarIsland.asm b/text/CinnabarIsland.asm index 54552a46..960c88dd 100644 --- a/text/CinnabarIsland.asm +++ b/text/CinnabarIsland.asm @@ -1,33 +1,33 @@ -_CinnabarIslandText8:: +_CinnabarIslandDoorIsLockedText:: text "The door is" line "locked..." done -_CinnabarIslandText1:: +_CinnabarIslandGirlText:: text "CINNABAR GYM's" line "BLAINE is an odd" cont "man who has lived" cont "here for decades." done -_CinnabarIslandText2:: +_CinnabarIslandGamblerText:: text "Scientists conduct" line "experiments in" cont "the burned-out" cont "building." done -_CinnabarIslandText3:: +_CinnabarIslandSignText:: text "CINNABAR ISLAND" line "The Fiery Town of" cont "Burning Desire" done -_CinnabarIslandText6:: +_CinnabarIslandPokemonLabSignText:: text "#MON LAB" done -_CinnabarIslandText7:: +_CinnabarIslandGymSignText:: text "CINNABAR ISLAND" line "#MON GYM" cont "LEADER: BLAINE" diff --git a/text/CinnabarLab.asm b/text/CinnabarLab.asm index a93a484d..3d1102f2 100644 --- a/text/CinnabarLab.asm +++ b/text/CinnabarLab.asm @@ -1,4 +1,4 @@ -_Lab1Text1:: +_CinnabarLabFishingGuruText:: text "We study #MON" line "extensively here." @@ -7,23 +7,23 @@ _Lab1Text1:: cont "for examination." done -_Lab1Text2:: +_CinnabarLabPhotoText:: text "A photo of the" line "LAB's founder," cont "DR.FUJI!" done -_Lab1Text3:: +_CinnabarLabMeetingRoomSignText:: text "#MON LAB" line "Meeting Room" done -_Lab1Text4:: +_CinnabarLabRAndDSignText:: text "#MON LAB" line "R-and-D Room" done -_Lab1Text5:: +_CinnabarLabTestingRoomSignText:: text "#MON LAB" line "Testing Room" done diff --git a/text/CinnabarLabFossilRoom.asm b/text/CinnabarLabFossilRoom.asm index 14db7fff..6701bbd0 100644 --- a/text/CinnabarLabFossilRoom.asm +++ b/text/CinnabarLabFossilRoom.asm @@ -1,4 +1,4 @@ -_Lab4Text_75dc6:: +_CinnabarLabFossilRoomScientist1Text:: text "Hiya!" para "I am important" @@ -11,11 +11,11 @@ _Lab4Text_75dc6:: line "fossil for me?" prompt -_Lab4Text_75dcb:: +_CinnabarLabFossilRoomScientist1NoFossilsText:: text "No! Is too bad!" done -_Lab4Text_75dd0:: +_CinnabarLabFossilRoomScientist1GoForAWalkText:: text "I take a little" line "time!" @@ -23,7 +23,7 @@ _Lab4Text_75dd0:: line "little while!" done -_Lab4Text_75dd5:: +_CinnabarLabFossilRoomScientist1FossilIsBackToLifeText:: text "Where were you?" para "Your fossil is" @@ -35,7 +35,7 @@ _Lab4Text_75dd5:: line "like I think!" prompt -_Lab4Text_610ae:: +_CinnabarLabFossilRoomScientist1SeesFossilText:: text "Oh! That is" line "@" text_ram wcd6d @@ -54,7 +54,7 @@ _Lab4Text_610ae:: cont "again!" done -_Lab4Text_610b3:: +_CinnabarLabFossilRoomScientist1TakesFossilText:: text "So! You hurry and" line "give me that!" @@ -64,7 +64,7 @@ _Lab4Text_610b3:: text "!" prompt -_Lab4Text_610b8:: +_CinnabarLabFossilRoomScientist1GoForAWalkText2:: text "I take a little" line "time!" @@ -72,7 +72,7 @@ _Lab4Text_610b8:: line "little while!" done -_Lab4Text_610bd:: +_CinnabarLabFossilRoomScientist1ComeAgainText:: text "Aiyah! You come" line "again!" done diff --git a/text/CinnabarLabMetronomeRoom.asm b/text/CinnabarLabMetronomeRoom.asm index 2a809953..dc42e114 100644 --- a/text/CinnabarLabMetronomeRoom.asm +++ b/text/CinnabarLabMetronomeRoom.asm @@ -1,4 +1,4 @@ -_TM35PreReceiveText:: +_CinnabarLabMetronomeRoomScientist1Text:: text "Tch-tch-tch!" line "I made a cool TM!" @@ -6,14 +6,14 @@ _TM35PreReceiveText:: line "kinds of fun!" prompt -_ReceivedTM35Text:: +_CinnabarLabMetronomeRoomScientist1ReceivedTM35Text:: text "<PLAYER> received " line "@" text_ram wStringBuffer text "!@" text_end -_TM35ExplanationText:: +_CinnabarLabMetronomeRoomScientist1TM35ExplanationText:: text "Tch-tch-tch!" line "That's the sound" cont "of a METRONOME!" @@ -24,18 +24,18 @@ _TM35ExplanationText:: cont "it doesn't know!" done -_TM35NoRoomText:: +_CinnabarLabMetronomeRoomScientist1TM35NoRoomText:: text "Your pack is" line "crammed full!" done -_Lab3Text2:: +_CinnabarLabMetronomeRoomScientist2Text:: text "EEVEE can evolve" line "into 1 of 3 kinds" cont "of #MON." done -_Lab3Text3:: +_CinnabarLabMetronomeRoomPCText:: text "There's an e-mail" line "message!" @@ -59,6 +59,6 @@ _Lab3Text3:: para "..." done -_Lab3Text5:: +_CinnabarLabMetronomeRoomAmberPipeText:: text "An amber pipe!" done diff --git a/text/CinnabarLabTradeRoom.asm b/text/CinnabarLabTradeRoom.asm index 196124e7..6f9a409e 100644 --- a/text/CinnabarLabTradeRoom.asm +++ b/text/CinnabarLabTradeRoom.asm @@ -1,4 +1,4 @@ -_Lab2Text1:: +_CinnabarLabTradeRoomSuperNerdText:: text "I found this very" line "strange fossil in" cont "MT.MOON!" diff --git a/text/CinnabarMart.asm b/text/CinnabarMart.asm index 42a41d06..063e2ff9 100644 --- a/text/CinnabarMart.asm +++ b/text/CinnabarMart.asm @@ -1,10 +1,10 @@ -_CinnabarMartText2:: +_CinnabarMartSilphWorkerFText:: text "Don't they have X" line "ATTACK? It's good" cont "for battles!" done -_CinnabarMartText3:: +_CinnabarMartScientistText:: text "It never hurts to" line "have extra items!" done diff --git a/text/CinnabarPokecenter.asm b/text/CinnabarPokecenter.asm index cf481764..07602e6e 100644 --- a/text/CinnabarPokecenter.asm +++ b/text/CinnabarPokecenter.asm @@ -1,4 +1,4 @@ -_CinnabarPokecenterText2:: +_CinnabarPokecenterCooltrainerFText:: text "You can cancel" line "evolution." @@ -8,7 +8,7 @@ _CinnabarPokecenterText2:: cont "it the way it is." done -_CinnabarPokecenterText3:: +_CinnabarPokecenterGentlemanText:: text "Do you have any" line "friends?" diff --git a/text/CopycatsHouse1F.asm b/text/CopycatsHouse1F.asm index d2d1f42a..e3af7d92 100644 --- a/text/CopycatsHouse1F.asm +++ b/text/CopycatsHouse1F.asm @@ -1,11 +1,11 @@ -_CopycatsHouse1FText1:: +_CopycatsHouse1FMiddleAgedWomanText:: text "My daughter is so" line "self-centered." cont "She only has a" cont "few friends." done -_CopycatsHouse1FText2:: +_CopycatsHouse1FMiddleAgedManText:: text "My daughter likes" line "to mimic people." @@ -15,7 +15,7 @@ _CopycatsHouse1FText2:: cont "around here!" done -_CopycatsHouse1FText3:: +_CopycatsHouse1FChanseyText:: text "CHANSEY: Chaaan" line "sey!@" text_end diff --git a/text/CopycatsHouse2F.asm b/text/CopycatsHouse2F.asm index 117dd64e..83184615 100644 --- a/text/CopycatsHouse2F.asm +++ b/text/CopycatsHouse2F.asm @@ -1,4 +1,4 @@ -_CopycatsHouse2FText_5ccd4:: +_CopycatsHouse2FCopycatDoYouLikePokemonText:: text "<PLAYER>: Hi! Do" line "you like #MON?" @@ -15,7 +15,7 @@ _CopycatsHouse2FText_5ccd4:: line "favorite hobby!" prompt -_TM31PreReceiveText:: +_CopycatsHouse2FCopycatTM31PreReceiveText:: text "Oh wow!" line "A # DOLL!" @@ -26,14 +26,14 @@ _TM31PreReceiveText:: line "this, then!" prompt -_ReceivedTM31Text:: +_CopycatsHouse2FCopycatReceivedTM31Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer text "!@" text_end -_TM31ExplanationText1:: +_CopycatsHouse2FCopycatTM31Explanation1Text:: text_start para "TM31 contains my" @@ -43,7 +43,7 @@ _TM31ExplanationText1:: line "#MON!@" text_end -_TM31ExplanationText2:: +_CopycatsHouse2FCopycatTM31Explanation2Text:: text "<PLAYER>: Hi!" line "Thanks for TM31!" @@ -57,12 +57,12 @@ _TM31ExplanationText2:: line "It's a scream!" done -_TM31NoRoomText:: +_CopycatsHouse2FCopycatTM31NoRoomText:: text "Don't you want" line "this?@" text_end -_CopycatsHouse2FText2:: +_CopycatsHouse2FDoduoText:: text "DODUO: Giiih!" para "MIRROR MIRROR ON" @@ -71,19 +71,19 @@ _CopycatsHouse2FText2:: cont "OF ALL?" done -_CopycatsHouse2FText3:: +_CopycatsHouse2FRareDollText:: text "This is a rare" line "#MON! Huh?" cont "It's only a doll!" done -_CopycatsHouse2FText6:: +_CopycatsHouse2FSNESText:: text "A game with MARIO" line "wearing a bucket" cont "on his head!" done -_CopycatsHouse2FText_5cd17:: +_CopycatsHouse2FPCMySecretsText:: text "..." para "My Secrets!" @@ -95,6 +95,6 @@ _CopycatsHouse2FText_5cd17:: cont "CLEFAIRY!" done -_CopycatsHouse2FText_5cd1c:: +_CopycatsHouse2FPCCantSeeText:: text "Huh? Can't see!" done diff --git a/text/Daycare.asm b/text/Daycare.asm index aa1e5bc5..a5b36b7d 100644 --- a/text/Daycare.asm +++ b/text/Daycare.asm @@ -1,16 +1,16 @@ -_DayCareIntroText:: +_DaycareGentlemanIntroText:: text "I run a DAYCARE." line "Would you like me" cont "to raise one of" cont "your #MON?" done -_DayCareWhichMonText:: +_DaycareGentlemanWhichMonText:: text "Which #MON" line "should I raise?" prompt -_DayCareWillLookAfterMonText:: +_DaycareGentlemanWillLookAfterMonText:: text "Fine, I'll look" line "after @" text_ram wcd6d @@ -18,12 +18,12 @@ _DayCareWillLookAfterMonText:: cont "for a while." prompt -_DayCareComeSeeMeInAWhileText:: +_DaycareGentlemanComeSeeMeInAWhileText:: text "Come see me in" line "a while." done -_DayCareMonHasGrownText:: +_DaycareGentlemanMonHasGrownText:: text "Your @" text_ram wcd6d text_start @@ -37,7 +37,7 @@ _DayCareMonHasGrownText:: para "Aren't I great?" prompt -_DayCareOweMoneyText:: +_DaycareGentlemanOweMoneyText:: text "You owe me ¥@" text_bcd wDayCareTotalCost, 2 | LEADING_ZEROES | LEFT_ALIGN text_start @@ -45,14 +45,14 @@ _DayCareOweMoneyText:: cont "of this #MON." done -_DayCareGotMonBackText:: +_DaycareGentlemanGotMonBackText:: text "<PLAYER> got" line "@" text_ram wDayCareMonName text " back!" done -_DayCareMonNeedsMoreTimeText:: +_DaycareGentlemanMonNeedsMoreTimeText:: text "Back already?" line "Your @" text_ram wcd6d @@ -61,37 +61,37 @@ _DayCareMonNeedsMoreTimeText:: cont "time with me." prompt -_DayCareAllRightThenText:: +_DaycareGentlemanAllRightThenText:: text "All right then," line "@" text_end -_DayCareComeAgainText:: +_DaycareGentlemanComeAgainText:: text "Come again." done -_DayCareNoRoomForMonText:: +_DaycareGentlemanNoRoomForMonText:: text "You have no room" line "for this #MON!" done -_DayCareOnlyHaveOneMonText:: +_DaycareGentlemanOnlyHaveOneMonText:: text "You only have one" line "#MON with you." done -_DayCareCantAcceptMonWithHMText:: +_DaycareGentlemanCantAcceptMonWithHMText:: text "I can't accept a" line "#MON that" cont "knows an HM move." done -_DayCareHeresYourMonText:: +_DaycareGentlemanHeresYourMonText:: text "Thank you! Here's" line "your #MON!" prompt -_DayCareNotEnoughMoneyText:: +_DaycareGentlemanNotEnoughMoneyText:: text "Hey, you don't" line "have enough ¥!" done diff --git a/text/DiglettsCaveRoute11.asm b/text/DiglettsCaveRoute11.asm index ecd3225e..62e9a1ea 100644 --- a/text/DiglettsCaveRoute11.asm +++ b/text/DiglettsCaveRoute11.asm @@ -1,4 +1,4 @@ -_DiglettsCaveEntRoute11Text1:: +_DiglettsCaveRoute11GamblerText:: text "What a surprise!" line "DIGLETTs dug this" cont "long tunnel!" diff --git a/text/DiglettsCaveRoute2.asm b/text/DiglettsCaveRoute2.asm index a04bbef7..cf2f328e 100644 --- a/text/DiglettsCaveRoute2.asm +++ b/text/DiglettsCaveRoute2.asm @@ -1,4 +1,4 @@ -_DiglettsCaveRoute2Text1:: +_DiglettsCaveRoute2FishingGuruText:: text "I went to ROCK" line "TUNNEL, but it's" cont "dark and scary." diff --git a/text/FightingDojo.asm b/text/FightingDojo.asm index a6ccc8c3..926c663e 100644 --- a/text/FightingDojo.asm +++ b/text/FightingDojo.asm @@ -1,4 +1,4 @@ -_FightingDojoText_5ce8e:: +_FightingDojoKarateMasterText:: text "Grunt!" para "I am the KARATE" @@ -12,12 +12,12 @@ _FightingDojoText_5ce8e:: para "Fwaaa!" done -_FightingDojoText_5ce93:: +_FightingDojoKarateMasterDefeatedText:: text "Hwa!" line "Arrgh! Beaten!" prompt -_FightingDojoText_5ce98:: +_FightingDojoKarateMasterIWillGiveYouAPokemonText:: text "Indeed, I have" line "lost!" @@ -34,24 +34,24 @@ _FightingDojoText_5ce98:: line "one you like!" done -_FightingDojoText_5ce9d:: +_FightingDojoKarateMasterStayAndTrainWithUsText:: text "Ho!" para "Stay and train at" line "Karate with us!" done -_FightingDojoBattleText1:: +_FightingDojoBlackbelt1BattleText:: text "Hoargh! Take your" line "shoes off!" done -_FightingDojoEndBattleText1:: +_FightingDojoBlackbelt1EndBattleText:: text "I give" line "up!" prompt -_FightingDojoAfterBattleText1:: +_FightingDojoBlackbelt1AfterBattleText:: text "You wait 'til you" line "see our Master!" @@ -59,22 +59,22 @@ _FightingDojoAfterBattleText1:: line "compared to him!" done -_FightingDojoBattleText2:: +_FightingDojoBlackbelt2BattleText:: text "I hear you're" line "good! Show me!" done -_FightingDojoEndBattleText2:: +_FightingDojoBlackbelt2EndBattleText:: text "Judge!" line "1 point!" prompt -_FightingDojoAfterBattleText2:: +_FightingDojoBlackbelt2AfterBattleText:: text "Our Master is a" line "pro fighter!" done -_FightingDojoBattleText3:: +_FightingDojoBlackbelt3BattleText:: text "Nothing tough" line "frightens me!" @@ -82,18 +82,18 @@ _FightingDojoBattleText3:: line "for training!" done -_FightingDojoEndBattleText3:: +_FightingDojoBlackbelt3EndBattleText:: text "Yow!" line "Stubbed fingers!" prompt -_FightingDojoAfterBattleText3:: +_FightingDojoBlackbelt3AfterBattleText:: text "The only thing" line "that frightens us" cont "is psychic power!" done -_FightingDojoBattleText4:: +_FightingDojoBlackbelt4BattleText:: text "Hoohah!" para "You're trespassing" @@ -101,30 +101,30 @@ _FightingDojoBattleText4:: cont "DOJO!" done -_FightingDojoEndBattleText4:: +_FightingDojoBlackbelt4EndBattleText:: text "Oof!" line "I give up!" prompt -_FightingDojoAfterBattleText4:: +_FightingDojoBlackbelt4AfterBattleText:: text "The prime fighters" line "across the land" cont "train here." done -_WantHitmonleeText:: +_FightingDojoHitmonleePokeBallText:: text "You want the" line "hard-kicking" cont "HITMONLEE?" done -_WantHitmonchanText:: +_FightingDojoHitmonchanPokeBallText:: text "You want the" line "piston-punching" cont "HITMONCHAN?" done -_OtherHitmonText:: +_FightingDojoBetterNotGetGreedyText:: text "Better not get" line "greedy..." done diff --git a/text/FuchsiaBillsGrandpasHouse.asm b/text/FuchsiaBillsGrandpasHouse.asm index 7b6556b1..9842de2f 100644 --- a/text/FuchsiaBillsGrandpasHouse.asm +++ b/text/FuchsiaBillsGrandpasHouse.asm @@ -1,4 +1,4 @@ -_FuchsiaHouse1Text1:: +_FuchsiaBillsGrandpasHouseMiddleAgedWomanText:: text "SAFARI ZONE's" line "WARDEN is old," cont "but still active!" @@ -7,7 +7,7 @@ _FuchsiaHouse1Text1:: line "false, though." done -_FuchsiaHouse1Text2:: +_FuchsiaBillsGrandpasHouseBillsGrandpaText:: text "Hmm? You've met" line "BILL?" @@ -18,7 +18,7 @@ _FuchsiaHouse1Text2:: cont "even as a child!" done -_FuchsiaHouse1Text3:: +_FuchsiaBillsGrandpasHouseYoungsterText:: text "BILL files his" line "own #MON data" cont "on his PC!" diff --git a/text/FuchsiaCity.asm b/text/FuchsiaCity.asm index 0392a1ed..d80238aa 100644 --- a/text/FuchsiaCity.asm +++ b/text/FuchsiaCity.asm @@ -1,11 +1,11 @@ -_FuchsiaCityText1:: +_FuchsiaCityYoungster1Text:: text "Did you try the" line "SAFARI GAME? Some" cont "#MON can only" cont "be caught there." done -_FuchsiaCityText2:: +_FuchsiaCityGamblerText:: text "SAFARI ZONE has a" line "zoo in front of" cont "the entrance." @@ -15,44 +15,44 @@ _FuchsiaCityText2:: cont "catching #MON." done -_FuchsiaCityText3:: +_FuchsiaCityErikText:: text "ERIK: Where's" line "SARA? I said I'd" cont "meet her here." done -_FuchsiaCityText4:: +_FuchsiaCityYoungster2Text:: text "That item ball in" line "there is really a" cont "#MON." done -_FuchsiaCityText5:: +_FuchsiaCityPokemonText:: text "!" done -_FuchsiaCityText11:: +_FuchsiaCitySignText:: text "FUCHSIA CITY" line "Behold! It's" cont "Passion Pink!" done -_FuchsiaCityText13:: +_FuchsiaCitySafariGameSignText:: text "SAFARI GAME" line "#MON-U-CATCH!" done -_FuchsiaCityText16:: +_FuchsiaCityWardensHomeSignText:: text "SAFARI ZONE" line "WARDEN's HOME" done -_FuchsiaCityText17:: +_FuchsiaCitySafariZoneSignText:: text "#MON PARADISE" line "SAFARI ZONE" done -_FuchsiaCityText18:: +_FuchsiaCityGymSignText:: text "FUCHSIA CITY" line "#MON GYM" cont "LEADER: KOGA" @@ -61,21 +61,21 @@ _FuchsiaCityText18:: line "Ninja Master!" done -_FuchsiaCityChanseyText:: +_FuchsiaCityChanseySignText:: text "Name: CHANSEY" para "Catching one is" line "all up to chance." prompt -_FuchsiaCityVoltorbText:: +_FuchsiaCityVoltorbSignText:: text "Name: VOLTORB" para "The very image of" line "a # BALL." prompt -_FuchsiaCityKangaskhanText:: +_FuchsiaCityKangaskhanSignText:: text "Name: KANGASKHAN" para "A maternal #MON" @@ -84,21 +84,21 @@ _FuchsiaCityKangaskhanText:: cont "on its belly." prompt -_FuchsiaCitySlowpokeText:: +_FuchsiaCitySlowpokeSignText:: text "Name: SLOWPOKE" para "Friendly and very" line "slow moving." prompt -_FuchsiaCityLaprasText:: +_FuchsiaCityLaprasSignText:: text "Name: LAPRAS" para "A.K.A. the king" line "of the seas." prompt -_FuchsiaCityOmanyteText:: +_FuchsiaCityFossilSignOmanyteText:: text "Name: OMANYTE" para "A #MON that" @@ -106,7 +106,7 @@ _FuchsiaCityOmanyteText:: cont "from a fossil." prompt -_FuchsiaCityKabutoText:: +_FuchsiaCityFossilSignKabutoText:: text "Name: KABUTO" para "A #MON that" @@ -114,6 +114,6 @@ _FuchsiaCityKabutoText:: cont "from a fossil." prompt -_FuchsiaCityText_19b2a:: +_FuchsiaCityFossilSignUndeterminedText:: text "..." done diff --git a/text/FuchsiaGoodRodHouse.asm b/text/FuchsiaGoodRodHouse.asm index 4625f8bf..d1454551 100644 --- a/text/FuchsiaGoodRodHouse.asm +++ b/text/FuchsiaGoodRodHouse.asm @@ -1,4 +1,4 @@ -_FuchsiaHouse3Text_561bd:: +_FuchsiaGoodRodHouseFishingGuruText:: text "I'm the FISHING" line "GURU's older" cont "brother!" @@ -10,7 +10,7 @@ _FuchsiaHouse3Text_561bd:: line "fish?" done -_FuchsiaHouse3Text_561c2:: +_FuchsiaGoodRodHouseFishingGuruReceivedGoodRodText:: text "Grand! I like" line "your style!" @@ -23,12 +23,12 @@ _FuchsiaHouse3Text_561c2:: text "!@" text_end -_FuchsiaHouse3Text_56212:: +_FuchsiaGoodRodHouseFishingGuruThatsSoDisappointingText:: text "Oh... That's so" line "disappointing..." done -_FuchsiaHouse3Text_56217:: +_FuchsiaGoodRodHouseFishingGuruHowAreTheFishText:: text "Hello there," line "<PLAYER>!" @@ -36,7 +36,7 @@ _FuchsiaHouse3Text_56217:: line "biting?" done -_FuchsiaHouse3Text_5621c:: +_FuchsiaGoodRodHouseFishingGuruNoRoomText:: text "Oh no!" para "You have no room" diff --git a/text/FuchsiaGym.asm b/text/FuchsiaGym.asm index 24de76d6..2685c6c8 100644 --- a/text/FuchsiaGym.asm +++ b/text/FuchsiaGym.asm @@ -1,4 +1,4 @@ -_KogaBeforeBattleText:: +_FuchsiaGymKogaBeforeBattleText:: text "KOGA: Fwahahaha!" para "A mere child like" @@ -16,7 +16,7 @@ _KogaBeforeBattleText:: cont "techniques!" done -_ReceivedSoulBadgeText:: +_FuchsiaGymKogaReceivedSoulBadgeText:: text "Humph!" line "You have proven" cont "your worth!" @@ -25,7 +25,7 @@ _ReceivedSoulBadgeText:: line "SOULBADGE!" prompt -_KogaPostBattleAdviceText:: +_FuchsiaGymKogaPostBattleAdviceText:: text "When afflicted by" line "TOXIC, #MON" cont "suffer more and" @@ -36,7 +36,7 @@ _KogaPostBattleAdviceText:: line "terrorize foes!" done -_KogaSoulBadgeInfoText:: +_FuchsiaGymKogaSoulBadgeInfoText:: text "Now that you have" line "the SOULBADGE," cont "the DEFENSE of" @@ -51,14 +51,14 @@ _KogaSoulBadgeInfoText:: line "too!" done -_ReceivedTM06Text:: +_FuchsiaGymKogaReceivedTM06Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer text "!@" text_end -_TM06ExplanationText:: +_FuchsiaGymKogaTM06ExplanationText:: text_start para "TM06 contains" line "TOXIC!" @@ -68,12 +68,12 @@ _TM06ExplanationText:: cont "400 years old!" done -_TM06NoRoomText:: +_FuchsiaGymKogaTM06NoRoomText:: text "Make space for" line "this, child!" done -_FuchsiaGymBattleText1:: +_FuchsiaGymRocker1BattleText:: text "Strength isn't" line "the key for" cont "#MON!" @@ -85,54 +85,54 @@ _FuchsiaGymBattleText1:: cont "brute strength!" done -_FuchsiaGymEndBattleText1:: +_FuchsiaGymRocker1EndBattleText:: text "What?" line "Extraordinary!" prompt -_FuchsiaGymAfterBattleText1:: +_FuchsiaGymRocker1AfterBattleText:: text "So, you mix brawn" line "with brains?" cont "Good strategy!" done -_FuchsiaGymBattleText2:: +_FuchsiaGymRocker2BattleText:: text "I wanted to become" line "a ninja, so I" cont "joined this GYM!" done -_FuchsiaGymEndBattleText2:: +_FuchsiaGymRocker2EndBattleText:: text "I'm done" line "for!" prompt -_FuchsiaGymAfterBattleText2:: +_FuchsiaGymRocker2AfterBattleText:: text "I will keep on" line "training under" cont "KOGA, my ninja" cont "master!" done -_FuchsiaGymBattleText3:: +_FuchsiaGymRocker3BattleText:: text "Let's see you" line "beat my special" cont "techniques!" done -_FuchsiaGymEndBattleText3:: +_FuchsiaGymRocker3EndBattleText:: text "You" line "had me fooled!" prompt -_FuchsiaGymAfterBattleText3:: +_FuchsiaGymRocker3AfterBattleText:: text "I like poison and" line "sleep techniques," cont "as they linger" cont "after battle!" done -_FuchsiaGymBattleText4:: +_FuchsiaGymRocker4BattleText:: text "Stop right there!" para "Our invisible" @@ -140,12 +140,12 @@ _FuchsiaGymBattleText4:: cont "frustrated?" done -_FuchsiaGymEndBattleText4:: +_FuchsiaGymRocker4EndBattleText:: text "Whoa!" line "He's got it!" prompt -_FuchsiaGymAfterBattleText4:: +_FuchsiaGymRocker4AfterBattleText:: text "You impressed me!" line "Here's a hint!" @@ -154,7 +154,7 @@ _FuchsiaGymAfterBattleText4:: cont "invisible walls!" done -_FuchsiaGymBattleText5:: +_FuchsiaGymRocker5BattleText:: text "I also study the" line "way of the ninja" cont "with master KOGA!" @@ -164,16 +164,16 @@ _FuchsiaGymBattleText5:: cont "animals!" done -_FuchsiaGymEndBattleText5:: +_FuchsiaGymRocker5EndBattleText:: text "Awoo!" prompt -_FuchsiaGymAfterBattleText5:: +_FuchsiaGymRocker5AfterBattleText:: text "I still have much" line "to learn!" done -_FuchsiaGymBattleText6:: +_FuchsiaGymRocker6BattleText:: text "Master KOGA comes" line "from a long line" cont "of ninjas!" @@ -182,12 +182,12 @@ _FuchsiaGymBattleText6:: line "descend from?" done -_FuchsiaGymEndBattleText6:: +_FuchsiaGymRocker6EndBattleText:: text "Dropped" line "my balls!" prompt -_FuchsiaGymAfterBattleText6:: +_FuchsiaGymRocker6AfterBattleText:: text "Where there is" line "light, there is" cont "shadow!" @@ -197,7 +197,7 @@ _FuchsiaGymAfterBattleText6:: cont "choose?" done -_FuchsiaGymGuidePreBattleText:: +_FuchsiaGymGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -214,7 +214,7 @@ _FuchsiaGymGuidePreBattleText:: cont "to reach him!" done -_FuchsiaGymGuidePostBattleText:: +_FuchsiaGymGymGuideBeatKogaText:: text "It's amazing how" line "ninja can terrify" cont "even now!" diff --git a/text/FuchsiaMart.asm b/text/FuchsiaMart.asm index 574898ce..6033b02c 100644 --- a/text/FuchsiaMart.asm +++ b/text/FuchsiaMart.asm @@ -1,4 +1,4 @@ -_FuchsiaMartText2:: +_FuchsiaMartMiddleAgedManText:: text "Do you have a" line "SAFARI ZONE flag?" @@ -6,7 +6,7 @@ _FuchsiaMartText2:: line "or calendars?" done -_FuchsiaMartText3:: +_FuchsiaMartCooltrainerFText:: text "Did you try X" line "SPEED? It speeds" cont "up a #MON in" diff --git a/text/FuchsiaMeetingRoom.asm b/text/FuchsiaMeetingRoom.asm index 10675ead..c3278861 100644 --- a/text/FuchsiaMeetingRoom.asm +++ b/text/FuchsiaMeetingRoom.asm @@ -1,4 +1,4 @@ -_FuchsiaMeetingRoomText1:: +_FuchsiaMeetingRoomSafariZoneWorker1:: text "We nicknamed the" line "WARDEN SLOWPOKE." @@ -6,7 +6,7 @@ _FuchsiaMeetingRoomText1:: line "both look vacant!" done -_FuchsiaMeetingRoomText2:: +_FuchsiaMeetingRoomSafariZoneWorker2:: text "SLOWPOKE is very" line "knowledgeable" cont "about #MON!" @@ -16,7 +16,7 @@ _FuchsiaMeetingRoomText2:: cont "extinct #MON!" done -_FuchsiaMeetingRoomText3:: +_FuchsiaMeetingRoomSafariZoneWorker3:: text "SLOWPOKE came in," line "but I couldn't" cont "understand him." diff --git a/text/FuchsiaPokecenter.asm b/text/FuchsiaPokecenter.asm index a0def7eb..b7c6b364 100644 --- a/text/FuchsiaPokecenter.asm +++ b/text/FuchsiaPokecenter.asm @@ -1,4 +1,4 @@ -_FuchsiaPokecenterText1:: +_FuchsiaPokecenterRockerText:: text "You can't win" line "with just one" cont "strong #MON." @@ -8,7 +8,7 @@ _FuchsiaPokecenterText1:: cont "them evenly." done -_FuchsiaPokecenterText3:: +_FuchsiaPokecenterCooltrainerFText:: text "There's a narrow" line "trail west of" cont "VIRIDIAN CITY." diff --git a/text/GameCorner.asm b/text/GameCorner.asm index a65043d9..1c38ea40 100644 --- a/text/GameCorner.asm +++ b/text/GameCorner.asm @@ -1,4 +1,4 @@ -_CeladonGameCornerText1:: +_GameCornerBeauty1Text:: text "Welcome!" para "You can exchange" @@ -7,7 +7,7 @@ _CeladonGameCornerText1:: cont "next door." done -_CeladonGameCornerText_48d22:: +_GameCornerClerkDoYouNeedSomeGameCoinsText:: text "Welcome to ROCKET" line "GAME CORNER!" @@ -19,32 +19,32 @@ _CeladonGameCornerText_48d22:: cont "like some?" done -_CeladonGameCornerText_48d27:: +_GameCornerClerkThanksHereAre50CoinsText:: text "Thanks! Here are" line "your 50 coins!" done -_CeladonGameCornerText_48d2c:: +_GameCornerClerkPleaseComePlaySometimeText:: text "No? Please come" line "play sometime!" done -_CeladonGameCornerText_48d31:: +_GameCornerClerkCantAffordTheCoinsText:: text "You can't afford" line "the coins!" done -_CeladonGameCornerText_48d36:: +_GameCornerClerkCoinCaseIsFullText:: text "Oops! Your COIN" line "CASE is full." done -_CeladonGameCornerText_48d3b:: +_GameCornerClerkDontHaveCoinCaseText:: text "You don't have a" line "COIN CASE!" done -_CeladonGameCornerText3:: +_GameCornerMiddleAgedMan1Text:: text "Keep this quiet." para "It's rumored that" @@ -52,38 +52,38 @@ _CeladonGameCornerText3:: cont "by TEAM ROCKET." done -_CeladonGameCornerText4:: +_GameCornerBeauty2Text:: text "I think these" line "machines have" cont "different odds." done -_CeladonGameCornerText_48d9c:: +_GameCornerFishingGuru1WantToPlayText:: text "Kid, do you want" line "to play?" prompt -_Received10CoinsText:: +_GameCornerFishingGuru1Received10CoinsText:: text "<PLAYER> received" line "10 coins!@" text_end -_CeladonGameCornerText_48da7:: +_GameCornerFishingGuru1DontNeedMyCoinsText:: text "You don't need my" line "coins!" done -_CeladonGameCornerText_48dac:: +_GameCornerFishingGuru1WinsComeAndGoText:: text "Wins seem to come" line "and go." done -_CeladonGameCornerText6:: +_GameCornerMiddleAgedWomanText:: text "I'm having a" line "wonderful time!" done -_CeladonGameCornerText_48dca:: +_GameCornerGymGuideChampInMakingText:: text "Hey!" para "You have better" @@ -100,7 +100,7 @@ _CeladonGameCornerText_48dca:: cont "be fooled!" done -_CeladonGameCornerText_48dcf:: +_GameCornerGymGuideTheyOfferRarePokemonText:: text "They offer rare" line "#MON that can" cont "be exchanged for" @@ -110,73 +110,73 @@ _CeladonGameCornerText_48dcf:: line "seem to win!" done -_CeladonGameCornerText8:: +_GameCornerGamblerText:: text "Games are scary!" line "It's so easy to" cont "get hooked!" done -_CeladonGameCornerText_48e26:: +_GameCornerMiddleAgedMan2WantSomeCoinsText:: text "What's up? Want" line "some coins?" prompt -_Received20CoinsText:: +_GameCornerMiddleAgedMan2Received20CoinsText:: text "<PLAYER> received" line "20 coins!@" text_end -_CeladonGameCornerText_48e31:: +_GameCornerMiddleAgedMan2YouHaveLotsOfCoinsText:: text "You have lots of" line "coins!" done -_CeladonGameCornerText_48e36:: +_GameCornerMiddleAgedMan2INeedMoreCoinsText:: text "Darn! I need more" line "coins for the" cont "#MON I want!" done -_CeladonGameCornerText_48e88:: +_GameCornerFishingGuru2ThrowingMeOffText:: text "Hey, what? You're" line "throwing me off!" cont "Here are some" cont "coins, shoo!" prompt -_CeladonGameCornerText_48e8d:: +_GameCornerFishingGuru2Received20CoinsText:: text "<PLAYER> received" line "20 coins!@" text_end -_CeladonGameCornerText_48e93:: +_GameCornerFishingGuru2YouGotYourOwnCoinsText:: text "You've got your" line "own coins!" done -_CeladonGameCornerText_48e98:: +_GameCornerFishingGuru2CloselyWatchTheReelsText:: text "The trick is to" line "watch the reels" cont "closely!" done -_CeladonGameCornerText_48ece:: +_GameCornerRocketImGuardingThisPosterText:: text "I'm guarding this" line "poster!" cont "Go away, or else!" done -_CeladonGameCornerText_48ed3:: +_GameCornerRocketBattleEndText:: text "Dang!" prompt -_CeladonGameCornerText_48ed8:: +_GameCornerRocketAfterBattleText:: text "Our hideout might" line "be discovered! I" cont "better tell BOSS!" done -_CeladonGameCornerText_48f09:: +_GameCornerPosterSwitchBehindPosterText:: text "Hey!" para "A switch behind" diff --git a/text/GameCornerPrizeRoom.asm b/text/GameCornerPrizeRoom.asm index 6b2bb537..9ece15ac 100644 --- a/text/GameCornerPrizeRoom.asm +++ b/text/GameCornerPrizeRoom.asm @@ -1,4 +1,4 @@ -_CeladonPrizeRoomText1:: +_GameCornerPrizeRoomBaldingGuyText:: text "I sure do fancy" line "that PORYGON!" @@ -6,7 +6,7 @@ _CeladonPrizeRoomText1:: line "win at slots!" done -_CeladonPrizeRoomText2:: +_GameCornerPrizeRoomGamblerText:: text "I had a major" line "haul today!" done diff --git a/text/GameCorner_2.asm b/text/GameCorner_2.asm index c288464d..3ea03fe5 100644 --- a/text/GameCorner_2.asm +++ b/text/GameCorner_2.asm @@ -1,4 +1,4 @@ -_CeladonGameCornerText_48f19:: +_GameCornerOopsForgotCoinCaseText:: text "Oops! Forgot the" line "COIN CASE!" done diff --git a/text/HallOfFame.asm b/text/HallOfFame.asm index 8faefd3f..8ab07c7c 100644 --- a/text/HallOfFame.asm +++ b/text/HallOfFame.asm @@ -1,4 +1,4 @@ -_HallofFameRoomText1:: +_HallOfFameOakText:: text "OAK: Er-hem!" line "Congratulations," cont "<PLAYER>!" diff --git a/text/IndigoPlateauLobby.asm b/text/IndigoPlateauLobby.asm index 8487e29a..13ce4048 100644 --- a/text/IndigoPlateauLobby.asm +++ b/text/IndigoPlateauLobby.asm @@ -1,4 +1,4 @@ -_IndigoPlateauLobbyText2:: +_IndigoPlateauLobbyGymGuideText:: text "Yo! Champ in" line "making!" @@ -13,7 +13,7 @@ _IndigoPlateauLobbyText2:: cont "is it! Go for it!" done -_IndigoPlateauLobbyText3:: +_IndigoPlateauLobbyCooltrainerFText:: text "From here on, you" line "face the ELITE" cont "FOUR one by one!" diff --git a/text/LancesRoom.asm b/text/LancesRoom.asm index 224db0b3..76cdd0cf 100644 --- a/text/LancesRoom.asm +++ b/text/LancesRoom.asm @@ -1,4 +1,4 @@ -_LanceBeforeBattleText:: +_LancesRoomLanceBeforeBattleText:: text "Ah! I heard about" line "you, <PLAYER>!" @@ -27,7 +27,7 @@ _LanceBeforeBattleText:: cont "with me, <PLAYER>!" done -_LanceEndBattleText:: +_LancesRoomLanceEndBattleText:: text "That's it!" para "I hate to admit" @@ -35,7 +35,7 @@ _LanceEndBattleText:: cont "#MON master!" prompt -_LanceAfterBattleText:: +_LancesRoomLanceAfterBattleText:: text "I still can't" line "believe my" cont "dragons lost to" diff --git a/text/LavenderCuboneHouse.asm b/text/LavenderCuboneHouse.asm index 77b8598d..ae9c75bc 100644 --- a/text/LavenderCuboneHouse.asm +++ b/text/LavenderCuboneHouse.asm @@ -1,8 +1,8 @@ -_LavenderHouse2Text1:: +_LavenderCuboneHouseCuboneText:: text "CUBONE: Kyarugoo!@" text_end -_LavenderHouse2Text_1d9dc:: +_LavenderCuboneHouseBrunetteGirlPoorCubonesMotherText:: text "I hate those" line "horrible ROCKETs!" @@ -14,7 +14,7 @@ _LavenderHouse2Text_1d9dc:: cont "from TEAM ROCKET!" done -_LavenderHouse2Text_1d9e1:: +_LavenderCuboneHouseBrunetteGirlGhostIsGoneText:: text "The GHOST of" line "#MON TOWER is" cont "gone!" diff --git a/text/LavenderMart.asm b/text/LavenderMart.asm index 222712c6..94a9f64b 100644 --- a/text/LavenderMart.asm +++ b/text/LavenderMart.asm @@ -1,4 +1,4 @@ -_LavenderMartText2:: +_LavenderMartBaldingGuyText:: text "I'm searching for" line "items that raise" cont "the abilities of" @@ -14,13 +14,13 @@ _LavenderMartText2:: line "I can get them?" done -_LavenderMartReviveText:: +_LavenderMartCooltrainerMReviveText:: text "You know REVIVE?" line "It revives any" cont "fainted #MON!" done -_LavenderMartNuggetText:: +_LavenderMartCooltrainerMNuggetText:: text "I found a NUGGET" line "in the mountains." diff --git a/text/LavenderPokecenter.asm b/text/LavenderPokecenter.asm index 3aa7b67d..33fe53f2 100644 --- a/text/LavenderPokecenter.asm +++ b/text/LavenderPokecenter.asm @@ -1,10 +1,10 @@ -_LavenderPokecenterText2:: +_LavenderPokecenterGentlemanText:: text "TEAM ROCKET will" line "do anything for" cont "the sake of gold!" done -_LavenderPokecenterText3:: +_LavenderPokecenterLittleGirlText:: text "I saw CUBONE's" line "mother die trying" cont "to escape from" diff --git a/text/LavenderTown.asm b/text/LavenderTown.asm index 19b6c8c8..294b12cc 100644 --- a/text/LavenderTown.asm +++ b/text/LavenderTown.asm @@ -1,14 +1,14 @@ -_LavenderTownText_4413c:: +_LavenderTownLittleGirlDoYouBelieveInGhostsText:: text "Do you believe in" line "GHOSTs?" done -_LavenderTownText_44141:: +_LavenderTownLittleGirlSoThereAreBelieversText:: text "Really? So there" line "are believers..." done -_LavenderTownText_44146:: +_LavenderTownLittleGirlHaHaGuessNotText:: text "Hahaha, I guess" line "not." @@ -17,7 +17,7 @@ _LavenderTownText_44146:: cont "it's not real." done -_LavenderTownText2:: +_LavenderTownCooltrainerMText:: text "This town is known" line "as the grave site" cont "of #MON." @@ -27,7 +27,7 @@ _LavenderTownText2:: cont "#MON TOWER." done -_LavenderTownText3:: +_LavenderTownSuperNerdText:: text "GHOSTs appeared" line "in #MON TOWER." @@ -37,13 +37,13 @@ _LavenderTownText3:: cont "ROCKETs killed." done -_LavenderTownText4:: +_LavenderTownSignText:: text "LAVENDER TOWN" line "The Noble Purple" cont "Town" done -_LavenderTownText5:: +_LavenderTownSilphScopeSignText:: text "New SILPH SCOPE!" para "Make the Invisible" @@ -52,12 +52,12 @@ _LavenderTownText5:: para "SILPH CO." done -_LavenderTownText8:: +_LavenderTownPokemonHouseSignText:: text "LAVENDER VOLUNTEER" line "#MON HOUSE" done -_LavenderTownText9:: +_LavenderTownPokemonTowerSignText:: text "May the Souls of" line "#MON Rest Easy" cont "#MON TOWER" diff --git a/text/LoreleisRoom.asm b/text/LoreleisRoom.asm index fdbb55b4..14c098df 100644 --- a/text/LoreleisRoom.asm +++ b/text/LoreleisRoom.asm @@ -1,4 +1,4 @@ -_LoreleiBeforeBattleText:: +_LoreleisRoomLoreleiBeforeBattleText:: text "Welcome to" line "#MON LEAGUE!" @@ -21,12 +21,12 @@ _LoreleiBeforeBattleText:: line "Are you ready?" done -_LoreleiEndBattleText:: +_LoreleisRoomLoreleiEndBattleText:: text "How" line "dare you!" prompt -_LoreleiAfterBattleText:: +_LoreleisRoomLoreleiAfterBattleText:: text "You're better" line "than I thought!" cont "Go on ahead!" @@ -36,7 +36,7 @@ _LoreleiAfterBattleText:: cont "LEAGUE power!" done -_LoreleiDontRunAwayText:: +_LoreleisRoomLoreleiDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/MrFujisHouse.asm b/text/MrFujisHouse.asm index 6c7f3439..3759c2a8 100644 --- a/text/MrFujisHouse.asm +++ b/text/MrFujisHouse.asm @@ -1,16 +1,16 @@ -_LavenderHouse1Text_1d8d1:: +_MrFujisHouseSuperNerdMrFujiIsntHereText:: text "That's odd, MR.FUJI" line "isn't here." cont "Where'd he go?" done -_LavenderHouse1Text_1d8d6:: +_MrFujisHouseSuperNerdMrFujiHadBeenPrayingText:: text "MR.FUJI had been" line "praying alone for" cont "CUBONE's mother." done -_LavenderHouse1Text_1d8f4:: +_MrFujisHouseLittleGirlThisIsMrFujisHouseText:: text "This is really" line "MR.FUJI's house." @@ -21,21 +21,21 @@ _LavenderHouse1Text_1d8f4:: cont "orphaned #MON!" done -_LavenderHouse1Text_1d8f9:: +_MrFujisHouseLittleGirlPokemonAreNiceToHugText:: text "It's so warm!" line "#MON are so" cont "nice to hug!" done -_LavenderHouse1Text3:: +_MrFujisHousePsyduckText:: text "PSYDUCK: Gwappa!@" text_end -_LavenderHouse1Text4:: +_MrFujisHouseNidorinoText:: text "NIDORINO: Gaoo!@" text_end -_LavenderHouse1Text_1d94c:: +_MrFujisHouseMrFujiIThinkThisMayHelpYourQuestText:: text "MR.FUJI: <PLAYER>." para "Your #DEX quest" @@ -47,14 +47,14 @@ _LavenderHouse1Text_1d94c:: line "help your quest." prompt -_ReceivedFluteText:: +_MrFujisHouseMrFujiReceivedPokeFluteText:: text "<PLAYER> received" line "a @" text_ram wStringBuffer text "!@" text_end -_FluteExplanationText:: +_MrFujisHouseMrFujiPokeFluteExplanationText:: text_start para "Upon hearing #" @@ -66,17 +66,17 @@ _FluteExplanationText:: line "sleeping #MON." done -_FluteNoRoomText:: +_MrFujisHouseMrFujiPokeFluteNoRoomText:: text "You must make" line "room for this!" done -_MrFujiAfterFluteText:: +_MrFujisHouseMrFujiHasMyFluteHelpedYouText:: text "MR.FUJI: Has my" line "FLUTE helped you?" done -_LavenderHouse1Text6:: +_MrFujisHouseMrFujiPokedexText:: text "#MON Monthly" line "Grand Prize" cont "Drawing!" diff --git a/text/MrPsychicsHouse.asm b/text/MrPsychicsHouse.asm index f58188e2..18946ae5 100644 --- a/text/MrPsychicsHouse.asm +++ b/text/MrPsychicsHouse.asm @@ -1,18 +1,18 @@ -_TM29PreReceiveText:: +_MrPsychicsHouseMrPsychicYouWantedThisText:: text "...Wait! Don't" line "say a word!" para "You wanted this!" prompt -_ReceivedTM29Text:: +_MrPsychicsHouseMrPsychicReceivedTM29Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer text "!@" text_end -_TM29ExplanationText:: +_MrPsychicsHouseMrPsychicTM29ExplanationText:: text "TM29 is PSYCHIC!" para "It can lower the" @@ -20,7 +20,7 @@ _TM29ExplanationText:: cont "abilities." done -_TM29NoRoomText:: +_MrPsychicsHouseMrPsychicTM29NoRoomText:: text "Where do you plan" line "to put this?" done diff --git a/text/MtMoon1F.asm b/text/MtMoon1F.asm index 2e8c960e..a7964604 100644 --- a/text/MtMoon1F.asm +++ b/text/MtMoon1F.asm @@ -1,119 +1,119 @@ -_MtMoon1BattleText2:: +_MtMoon1FHikerBattleText:: text "WHOA! You shocked" line "me! Oh, you're" cont "just a kid!" done -_MtMoon1EndBattleText2:: +_MtMoon1FHikerEndBattleText:: text "Wow!" line "Shocked again!" prompt -_MtMoon1AfterBattleText2:: +_MtMoon1FHikerAfterBattleText:: text "Kids like you" line "shouldn't be" cont "here!" done -_MtMoon1BattleText3:: +_MtMoon1FYoungster1BattleText:: text "Did you come to" line "explore too?" done -_MtMoon1EndBattleText3:: +_MtMoon1FYoungster1EndBattleText:: text "Losing" line "stinks!" prompt -_MtMoon1AfterBattleText3:: +_MtMoon1FYoungster1AfterBattleText:: text "I came down here" line "to show off to" cont "girls." done -_MtMoon1BattleText4:: +_MtMoon1FCooltrainerF1BattleText:: text "Wow! It's way" line "bigger in here" cont "than I thought!" done -_MtMoon1EndBattleText4:: +_MtMoon1FCooltrainerF1EndBattleText:: text "Oh!" line "I lost it!" prompt -_MtMoon1AfterBattleText4:: +_MtMoon1FCooltrainerF1AfterBattleText:: text "How do you get" line "out of here?" done -_MtMoon1BattleText5:: +_MtMoon1FSuperNerdBattleText:: text "What! Don't sneak" line "up on me!" done -_MtMoon1EndBattleText5:: +_MtMoon1FSuperNerdEndBattleText:: text "My" line "#MON won't do!" prompt -_MtMoon1AfterBattleText5:: +_MtMoon1FSuperNerdAfterBattleText:: text "I have to find" line "stronger #MON." done -_MtMoon1BattleText6:: +_MtMoon1FCooltrainerF2BattleText:: text "What? I'm waiting" line "for my friends to" cont "find me here." done -_MtMoon1EndBattleText6:: +_MtMoon1FCooltrainerF2EndBattleText:: text "I lost?" prompt -_MtMoon1AfterBattleText6:: +_MtMoon1FCooltrainerF2AfterBattleText:: text "I heard there are" line "some very rare" cont "fossils here." done -_MtMoon1BattleText7:: +_MtMoon1FYoungster2BattleText:: text "Suspicious men" line "are in the cave." cont "What about you?" done -_MtMoon1EndBattleText7:: +_MtMoon1FYoungster2EndBattleText:: text "You" line "got me!" prompt -_MtMoon1AfterBattleText7:: +_MtMoon1FYoungster2AfterBattleText:: text "I saw them! I'm" line "sure they're from" cont "TEAM ROCKET!" done -_MtMoon1BattleText8:: +_MtMoon1FYoungster3BattleText:: text "Go through this" line "cave to get to" cont "CERULEAN CITY!" done -_MtMoon1EndBattleText8:: +_MtMoon1FYoungster3EndBattleText:: text "I" line "lost." prompt -_MtMoon1AfterBattleText8:: +_MtMoon1FYoungster3AfterBattleText:: text "ZUBAT is tough!" line "But, it can be" cont "useful if you" cont "catch one." done -_MtMoon1Text14:: +_MtMoon1FBewareZubatSign:: text "Beware! ZUBAT is" line "a bloodsucker!" done diff --git a/text/MtMoonB1F.asm b/text/MtMoonB1F.asm index 968b845f..2d2dea00 100644 --- a/text/MtMoonB1F.asm +++ b/text/MtMoonB1F.asm @@ -1,3 +1,3 @@ -_MtMoonText1:: +_MtMoonB1FUnusedText:: text_start done diff --git a/text/MtMoonB2F.asm b/text/MtMoonB2F.asm index 93d2c7d8..20c2992c 100644 --- a/text/MtMoonB2F.asm +++ b/text/MtMoonB2F.asm @@ -21,29 +21,29 @@ _MtMoonJessieJamesText4:: cont "of light!@" text_end -_MtMoon3Text_49f24:: +_MtMoonB2FDomeFossilYouWantText:: text "You want the" line "DOME FOSSIL?" done -_MtMoon3Text_49f64:: +_MtMoonB2FHelixFossilYouWantText:: text "You want the" line "HELIX FOSSIL?" done -_MtMoon3Text_49f6f:: +_MtMoonB2FReceivedFossilText:: text "<PLAYER> got the" line "@" text_ram wStringBuffer text "!@" text_end -_MtMoon3Text_49f7f:: +_MtMoonB2FYouHaveNoRoomText:: text "Look, you've got" line "no room for this.@" text_end -_MtMoon3Text_49f85:: +_MtMoonB2FSuperNerdTheyreBothMineText:: text "Hey, stop!" para "I found these" @@ -51,18 +51,18 @@ _MtMoon3Text_49f85:: cont "both mine!" done -_MtMoon3Text_49f8a:: +_MtMoonB2FSuperNerdOkIllShareText:: text "OK!" line "I'll share!" prompt -_MtMoon3Text_49f8f:: +_MtMoonB2fSuperNerdEachTakeOneText:: text "We'll each take" line "one!" cont "No being greedy!" done -_MtMoon3Text_49f94:: +_MtMoonB2FSuperNerdTheresAPokemonLabText:: text "Far away, on" line "CINNABAR ISLAND," cont "there's a #MON" @@ -73,57 +73,57 @@ _MtMoon3Text_49f94:: cont "fossils." done -_MtMoon3Text_49f99:: +_MtMoonB2FSuperNerdThenThisIsMineText:: text "All right. Then" line "this is mine!@" text_end -_MtMoon3BattleText3:: +_MtMoonB2FRocket2BattleText:: text "We, TEAM ROCKET," line "are #MON" cont "gangsters!" done -_MtMoon3EndBattleText3:: +_MtMoonB2FRocket2EndBattleText:: text "I blew" line "it!" prompt -_MtMoon3AfterBattleText3:: +_MtMoonB2FRocket2AfterBattleText:: text "Darn it all! My" line "associates won't" cont "stand for this!" done -_MtMoon3BattleText4:: +_MtMoonB2FRocket3BattleText:: text "We're pulling a" line "big job here!" cont "Get lost, kid!" done -_MtMoon3EndBattleText4:: +_MtMoonB2FRocket3EndBattleText:: text "So, you" line "are good." prompt -_MtMoon3AfterBattleText4:: +_MtMoonB2FRocket3AfterBattleText:: text "If you find a" line "fossil, give it" cont "to me and scram!" done -_MtMoon3BattleText5:: +_MtMoonB2FRocket4BattleText:: text "Little kids" line "should leave" cont "grown-ups alone!" done -_MtMoon3EndBattleText5:: +_MtMoonB2FRocket4EndBattleText:: text "I'm" line "steamed!" prompt -_MtMoon3AfterBattleText5:: +_MtMoonB2FRocket4AfterBattleText:: text "#MON lived" line "here long before" cont "people came." diff --git a/text/MtMoonPokecenter.asm b/text/MtMoonPokecenter.asm index 052dd85b..e2dce2fe 100644 --- a/text/MtMoonPokecenter.asm +++ b/text/MtMoonPokecenter.asm @@ -1,4 +1,4 @@ -_MtMoonPokecenterText1:: +_MtMoonPokecenterYoungsterText:: text "I've 6 # BALLs" line "set in my belt." @@ -6,7 +6,7 @@ _MtMoonPokecenterText1:: line "carry 6 #MON." done -_MtMoonPokecenterText3:: +_MtMoonPokecenterGentlemanText:: text "TEAM ROCKET" line "attacks CERULEAN" cont "citizens..." @@ -16,11 +16,11 @@ _MtMoonPokecenterText3:: cont "news!" done -_MtMoonPokecenterText5:: +_MtMoonPokecenterClipboardText:: text_start done -_MagikarpSalesmanText1:: +_MtMoonPokecenterMagikarpSalesmanIGotADealText:: text "MAN: Hello, there!" line "Have I got a deal" cont "just for you!" @@ -31,18 +31,18 @@ _MagikarpSalesmanText1:: cont "What do you say?" done -_MagikarpSalesmanNoText:: +_MtMoonPokecenterMagikarpSalesmanNoText:: text "No? I'm only" line "doing this as a" cont "favor to you!" done -_MagikarpSalesmanNoMoneyText:: +_MtMoonPokecenterMagikarpSalesmanNoMoneyText:: text "You'll need more" line "money than that!" done -_MagikarpSalesmanText2:: +_MtMoonPokecenterMagikarpSalesmanNoRefundsText:: text "MAN: Well, I don't" line "give refunds!" done diff --git a/text/Museum1F.asm b/text/Museum1F.asm index e7b6ce53..40f1da88 100644 --- a/text/Museum1F.asm +++ b/text/Museum1F.asm @@ -1,8 +1,8 @@ -_Museum1FText_5c21a:: +_Museum1FScientist1ComeAgainText:: text "Come again!" done -_Museum1FText_5c21f:: +_Museum1FScientist1WouldYouLikeToComeInText:: text "It's ¥50 for a" line "child's ticket." @@ -10,17 +10,17 @@ _Museum1FText_5c21f:: line "come in?" done -_Museum1FText_5c224:: +_Museum1FScientist1ThankYouText:: text "Right, ¥50!" line "Thank you!" done -_Museum1FText_5c229:: +_Museum1FScientist1DontHaveEnoughMoneyText:: text "You don't have" line "enough money." prompt -_Museum1FText_5c22e:: +_Museum1FScientist1DoYouKnowWhatAmberIsText:: text "You can't sneak" line "in the back way!" @@ -29,7 +29,7 @@ _Museum1FText_5c22e:: cont "AMBER is?" done -_Museum1FText_5c233:: +_Museum1FScientist1TheresALabSomewhereText:: text "There's a lab" line "somewhere trying" cont "to resurrect" @@ -37,28 +37,28 @@ _Museum1FText_5c233:: cont "from AMBER." done -_Museum1FText_5c238:: +_Museum1FScientist1AmberIsFossilizedTreeSapText:: text "AMBER is fossil-" line "ized tree sap." done -_Museum1FText_5c23d:: +_Museum1FScientist1GoToOtherSideText:: text "Please go to the" line "other side!" done -_Museum1FText_5c242:: +_Museum1FScientist1TakePlentyOfTimeText:: text "Take plenty of" line "time to look!" done -_Museum1FText_5c251:: +_Museum1FGamblerText:: text "That is one" line "magnificent" cont "fossil!" done -_Museum1FText_5c28e:: +_Museum1FScientist2TakeThisToAPokemonLabText:: text "Ssh! I think that" line "this chunk of" cont "AMBER contains" @@ -80,29 +80,29 @@ _Museum1FText_5c28e:: cont "get it examined!" prompt -_ReceivedOldAmberText:: +_Museum1FScientist2ReceivedOldAmberText:: text "<PLAYER> received" line "OLD AMBER!@" text_end -_Museum1FText_5c299:: +_Museum1FScientist2GetTheOldAmberCheckText:: text "Ssh! Get the OLD" line "AMBER checked!" done -_Museum1FText_5c29e:: +_Museum1FScientist2YouDontHaveSpaceText:: text "You don't have" line "space for this!" done -_Museum1FText_5c2ad:: +_Museum1FScientist3Text:: text "We are proud of 2" line "fossils of very" cont "rare, prehistoric" cont "#MON!" done -_Museum1FText_5c2bc:: +_Museum1FOldAmberText:: text "The AMBER is" line "clear and gold!" done diff --git a/text/Museum2F.asm b/text/Museum2F.asm index 12cfe8b2..35bac50b 100644 --- a/text/Museum2F.asm +++ b/text/Museum2F.asm @@ -1,11 +1,11 @@ -_Museum2FText1:: +_Museum2FYoungsterText:: text "MOON STONE?" para "What's so special" line "about it?" done -_Museum2FText2:: +_Museum2FGrampsText:: text "July 20, 1969!" para "The 1st lunar" @@ -15,12 +15,12 @@ _Museum2FText2:: line "TV to watch it!" done -_Museum2FText3:: +_Museum2FScientistText:: text "We have a space" line "exhibit now." done -_Museum2FText4:: +_Museum2FBrunetteGirlText:: text "I want a PIKACHU!" line "It's so cute!" @@ -28,7 +28,7 @@ _Museum2FText4:: line "to catch me one!" done -_Museum2FText5:: +_Museum2FHikerText:: text "Yeah, a PIKACHU" line "soon, I promise!" done @@ -47,12 +47,12 @@ _Museum2FPikachuText2:: cont "attached to you." done -_Museum2FText6:: +_Museum2FSpaceShuttleSignText:: text "SPACE SHUTTLE" line "COLUMBIA" done -_Museum2FText7:: +_Museum2FMoonStoneSignText:: text "Meteorite that" line "fell on MT.MOON." cont "(MOON STONE?)" diff --git a/text/NameRatersHouse.asm b/text/NameRatersHouse.asm index 49637b6d..2c4054f6 100644 --- a/text/NameRatersHouse.asm +++ b/text/NameRatersHouse.asm @@ -1,4 +1,4 @@ -_NameRaterText_1dab3:: +_NameRatersHouseNameRaterWantMeToRateText:: text "Hello, hello!" line "I am the official" cont "NAME RATER!" @@ -8,12 +8,12 @@ _NameRaterText_1dab3:: cont "your #MON?" done -_NameRaterText_1dab8:: +_NameRatersHouseNameRaterWhichPokemonText:: text "Which #MON" line "should I look at?" prompt -_NameRaterText_1dabd:: +_NameRatersHouseNameRaterGiveItANiceNameText:: text_ram wcd6d text ", is it?" line "That is a decent" @@ -26,12 +26,12 @@ _NameRaterText_1dabd:: para "How about it?" done -_NameRaterText_1dac2:: +_NameRatersHouseNameRaterWhatShouldWeNameItText:: text "Fine! What should" line "we name it?" prompt -_NameRaterText_1dac7:: +_NameRatersHouseNameRaterPokemonHasBeenRenamedText:: text "OK! This #MON" line "has been renamed" cont "@" @@ -42,12 +42,12 @@ _NameRaterText_1dac7:: line "name than before!" done -_NameRaterText_1dacc:: +_NameRatersHouseNameRaterComeAnyTimeYouLikeText:: text "Fine! Come any-" line "time you like!" done -_NameRaterText_1dad1:: +_NameRatersHouseNameRaterATrulyImpeccableNameText:: text_ram wcd6d text ", is it?" line "That is a truly" diff --git a/text/OaksLab.asm b/text/OaksLab.asm index 7e78f8f5..606ade96 100644 --- a/text/OaksLab.asm +++ b/text/OaksLab.asm @@ -1,4 +1,4 @@ -_OaksLabGaryText1:: +_OaksLabRivalGrampsIsntAroundText:: text "<RIVAL>: Yo" line "<PLAYER>! Gramps" cont "isn't around!" @@ -8,30 +8,30 @@ _OaksLabGaryText1:: cont "#MON for me." done -_OaksLabText40:: +_OaksLabRivalIllGetABetterPokemonThanYou:: text "<RIVAL>: Humph!" line "I'll get a better" cont "#MON than you!" done -_OaksLabText41:: +_OaksLabRivalMyPokemonLooksStrongerText:: text "<RIVAL>: Heh, my" line "#MON looks a" cont "lot stronger." done -_OaksLabText39:: +_OaksLabThatsAPokeball:: text "That's a #" line "BALL. There's a" cont "#MON inside!" done -_OaksLabPikachuText:: +_OaksLabOak1GoAheadItsYours:: text "OAK: Go ahead," line "it's yours!" done -_OaksLabText_1d2f5:: +_OaksLabOak1YourPokemonCanFightText:: text "OAK: If a wild" line "#MON appears," cont "your #MON can" @@ -41,13 +41,13 @@ _OaksLabText_1d2f5:: line "to the next town." done -_OaksLabText_1d2fa:: +_OaksLabOak1YouShouldTalkToIt:: text "OAK: You should" line "talk to it and" cont "see how it feels." done -_OaksLabDeliverParcelText1:: +_OaksLabOak1DeliverParcelText:: text "OAK: Oh, <PLAYER>!" para "How is my old" @@ -67,7 +67,7 @@ _OaksLabDeliverParcelText1:: line "OAK's PARCEL.@" text_end -_OaksLabDeliverParcelText2:: +_OaksLabOak1ParcelThanksText:: text_start para "Ah! This is the" line "custom # BALL" @@ -79,13 +79,13 @@ _OaksLabDeliverParcelText2:: cont "something for me." done -_OaksLabAroundWorldText:: +_OaksLabOak1PokemonAroundTheWorldText:: text "#MON around the" line "world wait for" cont "you, <PLAYER>!" done -_OaksLabGivePokeballsText1:: +_OaksLabOak1ReceivedPokeballsText:: text "OAK: You can't get" line "detailed data on" cont "#MON by just" @@ -100,7 +100,7 @@ _OaksLabGivePokeballsText1:: line "# BALLs!@" text_end -_OaksLabGivePokeballsText2:: +_OaksLabGivePokeballsExplanationText:: text_start para "When a wild" line "#MON appears," @@ -119,7 +119,7 @@ _OaksLabGivePokeballsText2:: cont "have to be lucky!" done -_OaksLabPleaseVisitText:: +_OaksLabOak1ComeSeeMeSometimesText:: text "OAK: Come see me" line "sometimes." @@ -128,7 +128,7 @@ _OaksLabPleaseVisitText:: cont "coming along." done -_OaksLabText_1d31d:: +_OaksLabOak1HowIsYourPokedexComingText:: text "OAK: Good to see " line "you! How is your " cont "#DEX coming? " @@ -136,17 +136,17 @@ _OaksLabText_1d31d:: cont "a look!" prompt -_OaksLabText_1d32c:: +_OaksLabPokedexText:: text "It's encyclopedia-" line "like, but the" cont "pages are blank!" done -_OaksLabText8:: +_OaksLabOak2Text:: text "?" done -_OaksLabText_1d340:: +_OaksLabGirlText:: text "PROF.OAK is the" line "authority on" cont "#MON!" @@ -156,13 +156,13 @@ _OaksLabText_1d340:: cont "in high regard!" done -_OaksLabRivalWaitingText:: +_OaksLabRivalFedUpWithWaitingText:: text "<RIVAL>: Gramps!" line "I'm fed up with" cont "waiting!" done -_OaksLabChooseMonText:: +_OaksLabOakChooseMonText:: text "OAK: Hmm? <RIVAL>?" line "Why are you here" cont "already?" @@ -185,13 +185,13 @@ _OaksLabChooseMonText:: line "Go on, take it!" done -_OaksLabRivalInterjectionText:: +_OaksLabRivalWhatAboutMeText:: text "<RIVAL>: Hey!" line "Gramps! What" cont "about me?" done -_OaksLabBePatientText:: +_OaksLabOakBePatientText:: text "OAK: Be patient," line "<RIVAL>, I'll give" cont "you one later." @@ -250,12 +250,12 @@ _OaksLabReceivedText:: text "!@" text_end -_OaksLabLeavingText:: +_OaksLabOakDontGoAwayYetText:: text "OAK: Hey! Don't go" line "away yet!" done -_OaksLabRivalChallengeText:: +_OaksLabRivalIllTakeYouOnText:: text "<RIVAL>: Wait" line "<PLAYER>!" cont "Let's check out" @@ -265,19 +265,19 @@ _OaksLabRivalChallengeText:: line "you on!" done -_OaksLabText_1d3be:: +_OaksLabRivalIPickedTheWrongPokemonText:: text "WHAT?" line "Unbelievable!" cont "I picked the" cont "wrong #MON!" prompt -_OaksLabText_1d3c3:: +_OaksLabRivalAmIGreatOrWhatText:: text "<RIVAL>: Yeah! Am" line "I great or what?" prompt -_OaksLabRivalToughenUpText:: +_OaksLabRivalSmellYouLaterText:: text "<RIVAL>: Okay!" line "I'll make my" cont "#MON fight to" @@ -311,18 +311,18 @@ _OaksLabPikachuDislikesPokeballsText2:: cont "feels about you." done -_OaksLabText21:: +_OaksLabRivalGrampsText:: text "<RIVAL>: Gramps!" done -_OaksLabText22:: +_OaksLabRivalMyPokemonHasGrownStrongerText:: text "<RIVAL>: Gramps," line "my #MON has" cont "grown stronger!" cont "Check it out!" done -_OaksLabText23:: +_OaksLabOakIHaveARequestText:: text "OAK: Ah, <RIVAL>," line "good timing!" @@ -331,7 +331,7 @@ _OaksLabText23:: cont "something for me." done -_OaksLabText24:: +_OaksLabOakMyInventionPokedexText:: text "On the desk there" line "is my invention," cont "#DEX!" @@ -345,7 +345,7 @@ _OaksLabText24:: line "encyclopedia!" done -_OaksLabText25:: +_OaksLabOakGotPokedexText:: text "OAK: <PLAYER> and" line "<RIVAL>! Take" cont "these with you!" @@ -354,7 +354,7 @@ _OaksLabText25:: line "#DEX from OAK!@" text_end -_OaksLabText26:: +_OaksLabOakThatWasMyDreamText:: text "To make a complete" line "guide on all the" cont "#MON in the" @@ -377,7 +377,7 @@ _OaksLabText26:: cont "#MON history!" done -_OaksLabText27:: +_OaksLabRivalLeaveItAllToMeText:: text "<RIVAL>: Alright" line "Gramps! Leave it" cont "all to me!" @@ -395,7 +395,7 @@ _OaksLabText27:: cont "<PLAYER>! Hahaha!" done -_OaksLabText_1d405:: +_OaksLabScientistText:: text "I study #MON as" line "PROF.OAK's AIDE." done diff --git a/text/PalletTown.asm b/text/PalletTown.asm index ec6ec630..498a80f8 100644 --- a/text/PalletTown.asm +++ b/text/PalletTown.asm @@ -1,9 +1,9 @@ -_OakAppearsText:: +_PalletTownOakHeyWaitDontGoOutText:: text "OAK: Hey! Wait!" line "Don't go out!@" text_end -_OakWalksUpText:: +_PalletTownOakThatWasCloseText:: text "OAK: That was" line "close!" @@ -11,11 +11,11 @@ _OakWalksUpText:: line "in tall grass!" done -_OakWhewText:: +_PalletTownOakWhewText:: text "OAK: Whew..." done -_OakGrassText:: +_PalletTownOakComeWithMe:: text "OAK: A #MON can" line "appear anytime in" cont "tall grass." @@ -29,7 +29,7 @@ _OakGrassText:: line "me!" done -_PalletTownText2:: +_PalletTownGirlText:: text "I'm raising" line "#MON too!" @@ -38,7 +38,7 @@ _PalletTownText2:: cont "protect me!" done -_PalletTownText3:: +_PalletTownFisherText:: text "Technology is" line "incredible!" @@ -48,21 +48,21 @@ _PalletTownText3:: cont "data via PC!" done -_PalletTownText4:: +_PalletTownOaksLabSignText:: text "OAK #MON" line "RESEARCH LAB" done -_PalletTownText5:: +_PalletTownSignText:: text "PALLET TOWN" line "Shades of your" cont "journey await!" done -_PalletTownText6:: +_PalletTownPlayersHouseSignText:: text "<PLAYER>'s house " done -_PalletTownText7:: +_PalletTownRivalsHouseSignText:: text "<RIVAL>'s house " done diff --git a/text/PewterCity.asm b/text/PewterCity.asm index 14240c9e..f3570f8c 100644 --- a/text/PewterCity.asm +++ b/text/PewterCity.asm @@ -1,4 +1,4 @@ -_PewterCityText1:: +_PewterCityCooltrainerFText:: text "It's rumored that" line "CLEFAIRYs came" cont "from the moon!" @@ -8,7 +8,7 @@ _PewterCityText1:: cont "fell on MT.MOON." done -_PewterCityText2:: +_PewterCityCooltrainerMText:: text "There aren't many" line "serious #MON" cont "trainers here!" @@ -20,24 +20,24 @@ _PewterCityText2:: cont "into it!" done -_PewterCityText_193f1:: +_PewterCitySuperNerd1DidYouCheckOutMuseumText:: text "Did you check out" line "the MUSEUM?" done -_PewterCityText_193f6:: +_PewterCitySuperNerd1WerentThoseFossilsAmazingText:: text "Weren't those" line "fossils from MT." cont "MOON amazing?" done -_PewterCityText_193fb:: +_PewterCitySuperNerd1YouHaveToGoText:: text "Really?" line "You absolutely" cont "have to go!" done -_PewterCityText13:: +_PewterCitySuperNerd1ItsRightHereText:: text "It's right here!" line "You have to pay" cont "to get in, but" @@ -45,24 +45,24 @@ _PewterCityText13:: cont "See you around!" done -_PewterCityText_19427:: +_PewterCitySuperNerd2DoYouKnowWhatImDoingText:: text "Psssst!" line "Do you know what" cont "I'm doing?" done -_PewterCityText_1942c:: +_PewterCitySuperNerd2ThatsRightText:: text "That's right!" line "It's hard work!" done -_PewterCityText_19431:: +_PewterCitySuperNerd2ImSprayingRepelText:: text "I'm spraying REPEL" line "to keep #MON" cont "out of my garden!" done -_PewterCityText_1945d:: +_PewterCityYoungsterYoureATrainerFollowMeText:: text "You're a trainer" line "right? BROCK's" cont "looking for new" @@ -70,13 +70,13 @@ _PewterCityText_1945d:: cont "Follow me!" done -_PewterCityText14:: +_PewterCityYoungsterGoTakeOnBrockText:: text "If you have the" line "right stuff, go" cont "take on BROCK!" done -_PewterCityText6:: +_PewterCityTrainerTipsText:: text "TRAINER TIPS" para "Any #MON that" @@ -85,7 +85,7 @@ _PewterCityText6:: cont "short, earns EXP!" done -_PewterCityText7:: +_PewterCityPoliceNoticeSignText:: text "NOTICE!" para "Thieves have been" @@ -96,12 +96,12 @@ _PewterCityText7:: cont "with any info!" done -_PewterCityText10:: +_PewterCityMuseumSignText:: text "PEWTER MUSEUM" line "OF SCIENCE" done -_PewterCityText11:: +_PewterCityGymSignText:: text "PEWTER CITY" line "#MON GYM" cont "LEADER: BROCK" @@ -110,7 +110,7 @@ _PewterCityText11:: line "#MON Trainer!" done -_PewterCityText12:: +_PewterCitySignText:: text "PEWTER CITY" line "A Stone Gray" cont "City" diff --git a/text/PewterGym.asm b/text/PewterGym.asm index 892269c1..c6534271 100644 --- a/text/PewterGym.asm +++ b/text/PewterGym.asm @@ -1,4 +1,4 @@ -_BrockPreBattleText:: +_PewterGymBrockPreBattleText:: text "I'm BROCK!" line "I'm PEWTER's GYM" cont "LEADER!" @@ -17,7 +17,7 @@ _BrockPreBattleText:: cont "me your best!" done -_BrockPostBattleAdviceText:: +_PewterGymBrockPostBattleAdviceText:: text "There are all" line "kinds of trainers" cont "in the world!" @@ -38,12 +38,12 @@ _BrockPostBattleAdviceText:: cont "your abilities!" done -_BeforeReceivedTM34Text:: +_PewterGymBrockWaitTakeThisText:: text "Wait! Take this" line "with you!" done -_ReceivedTM34Text:: +_PewterGymReceivedTM34Text:: text "<PLAYER> received" line "TM34!@" text_end @@ -72,12 +72,12 @@ _TM34ExplanationText:: cont "it back double!" done -_TM34NoRoomText:: +_PewterGymTM34NoRoomText:: text "You don't have" line "room for this!" done -_ReceivedBoulderBadgeText:: +_PewterGymBrockReceivedBoulderBadgeText:: text "I took" line "you for granted." @@ -89,7 +89,7 @@ _ReceivedBoulderBadgeText:: line "the BOULDERBADGE!@" text_end -_BrockBoulerBadgeInfoText:: +_PewterGymBrockBoulderBadgeInfoText:: text_start para "That's an official" @@ -105,7 +105,7 @@ _BrockBoulerBadgeInfoText:: cont "used anytime!" prompt -_PewterGymBattleText1:: +_PewterGymCooltrainerMBattleText:: text "Stop right there," line "kid!" @@ -114,7 +114,7 @@ _PewterGymBattleText1:: cont "BROCK!" done -_PewterGymEndBattleText1:: +_PewterGymCooltrainerMEndBattleText:: text "Darn!" para "Light years isn't" @@ -122,7 +122,7 @@ _PewterGymEndBattleText1:: cont "distance!" prompt -_PewterGymAfterBattleText1:: +_PewterGymCooltrainerMAfterBattleText:: text "You're pretty hot," line "but not as hot" cont "as BROCK!" @@ -159,7 +159,7 @@ _PewterGymGuideAdviceText:: cont "made easier!" done -_PewterGymText_5c524:: +_PewterGymGuideFreeServiceText:: text "It's a free" line "service! Let's" cont "get happening!" diff --git a/text/PewterMart.asm b/text/PewterMart.asm index 4dbc3c02..128bee3b 100644 --- a/text/PewterMart.asm +++ b/text/PewterMart.asm @@ -1,4 +1,4 @@ -_PewterMartText2:: +_PewterMartYoungsterText:: text "A shady old man" line "got me to buy" cont "this really weird" @@ -8,7 +8,7 @@ _PewterMartText2:: line "and it cost ¥500!" done -_PewterMartText3:: +_PewterMartSuperNerdText:: text "Good things can" line "happen if you" cont "raise #MON" diff --git a/text/PewterNidoranHouse.asm b/text/PewterNidoranHouse.asm index d4a092c8..dc52ef01 100644 --- a/text/PewterNidoranHouse.asm +++ b/text/PewterNidoranHouse.asm @@ -1,12 +1,12 @@ -_PewterHouse1Text1:: +_PewterNidoranHouseNidoranText:: text "NIDORAN: Bowbow!@" text_end -_PewterHouse1Text2:: +_PewterNidoranHouseLittleBoyText:: text "NIDORAN sit!" done -_PewterHouse1Text3:: +_PewterNidoranHouseMiddleAgedManText:: text "Our #MON's an" line "outsider, so it's" cont "hard to handle." diff --git a/text/PewterPokecenter.asm b/text/PewterPokecenter.asm index 968f6af0..4f0724e6 100644 --- a/text/PewterPokecenter.asm +++ b/text/PewterPokecenter.asm @@ -1,4 +1,4 @@ -_PewterPokecenterText2:: +_PewterPokecenterGentlemanText:: text "What!?" para "TEAM ROCKET is" @@ -21,7 +21,7 @@ _PewterPokecenterText3:: cont "are cured." done -_PewterJigglypuffText:: +_PewterPokecenterJigglypuffText:: text "JIGGLYPUFF: Puu" line "pupuu!" done diff --git a/text/PewterSpeechHouse.asm b/text/PewterSpeechHouse.asm index 615536f7..154061e9 100644 --- a/text/PewterSpeechHouse.asm +++ b/text/PewterSpeechHouse.asm @@ -1,4 +1,4 @@ -_PewterHouse2Text1:: +_PewterSpeechHouseGamblerText:: text "#MON learn new" line "techniques as" cont "they grow!" @@ -8,7 +8,7 @@ _PewterHouse2Text1:: cont "the trainer!" done -_PewterHouse2Text2:: +_PewterSpeechHouseYoungsterText:: text "#MON become" line "easier to catch" cont "when they are" diff --git a/text/PokemonFanClub.asm b/text/PokemonFanClub.asm index 1d4e5648..73ee86c0 100644 --- a/text/PokemonFanClub.asm +++ b/text/PokemonFanClub.asm @@ -1,16 +1,16 @@ -PikachuFanText:: +_PokemonFanClubClefairyFanNormalText:: text "Won't you admire" line "my CLEFAIRY's" cont "adorable tail?" done -PikachuFanBetterText:: +_PokemonFanClubClefairyFanBetterText:: text "Humph! My CLEFAIRY" line "is twice as cute" cont "as that one!" done -PikachuFanPrintText:: +_PokemonFanClubClefairyFanText:: text "Our CHAIRMAN's new" line "hobby is taking" cont "#MON photos." @@ -20,7 +20,7 @@ PikachuFanPrintText:: cont "CLEFAIRY." done -SeelFanText:: +_PokemonFanClubSeelFanNormalText:: text "I just love my" line "SEEL!" @@ -28,29 +28,29 @@ SeelFanText:: line "hug it!" done -SeelFanBetterText:: +_PokemonFanClubSeelFanBetterText:: text "Oh dear!" para "My SEEL is far" line "more attractive!" done -SeelFanPrintText:: +_PokemonFanClubSeelFanText:: text "I'm going to hook" line "up the cable to" cont "get a photo PRINT" cont "of my SEEL!" done -FanClubPikachuText:: +_PokemonFanClubClefairyText:: text "CLEFAIRY: Pippii!" done -FanClubSeelText:: +_PokemonFanClubSeelText:: text "SEEL: Kyuoo!" done -FanClubMeetChairText:: +_PokemonFanClubChairmanIntroText:: text "I chair the" line "#MON Fan Club!" @@ -69,7 +69,7 @@ FanClubMeetChairText:: cont "about my #MON?" done -FanClubChairStoryText:: +_PokemonFanClubChairmanStoryText:: text "Good!" line "Then listen up!" @@ -99,15 +99,16 @@ FanClubChairStoryText:: cont "you to have this!" prompt -ReceivedBikeVoucherText:: +_PokemonFanClubReceivedBikeVoucherText:: text "<PLAYER> received" line "a @" text_ram wStringBuffer text "!@" text_end -ExplainBikeVoucherText:: +_PokemonFanClubExplainBikeVoucherText:: text_start + para "Exchange that for" line "a BICYCLE!" @@ -122,13 +123,13 @@ ExplainBikeVoucherText:: line "cycling!" done -FanClubNoStoryText:: +_PokemonFanClubNoStoryText:: text "Oh. Come back" line "when you want to" cont "hear my story!" done -FanClubChairFinalText:: +_PokemonFanClubChairFinalText:: text "Hello, <PLAYER>!" para "Did you come see" @@ -138,7 +139,7 @@ FanClubChairFinalText:: para "No? Too bad!" done -FanClubBagFullText:: +_PokemonFanClubBagFullText:: text "Make room for" line "this!" done @@ -172,7 +173,7 @@ FanClubChairPrintText4:: line "PRINT this now." done -_FanClubText6:: +_PokemonFanClubReceptionistText:: text "Our CHAIRMAN is" line "very vocal about" cont "#MON." diff --git a/text/PokemonMansion1F.asm b/text/PokemonMansion1F.asm index a3c517fb..2e927f25 100644 --- a/text/PokemonMansion1F.asm +++ b/text/PokemonMansion1F.asm @@ -1,29 +1,29 @@ -_Mansion1BattleText2:: +_PokemonMansion1FScientistBattleText:: text "Who are you? There" line "shouldn't be" cont "anyone here." done -_Mansion1EndBattleText2:: +_PokemonMansion1FScientistEndBattleText:: text "Ouch!" prompt -_Mansion1AfterBattleText2:: +_PokemonMansion1FScientistAfterBattleText:: text "A key? I don't" line "know what you're" cont "talking about." done -_MansionSwitchText:: +_PokemonMansion1FSwitchText:: text "A secret switch!" para "Press it?" done -_MansionSwitchPressedText:: +_PokemonMansion1FSwitchPressedText:: text "Who wouldn't?" prompt -_MansionSwitchNotPressedText:: +_PokemonMansion1FSwitchNotPressedText:: text "Not quite yet!" done diff --git a/text/PokemonMansion2F.asm b/text/PokemonMansion2F.asm index 378efb30..ee2ddaeb 100644 --- a/text/PokemonMansion2F.asm +++ b/text/PokemonMansion2F.asm @@ -1,21 +1,21 @@ -_Mansion2BattleText1:: +_PokemonMansion2FSuperNerdBattleText:: text "I can't get out!" line "This old place is" cont "one big puzzle!" done -_Mansion2EndBattleText1:: +_PokemonMansion2FSuperNerdEndBattleText:: text "Oh no!" line "My bag of loot!" prompt -_Mansion2AfterBattleText1:: +_PokemonMansion2FSuperNerdAfterBattleText:: text "Switches open and" line "close alternating" cont "sets of doors!" done -_Mansion2Text3:: +_PokemonMansion2FDiary1Text:: text "Diary: July 5" line "Guyana," cont "South America" @@ -25,23 +25,23 @@ _Mansion2Text3:: cont "in the jungle." done -_Mansion2Text4:: +_PokemonMansion2FDiary2Text:: text "Diary: July 10" line "We christened the" cont "newly discovered" cont "#MON, MEW." done -_Mansion2Text_520c2:: +_PokemonMansion2FSwitchText:: text "A secret switch!" para "Press it?" done -_Mansion2Text_520c7:: +_PokemonMansion2FSwitchPressedText:: text "Who wouldn't?" prompt -_Mansion2Text_520cc:: +_PokemonMansion2FSwitchNotPressedText:: text "Not quite yet!" done diff --git a/text/PokemonMansion3F.asm b/text/PokemonMansion3F.asm index 70331fdf..42655b77 100644 --- a/text/PokemonMansion3F.asm +++ b/text/PokemonMansion3F.asm @@ -1,34 +1,34 @@ -_Mansion3BattleText1:: +_PokemonMansion3FSuperNerdBattleText:: text "This place is" line "like, huge!" done -_Mansion3EndBattleText1:: +_PokemonMansion3FSuperNerdEndBattleText:: text "Ayah!" prompt -_Mansion3AfterBattleText1:: +_PokemonMansion3FSuperNerdAfterBattleText:: text "I wonder where" line "my partner went." done -_Mansion3BattleText2:: +_PokemonMansion3FScientistBattleText:: text "My mentor once" line "lived here." done -_Mansion3EndBattleText2:: +_PokemonMansion3FScientistEndBattleText:: text "Whew!" line "Overwhelming!" prompt -_Mansion3AfterBattleText2:: +_PokemonMansion3FScientistAfterBattleText:: text "So, you're stuck?" line "Try jumping off" cont "over there!" done -_Mansion3Text5:: +_PokemonMansion3FDiaryText:: text "Diary: Feb. 6" line "MEW gave birth." diff --git a/text/PokemonMansionB1F.asm b/text/PokemonMansionB1F.asm index 1bc1ef89..da641b5f 100644 --- a/text/PokemonMansionB1F.asm +++ b/text/PokemonMansionB1F.asm @@ -1,34 +1,34 @@ -_Mansion4BattleText1:: +_PokemonMansionB1FBurglarBattleText:: text "Uh-oh. Where am" line "I now?" done -_Mansion4EndBattleText1:: +_PokemonMansionB1FBurglarEndBattleText:: text "Awooh!" prompt -_Mansion4AfterBattleText1:: +_PokemonMansionB1FBurglarAfterBattleText:: text "You can find stuff" line "lying around." done -_Mansion4BattleText2:: +_PokemonMansionB1FScientistBattleText:: text "This place is" line "ideal for a lab." done -_Mansion4EndBattleText2:: +_PokemonMansionB1FScientistEndBattleText:: text "What" line "was that for?" prompt -_Mansion4AfterBattleText2:: +_PokemonMansionB1FScientistAfterBattleText:: text "I like it here!" line "It's conducive to" cont "my studies!" done -_Mansion4Text7:: +_PokemonMansionB1FDiaryText:: text "Diary; Sept. 1" line "MEWTWO is far too" cont "powerful." diff --git a/text/PokemonTower1F.asm b/text/PokemonTower1F.asm index 50a2cd29..f883134f 100644 --- a/text/PokemonTower1F.asm +++ b/text/PokemonTower1F.asm @@ -1,17 +1,17 @@ -_PokemonTower1Text1:: +_PokemonTower1FReceptionistText:: text "#MON TOWER was" line "erected in the" cont "memory of #MON" cont "that had died." done -_PokemonTower1Text2:: +_PokemonTower1FMiddleAgedWomanText:: text "Did you come to" line "pay respects?" cont "Bless you!" done -_PokemonTower1Text3:: +_PokemonTower1FBaldingGuyText:: text "I came to pray" line "for my CLEFAIRY." @@ -19,12 +19,12 @@ _PokemonTower1Text3:: line "stop crying..." done -_PokemonTower1Text4:: +_PokemonTower1FGirlText:: text "My GROWLITHE..." line "Why did you die?" done -_PokemonTower1Text5:: +_PokemonTower1FChannelerText:: text "I am a CHANNELER!" line "There are spirits" cont "up to mischief!" diff --git a/text/PokemonTower2F.asm b/text/PokemonTower2F.asm index 79323001..e927eabd 100644 --- a/text/PokemonTower2F.asm +++ b/text/PokemonTower2F.asm @@ -1,4 +1,4 @@ -_PokemonTower2Text_6062d:: +_PokemonTower2FRivalWhatBringsYouHereText:: text "<RIVAL>: Hey," line "<PLAYER>! What" cont "brings you here?" @@ -10,7 +10,7 @@ _PokemonTower2Text_6062d:: cont "Let's go, pal!" done -_PokemonTower2Text_60632:: +_PokemonTower2FRivalDefeatedText:: text "What?" line "You stinker!" @@ -18,7 +18,7 @@ _PokemonTower2Text_60632:: line "you too!" prompt -_PokemonTower2Text_60637:: +_PokemonTower2FRivalVictoryText:: text "<RIVAL>: Well," line "look at all your" cont "wimpy #MON!" @@ -27,7 +27,7 @@ _PokemonTower2Text_60637:: line "bit more!" prompt -_PokemonTower2Text_6063c:: +_PokemonTower2FRivalHowsYourDexText:: text "How's your #DEX" line "coming, pal?" cont "I just caught a" @@ -46,7 +46,7 @@ _PokemonTower2Text_6063c:: para "Smell ya later!" done -_PokemonTower2Text2:: +_PokemonTower2FChannelerText:: text "Even we could not" line "identify the" cont "wayward GHOSTs!" diff --git a/text/PokemonTower3F.asm b/text/PokemonTower3F.asm index 67098e6b..2059fe8e 100644 --- a/text/PokemonTower3F.asm +++ b/text/PokemonTower3F.asm @@ -1,45 +1,45 @@ -_PokemonTower3BattleText1:: +_PokemonTower3FChanneler1BattleText:: text "Urrg...Awaa..." line "Huhu...graa.." done -_PokemonTower3EndBattleText1:: +_PokemonTower3FChanneler1EndBattleText:: text "Hwa!" line "I'm saved!" prompt -_PokemonTower3AfterBattleText1:: +_PokemonTower3FChanneler1AfterBattleText:: text "The GHOSTs can be" line "identified by the" cont "SILPH SCOPE." done -_PokemonTower3BattleText2:: +_PokemonTower3FChanneler2BattleText:: text "Kekeke...." line "Kwaaah!" done -_PokemonTower3EndBattleText2:: +_PokemonTower3FChanneler2EndBattleText:: text "Hmm?" line "What am I doing?" prompt -_PokemonTower3AfterBattleText2:: +_PokemonTower3FChanneler2AfterBattleText:: text "Sorry! I was" line "possessed!" done -_PokemonTower3BattleText3:: +_PokemonTower3FChanneler3BattleText:: text "Be gone!" line "Evil spirit!" done -_PokemonTower3EndBattleText3:: +_PokemonTower3FChanneler3EndBattleText:: text "Whew!" line "The spirit left!" prompt -_PokemonTower3AfterBattleText3:: +_PokemonTower3FChanneler3AfterBattleText:: text "My friends were" line "possessed too!" done diff --git a/text/PokemonTower4F.asm b/text/PokemonTower4F.asm index 771325a0..4b3882a7 100644 --- a/text/PokemonTower4F.asm +++ b/text/PokemonTower4F.asm @@ -1,44 +1,44 @@ -_PokemonTower4BattleText1:: +_PokemonTower4FChanneler1BattleText:: text "GHOST! No!" line "Kwaaah!" done -_PokemonTower4EndBattleText1:: +_PokemonTower4FChanneler1EndBattleText:: text "Where" line "is the GHOST?" prompt -_PokemonTower4AfterBattleText1:: +_PokemonTower4FChanneler1AfterBattleText:: text "I must have been" line "dreaming..." done -_PokemonTower4BattleText2:: +_PokemonTower4FChanneler2BattleText:: text "Be cursed with" line "me! Kwaaah!" done -_PokemonTower4EndBattleText2:: +_PokemonTower4FChanneler2EndBattleText:: text "What!" prompt -_PokemonTower4AfterBattleText2:: +_PokemonTower4FChanneler2AfterBattleText:: text "We can't crack" line "the identity of" cont "the GHOSTs." done -_PokemonTower4BattleText3:: +_PokemonTower4FChanneler3BattleText:: text "Huhuhu..." line "Beat me not!" done -_PokemonTower4EndBattleText3:: +_PokemonTower4FChanneler3EndBattleText:: text "Huh?" line "Who? What?" prompt -_PokemonTower4AfterBattleText3:: +_PokemonTower4FChanneler3AfterBattleText:: text "May the departed" line "souls of #MON" cont "rest in peace..." diff --git a/text/PokemonTower5F.asm b/text/PokemonTower5F.asm index b329118d..ae4135d7 100644 --- a/text/PokemonTower5F.asm +++ b/text/PokemonTower5F.asm @@ -1,4 +1,4 @@ -_PokemonTower5Text1:: +_PokemonTower5FChanneler1Text:: text "Come, child! I" line "sealed this space" cont "with white magic!" @@ -6,63 +6,63 @@ _PokemonTower5Text1:: para "You can rest here!" done -_PokemonTower5BattleText1:: +_PokemonTower5FChanneler2BattleText:: text "Give...me..." line "your...soul..." done -_PokemonTower5EndBattleText1:: +_PokemonTower5FChanneler2EndBattleText:: text "Gasp!" prompt -_PokemonTower5AfterBattleText1:: +_PokemonTower5FChanneler2AfterBattleText:: text "I was under" line "possession!" done -_PokemonTower5BattleText2:: +_PokemonTower5FChanneler3BattleText:: text "You...shall..." line "join...us..." done -_PokemonTower5EndBattleText2:: +_PokemonTower5FChanneler3EndBattleText:: text "What" line "a nightmare!" prompt -_PokemonTower5AfterBattleText2:: +_PokemonTower5FChanneler3AfterBattleText:: text "I was possessed!" done -_PokemonTower5BattleText3:: +_PokemonTower5FChanneler4BattleText:: text "Zombies!" done -_PokemonTower5EndBattleText3:: +_PokemonTower5FChanneler4EndBattleText:: text "Ha?" prompt -_PokemonTower5AfterBattleText3:: +_PokemonTower5FChanneler4AfterBattleText:: text "I regained my" line "senses!" done -_PokemonTower5BattleText4:: +_PokemonTower5FChanneler5BattleText:: text "Urgah..." line "Urff...." done -_PokemonTower5EndBattleText4:: +_PokemonTower5FChanneler5EndBattleText:: text "Whoo!" prompt -_PokemonTower5AfterBattleText4:: +_PokemonTower5FChanneler5AfterBattleText:: text "I fell to evil" line "spirits despite" cont "my training!" done -_PokemonTower5Text7:: +_PokemonTower5FPurifiedZoneText:: text "Entered purified," line "protected zone!" diff --git a/text/PokemonTower6F.asm b/text/PokemonTower6F.asm index 7532d56d..55509e91 100644 --- a/text/PokemonTower6F.asm +++ b/text/PokemonTower6F.asm @@ -1,10 +1,10 @@ -_PokemonTower2Text_60c1f:: +_PokemonTower6FGhostWasCubonesMotherText:: text "The GHOST was the" line "restless soul of" cont "CUBONE's mother!" done -_PokemonTower2Text_60c24:: +_PokemonTower6FSoulWasCalmedText:: text "The mother's soul" line "was calmed." @@ -12,50 +12,50 @@ _PokemonTower2Text_60c24:: line "the afterlife!" done -_PokemonTower6BattleText1:: +_PokemonTower6FChanneler1BattleText:: text "Give...me..." line "blood..." done -_PokemonTower6EndBattleText1:: +_PokemonTower6FChanneler1EndBattleText:: text "Groan!" prompt -_PokemonTower6AfterBattleText1:: +_PokemonTower6FChanneler1AfterBattleText:: text "I feel anemic and" line "weak..." done -_PokemonTower6BattleText2:: +_PokemonTower6FChanneler2BattleText:: text "Urff... Kwaah!" done -_PokemonTower6EndBattleText2:: +_PokemonTower6FChanneler2EndBattleText:: text "Some-" line "thing fell out!" prompt -_PokemonTower6AfterBattleText2:: +_PokemonTower6FChanneler2AfterBattleText:: text "Hair didn't fall" line "out! It was an" cont "evil spirit!" done -_PokemonTower6BattleText3:: +_PokemonTower6FChanneler3BattleText:: text "Ke..ke...ke..." line "ke..ke...ke!!" done -_PokemonTower6EndBattleText3:: +_PokemonTower6FChanneler3EndBattleText:: text "Keee!" prompt -_PokemonTower6AfterBattleText3:: +_PokemonTower6FChanneler3AfterBattleText:: text "What's going on" line "here?" done -_PokemonTower6Text6:: +_PokemonTower6FBeGoneText:: text "Be gone..." line "Intruders..." done diff --git a/text/PokemonTower7F.asm b/text/PokemonTower7F.asm index 86f05445..35c404ca 100644 --- a/text/PokemonTower7F.asm +++ b/text/PokemonTower7F.asm @@ -24,7 +24,7 @@ _PokemonTowerJessieJamesText4:: cont "off again!@" text_end -_TowerRescueFujiText:: +_PokemonTower7FMrFujiRescueText:: text "MR.FUJI: Heh? You" line "came to save me?" diff --git a/text/PowerPlant.asm b/text/PowerPlant.asm index dcdcd739..f2ff25df 100644 --- a/text/PowerPlant.asm +++ b/text/PowerPlant.asm @@ -1,7 +1,7 @@ -_VoltorbBattleText:: +_PowerPlantVoltorbBattleText:: text "Bzzzt!" done -_ZapdosBattleText:: +_PowerPlantZapdosBattleText:: text "Gyaoo!@" text_end diff --git a/text/RedsHouse1F.asm b/text/RedsHouse1F.asm index 633075bb..7d0f68a1 100644 --- a/text/RedsHouse1F.asm +++ b/text/RedsHouse1F.asm @@ -1,4 +1,4 @@ -_MomWakeUpText:: +_RedsHouse1FMomWakeUpText:: text "MOM: Right." line "All boys leave" cont "home someday." @@ -9,7 +9,7 @@ _MomWakeUpText:: cont "for you." done -_MomHealText1:: +_RedsHouse1FMomYouShouldRestText:: text "MOM: <PLAYER>, if" line "you drive your" cont "#MON too hard," @@ -20,7 +20,7 @@ _MomHealText1:: line "rest." prompt -_MomHealText2:: +_RedsHouse1FMomLookingGreatText:: text "MOM: Oh good!" line "You and your" cont "#MON are" @@ -28,7 +28,7 @@ _MomHealText2:: cont "Take care now!" done -_StandByMeText:: +_RedsHouse1FTVStandByMeMovieText:: text "There's a movie" line "on TV. Four boys" cont "are walking on" @@ -37,6 +37,6 @@ _StandByMeText:: para "I better go too." done -_TVWrongSideText:: +_RedsHouse1FTVWrongSideText:: text "Oops, wrong side." done diff --git a/text/RockTunnel1F.asm b/text/RockTunnel1F.asm index 472c52f8..cfe38939 100644 --- a/text/RockTunnel1F.asm +++ b/text/RockTunnel1F.asm @@ -1,114 +1,114 @@ -_RockTunnel1BattleText1:: +_RockTunnel1FHiker1BattleText:: text "This tunnel goes" line "a long way, kid!" done -_RockTunnel1EndBattleText1:: +_RockTunnel1FHiker1EndBattleText:: text "Doh!" line "You win!" prompt -_RockTunnel1AfterBattleText1:: +_RockTunnel1FHiker1AfterBattleText:: text "Watch for ONIX!" line "It can put the" cont "squeeze on you!" done -_RockTunnel1BattleText2:: +_RockTunnel1FHiker2BattleText:: text "Hmm. Maybe I'm" line "lost in here..." done -_RockTunnel1EndBattleText2:: +_RockTunnel1FHiker2EndBattleText:: text "Ease up!" line "What am I doing?" cont "Which way is out?" prompt -_RockTunnel1AfterBattleText2:: +_RockTunnel1FHiker2AfterBattleText:: text "That sleeping" line "#MON on ROUTE" cont "12 forced me to" cont "take this detour." done -_RockTunnel1BattleText3:: +_RockTunnel1FHiker3BattleText:: text "Outsiders like" line "you need to show" cont "me some respect!" done -_RockTunnel1EndBattleText3:: +_RockTunnel1FHiker3EndBattleText:: text "I give!" prompt -_RockTunnel1AfterBattleText3:: +_RockTunnel1FHiker3AfterBattleText:: text "You're talented" line "enough to hike!" done -_RockTunnel1BattleText4:: +_RockTunnel1FSuperNerdBattleText:: text "#MON fight!" line "Ready, go!" done -_RockTunnel1EndBattleText4:: +_RockTunnel1FSuperNerdEndBattleText:: text "Game" line "over!" prompt -_RockTunnel1AfterBattleText4:: +_RockTunnel1FSuperNerdAfterBattleText:: text "Oh well, I'll get" line "a ZUBAT as I go!" done -_RockTunnel1BattleText5:: +_RockTunnel1FCooltrainerF1BattleText:: text "Eek! Don't try" line "anything funny in" cont "the dark!" done -_RockTunnel1EndBattleText5:: +_RockTunnel1FCooltrainerF1EndBattleText:: text "It" line "was too dark!" prompt -_RockTunnel1AfterBattleText5:: +_RockTunnel1FCooltrainerF1AfterBattleText:: text "I saw a MACHOP" line "in this tunnel!" done -_RockTunnel1BattleText6:: +_RockTunnel1FCooltrainerF2BattleText:: text "I came this far" line "for #MON!" done -_RockTunnel1EndBattleText6:: +_RockTunnel1FCooltrainerF2EndBattleText:: text "I'm" line "out of #MON!" prompt -_RockTunnel1AfterBattleText6:: +_RockTunnel1FCooltrainerF2AfterBattleText:: text "You looked cute" line "and harmless!" done -_RockTunnel1BattleText7:: +_RockTunnel1FCooltrainerF3BattleText:: text "You have #MON!" line "Let's start!" done -_RockTunnel1EndBattleText7:: +_RockTunnel1FCooltrainerF3EndBattleText:: text "You" line "play hard!" prompt -_RockTunnel1AfterBattleText7:: +_RockTunnel1FCooltrainerF3AfterBattleText:: text "Whew! I'm all" line "sweaty now!" done -_RockTunnel1Text8:: +_RockTunnel1FSignText:: text "ROCK TUNNEL" line "CERULEAN CITY -" cont "LAVENDER TOWN" diff --git a/text/RockTunnelB1F.asm b/text/RockTunnelB1F.asm index d0437de7..6dee59a2 100644 --- a/text/RockTunnelB1F.asm +++ b/text/RockTunnelB1F.asm @@ -1,129 +1,129 @@ -_RockTunnel2BattleText2:: +_RockTunnelB1FCooltrainerF1BattleText:: text "Hikers leave twigs" line "as trail markers." done -_RockTunnel2EndBattleText2:: +_RockTunnelB1FCooltrainerF1EndBattleText:: text "Ohhh!" line "I did my best!" prompt -_RockTunnel2AfterBattleText2:: +_RockTunnelB1FCooltrainerF1AfterBattleText:: text "I want to go " line "home!" done -_RockTunnel2BattleText3:: +_RockTunnelB1FHiker1BattleText:: text "Hahaha! Can you" line "beat my power?" done -_RockTunnel2EndBattleText3:: +_RockTunnelB1FHiker1EndBattleText:: text "Oops!" line "Out-muscled!" prompt -_RockTunnel2AfterBattleText3:: +_RockTunnelB1FHiker1AfterBattleText:: text "I go for power" line "because I hate" cont "thinking!" done -_RockTunnel2BattleText4:: +_RockTunnelB1FSuperNerd1BattleText:: text "You have a" line "#DEX?" cont "I want one too!" done -_RockTunnel2EndBattleText4:: +_RockTunnelB1FSuperNerd1EndBattleText:: text "Shoot!" line "I'm so jealous!" prompt -_RockTunnel2AfterBattleText4:: +_RockTunnelB1FSuperNerd1AfterBattleText:: text "When you finish" line "your #DEX, can" cont "I have it?" done -_RockTunnel2BattleText5:: +_RockTunnelB1FSuperNerd2BattleText:: text "Do you know about" line "costume players?" done -_RockTunnel2EndBattleText5:: +_RockTunnelB1FSuperNerd2EndBattleText:: text "Well," line "that's that." prompt -_RockTunnel2AfterBattleText5:: +_RockTunnelB1FSuperNerd2AfterBattleText:: text "Costume players" line "dress up as" cont "#MON for fun." done -_RockTunnel2BattleText6:: +_RockTunnelB1FHiker2BattleText:: text "My #MON" line "techniques will" cont "leave you crying!" done -_RockTunnel2EndBattleText6:: +_RockTunnelB1FHiker2EndBattleText:: text "I give!" line "You're a better" cont "technician!" prompt -_RockTunnel2AfterBattleText6:: +_RockTunnelB1FHiker2AfterBattleText:: text "In mountains," line "you'll often find" cont "rock-type #MON." done -_RockTunnel2BattleText7:: +_RockTunnelB1FCooltrainerF2BattleText:: text "I don't often" line "come here, but I" cont "will fight you." done -_RockTunnel2EndBattleText7:: +_RockTunnelB1FCooltrainerF2EndBattleText:: text "Oh!" line "I lost!" prompt -_RockTunnel2AfterBattleText7:: +_RockTunnelB1FCooltrainerF2AfterBattleText:: text "I like tiny" line "#MON, big ones" cont "are too scary!" done -_RockTunnel2BattleText8:: +_RockTunnelB1FHiker3BattleText:: text "Hit me with your" line "best shot!" done -_RockTunnel2EndBattleText8:: +_RockTunnelB1FHiker3EndBattleText:: text "Fired" line "away!" prompt -_RockTunnel2AfterBattleText8:: +_RockTunnelB1FHiker3AfterBattleText:: text "I'll raise my" line "#MON to beat" cont "yours, kid!" done -_RockTunnel2BattleText9:: +_RockTunnelB1FSuperNerd3BattleText:: text "I draw #MON" line "when I'm home." done -_RockTunnel2EndBattleText9:: +_RockTunnelB1FSuperNerd3EndBattleText:: text "Whew!" line "I'm exhausted!" prompt -_RockTunnel2AfterBattleText9:: +_RockTunnelB1FSuperNerd3AfterBattleText:: text "I'm an artist," line "not a fighter." done diff --git a/text/RockTunnelPokecenter.asm b/text/RockTunnelPokecenter.asm index 0fc249ff..738dfab6 100644 --- a/text/RockTunnelPokecenter.asm +++ b/text/RockTunnelPokecenter.asm @@ -1,4 +1,4 @@ -_RockTunnelPokecenterText2:: +_RockTunnelPokecenterGentlemanText:: text "The element types" line "of #MON make" cont "them stronger" @@ -7,7 +7,7 @@ _RockTunnelPokecenterText2:: cont "others!" done -_RockTunnelPokecenterText3:: +_RockTunnelPokecenterFisherText:: text "I sold a useless" line "NUGGET for ¥5000!" done diff --git a/text/RocketHideoutB1F.asm b/text/RocketHideoutB1F.asm index c4fcb4b1..4ff0f8ec 100644 --- a/text/RocketHideoutB1F.asm +++ b/text/RocketHideoutB1F.asm @@ -1,74 +1,74 @@ -_RocketHideout1EndBattleText6:: +_RocketHideoutB1FRocket5EndBattleText:: text "Why...?@" text_end -_RocketHideout1BattleText2:: +_RocketHideoutB1FRocket1BattleText:: text "Who are you? How" line "did you get here?" done -_RocketHideout1EndBattleText2:: +_RocketHideoutB1FRocket1EndBattleText:: text "Oww!" line "Beaten!" prompt -_RocketHideout1AfterBattleTxt2:: +_RocketHideoutB1FRocket1AfterBattleText:: text "Are you dissing" line "TEAM ROCKET?" done -_RocketHideout1BattleText3:: +_RocketHideoutB1FRocket2BattleText:: text "You broke into" line "our operation?" done -_RocketHideout1EndBattleText3:: +_RocketHideoutB1FRocket2EndBattleText:: text "Burnt!" prompt -_RocketHideout1AfterBattleTxt3:: +_RocketHideoutB1FRocket2AfterBattleText:: text "You're not going" line "to get away with" cont "this, brat!" done -_RocketHideout1BattleText4:: +_RocketHideoutB1FRocket3BattleText:: text "Intruder alert!" done -_RocketHideout1EndBattleText4:: +_RocketHideoutB1FRocket3EndBattleText:: text "I" line "can't do it!" prompt -_RocketHideout1AfterBattleTxt4:: +_RocketHideoutB1FRocket3AfterBattleText:: text "SILPH SCOPE?" line "I don't know" cont "where it is!" done -_RocketHideout1BattleText5:: +_RocketHideoutB1FRocket4BattleText:: text "Why did you come" line "here?" done -_RocketHideout1EndBattleText5:: +_RocketHideoutB1FRocket4EndBattleText:: text "This" line "won't do!" prompt -_RocketHideout1AfterBattleTxt5:: +_RocketHideoutB1FRocket4AfterBattleText:: text "OK, I'll talk!" line "Take the elevator" cont "to see my BOSS!" done -_RocketHideout1BattleText6:: +_RocketHideoutB1FRocket5BattleText:: text "Are you lost, you" line "little rat?" done -_RocketHideout1AfterBattleTxt6:: +_RocketHideoutB1FRocket5AfterBattleText:: text "Uh-oh, that fight" line "opened the door!" done diff --git a/text/RocketHideoutB2F.asm b/text/RocketHideoutB2F.asm index c13c3593..4dffbc3b 100644 --- a/text/RocketHideoutB2F.asm +++ b/text/RocketHideoutB2F.asm @@ -1,15 +1,15 @@ -_RocketHideout2BattleText2:: +_RocketHideoutB1FRocketBattleText:: text "BOSS said you can" line "see GHOSTs with" cont "the SILPH SCOPE!" done -_RocketHideout2EndBattleText2:: +_RocketHideoutB1FRocketEndBattleText:: text "I" line "surrender!" prompt -_RocketHideout2AfterBattleTxt2:: +_RocketHideoutB1FRocketAfterBattleText:: text "The TEAM ROCKET" line "HQ has 4 basement" cont "floors. Can you" diff --git a/text/RocketHideoutB3F.asm b/text/RocketHideoutB3F.asm index a146a383..b7ec9e1a 100644 --- a/text/RocketHideoutB3F.asm +++ b/text/RocketHideoutB3F.asm @@ -1,15 +1,15 @@ -_RocketHideout3BattleText2:: +_RocketHideoutB3FRocket1BattleText:: text "Stop meddling in" line "TEAM ROCKET's" cont "affairs!" done -_RocketHideout3EndBattleText2:: +_RocketHideoutB3FRocket1EndBattleText:: text "Oof!" line "Taken down!" prompt -_RocketHideout3AfterBattleTxt2:: +_RocketHideoutB3FRocket1AfterBattleText:: text "SILPH SCOPE?" line "The machine the" cont "BOSS stole. It's" diff --git a/text/RocketHideoutB4F.asm b/text/RocketHideoutB4F.asm index 099045bc..5a116b45 100644 --- a/text/RocketHideoutB4F.asm +++ b/text/RocketHideoutB4F.asm @@ -23,18 +23,18 @@ _RocketHideoutJessieJamesText4:: cont "off again!@" text_end -_RocketHideout4Text_4557a:: +_RocketHideoutB4FGiovanniImpressedYouGotHereText:: text "So! I must say, I" line "am impressed you" cont "got here!" done -_RocketHideout4Text_4557f:: +_RocketHideoutB4FGiovanniWhatCannotBeText:: text "WHAT!" line "This cannot be!" prompt -_RocketHideout4Text_45584:: +_RocketHideoutB4FGiovanniHopeWeMeetAgainText:: text "I see that you" line "raise #MON" cont "with utmost care." @@ -51,17 +51,17 @@ _RocketHideout4Text_45584:: line "again..." done -_RocketHideout4BattleText4:: +_RocketHideoutB4FRocket2BattleText:: text "The elevator" line "doesn't work? Who" cont "has the LIFT KEY?" done -_RocketHideout4EndBattleText4:: +_RocketHideoutB4FRocket2EndBattleText:: text "No!" prompt -_RocketHideout4Text_455ec:: +_RocketHideoutB4FRocket2AfterBattleText:: text "Oh no! I dropped" line "the LIFT KEY!" done diff --git a/text/RocketHideoutElevator.asm b/text/RocketHideoutElevator.asm index 1b8ba561..a35af381 100644 --- a/text/RocketHideoutElevator.asm +++ b/text/RocketHideoutElevator.asm @@ -1,4 +1,4 @@ -_RocketElevatorText_4578b:: +_RocketHideoutElevatorAppearsToNeedKeyText:: text "It appears to" line "need a key.@" text_end diff --git a/text/Route1.asm b/text/Route1.asm index c7a05cd4..bc9badaf 100644 --- a/text/Route1.asm +++ b/text/Route1.asm @@ -1,4 +1,4 @@ -_Route1ViridianMartSampleText:: +_Route1Youngster1MartSampleText:: text "Hi! I work at a" line "#MON MART." @@ -12,25 +12,25 @@ _Route1ViridianMartSampleText:: cont "Here you go!" prompt -_Route1Text_1cae8:: +_Route1Youngster1GotPotionText:: text "<PLAYER> got" line "@" text_ram wStringBuffer text "!@" text_end -_Route1Text_1caee:: +_Route1Youngster1AlsoGotPokeballsText:: text "We also carry" line "# BALLs for" cont "catching #MON!" done -_Route1Text_1caf3:: +_Route1Youngster1NoRoomText:: text "You have too much" line "stuff with you!" done -_Route1Text2:: +_Route1Youngster2Text:: text "See those ledges" line "along the road?" @@ -43,7 +43,7 @@ _Route1Text2:: cont "quicker that way." done -_Route1Text3:: +_Route1SignText:: text "ROUTE 1" line "PALLET TOWN -" cont "VIRIDIAN CITY" diff --git a/text/Route10.asm b/text/Route10.asm index a56018f0..9546d65b 100644 --- a/text/Route10.asm +++ b/text/Route10.asm @@ -1,97 +1,97 @@ -_Route10BattleText1:: +_Route10SuperNerd1BattleText:: text "Wow, are you a" line "#MANIAC too?" cont "Want to see my" cont "collection?" done -_Route10EndBattleText1:: +_Route10SuperNerd1EndBattleText:: text "Humph." line "I'm not angry!" prompt -_Route10AfterBattleText1:: +_Route10SuperNerd1AfterBattleText:: text "I have more rare" line "#MON at home!" done -_Route10BattleText2:: +_Route10Hiker1BattleText:: text "Ha-hahah-ah-ha!" done -_Route10EndBattleText2:: +_Route10Hiker1EndBattleText:: text "Ha-haha!" line "Not laughing!" cont "Ha-hay fever!" cont "Haha-ha-choo!" prompt -_Route10AfterBattleText2:: +_Route10Hiker1AfterBattleText:: text "Haha-ha-choo!" line "Ha-choo!" cont "Snort! Snivel!" done -_Route10BattleText3:: +_Route10SuperNerd2BattleText:: text "Hi, kid, want to" line "see my #MON?" done -_Route10EndBattleText3:: +_Route10SuperNerd2EndBattleText:: text "Oh no!" line "My #MON!" prompt -_Route10AfterBattleText3:: +_Route10SuperNerd2AfterBattleText:: text "I don't like you" line "for beating me!" done -_Route10BattleText4:: +_Route10CooltrainerF1BattleText:: text "I've been to a" line "#MON GYM a few" cont "times. But, I" cont "lost each time." done -_Route10EndBattleText4:: +_Route10CooltrainerF1EndBattleText:: text "Ohh!" line "Blew it again!" prompt -_Route10AfterBattleText4:: +_Route10CooltrainerF1AfterBattleText:: text "I noticed some" line "#MANIACs" cont "prowling around." done -_Route10BattleText5:: +_Route10Hiker2BattleText:: text "Ah! This mountain" line "air is delicious!" done -_Route10EndBattleText5:: +_Route10Hiker2EndBattleText:: text "That" line "cleared my head!" prompt -_Route10AfterBattleText5:: +_Route10Hiker2AfterBattleText:: text "I feel bloated on" line "mountain air!" done -_Route10BattleText6:: +_Route10CooltrainerF2BattleText:: text "I'm feeling a bit" line "faint from this" cont "tough hike." done -_Route10EndBattleText6:: +_Route10CooltrainerF2EndBattleText:: text "I'm" line "not up to it!" prompt -_Route10AfterBattleText6:: +_Route10CooltrainerF2AfterBattleText:: text "The #MON here" line "are so chunky!" cont "There should be a" @@ -99,11 +99,10 @@ _Route10AfterBattleText6:: cont "floral pattern!" done -_Route10Text9:: -_Route10Text7:: +_Route10RockTunnelSignText:: text "ROCK TUNNEL" done -_Route10Text10:: +_Route10PowerPlantSignText:: text "POWER PLANT" done diff --git a/text/Route11.asm b/text/Route11.asm index 451d2bec..7f4852b5 100644 --- a/text/Route11.asm +++ b/text/Route11.asm @@ -1,123 +1,123 @@ -_Route11BattleText1:: +_Route11Gambler1BattleText:: text "Win, lose or draw!" done -_Route11EndBattleText1:: +_Route11Gambler1EndBattleText:: text "Atcha!" line "Didn't go my way!" prompt -_Route11AfterBattleText1:: +_Route11Gambler1AfterBattleText:: text "#MON is life!" line "And to live is to" cont "gamble!" done -_Route11BattleText2:: +_Route11Gambler2BattleText:: text "Competition! I" line "can't get enough!" done -_Route11EndBattleText2:: +_Route11Gambler2EndBattleText:: text "I had" line "a chance!" prompt -_Route11AfterBattleText2:: +_Route11Gambler2AfterBattleText:: text "You can't be a" line "coward in the" cont "world of #MON!" done -_Route11BattleText3:: +_Route11Youngster1BattleText:: text "Let's go, but" line "don't cheat!" done -_Route11EndBattleText3:: +_Route11Youngster1EndBattleText:: text "Huh?" line "That's not right!" prompt -_Route11AfterBattleText3:: +_Route11Youngster1AfterBattleText:: text "I did my best! I" line "have no regrets!" done -_Route11BattleText4:: +_Route11SuperNerd1BattleText:: text "Careful!" line "I'm laying down" cont "some cables!" done -_Route11EndBattleText4:: +_Route11SuperNerd1EndBattleText:: text "That" line "was electric!" prompt -_Route11AfterBattleText4:: +_Route11SuperNerd1AfterBattleText:: text "Spread the word" line "to save energy!" done -_Route11BattleText5:: +_Route11Youngster2BattleText:: text "I just became a" line "trainer! But, I" cont "think I can win!" done -_Route11EndBattleText5:: +_Route11Youngster2EndBattleText:: text "My" line "#MON couldn't!" prompt -_Route11AfterBattleText5:: +_Route11Youngster2AfterBattleText5:: text "What do you want?" line "Leave me alone!" done -_Route11BattleText6:: +_Route11Gambler3BattleText:: text "Fwahaha! I have" line "never lost!" done -_Route11EndBattleText6:: +_Route11Gambler3EndBattleText:: text "My" line "first loss!" prompt -_Route11AfterBattleText6:: +_Route11Gambler3AfterBattleText:: text "Luck of the draw!" line "Just luck!" done -_Route11BattleText7:: +_Route11Gambler4BattleText:: text "I have never won" line "before..." done -_Route11EndBattleText7:: +_Route11Gambler4EndBattleText:: text "I saw" line "this coming..." prompt -_Route11AfterBattleText7:: +_Route11Gambler4AfterBattleText:: text "It's just luck." line "Luck of the draw." done -_Route11BattleText8:: +_Route11Youngster3BattleText:: text "I'm the best in" line "my class!" done -_Route11EndBattleText8:: +_Route11Youngster3EndBattleText:: text "Darn!" line "I need to make my" cont "#MON stronger!" prompt -_Route11AfterBattleText8:: +_Route11Youngster3AfterBattleText:: text "There's a fat" line "#MON that" cont "comes down from" @@ -127,36 +127,36 @@ _Route11AfterBattleText8:: line "you can get it." done -_Route11BattleText9:: +_Route11SuperNerd2BattleText:: text "Watch out for" line "live wires!" done -_Route11EndBattleText9:: +_Route11SuperNerd2EndBattleText:: text "Whoa!" line "You spark plug!" prompt -_Route11AfterBattleText9:: +_Route11SuperNerd2AfterBattleText:: text "Well, better get" line "back to work." done -_Route11BattleText10:: +_Route11Youngster4BattleText:: text "My #MON should" line "be ready by now!" done -_Route11EndBattleText10:: +_Route11Youngster4EndBattleText:: text "Too" line "much, too young!" prompt -_Route11AfterBattleText10:: +_Route11Youngster4AfterBattleText:: text "I better go find" line "stronger ones!" done -_Route11Text11:: +_Route11DiglettsCaveSignText:: text "DIGLETT's CAVE" done diff --git a/text/Route11Gate1F.asm b/text/Route11Gate1F.asm index ef371d06..bca56b52 100644 --- a/text/Route11Gate1F.asm +++ b/text/Route11Gate1F.asm @@ -1,4 +1,4 @@ -_Route11GateText1:: +_Route11Gate1FGuardText:: text "When you catch" line "lots of #MON," cont "isn't it hard to" diff --git a/text/Route11Gate2F.asm b/text/Route11Gate2F.asm index 10236081..cb05fdff 100644 --- a/text/Route11Gate2F.asm +++ b/text/Route11Gate2F.asm @@ -1,4 +1,4 @@ -_Route11GateUpstairsText_494a3:: +_Route11Gate2FOaksAideItemfinderDescriptionText:: text "There are items on" line "the ground that" cont "can't be seen." @@ -12,7 +12,7 @@ _Route11GateUpstairsText_494a3:: cont "to look yourself!" done -_BinocularsSnorlaxText:: +_Route11Gate2FLeftBinocularsSnorlaxText:: text "Looked into the" line "binoculars." @@ -20,7 +20,7 @@ _BinocularsSnorlaxText:: line "asleep on a road!" done -_BinocularsNoSnorlaxText:: +_Route11Gate2FLeftBinocularsNoSnorlaxText:: text "Looked into the" line "binoculars." @@ -28,7 +28,7 @@ _BinocularsNoSnorlaxText:: line "view!" done -_Route11GateUpstairsText_494d5:: +_Route11Gate2FRightBinocularsText:: text "Looked into the" line "binoculars." diff --git a/text/Route12.asm b/text/Route12.asm index 27befda5..65ba9c08 100644 --- a/text/Route12.asm +++ b/text/Route12.asm @@ -1,139 +1,139 @@ -_Route12Text1:: +_Route12SnorlaxText:: text "A sleeping #MON" line "blocks the way!" done -_Route12Text13:: +_Route12SnorlaxWokeUpText:: text "SNORLAX woke up!" para "It attacked in a" line "grumpy rage!" done -_Route12Text14:: +_Route12SnorlaxCalmedDownText:: text "SNORLAX calmed" line "down! With a big" cont "yawn, it returned" cont "to the mountains!" done -_Route12BattleText1:: +_Route12Fisher1BattleText:: text "Yeah! I got a" line "bite, here!" done -_Route12EndBattleText1:: +_Route12Fisher1EndBattleText:: text "Tch!" line "Just a small fry!" prompt -_Route12AfterBattleText1:: +_Route12Fisher1AfterBattleText:: text "Hang on! My line's" line "snagged!" done -_Route12BattleText2:: +_Route12Fisher2BattleText:: text "Be patient!" line "Fishing is a" cont "waiting game!" done -_Route12EndBattleText2:: +_Route12Fisher2EndBattleText:: text "That" line "one got away!" prompt -_Route12AfterBattleText2:: +_Route12Fisher2AfterBattleText:: text "With a better ROD," line "I could catch" cont "better #MON!" done -_Route12BattleText3:: +_Route12CooltrainerMBattleText:: text "Have you found a" line "MOON STONE?" done -_Route12EndBattleText3:: +_Route12CooltrainerMEndBattleText:: text "Oww!" prompt -_Route12AfterBattleText3:: +_Route12CooltrainerMAfterBattleText:: text "I could have made" line "my #MON evolve" cont "with MOON STONE!" done -_Route12BattleText4:: +_Route12SuperNerdBattleText:: text "Electricity is my" line "specialty!" done -_Route12EndBattleText4:: +_Route12SuperNerdEndBattleText:: text "Unplugged!" prompt -_Route12AfterBattleText4:: +_Route12SuperNerdAfterBattleText:: text "Water conducts" line "electricity, so" cont "you should zap" cont "sea #MON!" done -_Route12BattleText5:: +_Route12Fisher3BattleText:: text "The FISHING FOOL" line "vs. #MON KID!" done -_Route12EndBattleText5:: +_Route12Fisher3EndBattleText:: text "Too" line "much!" prompt -_Route12AfterBattleText5:: +_Route12Fisher3AfterBattleText:: text "You beat me at" line "#MON, but I'm" cont "good at fishing!" done -_Route12BattleText6:: +_Route12Fisher4BattleText:: text "I'd rather be" line "working!" done -_Route12EndBattleText6:: +_Route12Fisher4EndBattleText:: text "It's" line "not easy..." prompt -_Route12AfterBattleText6:: +_Route12Fisher4AfterBattleText:: text "It's all right." line "Losing doesn't" cont "bug me anymore." done -_Route12BattleText7:: +_Route12Fisher5BattleText:: text "You never know" line "what you could" cont "catch!" done -_Route12EndBattleText7:: +_Route12Fisher5EndBattleText:: text "Lost" line "it!" prompt -_Route12AfterBattleText7:: +_Route12Fisher5AfterBattleText:: text "I catch MAGIKARP" line "all the time, but" cont "they're so weak!" done -_Route12Text11:: +_Route12SignText:: text "ROUTE 12 " line "North to LAVENDER" done -_Route12Text12:: +_Route12SportFishingSignText:: text "SPORT FISHING AREA" done diff --git a/text/Route12Gate1F.asm b/text/Route12Gate1F.asm index 51d75539..e43764d5 100644 --- a/text/Route12Gate1F.asm +++ b/text/Route12Gate1F.asm @@ -1,4 +1,4 @@ -_Route12GateText1:: +_Route12Gate1FGuardText:: text "There's a lookout" line "spot upstairs." done diff --git a/text/Route12Gate2F.asm b/text/Route12Gate2F.asm index adaf22cd..2bdc1a31 100644 --- a/text/Route12Gate2F.asm +++ b/text/Route12Gate2F.asm @@ -1,4 +1,4 @@ -_TM39PreReceiveText:: +_Route12Gate2FBrunetteGirlYouCanHaveThisText:: text "My #MON's" line "ashes are stored" cont "in #MON TOWER." @@ -8,12 +8,12 @@ _TM39PreReceiveText:: cont "it anymore..." prompt -_ReceivedTM39Text:: +_Route12Gate2FBrunetteGirlReceivedTM39Text:: text "<PLAYER> received" line "TM39!@" text_end -_TM39ExplanationText:: +_Route12Gate2FBrunetteGirlTM39ExplanationText:: text "TM39 is a move" line "called SWIFT." @@ -23,19 +23,19 @@ _TM39ExplanationText:: cont "afford to lose." done -_TM39NoRoomText:: +_Route12Gate2FBrunetteGirlTM39NoRoomText:: text "You don't have" line "room for this." done -_Route12GateUpstairsText_495b8:: +_Route12Gate2FLeftBinocularsText:: text "Looked into the" line "binoculars." para "A man fishing!" done -_Route12GateUpstairsText_495c4:: +_Route12Gate2FRightBinocularsText:: text "Looked into the" line "binoculars." diff --git a/text/Route12SuperRodHouse.asm b/text/Route12SuperRodHouse.asm index 990fc631..dfb87296 100644 --- a/text/Route12SuperRodHouse.asm +++ b/text/Route12SuperRodHouse.asm @@ -1,4 +1,4 @@ -_Route12HouseText_564c0:: +_Route12SuperRodHouseFishingGuruDoYouLikeToFishText:: text "I'm the FISHING" line "GURU's brother!" @@ -9,7 +9,7 @@ _Route12HouseText_564c0:: line "fish?" done -_Route12HouseText_564c5:: +_Route12SuperRodHouseFishingGuruReceivedSuperRodText:: text "Grand! I like" line "your style!" @@ -22,7 +22,7 @@ _Route12HouseText_564c5:: text "!@" text_end -_Route12HouseText_564ca:: +_Route12SuperRodHouseFishingGuruFishingWayOfLifeText:: text_start para "Fishing is a way" @@ -34,12 +34,12 @@ _Route12HouseText_564ca:: cont "one!" done -_Route12HouseText_564cf:: +_Route12SuperRodHouseFishingGuruThatsDisappointingText:: text "Oh... That's so" line "disappointing..." done -_Route12HouseText_564d4:: +_Route12SuperRodHouseFishingGuruTryFishingText:: text "Hello there," line "<PLAYER>!" @@ -53,7 +53,7 @@ _Route12HouseText_564d4:: line "wherever you can!" done -_Route12HouseText_564d9:: +_Route12SuperRodHouseFishingGuruNoRoomText:: text "Oh no!" para "I had a gift for" diff --git a/text/Route13.asm b/text/Route13.asm index e2718919..26f7727f 100644 --- a/text/Route13.asm +++ b/text/Route13.asm @@ -1,170 +1,170 @@ -_Route13BattleText2:: +_Route13CooltrainerM1BattleText:: text "My bird #MON" line "want to scrap!" done -_Route13EndBattleText2:: +_Route13CooltrainerM1EndBattleText:: text "My" line "bird combo lost?" prompt -_Route13AfterBattleText2:: +_Route13CooltrainerM1AfterBattleText:: text "My #MON look" line "happy even though" cont "they lost." done -_Route13BattleText3:: +_Route13CooltrainerF1BattleText:: text "I'm told I'm good" line "for a kid!" done -_Route13EndBattleText3:: +_Route13CooltrainerF1EndBattleText:: text "Ohh!" line "I lost!" prompt -_Route13AfterBattleText3:: +_Route13CooltrainerF1AfterBattleText:: text "I want to become" line "a good trainer." cont "I'll train hard." done -_Route13BattleText4:: +_Route13CooltrainerF2BattleText:: text "Wow! Your BADGEs" line "are too cool!" done -_Route13EndBattleText4:: +_Route13CooltrainerF2EndBattleText:: text "Not" line "enough!" prompt -_Route13AfterBattleText4:: +_Route13CooltrainerF2AfterBattleText:: text "You got those" line "BADGEs from GYM" cont "LEADERs. I know!" done -_Route13BattleText5:: +_Route13CooltrainerF3BattleText:: text "My cute #MON" line "wish to make your" cont "acquaintance." done -_Route13EndBattleText5:: +_Route13CooltrainerF3EndBattleText:: text "Wow!" line "You totally won!" prompt -_Route13AfterBattleText5:: +_Route13CooltrainerF3AfterBattleText:: text "You have to make" line "#MON fight to" cont "toughen them up!" done -_Route13BattleText6:: +_Route13CooltrainerF4BattleText:: text "I found CARBOS in" line "a cave once." done -_Route13EndBattleText6:: +_Route13CooltrainerF4EndBattleText:: text "Just" line "messed up!" prompt -_Route13AfterBattleText6:: +_Route13CooltrainerF4AfterBattleText:: text "CARBOS boosted" line "the SPEED of my" cont "#MON." done -_Route13BattleText7:: +_Route13CooltrainerM2BattleText:: text "The wind's blowing" line "my way!" done -_Route13EndBattleText7:: +_Route13CooltrainerM2EndBattleText:: text "The" line "wind turned!" prompt -_Route13AfterBattleText7:: +_Route13CooltrainerM2AfterBattleText:: text "I'm beat. I guess" line "I'll FLY home." done -_Route13BattleText8:: +_Route13Beauty1BattleText:: text "Sure, I'll play" line "with you!" done -_Route13EndBattleText8:: +_Route13Beauty1EndBattleText:: text "Oh!" line "You little brute!" prompt -_Route13AfterBattleText8:: +_Route13Beauty1AfterBattleText:: text "I wonder which is" line "stronger, male or" cont "female #MON?" done -_Route13BattleText9:: +_Route13Beauty2BattleText:: text "Do you want to" line "#MON with me?" done -_Route13EndBattleText9:: +_Route13Beauty2EndBattleText:: text "It's over" line "already?" prompt -_Route13AfterBattleText9:: +_Route13Beauty2AfterBattleText:: text "I don't know" line "anything about" cont "#MON. I just" cont "like cool ones!" done -_Route13BattleText10:: +_Route13BikerBattleText:: text "What're you" line "lookin' at?" done -_Route13EndBattleText10:: +_Route13BikerEndBattleText:: text "Dang!" line "Stripped gears!" prompt -_Route13AfterBattleText10:: +_Route13BikerAfterBattleText:: text "Get lost!" done -_Route13BattleText11:: +_Route13CooltrainerM3BattleText:: text "I always go with" line "bird #MON!" done -_Route13EndBattleText11:: +_Route13CooltrainerM3EndBattleText:: text "Out" line "of power!" prompt -_Route13AfterBattleText11:: +_Route13CooltrainerM3AfterBattleText:: text "I wish I could" line "fly like PIDGEY" cont "and PIDGEOTTO..." done -_Route13Text11:: +_Route13TrainerTips1Text:: text "TRAINER TIPS" para "Look to the left" line "of that post!" done -_Route13Text12:: +_Route13TrainerTips2Text:: text "TRAINER TIPS" para "Use SELECT to" @@ -172,7 +172,7 @@ _Route13Text12:: cont "the ITEM window!" done -_Route13Text13:: +_Route13SignText:: text "ROUTE 13" line "North to SILENCE" cont "BRIDGE" diff --git a/text/Route14.asm b/text/Route14.asm index 9a9de78c..2d4c290a 100644 --- a/text/Route14.asm +++ b/text/Route14.asm @@ -1,147 +1,147 @@ -_Route14BattleText1:: +_Route14CooltrainerM1BattleText:: text "You need to use" line "TMs to teach good" cont "moves to #MON!" done -_Route14EndBattleText1:: +_Route14CooltrainerM1EndBattleText:: text "Not" line "good enough!" prompt -_Route14AfterBattleText1:: +_Route14CooltrainerM1AfterBattleText:: text "You have some HMs," line "right? #MON" cont "can't ever forget" cont "those moves." done -_Route14BattleText2:: +_Route14CooltrainerM2BattleText:: text "My bird #MON" line "should be ready" cont "for battle." done -_Route14EndBattleText2:: +_Route14CooltrainerM2EndBattleText:: text "Not" line "ready yet!" prompt -_Route14AfterBattleText2:: +_Route14CooltrainerM2AfterBattleText:: text "They need to learn" line "better moves." done -_Route14BattleText3:: +_Route14CooltrainerM3BattleText:: text "TMs are on sale" line "in CELADON!" cont "But, only a few" cont "people have HMs!" done -_Route14EndBattleText3:: +_Route14CooltrainerM3EndBattleText:: text "Aww," line "bummer!" prompt -_Route14AfterBattleText3:: +_Route14CooltrainerM3AfterBattleText:: text "Teach #MON" line "moves of the same" cont "element type for" cont "more power." done -_Route14BattleText4:: +_Route14CooltrainerM4BattleText:: text "Have you taught" line "your bird #MON" cont "how to FLY?" done -_Route14EndBattleText4:: +_Route14CooltrainerM4EndBattleText:: text "Shot" line "down in flames!" prompt -_Route14AfterBattleText4:: +_Route14CooltrainerM4AfterBattleText:: text "Bird #MON are" line "my true love!" done -_Route14BattleText5:: +_Route14CooltrainerM5BattleText:: text "Have you heard of" line "the legendary" cont "#MON?" done -_Route14EndBattleText5:: +_Route14CooltrainerM5EndBattleText:: text "Why?" line "Why'd I lose?" prompt -_Route14AfterBattleText5:: +_Route14CooltrainerM5AfterBattleText:: text "The 3 legendary" line "#MON are all" cont "birds of prey." done -_Route14BattleText6:: +_Route14CooltrainerM6BattleText:: text "I'm not into it," line "but OK! Let's go!" done -_Route14EndBattleText6:: +_Route14CooltrainerM6EndBattleText:: text "I" line "knew it!" prompt -_Route14AfterBattleText6:: +_Route14CooltrainerM6AfterBattleText:: text "Winning, losing," line "it doesn't matter" cont "in the long run!" done -_Route14BattleText7:: +_Route14Biker1BattleText:: text "C'mon, c'mon." line "Let's go, let's" cont "go, let's go!" done -_Route14EndBattleText7:: +_Route14Biker1EndBattleText:: text "Arrg!" line "Lost! Get lost!" prompt -_Route14AfterBattleText7:: +_Route14Biker1AfterBattleText:: text "What, what, what?" line "What do you want?" done -_Route14BattleText8:: +_Route14Biker2BattleText:: text "Perfect! I need to" line "burn some time!" done -_Route14EndBattleText8:: +_Route14Biker2EndBattleText:: text "What?" line "You!?" prompt -_Route14AfterBattleText8:: +_Route14Biker2AfterBattleText:: text "Raising #MON" line "is a drag, man." done -_Route14BattleText9:: +_Route14Biker3BattleText:: text "We ride out here" line "because there's" cont "more room!" done -_Route14EndBattleText9:: +_Route14Biker3EndBattleText:: text "Wipe out!" prompt -_Route14AfterBattleText9:: +_Route14Biker3AfterBattleText:: text "It's cool you" line "made your #MON" cont "so strong!" @@ -150,23 +150,23 @@ _Route14AfterBattleText9:: line "And you know it!" done -_Route14BattleText10:: +_Route14Biker4BattleText:: text "#MON fight?" line "Cool! Rumble!" done -_Route14EndBattleText10:: +_Route14Biker4EndBattleText:: text "Blown" line "away!" prompt -_Route14AfterBattleText10:: +_Route14Biker4AfterBattleText:: text "You know who'd" line "win, you and me" cont "one on one!" done -_Route14Text11:: +_Route14SignText:: text "ROUTE 14" line "West to FUCHSIA" cont "CITY" diff --git a/text/Route15.asm b/text/Route15.asm index 9dc0e6ba..f28b315d 100644 --- a/text/Route15.asm +++ b/text/Route15.asm @@ -1,15 +1,15 @@ -_Route15BattleText1:: +_Route15CooltrainerF1BattleText:: text "Let me try out the" line "#MON I just" cont "got in a trade!" done -_Route15EndBattleText1:: +_Route15CooltrainerF1EndBattleText:: text "Not" line "good enough!" prompt -_Route15AfterBattleText1:: +_Route15CooltrainerF1AfterBattleText:: text "You can't change" line "the nickname of" cont "any #MON you" @@ -19,153 +19,153 @@ _Route15AfterBattleText1:: line "Trainer can." done -_Route15BattleText2:: +_Route15CooltrainerF2BattleText:: text "You look gentle," line "so I think I can" cont "beat you!" done -_Route15EndBattleText2:: +_Route15CooltrainerF2EndBattleText:: text "No," line "wrong!" prompt -_Route15AfterBattleText2:: +_Route15CooltrainerF2AfterBattleText:: text "I'm afraid of" line "BIKERs, they look" cont "so ugly and mean!" done -_Route15BattleText3:: +_Route15CooltrainerM1BattleText:: text "When I whistle, I" line "can summon bird" cont "#MON!" done -_Route15EndBattleText3:: +_Route15CooltrainerM1EndBattleText:: text "Ow!" line "That's tragic!" prompt -_Route15AfterBattleText3:: +_Route15CooltrainerM1AfterBattleText:: text "Maybe I'm not cut" line "out for battles." done -_Route15BattleText4:: +_Route15CooltrainerM2BattleText:: text "Hmm? My birds are" line "shivering! You're" cont "good, aren't you?" done -_Route15EndBattleText4:: +_Route15CooltrainerM2EndBattleText:: text "Just" line "as I thought!" prompt -_Route15AfterBattleText4:: +_Route15CooltrainerM2AfterBattleText:: text "Did you know moves" line "like EARTHQUAKE" cont "don't have any" cont "effect on birds?" done -_Route15BattleText5:: +_Route15Beauty1BattleText:: text "Oh, you're a" line "little cutie!" done -_Route15EndBattleText5:: +_Route15Beauty1EndBattleText:: text "You looked" line "so cute too!" prompt -_Route15AfterBattleText5:: +_Route15Beauty1AfterBattleText:: text "I forgive you!" line "I can take it!" done -_Route15BattleText6:: +_Route15Beauty2BattleText:: text "I raise #MON" line "because I live" cont "alone!" done -_Route15EndBattleText6:: +_Route15Beauty2EndBattleText:: text "I didn't" line "ask for this!" prompt -_Route15AfterBattleText6:: +_Route15Beauty2AfterBattleText:: text "I just like going" line "home to be with" cont "my #MON!" done -_Route15BattleText7:: +_Route15Biker1BattleText:: text "Hey kid! C'mon!" line "I just got these!" done -_Route15EndBattleText7:: +_Route15Biker1EndBattleText:: text "Why" line "not?" prompt -_Route15AfterBattleText7:: +_Route15Biker1AfterBattleText:: text "You only live" line "once, so I live" cont "as an outlaw!" cont "TEAM ROCKET RULES!" done -_Route15BattleText8:: +_Route15Biker2BattleText:: text "Fork over all your" line "cash when you" cont "lose to me, kid!" done -_Route15EndBattleText8:: +_Route15Biker2EndBattleText:: text "That" line "can't be true!" prompt -_Route15AfterBattleText8:: +_Route15Biker2AfterBattleText:: text "I was just joking" line "about the money!" done -_Route15BattleText9:: +_Route15CooltrainerF3BattleText:: text "What's cool?" line "Trading #MON!" done -_Route15EndBattleText9:: +_Route15CooltrainerF3EndBattleText:: text "I" line "said trade!" prompt -_Route15AfterBattleText9:: +_Route15CooltrainerF3AfterBattleText:: text "I trade #MON" line "with my friends!" done -_Route15BattleText10:: +_Route15CooltrainerF4BattleText:: text "Want to play with" line "my #MON?" done -_Route15EndBattleText10:: +_Route15CooltrainerF4EndBattleText:: text "I was" line "too impatient!" prompt -_Route15AfterBattleText10:: +_Route15CooltrainerF4AfterBattleText:: text "I'll go train with" line "weaker people.@" text_end -_Route15Text12:: +_Route15SignText:: text "ROUTE 15" line "West to FUCHSIA" cont "CITY" diff --git a/text/Route15Gate1F.asm b/text/Route15Gate1F.asm index 0a526142..5aec0e02 100644 --- a/text/Route15Gate1F.asm +++ b/text/Route15Gate1F.asm @@ -1,4 +1,4 @@ -_Route15GateText1:: +_Route15Gate1FGuardText:: text "Are you working" line "on a #DEX?" diff --git a/text/Route15Gate2F.asm b/text/Route15Gate2F.asm index ade4a358..e93ce19f 100644 --- a/text/Route15Gate2F.asm +++ b/text/Route15Gate2F.asm @@ -1,4 +1,4 @@ -_Route15GateUpstairsText_4968c:: +_Route15Gate2FOaksAideExpAllText:: text "EXP.ALL gives" line "EXP points to all" cont "the #MON with" @@ -15,7 +15,7 @@ _Route15GateUpstairsText_4968c:: cont "store it via PC." done -_Route15GateUpstairsText_49698:: +_Route15Gate2FBinocularsText:: text "Looked into the" line "binoculars." diff --git a/text/Route16.asm b/text/Route16.asm index 2ef6b02a..27a882d8 100644 --- a/text/Route16.asm +++ b/text/Route16.asm @@ -1,90 +1,90 @@ -_Route16BattleText1:: +_Route16Biker1BattleText:: text "What do you want?" done -_Route16EndBattleText1:: +_Route16Biker1EndBattleText:: text "Don't you" line "dare laugh!" prompt -_Route16AfterBattleText1:: +_Route16Biker1AfterBattleText:: text "We like just" line "hanging here," cont "what's it to you?" done -_Route16BattleText2:: +_Route16Biker2BattleText:: text "Nice BIKE!" line "Hand it over!" done -_Route16EndBattleText2:: +_Route16Biker2EndBattleText:: text "Knock-" line "out!" prompt -_Route16AfterBattleText2:: +_Route16Biker2AfterBattleText:: text "Forget it, who" line "needs your BIKE!" done -_Route16BattleText3:: +_Route16Biker3BattleText:: text "Come out and play," line "little mouse!" done -_Route16EndBattleText3:: +_Route16Biker3EndBattleText:: text "You" line "little rat!" prompt -_Route16AfterBattleText3:: +_Route16Biker3AfterBattleText:: text "I hate losing!" line "Get away from me!" done -_Route16BattleText4:: +_Route16biker4BattleText:: text "Hey, you just" line "bumped me!" done -_Route16EndBattleText4:: +_Route16Biker4EndBattleText:: text "Kaboom!" prompt -_Route16AfterBattleText4:: +_Route16Biker4AfterBattleText:: text "You can also get" line "to FUCHSIA from" cont "VERMILION using a" cont "coastal road." done -_Route16BattleText5:: +_Route16Biker5BattleText:: text "I'm feeling" line "hungry and mean!" done -_Route16EndBattleText5:: +_Route16Biker5EndBattleText:: text "Bad," line "bad, bad!" prompt -_Route16AfterBattleText5:: +_Route16Biker5AfterBattleText:: text "I like my #MON" line "ferocious! They" cont "tear up enemies!" done -_Route16BattleText6:: +_Route16Biker6BattleText:: text "Sure, I'll go!" done -_Route16EndBattleText6:: +_Route16Biker6EndBattleText:: text "Don't make" line "me mad!" prompt -_Route16AfterBattleText6:: +_Route16Biker6AfterBattleText:: text "I like harassing" line "people with my" cont "vicious #MON!" @@ -95,25 +95,25 @@ _Route16Text7:: line "blocks the way!" done -_Route16Text10:: +_Route16SnorlaxWokeUpText:: text "SNORLAX woke up!" para "It attacked in a" line "grumpy rage!" done -_Route16Text11:: +_Route16SnorlaxReturnedToMountainsText:: text "With a big yawn," line "SNORLAX returned" cont "to the mountains!" done -_Route16Text8:: +_Route16CyclingRoadSignText:: text "Enjoy the slope!" line "CYCLING ROAD" done -_Route16Text9:: +_Route16SignText:: text "ROUTE 16" line "CELADON CITY -" cont "FUCHSIA CITY" diff --git a/text/Route16FlyHouse.asm b/text/Route16FlyHouse.asm index 89f76e51..d8b17cbe 100644 --- a/text/Route16FlyHouse.asm +++ b/text/Route16FlyHouse.asm @@ -1,4 +1,4 @@ -_Route16HouseText3:: +_Route16FlyHouseBrunetteGirlText:: text "Oh, you found my" line "secret retreat!" @@ -8,12 +8,12 @@ _Route16HouseText3:: cont "to you with this!" prompt -_ReceivedHM02Text:: +_Route16FlyHouseBrunetteGirlReceivedHM02Text:: text "<PLAYER> received" line "HM02!@" text_end -_HM02ExplanationText:: +_Route16FlyHouseBrunetteGirlHM02ExplanationText:: text "HM02 is FLY." line "It will take you" cont "back to any town." @@ -22,11 +22,11 @@ _HM02ExplanationText:: line "use!" done -_HM02NoRoomText:: +_Route16FlyHouseBrunetteGirlHM02NoRoomText:: text "You don't have any" line "room for this." done -_Route16HouseText_1e652:: +_Route16FlyHouseFearowText:: text "FEAROW: Kyueen!" done diff --git a/text/Route16Gate1F.asm b/text/Route16Gate1F.asm index f548977f..6286528a 100644 --- a/text/Route16Gate1F.asm +++ b/text/Route16Gate1F.asm @@ -1,22 +1,22 @@ -_Route16GateText_49777:: +_Route16Gate1FGuardNoPedestriansAllowedText:: text "No pedestrians" line "are allowed on" cont "CYCLING ROAD!" done -_Route16GateText_4977c:: +_Route16Gate1FGuardCyclingRoadExplanationText:: text "CYCLING ROAD is a" line "downhill course" cont "by the sea. It's" cont "a great ride." done -_Route16GateText_49781:: +_Route16Gate1FGuardWaitUpText:: text "Excuse me! Wait" line "up please!" done -_Route16GateText2:: +_Route16Gate1FGamblerText:: text "How'd you get in?" line "Good effort!" done diff --git a/text/Route16Gate2F.asm b/text/Route16Gate2F.asm index d76b70ca..e8c3adce 100644 --- a/text/Route16Gate2F.asm +++ b/text/Route16Gate2F.asm @@ -1,15 +1,15 @@ -_Route16GateUpstairsText_49820:: +_Route16Gate2FLittleBoyText:: text "I'm going for a" line "ride with my girl" cont "friend!" done -_Route16GateUpstairsText_4982f:: +_Route16Gate2FLittleGirlText:: text "We're going" line "riding together!" done -_Route16GateUpstairsText_4983b:: +_Route16Gate2FLeftBinocularsText:: text "Looked into the" line "binoculars." @@ -17,7 +17,7 @@ _Route16GateUpstairsText_4983b:: line "STORE!" done -_Route16GateUpstairsText_49847:: +_Route16Gate2FRightBinocularsText:: text "Looked into the" line "binoculars." diff --git a/text/Route17.asm b/text/Route17.asm index f7f59683..b3002fda 100644 --- a/text/Route17.asm +++ b/text/Route17.asm @@ -1,160 +1,160 @@ -_Route17BattleText1:: +_Route17Biker1BattleText:: text "There's no money" line "in fighting kids!" done -_Route17EndBattleText1:: +_Route17Biker1EndBattleText:: text "Burned" line "out!" prompt -_Route17AfterBattleText1:: +_Route17Biker1AfterBattleText:: text "Good stuff is" line "lying around on" cont "CYCLING ROAD!" done -_Route17BattleText2:: +_Route17Biker2BattleText:: text "What do you want," line "kiddo?" done -_Route17EndBattleText2:: +_Route17Biker2EndBattleText:: text "Whoo!" prompt -_Route17AfterBattleText2:: +_Route17Biker2AfterBattleText:: text "I could belly-" line "bump you outta" cont "here!" done -_Route17BattleText3:: +_Route17Biker3BattleText:: text "You heading to" line "FUCHSIA?" done -_Route17EndBattleText3:: +_Route17Biker3EndBattleText:: text "Crash and" line "burn!" prompt -_Route17AfterBattleText3:: +_Route17Biker3AfterBattleText:: text "I love racing" line "downhill!" done -_Route17BattleText4:: +_Route17Biker4BattleText:: text "We're BIKERs!" line "Highway stars!" done -_Route17EndBattleText4:: +_Route17Biker4EndBattleText:: text "Smoked!" prompt -_Route17AfterBattleText4:: +_Route17Biker4AfterBattleText:: text "Are you looking" line "for adventure?" done -_Route17BattleText5:: +_Route17Biker5BattleText:: text "Let VOLTORB" line "electrify you!" done -_Route17EndBattleText5:: +_Route17Biker5EndBattleText:: text "Grounded" line "out!" prompt -_Route17AfterBattleText5:: +_Route17Biker5AfterBattleText:: text "I got my VOLTORB" line "at the abandoned" cont "POWER PLANT." done -_Route17BattleText6:: +_Route17Biker6BattleText:: text "My #MON won't" line "evolve! Why?" done -_Route17EndBattleText6:: +_Route17Biker6EndBattleText:: text "Why," line "you!" prompt -_Route17AfterBattleText6:: +_Route17Biker6AfterBattleText:: text "Maybe some #MON" line "need element" cont "STONEs to evolve." done -_Route17BattleText7:: +_Route17Biker7BattleText:: text "I need a little" line "exercise!" done -_Route17EndBattleText7:: +_Route17Biker7EndBattleText:: text "Whew!" line "Good workout!" prompt -_Route17AfterBattleText7:: +_Route17Biker7AfterBattleText:: text "I'm sure I lost" line "weight there!" done -_Route17BattleText8:: +_Route17Biker8BattleText:: text "Be a rebel!" done -_Route17EndBattleText8:: +_Route17Biker8EndBattleText:: text "Aaaargh!" prompt -_Route17AfterBattleText8:: +_Route17Biker8AfterBattleText:: text "Be ready to fight" line "for your beliefs!" done -_Route17BattleText9:: +_Route17Biker9BattleText:: text "Nice BIKE!" line "How's it handle?" done -_Route17EndBattleText9:: +_Route17Biker9EndBattleText:: text "Shoot!" prompt -_Route17AfterBattleText9:: +_Route17Biker9AfterBattleText:: text "The slope makes" line "it hard to steer!" done -_Route17BattleText10:: +_Route17Biker10BattleText:: text "Get lost, kid!" line "I'm bushed!" done -_Route17EndBattleText10:: +_Route17Biker10EndBattleText:: text "Are you" line "satisfied?" prompt -_Route17AfterBattleText10:: +_Route17Biker10AfterBattleText:: text "I need to catch" line "a few Zs!" done -_Route17Text11:: +_Route17NoticeSign1Text:: text "It's a notice!" para "Watch out for" line "discarded items!" done -_Route17Text12:: +_Route17TrainerTips1Text:: text "TRAINER TIPS" para "All #MON are" @@ -166,7 +166,7 @@ _Route17Text12:: cont "different rates." done -_Route17Text13:: +_Route17TrainerTips2Text:: text "TRAINER TIPS" para "Press the A or B" @@ -175,13 +175,13 @@ _Route17Text13:: cont "slope." done -_Route17Text14:: +_Route17SignText:: text "ROUTE 17" line "CELADON CITY -" cont "FUCHSIA CITY" done -_Route17Text15:: +_Route17NoticeSign2Text:: text "It's a notice!" para "Don't throw the" @@ -189,7 +189,7 @@ _Route17Text15:: cont "BALLs instead!" done -_Route17Text16:: +_Route17CyclingRoadEndsSignText:: text "CYCLING ROAD" line "Slope ends here!" done diff --git a/text/Route18.asm b/text/Route18.asm index d09caf82..d91b1b94 100644 --- a/text/Route18.asm +++ b/text/Route18.asm @@ -1,57 +1,57 @@ -_Route18BattleText1:: +_Route18CooltrainerM1BattleText:: text "I always check" line "every grassy area" cont "for new #MON." done -_Route18EndBattleText1:: +_Route18CooltrainerM1EndBattleText:: text "Tch!" prompt -_Route18AfterBattleText1:: +_Route18CooltrainerM1AfterBattleText:: text "I wish I had a" line "BIKE!" done -_Route18BattleText2:: +_Route18CooltrainerM2BattleText:: text "Kurukkoo!" line "How do you like" cont "my bird call?" done -_Route18EndBattleText2:: +_Route18CooltrainerM2EndBattleText:: text "I" line "had to bug you!" prompt -_Route18AfterBattleText2:: +_Route18CooltrainerM2AfterBattleText:: text "I also collect sea" line "#MON on" cont "weekends!" done -_Route18BattleText3:: +_Route18CooltrainerM3BattleText:: text "This is my turf!" line "Get out of here!" done -_Route18EndBattleText3:: +_Route18CooltrainerM3EndBattleText:: text "Darn!" prompt -_Route18AfterBattleText3:: +_Route18CooltrainerM3AfterBattleText:: text "This is my fave" line "#MON hunting" cont "area!" done -_Route18Text4:: +_Route18SignText:: text "ROUTE 18" line "CELADON CITY -" cont "FUCHSIA CITY" done -_Route18Text5:: +_Route18CyclingRoadSignText:: text "CYCLING ROAD" line "No pedestrians" cont "permitted!" diff --git a/text/Route18Gate1F.asm b/text/Route18Gate1F.asm index f2f51039..453290f2 100644 --- a/text/Route18Gate1F.asm +++ b/text/Route18Gate1F.asm @@ -1,14 +1,14 @@ -_Route18GateText_49928:: +_Route18Gate1FGuardYouNeedABicycleText:: text "You need a BICYCLE" line "for CYCLING ROAD!" done -_Route18GateText_4992d:: +_Route18Gate1FGuardCyclingRoadUphillText:: text "CYCLING ROAD is" line "all uphill from" cont "here." done -_Route18GateText_49932:: +_Route18Gate1FGuardExcuseMeText:: text "Excuse me!" done diff --git a/text/Route18Gate2F.asm b/text/Route18Gate2F.asm index 0fd2de09..78da4079 100644 --- a/text/Route18Gate2F.asm +++ b/text/Route18Gate2F.asm @@ -1,4 +1,4 @@ -_Route18GateUpstairsText_49993:: +_Route18Gate2FLeftBinocularsText:: text "Looked into the" line "binoculars." @@ -6,7 +6,7 @@ _Route18GateUpstairsText_49993:: line "the west!" done -_Route18GateUpstairsText_4999f:: +_Route18Gate2FRightBinocularsText:: text "Looked into the" line "binoculars." diff --git a/text/Route19.asm b/text/Route19.asm index 244e31d0..ca060e00 100644 --- a/text/Route19.asm +++ b/text/Route19.asm @@ -1,156 +1,156 @@ -_Route19BattleText1:: +_Route19CooltrainerM1BattleText:: text "Have to warm up" line "before my swim!" done -_Route19EndBattleText1:: +_Route19CooltrainerM1EndBattleText:: text "All" line "warmed up!" prompt -_Route19AfterBattleText1:: +_Route19CooltrainerM1AfterBattleText:: text "Thanks, kid! I'm" line "ready for a swim!" done -_Route19BattleText2:: +_Route19CooltrainerM2BattleText:: text "Wait! You'll have" line "a heart attack!" done -_Route19EndBattleText2:: +_Route19CooltrainerM2EndBattleText:: text "Ooh!" line "That's chilly!" prompt -_Route19AfterBattleText2:: +_Route19CooltrainerM2AfterBattleText:: text "Watch out for" line "TENTACOOL!" done -_Route19BattleText3:: +_Route19Swimmer1BattleText:: text "I love swimming!" line "What about you?" done -_Route19EndBattleText3:: +_Route19Swimmer1EndBattleText:: text "Belly" line "flop!" prompt -_Route19AfterBattleText3:: +_Route19Swimmer1AfterBattleText:: text "I can beat #MON" line "at swimming!" done -_Route19BattleText4:: +_Route19Swimmer2BattleText:: text "What's beyond the" line "horizon?" done -_Route19EndBattleText4:: +_Route19Swimmer2EndBattleText:: text "Glub!" prompt -_Route19AfterBattleText4:: +_Route19Swimmer2AfterBattleText:: text "I see a couple of" line "islands!" done -_Route19BattleText5:: +_Route19Swimmer3BattleText:: text "I tried diving" line "for #MON, but" cont "it was a no go!" done -_Route19EndBattleText5:: +_Route19Swimmer3EndBattleText:: text "Help!" prompt -_Route19AfterBattleText5:: +_Route19Swimmer3AfterBattleText:: text "You have to fish" line "for sea #MON!" done -_Route19BattleText6:: +_Route19Swimmer4BattleText:: text "I look at the" line "sea to forget!" done -_Route19EndBattleText6:: +_Route19Swimmer4EndBattleText:: text "Ooh!" line "Traumatic!" prompt -_Route19AfterBattleText6:: +_Route19Swimmer4AfterBattleText:: text "I'm looking at the" line "sea to forget!" done -_Route19BattleText7:: +_Route19Swimmer5BattleText:: text "Oh, I just love" line "your ride! Can I" cont "have it if I win?" done -_Route19EndBattleText7:: +_Route19Swimmer5EndBattleText:: text "Oh!" line "I lost!" prompt -_Route19AfterBattleText7:: +_Route19Swimmer5AfterBattleText:: text "It's still a long" line "way to go to" cont "SEAFOAM ISLANDS." done -_Route19BattleText8:: +_Route19Swimmer6BattleText:: text "Swimming's great!" line "Sunburns aren't!" done -_Route19EndBattleText8:: +_Route19Swimmer6EndBattleText:: text "Shocker!" prompt -_Route19AfterBattleText8:: +_Route19Swimmer6AfterBattleText:: text "My boy friend" line "wanted to swim to" cont "SEAFOAM ISLANDS." done -_Route19BattleText9:: +_Route19Swimmer7BattleText:: text "These waters are" line "treacherous!" done -_Route19EndBattleText9:: +_Route19Swimmer7EndBattleText:: text "Ooh!" line "Dangerous!" prompt -_Route19AfterBattleText9:: +_Route19Swimmer7AfterBattleText:: text "I got a cramp!" line "Glub, glub..." done -_Route19BattleText10:: +_Route19Swimmer8BattleText:: text "I swam here, but" line "I'm tired." done -_Route19EndBattleText10:: +_Route19Swimmer8EndBattleText:: text "I'm" line "exhausted..." prompt -_Route19AfterBattleText10:: +_Route19Swimmer8AfterBattleText:: text "LAPRAS is so big," line "it must keep you" cont "dry on water." done -_Route19Text11:: +_Route19SignText:: text "SEA ROUTE 19" line "FUCHSIA CITY -" cont "SEAFOAM ISLANDS" diff --git a/text/Route2.asm b/text/Route2.asm index dd7becc0..eda91b0b 100644 --- a/text/Route2.asm +++ b/text/Route2.asm @@ -1,9 +1,9 @@ -_Route2Text3:: +_Route2SignText:: text "ROUTE 2" line "VIRIDIAN CITY -" cont "PEWTER CITY" done -_Route2Text4:: +_Route2DiglettsCaveSignText:: text "DIGLETT's CAVE" done diff --git a/text/Route20.asm b/text/Route20.asm index 1ccf0b6c..b81b9d3a 100644 --- a/text/Route20.asm +++ b/text/Route20.asm @@ -1,156 +1,155 @@ -_Route20BattleText1:: +_Route20Swimmer1BattleText:: text "The water is" line "shallow here." done -_Route20EndBattleText1:: +_Route20Swimmer1EndBattleText:: text "Splash!" prompt -_Route20AfterBattleText1:: +_Route20Swimmer1AfterBattleText:: text "I wish I could" line "ride my #MON." done -_Route20BattleText2:: +_Route20Swimmer2BattleText:: text "SEAFOAM is a" line "quiet getaway!" done -_Route20EndBattleText2:: +_Route20Swimmer2EndBattleText:: text "Quit it!" prompt -_Route20AfterBattleText2:: +_Route20Swimmer2AfterBattleText:: text "There's a huge" line "cavern underneath" cont "this island." done -_Route20BattleText3:: +_Route20Swimmer3BattleText:: text "I love floating" line "with the fishes!" done -_Route20EndBattleText3:: +_Route20Swimmer3EndBattleText:: text "Yowch!" prompt -_Route20AfterBattleText3:: +_Route20Swimmer3AfterBattleText:: text "Want to float" line "with me?" done -_Route20BattleText4:: +_Route20Swimmer4BattleText:: text "Are you on" line "vacation too?" done -_Route20EndBattleText4:: +_Route20Swimmer4EndBattleText:: text "No" line "mercy at all!" prompt -_Route20AfterBattleText4:: +_Route20Swimmer4AfterBattleText:: text "SEAFOAM used to" line "be one island!" done -_Route20BattleText5:: +_Route20Swimmer5BattleText:: text "Check out my buff" line "physique!" done -_Route20EndBattleText5:: +_Route20Swimmer5EndBattleText:: text "Wimpy!" prompt -_Route20AfterBattleText5:: +_Route20Swimmer5AfterBattleText:: text "I should've been" line "buffing up my" cont "#MON, not me!" done -_Route20BattleText6:: +_Route20Swimmer6BattleText:: text "Why are you" line "riding a #MON?" cont "Can't you swim?" done -_Route20EndBattleText6:: +_Route20Swimmer6EndBattleText:: text "Ouch!" line "Torpedoed!" prompt -_Route20AfterBattleText6:: +_Route20Swimmer6AfterBattleText:: text "Riding a #MON" line "sure looks fun!" done -_Route20BattleText7:: +_Route20CooltrainerMBattleText:: text "I rode my bird" line "#MON here!" done -_Route20EndBattleText7:: +_Route20CooltrainerMEndBattleText:: text "Oh" line "no!" prompt -_Route20AfterBattleText7:: +_Route20CooltrainerMAfterBattleText:: text "My birds can't" line "FLY me back!" done -_Route20BattleText8:: +_Route20Swimmer7BattleText:: text "My boy friend gave" line "me big pearls!" done -_Route20EndBattleText8:: +_Route20Swimmer7EndBattleText:: text "Don't" line "touch my pearls!" prompt -_Route20AfterBattleText8:: +_Route20Swimmer7AfterBattleText:: text "Will my pearls" line "grow bigger" cont "inside CLOYSTER?" done -_Route20BattleText9:: +_Route20Swimmer8BattleText:: text "I swam here from" line "CINNABAR ISLAND!" done -_Route20EndBattleText9:: +_Route20Swimmer8EndBattleText:: text "I'm" line "so disappointed!" prompt -_Route20AfterBattleText9:: +_Route20Swimmer8AfterBattleText:: text "#MON have" line "taken over an" cont "abandoned mansion" cont "on CINNABAR!" done -_Route20BattleText10:: +_Route20Swimmer9BattleText:: text "CINNABAR, in the" line "west, has a LAB" cont "for #MON." done -_Route20EndBattleText10:: +_Route20Swimmer9EndBattleText:: text "Wait!" prompt -_Route20AfterBattleText10:: +_Route20Swimmer9AfterBattleText:: text "CINNABAR is a " line "volcanic island!" done -_Route20Text12:: -_Route20Text11:: +_Route20SeafoamIslandsSignText:: text "SEAFOAM ISLANDS" done diff --git a/text/Route21.asm b/text/Route21.asm index 3451953f..e2e1bf6c 100644 --- a/text/Route21.asm +++ b/text/Route21.asm @@ -1,137 +1,137 @@ -_Route21BattleText1:: +_Route21Fisher1BattleText:: text "You want to know" line "if the fish are" cont "biting?" done -_Route21EndBattleText1:: +_Route21Fisher1EndBattleText:: text "Dang!" prompt -_Route21AfterBattleText1:: +_Route21Fisher1AfterBattleText:: text "I can't catch" line "anything good!" done -_Route21BattleText2:: +_Route21Fisher2BattleText:: text "I got a big haul!" line "Wanna go for it?" done -_Route21EndBattleText2:: +_Route21Fisher2EndBattleText:: text "Darn" line "MAGIKARP!" prompt -_Route21AfterBattleText2:: +_Route21Fisher2AfterBattleText:: text "I seem to only" line "catch MAGIKARP!" done -_Route21BattleText3:: +_Route21Swimmer1BattleText:: text "The sea cleanses" line "my body and soul!" done -_Route21EndBattleText3:: +_Route21Swimmer1EndBattleText:: text "Ayah!" prompt -_Route21AfterBattleText3:: +_Route21Swimmer1AfterBattleText:: text "I like the" line "mountains too!" done -_Route21BattleText4:: +_Route21Swimmer2BattleText:: text "What's wrong with" line "me swimming?" done -_Route21EndBattleText4:: +_Route21Swimmer2EndBattleText:: text "Cheap" line "shot!" prompt -_Route21AfterBattleText4:: +_Route21Swimmer2AfterBattleText:: text "I look like what?" line "A studded inner" cont "tube? Get lost!" done -_Route21BattleText5:: +_Route21Swimmer3BattleText:: text "I caught all my" line "#MON at sea!" done -_Route21EndBattleText5:: +_Route21Swimmer3EndBattleText:: text "Diver!!" line "Down!!" prompt -_Route21AfterBattleText5:: +_Route21Swimmer3AfterBattleText:: text "Where'd you catch" line "your #MON?" done -_Route21BattleText6:: +_Route21Swimmer4BattleText:: text "Right now, I'm in" line "a triathlon meet!" done -_Route21EndBattleText6:: +_Route21Swimmer4EndBattleText:: text "Pant..." line "pant...pant..." prompt -_Route21AfterBattleText6:: +_Route21Swimmer4AfterBattleText:: text "I'm beat!" line "But, I still have" cont "the bike race and" cont "marathon left!" done -_Route21BattleText7:: +_Route21Swimmer5BattleText:: text "Ahh! Feel the sun" line "and the wind!" done -_Route21EndBattleText7:: +_Route21Swimmer5EndBattleText:: text "Yow!" line "I lost!" prompt -_Route21AfterBattleText7:: +_Route21Swimmer5AfterBattleText:: text "I'm sunburnt to a" line "crisp!" done -_Route21BattleText8:: +_Route21Fisher3BattleText:: text "Hey, don't scare" line "away the fish!" done -_Route21EndBattleText8:: +_Route21Fisher3EndBattleText:: text "Sorry!" line "I didn't mean it!" prompt -_Route21AfterBattleText8:: +_Route21Fisher3AfterBattleText:: text "I was just angry" line "that I couldn't" cont "catch anything." done -_Route21BattleText9:: +_Route21Fisher4BattleText:: text "Keep me company" line "'til I get a hit!" done -_Route21EndBattleText9:: +_Route21Fisher4EndBattleText:: text "That" line "burned some time." prompt -_Route21AfterBattleText9:: +_Route21Fisher4AfterBattleText:: text "Oh wait! I got a" line "bite! Yeah!" done diff --git a/text/Route22.asm b/text/Route22.asm index 1754627f..62ec95d5 100644 --- a/text/Route22.asm +++ b/text/Route22.asm @@ -1,10 +1,10 @@ -_Route22RivalDefeatedText1:: +_Route22Rival1DefeatedText:: text "Awww!" line "You just lucked" cont "out!" prompt -_Route22Text_511bc:: +_Route22Rival1VictoryText:: text "<RIVAL>: What?" line "Why do I have 2" cont "#MON?" @@ -13,14 +13,14 @@ _Route22Text_511bc:: cont "some more too!" prompt -_Route22RivalDefeatedText2:: +_Route22Rival2DefeatedText:: text "What!?" para "I was just" line "careless!" prompt -_Route22Text_511d0:: +_Route22Rival2VictoryText:: text "<RIVAL>: Hahaha!" line "<PLAYER>! That's" cont "your best? You're" @@ -98,7 +98,7 @@ _Route22RivalAfterBattleText2:: cont "here. Smell ya!" done -_Route22FrontGateText:: +_Route22PokemonLeagueSignText:: text "#MON LEAGUE" line "Front Gate" done diff --git a/text/Route22Gate.asm b/text/Route22Gate.asm index 33893d6e..20607ac3 100644 --- a/text/Route22Gate.asm +++ b/text/Route22Gate.asm @@ -1,4 +1,4 @@ -_Route22GateText_1e704:: +_Route22GateGuardNoBoulderbadgeText:: text "Only truly skilled" line "trainers are" cont "allowed through." @@ -7,7 +7,7 @@ _Route22GateText_1e704:: line "BOULDERBADGE yet!@" text_end -_Route22GateText_1e715:: +_Route22GateGuardICantLetYouPassText:: text_start para "The rules are" @@ -15,7 +15,7 @@ _Route22GateText_1e715:: cont "let you pass." done -_Route22GateText_1e71a:: +_Route22GateGuardGoRightAheadText:: text "Oh! That is the" line "BOULDERBADGE!" cont "Go right ahead!@" diff --git a/text/Route23.asm b/text/Route23.asm index f21857b3..921b6407 100644 --- a/text/Route23.asm +++ b/text/Route23.asm @@ -1,4 +1,4 @@ -_VictoryRoadGuardText1:: +_Route23YouDontHaveTheBadgeYetText:: text "You can pass here" line "only if you have" cont "the @" @@ -15,7 +15,7 @@ _VictoryRoadGuardText1:: cont "#MON LEAGUE!@" text_end -_VictoryRoadGuardText2:: +_Route23OhThatIsTheBadgeText:: text "You can pass here" line "only if you have" cont "the @" @@ -28,14 +28,14 @@ _VictoryRoadGuardText2:: text "!@" text_end -_VictoryRoadGuardText_513a3:: +_Route23GoRightAheadText:: text_start para "OK then! Please," line "go right ahead!" done -_Route23Text8:: +_Route23VictoryRoadGateSignText:: text "VICTORY ROAD GATE" line "- #MON LEAGUE" done diff --git a/text/Route24.asm b/text/Route24.asm index 0812d222..8fcae9c7 100644 --- a/text/Route24.asm +++ b/text/Route24.asm @@ -1,29 +1,29 @@ -_Route24Text_51510:: +_Route24CooltrainerM1YouBeatOurContestText:: text "Congratulations!" line "You beat our 5" cont "contest trainers!@" text_end -_Route24Text_51515:: +_Route24CooltrainerM1YouJustEarnedAPrizeText:: text_start para "You just earned a" line "fabulous prize!" prompt -_Route24Text_5151a:: +_Route24CooltrainerM1ReceivedNuggetText:: text "<PLAYER> received" line "a @" text_ram wStringBuffer text "!@" text_end -_Route24Text_51521:: +_Route24CooltrainerM1NoRoomText:: text "You don't have" line "any room!" done -_Route24Text_51526:: +_Route24CooltrainerM1JoinTeamRocketText:: text "By the way, would" line "you like to join" cont "TEAM ROCKET?" @@ -49,95 +49,95 @@ _Route24Text_51526:: cont "refuse!" done -_Route24Text_5152b:: +_Route24CooltrainerM1DefeatedText:: text "Arrgh!" line "You are good!" prompt -_Route24Text_51530:: +_Route24CooltrainerM1YouCouldBecomeATopLeaderText:: text "With your ability," line "you could become" cont "a top leader in" cont "TEAM ROCKET!" done -_Route24BattleText1:: +_Route24CooltrainerM2BattleText:: text "I saw your feat" line "from the grass!" done -_Route24EndBattleText1:: +_Route24CooltrainerM2EndBattleText:: text "I" line "thought not!" prompt -_Route24AfterBattleText1:: +_Route24CooltrainerM2AfterBattleText:: text "I hid because the" line "people on the" cont "bridge scared me!" done -_Route24BattleText2:: +_Route24CooltrainerM3BattleText:: text "OK! I'm No. 5!" line "I'll stomp you!" done -_Route24EndBattleText2:: +_Route24CooltrainerM3EndBattleText:: text "Whoa!" line "Too much!" prompt -_Route24AfterBattleText2:: +_Route24CooltrainerM3AfterBattleText:: text "I did my best, I" line "have no regrets!" done -_Route24BattleText3:: +_Route24CooltrainerF1BattleText:: text "I'm No. 4!" line "Getting tired?" done -_Route24EndBattleText3:: +_Route24CooltrainerF1EndBattleText:: text "I lost" line "too!" prompt -_Route24AfterBattleText3:: +_Route24CooltrainerF1AfterBattleText:: text "I did my best, so" line "I've no regrets!" done -_Route24BattleText4:: +_Route24Youngster1BattleText:: text "Here's No. 3!" line "I won't be easy!" done -_Route24EndBattleText4:: +_Route24Youngster1EndBattleText:: text "Ow!" line "Stomped flat!" prompt -_Route24AfterBattleText4:: +_Route24Youngster1AfterBattleText:: text "I did my best, I" line "have no regrets!" done -_Route24BattleText5:: +_Route24CooltrainerF2BattleText:: text "I'm second!" line "Now it's serious!" done -_Route24EndBattleText5:: +_Route24CooltrainerF2EndBattleText:: text "How could I" line "lose?" prompt -_Route24AfterBattleText5:: +_Route24CooltrainerF2AfterBattleText:: text "I did my best, I" line "have no regrets!" done -_Route24BattleText6:: +_Route24Youngster2BattleText:: text "This is NUGGET" line "BRIDGE! Beat us 5" cont "trainers and win" @@ -147,12 +147,12 @@ _Route24BattleText6:: line "what it takes?" done -_Route24EndBattleText6:: +_Route24Youngster2EndBattleText:: text "Whoo!" line "Good stuff!" prompt -_Route24AfterBattleText6:: +_Route24Youngster2AfterBattleText:: text "I did my best, I" line "have no regrets!" done diff --git a/text/Route25.asm b/text/Route25.asm index 4786d830..f0b48eb4 100644 --- a/text/Route25.asm +++ b/text/Route25.asm @@ -1,156 +1,156 @@ -_Route25BattleText1:: +_Route25Youngster1BattleText:: text "Local trainers" line "come here to" cont "practice!" done -_Route25EndBattleText1:: +_Route25Youngster1EndBattleText:: text "You're" line "decent." prompt -_Route25AfterBattleText1:: +_Route25Youngster1AfterBattleText:: text "All #MON have" line "weaknesses. It's" cont "best to raise" cont "different kinds." done -_Route25BattleText2:: +_Route25Youngster2BattleText:: text "Dad took me to a" line "great party on" cont "S.S.ANNE at" cont "VERMILION CITY!" done -_Route25EndBattleText2:: +_Route25Youngster2EndBattleText:: text "I'm" line "not mad!" prompt -_Route25AfterBattleText2:: +_Route25Youngster2AfterBattleText:: text "On S.S.ANNE, I" line "saw trainers from" cont "around the world." done -_Route25BattleText3:: +_Route25CooltrainerMBattleText:: text "I'm a cool guy." line "I've got a girl" cont "friend!" done -_Route25EndBattleText3:: +_Route25CooltrainerMEndBattleText:: text "Aww," line "darn..." prompt -_Route25AfterBattleText3:: +_Route25CooltrainerMAfterBattleText:: text "Oh well. My girl" line "will cheer me up." done -_Route25BattleText4:: +_Route25CooltrainerF1BattleText:: text "Hi! My boy" line "friend is cool!" done -_Route25EndBattleText4:: +_Route25CooltrainerF1EndBattleText:: text "I'm in" line "a slump!" prompt -_Route25AfterBattleText4:: +_Route25CooltrainerF1AfterBattleText:: text "I wish my guy was" line "as good as you!" done -_Route25BattleText5:: +_Route25Youngster3BattleText:: text "I knew I had to" line "fight you!" done -_Route25EndBattleText5:: +_Route25Youngster3EndBattleText:: text "I knew" line "I'd lose too!" prompt -_Route25AfterBattleText5:: +_Route25Youngster3AfterBattleText:: text "If your #MON" line "gets confused or" cont "falls asleep," cont "switch it!" done -_Route25BattleText6:: +_Route25CooltrainerF2BattleText:: text "My friend has a" line "cute #MON." cont "I'm so jealous!" done -_Route25EndBattleText6:: +_Route25CooltrainerF2EndBattleText:: text "I'm" line "not so jealous!" prompt -_Route25AfterBattleText6:: +_Route25CooltrainerF2AfterBattleText:: text "You came from MT." line "MOON? May I have" cont "a CLEFAIRY?" done -_Route25BattleText7:: +_Route25Hiker1BattleText:: text "I just got down" line "from MT.MOON," cont "but I'm ready!" done -_Route25EndBattleText7:: +_Route25Hiker1EndBattleText:: text "You" line "worked hard!" prompt -_Route25AfterBattleText7:: +_Route25Hiker1AfterBattleText:: text "Drat!" line "A ZUBAT bit me" cont "back in there." done -_Route25BattleText8:: +_Route25Hiker2BattleText:: text "I'm off to see a" line "#MON collector" cont "at the cape!" done -_Route25EndBattleText8:: +_Route25Hiker2EndBattleText:: text "You" line "got me." prompt -_Route25AfterBattleText8:: +_Route25Hiker2AfterBattleText:: text "The collector has" line "many rare kinds" cont "of #MON." done -_Route25BattleText9:: +_Route25Hiker3BattleText:: text "You're going to" line "see BILL? First," cont "let's fight!" done -_Route25EndBattleText9:: +_Route25Hiker3EndBattleText:: text "You're" line "something." prompt -_Route25AfterBattleText9:: +_Route25Hiker3AfterBattleText:: text "The trail below" line "is a shortcut to" cont "CERULEAN CITY." done -_Route25Text11:: +_Route25BillSignText:: text "SEA COTTAGE" line "BILL lives here!" done diff --git a/text/Route2Gate.asm b/text/Route2Gate.asm index 566830f8..ad22479a 100644 --- a/text/Route2Gate.asm +++ b/text/Route2Gate.asm @@ -1,10 +1,10 @@ -_Route2GateText_5d616:: +_Route2GateOaksAideFlashExplanationText:: text "The HM FLASH" line "lights even the" cont "darkest dungeons." done -_Route2GateText2:: +_Route2GateYoungsterText:: text "Once a #MON" line "learns FLASH, you" cont "can get through" diff --git a/text/Route2TradeHouse.asm b/text/Route2TradeHouse.asm index 46fc1062..e6a29bfc 100644 --- a/text/Route2TradeHouse.asm +++ b/text/Route2TradeHouse.asm @@ -1,4 +1,4 @@ -_Route2HouseText1:: +_Route2TradeHouseScientistText:: text "A fainted #MON" line "can't fight. But, " cont "it can still use " diff --git a/text/Route3.asm b/text/Route3.asm index 14d44e64..7068e77d 100644 --- a/text/Route3.asm +++ b/text/Route3.asm @@ -8,138 +8,138 @@ _Route3Text1:: cont "lot out of you!" done -_Route3BattleText1:: +_Route3Youngster1BattleText:: text "Hey! I met you in" line "VIRIDIAN FOREST!" done -_Route3EndBattleText1:: +_Route3Youngster1EndBattleText:: text "You" line "beat me again!" prompt -_Route3AfterBattleText1:: +_Route3Youngster1AfterBattleText:: text "There are other" line "kinds of #MON" cont "than those found" cont "in the forest!" done -_Route3BattleText2:: +_Route3Youngster2BattleText:: text "Hi! I like shorts!" line "They're comfy and" cont "easy to wear!" done -_Route3EndBattleText2:: +_Route3Youngster2EndBattleText:: text "I don't" line "believe it!" prompt -_Route3AfterBattleText2:: +_Route3Youngster2AfterBattleText:: text "Are you storing" line "your #MON on" cont "PC? Each BOX can" cont "hold 20 #MON!" done -_Route3BattleText3:: +_Route3CooltrainerF1BattleText:: text "You looked at me," line "didn't you?" done -_Route3EndBattleText3:: +_Route3CooltrainerF1EndBattleText:: text "You're" line "mean!" prompt -_Route3AfterBattleText3:: +_Route3CooltrainerF1AfterBattleText:: text "Quit staring if" line "you don't want to" cont "fight!" done -_Route3BattleText4:: +_Route3Youngster3BattleText:: text "Are you a trainer?" line "Let's fight!" done -_Route3EndBattleText4:: +_Route3Youngster3EndBattleText:: text "If I" line "had new #MON," cont "I would've won!" prompt -_Route3AfterBattleText4:: +_Route3Youngster3AfterBattleText:: text "If a #MON BOX" line "on the PC gets" cont "full, just switch" cont "to another BOX!" done -_Route3BattleText5:: +_Route3CooltrainerF2BattleText:: text "That look you" line "gave me, it's so" cont "intriguing!" done -_Route3EndBattleText5:: +_Route3CooltrainerF2EndBattleText:: text "Be nice!" prompt -_Route3AfterBattleText5:: +_Route3CooltrainerF2AfterBattleText:: text "Avoid fights by" line "not letting" cont "people see you!" done -_Route3BattleText6:: +_Route3Youngster4BattleText:: text "Hey! You're not" line "wearing shorts!" done -_Route3EndBattleText6:: +_Route3Youngster4EndBattleText:: text "Lost!" line "Lost! Lost!" prompt -_Route3AfterBattleText6:: +_Route3Youngster4AfterBattleText:: text "I always wear" line "shorts, even in" cont "winter!" done -_Route3BattleText7:: +_Route3Youngster5BattleText:: text "You can fight my" line "new #MON!" done -_Route3EndBattleText7:: +_Route3Youngster5EndBattleText:: text "Done" line "like dinner!" prompt -_Route3AfterBattleText7:: +_Route3Youngster5AfterBattleText:: text "Trained #MON" line "are stronger than" cont "the wild ones!" done -_Route3BattleText8:: +_Route3CooltrainerF3BattleText:: text "Eek! Did you" line "touch me?" done -_Route3EndBattleText8:: +_Route3CooltrainerF3EndBattleText:: text "That's it?" prompt -_Route3AfterBattleText8:: +_Route3CooltrainerF3AfterBattleText:: text "ROUTE 4 is at the" line "foot of MT.MOON." done -_Route3Text10:: +_Route3SignText:: text "ROUTE 3" line "MT.MOON AHEAD" done diff --git a/text/Route4.asm b/text/Route4.asm index 0a36f4cd..802f8003 100644 --- a/text/Route4.asm +++ b/text/Route4.asm @@ -1,20 +1,20 @@ -_Route4Text1:: +_Route4CooltrainerF1Text:: text "Ouch! I tripped" line "over a rocky" cont "#MON, GEODUDE!" done -_Route4BattleText1:: +_Route4CooltrainerF2BattleText:: text "I came to get my" line "mushroom #MON!" done -_Route4EndBattleText1:: +_Route4CooltrainerF2EndBattleText:: text "Oh! My cute" line "mushroom #MON!" prompt -_Route4AfterBattleText1:: +_Route4CooltrainerF2AfterBattleText:: text "There might not" line "be any more" cont "mushrooms here." @@ -23,12 +23,12 @@ _Route4AfterBattleText1:: line "them all." done -_Route4Text5:: +_Route4MtMoonSignText:: text "MT.MOON" line "Tunnel Entrance" done -_Route4Text6:: +_Route4SignText:: text "ROUTE 4" line "MT.MOON -" cont "CERULEAN CITY" diff --git a/text/Route5.asm b/text/Route5.asm index 54ff0f84..aeae95f1 100644 --- a/text/Route5.asm +++ b/text/Route5.asm @@ -1,4 +1,4 @@ -_Route5Text1:: +_Route5UndergroundPathSignText:: text "UNDERGROUND PATH" line "CERULEAN CITY -" cont "VERMILION CITY" diff --git a/text/Route6.asm b/text/Route6.asm index 71760449..3d16a8d1 100644 --- a/text/Route6.asm +++ b/text/Route6.asm @@ -1,103 +1,103 @@ -_Route6BattleText1:: +_Route6CooltrainerM1BattleText:: text "I'm doing this" line "out of love." cont "Leave me alone!" done -_Route6EndBattleText1:: +_Route6CooltrainerM1EndBattleText:: text "No," line "this can't be..." prompt -_Route6AfterBattleText1:: +_Route6CooltrainerM1AfterBattleText:: text "My love will leave" line "me in disgust." done -_Route6BattleText2:: +_Route6CooltrainerF1BattleText:: text "I'm training for" line "my love. Don't" cont "bother me!" done -_Route6EndBattleText2:: +_Route6CooltrainerF1EndBattleText:: text "My" line "textbook never..." prompt -_Route6AfterBattleText2:: +_Route6CooltrainerF1AfterBattleText:: text "Now I understand," line "#MON isn't" cont "about calculated" cont "numbers." done -_Route6BattleText3:: +_Route6Youngster1BattleText:: text "There aren't many" line "bugs out here." done -_Route6EndBattleText3:: +_Route6Youngster1EndBattleText:: text "No!" line "You're kidding!" prompt -_Route6AfterBattleText3:: +_Route6Youngster1AfterBattleText:: text "I like bugs, so" line "I'm going back to" cont "VIRIDIAN FOREST." done -_Route6BattleText4:: +_Route6CooltrainerM2BattleText:: text "Huh? You want" line "to talk to me?" done -_Route6EndBattleText4:: +_Route6CooltrainerM2EndBattleText:: text "I" line "didn't start it!" prompt -_Route6AfterBattleText4:: +_Route6CooltrainerM2AfterBattleText:: text "I should carry" line "more #MON with" cont "me for safety." done -_Route6BattleText5:: +_Route6CooltrainerF2BattleText:: text "Me? Well, OK." line "I'll play!" done -_Route6EndBattleText5:: +_Route6CooltrainerF2EndBattleText:: text "Just" line "didn't work!" prompt -_Route6AfterBattleText5:: +_Route6CooltrainerF2AfterBattleText:: text "I want to get" line "stronger! What's" cont "your secret?" done -_Route6BattleText6:: +_Route6Youngster2BattleText:: text "I've never seen" line "you around!" cont "Are you good?" done -_Route6EndBattleText6:: +_Route6Youngster2EndBattleText:: text "You" line "are too good!" prompt -_Route6AfterBattleText6:: +_Route6Youngster2AfterBattleText:: text "Are my #MON" line "weak? Or, am I" cont "just bad?" done -_Route6Text7:: +_Route6UndergroundPathSignText:: text "UNDERGROUND PATH" line "CERULEAN CITY -" cont "VERMILION CITY" diff --git a/text/Route7.asm b/text/Route7.asm index 6500be96..9d1f2623 100644 --- a/text/Route7.asm +++ b/text/Route7.asm @@ -1,4 +1,4 @@ -_Route7Text1:: +_Route7UndergroundPathSignText:: text "UNDERGROUND PATH" line "CELADON CITY -" cont "LAVENDER TOWN" diff --git a/text/Route8.asm b/text/Route8.asm index c0988d70..a6b24d79 100644 --- a/text/Route8.asm +++ b/text/Route8.asm @@ -1,153 +1,153 @@ -_Route8BattleText1:: +_Route8SuperNerd1BattleText:: text "You look good at" line "#MON, but" cont "how's your chem?" done -_Route8EndBattleText1:: +_Route8SuperNerd1EndBattleText:: text "Ow!" line "Meltdown!" prompt -_Route8AfterBattleText1:: +_Route8SuperNerd1AfterBattleText:: text "I am better at" line "school than this!" done -_Route8BattleText2:: +_Route8Gambler1BattleText:: text "All right! Let's" line "roll the dice!" done -_Route8EndBattleText2:: +_Route8Gambler1EndBattleText:: text "Drat!" line "Came up short!" prompt -_Route8AfterBattleText2:: +_Route8Gambler1AfterBattleText:: text "Lady Luck's not" line "with me today!" done -_Route8BattleText3:: +_Route8SuperNerd2BattleText:: text "You need strategy" line "to win at this!" done -_Route8EndBattleText3:: +_Route8SuperNerd2EndBattleText:: text "It's" line "not logical!" prompt -_Route8AfterBattleText3:: +_Route8SuperNerd2AfterBattleText:: text "Go with GRIMER" line "first...and..." cont "...and...then..." done -_Route8BattleText4:: +_Route8CooltrainerF1BattleText:: text "I like NIDORAN, so" line "I collect them!" done -_Route8EndBattleText4:: +_Route8CooltrainerF21EndBattleText:: text "Why? Why??" prompt -_Route8AfterBattleText4:: +_Route8CooltrainerF1AfterBattleText:: text "When #MON grow" line "up they get ugly!" cont "They shouldn't" cont "evolve!" done -_Route8BattleText5:: +_Route8SuperNerd3BattleText:: text "School is fun, but" line "so are #MON." done -_Route8EndBattleText5:: +_Route8SuperNerd3EndBattleText:: text "I'll" line "stay with school." prompt -_Route8AfterBattleText5:: +_Route8SuperNerd3AfterBattleText:: text "We're stuck here" line "because of the" cont "gates at SAFFRON." done -_Route8BattleText6:: +_Route8CooltrainerF2BattleText:: text "MEOWTH is so cute," line "meow, meow, meow!" done -_Route8EndBattleText6:: +_Route8CooltrainerF2EndBattleText:: text "Meow!" prompt -_Route8AfterBattleText6:: +_Route8CooltrainerF2AfterBattleText:: text "I think PIDGEY" line "and RATTATA" cont "are cute too!" done -_Route8BattleText7:: +_Route8CooltrainerF3BattleText:: text "We must look" line "silly standing" cont "here like this!" done -_Route8EndBattleText7:: +_Route8CooltrainerF3EndBattleText:: text "Look what" line "you did!" prompt -_Route8AfterBattleText7:: +_Route8CooltrainerF3AfterBattleText:: text "SAFFRON's gate-" line "keeper won't let" cont "us through." cont "He's so mean!" done -_Route8BattleText8:: +_Route8Gambler2BattleText:: text "I'm a rambling," line "gambling dude!" done -_Route8EndBattleText8:: +_Route8Gambler2EndBattleText:: text "Missed" line "the big score!" prompt -_Route8AfterBattleText8:: +_Route8Gambler2AfterBattleText:: text "Gambling and" line "#MON are like" cont "eating peanuts!" cont "Just can't stop!" done -_Route8BattleText9:: +_Route8CooltrainerF4BattleText:: text "What's a cute," line "round and fluffy" cont "#MON?" done -_Route8EndBattleText9:: +_Route8CooltrainerF4EndBattleText:: text "Stop!" para "Don't be so mean" line "to my CLEFAIRY!" prompt -_Route8AfterBattleText9:: +_Route8CooltrainerF4AfterBattleText:: text "I heard that" line "CLEFAIRY evolves" cont "when it's exposed" cont "to a MOON STONE." done -_Route8Text10:: +_Route8UndergroundSignText:: text "UNDERGROUND PATH" line "CELADON CITY -" cont "LAVENDER TOWN" diff --git a/text/Route9.asm b/text/Route9.asm index 741c990c..8c7f0345 100644 --- a/text/Route9.asm +++ b/text/Route9.asm @@ -1,75 +1,75 @@ -_Route9BattleText1:: +_Route9CooltrainerF1BattleText:: text "You have #MON" line "with you!" cont "You're mine!" done -_Route9EndBattleText1:: +_Route9CooltrainerF1EndBattleText:: text "You" line "deceived me!" prompt -_Route9AfterBattleText1:: +_Route9CooltrainerF1AfterBattleText:: text "You need light to" line "get through that" cont "dark tunnel ahead." done -_Route9BattleTextAJ:: +_Route9AJBattleText:: text "I aim to be the" line "ultimate trainer!" done -_Route9EndBattleTextAJ:: +_Route9AJEndBattleText:: text "My" line "SANDSHREW lost?" prompt -_Route9AfterBattleTextAJ:: +_Route9AJAfterBattleText:: text "I'll restart my" line "100-win streak" cont "with SANDSHREW." done -_Route9BattleText3:: +_Route9CooltrainerM2BattleText:: text "I'm taking ROCK" line "TUNNEL to go to" cont "LAVENDER..." done -_Route9EndBattleText3:: +_Route9CooltrainerM2EndBattleText:: text "Can't" line "measure up!" prompt -_Route9AfterBattleText3:: +_Route9CooltrainerM2AfterBattleText:: text "Are you off to" line "ROCK TUNNEL too?" done -_Route9BattleText4:: +_Route9CooltrainerF2BattleText:: text "Don't you dare" line "condescend me!" done -_Route9EndBattleText4:: +_Route9CooltrainerF2EndBattleText:: text "No!" line "You're too much!" prompt -_Route9AfterBattleText4:: +_Route9CooltrainerF2AfterBattleText:: text "You're obviously" line "talented! Good" cont "luck to you!" done -_Route9BattleText5:: +_Route9Hiker1BattleText:: text "Bwahaha!" line "Great! I was" cont "bored, eh!" done -_Route9EndBattleText5:: +_Route9Hiker1EndBattleText:: text "Keep it" line "coming, eh!" @@ -77,59 +77,59 @@ _Route9EndBattleText5:: line "of #MON!" prompt -_Route9AfterBattleText5:: +_Route9Hiker1AfterBattleText:: text "You sure had guts" line "standing up to me" cont "there, eh?" done -_Route9BattleText6:: +_Route9Hiker2BattleText:: text "Hahaha!" line "Aren't you a" cont "little toughie!" done -_Route9EndBattleText6:: +_Route9Hiker2EndBattleText:: text "What's" line "that?" prompt -_Route9AfterBattleText6:: +_Route9Hiker2AfterBattleText:: text "Hahaha! Kids" line "should be tough!" done -_Route9BattleText7:: +_Route9Youngster1BattleText:: text "I got up early" line "every day to" cont "raise my #MON" cont "from cocoons!" done -_Route9EndBattleText7:: +_Route9Youngster1EndBattleText:: text "WHAT?" para "What a total" line "waste of time!" prompt -_Route9AfterBattleText7:: +_Route9Youngster1AfterBattleText:: text "I have to collect" line "more than bugs to" cont "get stronger..." done -_Route9BattleText8:: +_Route9Hiker3BattleText:: text "Hahahaha!" line "Come on, dude!" done -_Route9EndBattleText8:: +_Route9Hiker3EndBattleText:: text "Hahahaha!" line "You beat me fair!" prompt -_Route9AfterBattleText8:: +_Route9Hiker3AfterBattleText:: text "Hahahaha!" line "Us hearty guys" cont "always laugh!" diff --git a/text/Route9_2.asm b/text/Route9_2.asm index f3803618..d25be3bc 100644 --- a/text/Route9_2.asm +++ b/text/Route9_2.asm @@ -1,20 +1,20 @@ -_Route9BattleText9:: +_Route9Youngster2BattleText:: text "Go, my super bug" line "#MON!" done -_Route9EndBattleText9:: +_Route9Youngster2EndBattleText:: text "My" line "bugs..." prompt -_Route9AfterBattleText9:: +_Route9Youngster2AfterBattleText:: text "If you don't like" line "bug #MON, you" cont "bug me!" done -_Route9Text11:: +_Route9SignText:: text "ROUTE 9" line "CERULEAN CITY-" cont "ROCK TUNNEL" diff --git a/text/SSAnne1F.asm b/text/SSAnne1F.asm index 2bbdcbac..6db138d7 100644 --- a/text/SSAnne1F.asm +++ b/text/SSAnne1F.asm @@ -1,4 +1,4 @@ -_SSAnne1Text1:: +_SSAnne1FWaiterText:: text "Bonjour!" line "I am le waiter on" cont "this ship!" @@ -11,7 +11,7 @@ _SSAnne1Text1:: line "silent type!" done -_SSAnne1Text2:: +_SSAnne1FSailorText:: text "The passengers" line "are restless!" diff --git a/text/SSAnne1FRooms.asm b/text/SSAnne1FRooms.asm index da672f8d..70433683 100644 --- a/text/SSAnne1FRooms.asm +++ b/text/SSAnne1FRooms.asm @@ -1,9 +1,9 @@ -_SSAnne8Text8:: +_SSAnne1FRoomsWigglytuffText:: text "WIGGLYTUFF: Puup" line "pupuu!@" text_end -_SSAnne8BattleText1:: +_SSAnne1FRoomsGentleman1BattleText:: text "I travel alone" line "on my journeys!" @@ -11,42 +11,42 @@ _SSAnne8BattleText1:: line "only friends!" done -_SSAnne8EndBattleText1:: +_SSAnne1FRoomsGentleman1EndBattleText:: text "My, my" line "friends..." prompt -_SSAnne8AfterBattleText1:: +_SSAnne1FRoomsGentleman1AfterBattleText:: text "You should be" line "nice to friends!" done -_SSAnne8BattleText2:: +_SSAnne1FRoomsGentleman2BattleText:: text "You pup! How dare" line "you barge in!" done -_SSAnne8EndBattleText2:: +_SSAnne1FRoomsGentleman2EndBattleText:: text "Humph!" line "You rude child!" prompt -_SSAnne8AfterBattleText2:: +_SSAnne1FRoomsGentleman2AfterBattleText:: text "I wish to be left" line "alone! Get out!" done -_SSAnne8BattleText3:: +_SSAnne1FRoomsYoungsterBattleText:: text "I love #MON!" line "Do you?" done -_SSAnne8EndBattleText3:: +_SSAnne1FRoomsYoungsterEndBattleText:: text "Wow! " line "You're great!" prompt -_SSAnne8AfterBattleText3:: +_SSAnne1FRoomsYoungsterAfterBattleText:: text "Let me be your" line "friend, OK?" @@ -54,19 +54,19 @@ _SSAnne8AfterBattleText3:: line "#MON!" done -_SSAnne8BattleText4:: +_SSAnne1FRoomsCooltrainerFBattleText:: text "I collected these" line "#MON from all" cont "around the world!" done -_SSAnne8EndBattleText4:: +_SSAnne1FRoomsCooltrainerFEndBattleText:: text "Oh no!" line "I went around the" cont "world for these!" prompt -_SSAnne8AfterBattleText4:: +_SSAnne1FRoomsCooltrainerFAfterBattleText:: text "You hurt my poor" line "worldly #MON!" @@ -75,28 +75,28 @@ _SSAnne8AfterBattleText4:: cont "#MON CENTER!" done -_SSAnne8Text5:: +_SSAnne1FRoomsGirl1Text:: text "Waiter, I would" line "like a cherry pie" cont "please!" done -_SSAnne8Text6:: +_SSAnne1FRoomsMiddleAgedManText:: text "A cruise is so" line "elegant yet cozy!" done -_SSAnne8Text7:: +_SSAnne1FRoomsLittleGirlText:: text "I always travel" line "with WIGGLYTUFF!" done -_SSAnne8Text9:: +_SSAnne1FRoomsGirl2Text:: text "We are cruising" line "around the world." done -_SSAnne8Text11:: +_SSAnne1FRoomsGentleman3Text:: text "Ssh! I'm a GLOBAL" line "POLICE agent!" diff --git a/text/SSAnne2F.asm b/text/SSAnne2F.asm index 58d804ba..85183438 100644 --- a/text/SSAnne2F.asm +++ b/text/SSAnne2F.asm @@ -1,4 +1,4 @@ -_SSAnne2Text1:: +_SSAnne2FWaiterText:: text "This ship, she is" line "a luxury liner" cont "for trainers!" @@ -8,7 +8,7 @@ _SSAnne2Text1:: cont "invited trainers!" done -_SSAnneRivalBeforeBattleText:: +_SSAnne2FRivalText:: text "<RIVAL>: Bonjour!" line "<PLAYER>!" @@ -31,7 +31,7 @@ _SSAnneRivalBeforeBattleText:: line "grassy areas!" done -_SSAnneRivalDefeatedText:: +_SSAnne2FRivalDefeatedText:: text "Humph!" para "At least you're" @@ -39,7 +39,7 @@ _SSAnneRivalDefeatedText:: cont "#MON!" prompt -_SSAnneRivalWonText:: +_SSAnne2FRivalVictoryText:: text "<PLAYER>! What are" line "you, seasick?" @@ -47,7 +47,7 @@ _SSAnneRivalWonText:: line "up, pal!" prompt -_SSAnneRivalCaptainText:: +_SSAnne2FRivalCutMasterText:: text "<RIVAL>: I heard" line "there was a CUT" cont "master on board." diff --git a/text/SSAnne2FRooms.asm b/text/SSAnne2FRooms.asm index c9b29119..699eb777 100644 --- a/text/SSAnne2FRooms.asm +++ b/text/SSAnne2FRooms.asm @@ -1,4 +1,4 @@ -_SSAnne9Text_61bf2:: +_SSAnne2FRoomsGentleman3Text:: text "In all my travels," line "I've never seen" cont "any #MON sleep" @@ -8,46 +8,46 @@ _SSAnne9Text_61bf2:: line "like this!" prompt -_SSAnne9Text_61c01:: +_SSAnne2FRoomsGentleman4Text:: text "Ah yes, I have" line "seen some #MON" cont "ferry people" cont "across the water!" done -_SSAnne9Text_61c10:: +_SSAnne2FRoomsGrampsText:: text "#MON can CUT" line "down small bushes." done -_SSAnne9BattleText1:: +_SSAnne2FRoomsGentleman1BattleText:: text "Competing against" line "the young keeps" cont "me youthful." done -_SSAnne9EndBattleText1:: +_SSAnne2FRoomsGentleman1EndBattleText:: text "Good" line "fight! Ah, I feel" cont "young again!" prompt -_SSAnne9AfterBattleText1:: +_SSAnne2FRoomsGentleman1AfterBattleText:: text "15 years ago, I" line "would have won!" done -_SSAnne9BattleText2:: +_SSAnne2FRoomsFisherBattleText:: text "Check out what I" line "fished up!" done -_SSAnne9EndBattleText2:: +_SSAnne2FRoomsFisherEndBattleText:: text "I'm" line "all out!" prompt -_SSAnne9AfterBattleText2:: +_SSAnne2FRoomsFisherAfterBattleText:: text "Party?" para "The cruise ship's" @@ -55,38 +55,38 @@ _SSAnne9AfterBattleText2:: cont "over by now." done -_SSAnne9BattleText3:: +_SSAnne2FRoomsGentleman2BattleText:: text "Which do you like," line "a strong or a" cont "rare #MON?" done -_SSAnne9EndBattleText3:: +_SSAnne2FRoomsGentleman2EndBattleText:: text "I must" line "salute you!" prompt -_SSAnne9AfterBattleText3:: +_SSAnne2FRoomsGentleman2AfterBattleText:: text "I prefer strong" line "and rare #MON." done -_SSAnne9BattleText4:: +_SSAnne2FRoomsCooltrainerFBattleText:: text "I never saw you" line "at the party." done -_SSAnne9EndBattleText4:: +_SSAnne2FRoomsCooltrainerFEndBattleText:: text "Take" line "it easy!" prompt -_SSAnne9AfterBattleText4:: +_SSAnne2FRoomsCooltrainerFAfterBattleText:: text "Oh, I adore your" line "strong #MON!" done -_SSAnne9Text_61c1f:: +_SSAnne2FRoomsGentleman5Text:: text "Have you gone to" line "the SAFARI ZONE" cont "in FUCHSIA CITY?" @@ -95,19 +95,19 @@ _SSAnne9Text_61c1f:: line "kinds of #MON!!" done -_SSAnne9Text_61c2e:: +_SSAnne2FRoomsLittleBoyText:: text "Me and my Daddy" line "think the SAFARI" cont "ZONE is awesome!" done -_SSAnne9Text_61c3d:: +_SSAnne2FRoomsBrunetteGirlText:: text "The CAPTAIN looked" line "really sick and" cont "pale!" done -_SSAnne9Text_61c4c:: +_SSAnne2FRoomsBeautyText:: text "I hear many people" line "get seasick!" done diff --git a/text/SSAnne3F.asm b/text/SSAnne3F.asm index 76490594..e7485ded 100644 --- a/text/SSAnne3F.asm +++ b/text/SSAnne3F.asm @@ -1,4 +1,4 @@ -_SSAnne3Text1:: +_SSAnne3FSailorText:: text "Our CAPTAIN is a" line "sword master!" diff --git a/text/SSAnneB1FRooms.asm b/text/SSAnneB1FRooms.asm index 8072fc85..1329cf77 100644 --- a/text/SSAnneB1FRooms.asm +++ b/text/SSAnneB1FRooms.asm @@ -1,90 +1,90 @@ -_SSAnne10Text8:: +_SSAnneB1FRoomsMachokeText:: text "MACHOKE: Gwoh!" line "Goggoh!@" text_end -_SSAnne10BattleText1:: +_SSAnneB1FRoomsSailor1BattleText:: text "You know what they" line "say about sailors" cont "and fighting!" done -_SSAnne10EndBattleText1:: +_SSAnneB1FRoomsSailor1EndBattleText:: text "Right!" line "Good fight, mate!" prompt -_SSAnne10AfterBattleText1:: +_SSAnneB1FRoomsSailor1AfterBattleText:: text "Haha! Want to be" line "a sailor, mate?" done -_SSAnne10BattleText2:: +_SSAnneB1FRoomsSailor2BattleText:: text "My sailor's pride" line "is at stake!" done -_SSAnne10EndBattleText2:: +_SSAnneB1FRoomsSailor2EndBattleText:: text "Your" line "spirit sank me!" prompt -_SSAnne10AfterBattleText2:: +_SSAnneB1FRoomsSailor2AfterBattleText:: text "Did you see the" line "FISHING GURU in" cont "VERMILION CITY?" done -_SSAnne10BattleText3:: +_SSAnneB1FRoomsSailor3BattleText:: text "Us sailors have" line "#MON too!" done -_SSAnne10EndBattleText3:: +_SSAnneB1FRoomsSailor3EndBattleText:: text "OK, " line "you're not bad." prompt -_SSAnne10AfterBattleText3:: +_SSAnneB1FRoomsSailor3AfterBattleText:: text "We caught all our" line "#MON while" cont "out at sea!" done -_SSAnne10BattleText4:: +_SSAnneB1FRoomsSailor4BattleText:: text "I like feisty" line "kids like you!@" text_end -_SSAnne10EndBattleText4:: +_SSAnneB1FRoomsSailor4EndBattleText:: text "Argh!" line "Lost it!" prompt -_SSAnne10AfterBattleText4:: +_SSAnneB1FRoomsSailor4AfterBattleText:: text "Sea #MON live" line "in deep water." cont "You'll need a ROD!" done -_SSAnne10BattleText5:: +_SSAnneB1FRoomsSailor5BattleText:: text "Matey, you're" line "walking the plank" cont "if you lose!" done -_SSAnne10EndBattleText5:: +_SSAnneB1FRoomsSailor5EndBattleText:: text "Argh!" line "Beaten by a kid!" prompt -_SSAnne10AfterBattleText5:: +_SSAnneB1FRoomsSailor5AfterBattleText:: text "Jellyfish some-" line "times drift into" cont "the ship." done -_SSAnne10BattleText6:: +_SSAnneB1FRoomsFisherBattleText:: text "Hello stranger!" line "Stop and chat!" @@ -92,19 +92,19 @@ _SSAnne10BattleText6:: line "are from the sea!" done -_SSAnne10EndBattleText6:: +_SSAnneB1FRoomsFisherEndBattleText:: text "Darn!" line "I let that one" cont "get away!" prompt -_SSAnne10AfterBattleText6:: +_SSAnneB1FRoomsFisherAfterBattleText:: text "I was going to" line "make you my" cont "assistant too!" done -_SSAnne10Text7:: +_SSAnneB1FRoomsSuperNerdText:: text "My buddy, MACHOKE," line "is super strong!" diff --git a/text/SSAnneBow.asm b/text/SSAnneBow.asm index 76cd5631..dcc1b4ff 100644 --- a/text/SSAnneBow.asm +++ b/text/SSAnneBow.asm @@ -1,50 +1,50 @@ -_SSAnne5Text1:: +_SSAnneBowSuperNerdText:: text "The party's over." line "The ship will be" cont "departing soon." done -_SSAnne5Text2:: +_SSAnneBowSailor1Text:: text "Scrubbing decks" line "is hard work!" done -_SSAnne5Text3:: +_SSAnneBowCooltrainerMText:: text "Urf. I feel ill." para "I stepped out to" line "get some air." done -_SSAnne5BattleText1:: +_SSAnneBowSailor2BattleText:: text "Hey matey!" para "Let's do a little" line "jig!" done -_SSAnne5EndBattleText1:: +_SSAnneBowSailor2EndBattleText:: text "You're" line "impressive!" prompt -_SSAnne5AfterBattleText1:: +_SSAnneBowSailor2AfterBattleText:: text "How many kinds of" line "#MON do you" cont "think there are?" done -_SSAnne5BattleText2:: +_SSAnneBowSailor3BattleText:: text "Ahoy there!" line "Are you seasick?" done -_SSAnne5EndBattleText2:: +_SSAnneBowSailor3EndBattleText:: text "I was" line "just careless!" prompt -_SSAnne5AfterBattleText2:: +_SSAnneBowSailor3AfterBattleText:: text "My Pa said there" line "are 100 kinds of" cont "#MON. I think" diff --git a/text/SSAnneCaptainsRoom.asm b/text/SSAnneCaptainsRoom.asm index c736572b..4c791619 100644 --- a/text/SSAnneCaptainsRoom.asm +++ b/text/SSAnneCaptainsRoom.asm @@ -1,4 +1,4 @@ -_SSAnne7RubText:: +_SSAnneCaptainsRoomRubCaptainsBackText:: text "CAPTAIN: Ooargh..." line "I feel hideous..." cont "Urrp! Seasick..." @@ -11,7 +11,7 @@ _SSAnne7RubText:: line "Rub-rub...@" text_end -_ReceivingHM01Text:: +_SSAnneCaptainsRoomCaptainIFeelMuchBetterText:: text "CAPTAIN: Whew!" line "Thank you! I" cont "feel much better!" @@ -31,14 +31,14 @@ _ReceivingHM01Text:: cont "anytime!" prompt -_ReceivedHM01Text:: +_SSAnneCaptainsRoomCaptainReceivedHM01Text:: text "<PLAYER> got" line "@" text_ram wStringBuffer text "!@" text_end -_SSAnne7Text_61932:: +_SSAnneCaptainsRoomCaptainNotSickAnymoreText:: text "CAPTAIN: Whew!" para "Now that I'm not" @@ -46,17 +46,17 @@ _SSAnne7Text_61932:: cont "guess it's time." done -_HM01NoRoomText:: +_SSAnneCaptainsRoomCaptainHM01NoRoomText:: text "Oh no! You have" line "no room for this!" done -_SSAnne7Text2:: +_SSAnneCaptainsRoomTrashText:: text "Yuck! Shouldn't" line "have looked!" done -_SSAnne7Text3:: +_SSAnneCaptainsRoomSeasickBookText:: text "How to Conquer" line "Seasickness..." cont "The CAPTAIN's" diff --git a/text/SSAnneKitchen.asm b/text/SSAnneKitchen.asm index b7784019..1432e65d 100644 --- a/text/SSAnneKitchen.asm +++ b/text/SSAnneKitchen.asm @@ -1,20 +1,20 @@ -_SSAnne6Text1:: +_SSAnneKitchenCook1Text:: text "You, mon petit!" line "We're busy here!" cont "Out of the way!" done -_SSAnne6Text2:: +_SSAnneKitchenCook2Text:: text "I saw an odd ball" line "in the trash." done -_SSAnne6Text3:: +_SSAnneKitchenCook3Text:: text "I'm so busy I'm" line "getting dizzy!" done -_SSAnne6Text4:: +_SSAnneKitchenCook4Text:: text "Hum-de-hum-de-" line "ho..." @@ -23,7 +23,7 @@ _SSAnne6Text4:: cont "Hum-hum..." done -_SSAnne6Text5:: +_SSAnneKitchenCook5Text:: text "Did you hear about" line "SNORLAX?" @@ -31,7 +31,7 @@ _SSAnne6Text5:: line "eat and sleep!" done -_SSAnne6Text6:: +_SSAnneKitchenCook6Text:: text "Snivel...Sniff..." para "I only get to" @@ -39,14 +39,14 @@ _SSAnne6Text6:: cont "Snivel..." done -_SSAnne6Text_61807:: +_SSAnneKitchenCook7MainCourseIsText:: text "Er-hem! Indeed I" line "am le CHEF!" para "Le main course is" prompt -_SSAnne6Text_6180c:: +SSAnneKitchenCook7SalmonDuSaladText:: text "Salade de Salmon!" para "Les guests may" @@ -54,14 +54,14 @@ _SSAnne6Text_6180c:: cont "again, however!" done -_SSAnne6Text_61811:: +SSAnneKitchenCook7EelsAuBarbecueText:: text "Eels au Barbecue!" para "Les guests will" line "mutiny, I fear." done -_SSAnne6Text_61816:: +SSAnneKitchenCook7PrimeBeefSteakText:: text "Prime Beef Steak!" para "But, have I enough" diff --git a/text/SafariZoneCenter.asm b/text/SafariZoneCenter.asm index 09918f93..b37b0e9b 100644 --- a/text/SafariZoneCenter.asm +++ b/text/SafariZoneCenter.asm @@ -1,8 +1,8 @@ -_SafariZoneCenterText2:: +_SafariZoneCenterRestHouseSignText:: text "REST HOUSE" done -_SafariZoneCenterText3:: +_SafariZoneCenterTrainerTipsSignText:: text "TRAINER TIPS" para "Press the START" diff --git a/text/SafariZoneCenterRestHouse.asm b/text/SafariZoneCenterRestHouse.asm index b6c87818..dd8d660d 100644 --- a/text/SafariZoneCenterRestHouse.asm +++ b/text/SafariZoneCenterRestHouse.asm @@ -1,10 +1,10 @@ -_SafariZoneRestHouse1Text1:: +_SafariZoneCenterRestHouseGirlText:: text "SARA: Where did" line "my boy friend," cont "ERIK, go?" done -_SafariZoneRestHouse1Text2:: +_SafariZoneCenterRestHouseScientistText:: text "I'm catching" line "#MON to take" cont "home as gifts!" diff --git a/text/SafariZoneEast.asm b/text/SafariZoneEast.asm index eebe5de7..680fd9ec 100644 --- a/text/SafariZoneEast.asm +++ b/text/SafariZoneEast.asm @@ -1,8 +1,8 @@ -_SafariZoneEastText5:: +_SafariZoneEastRestHouseSignText:: text "REST HOUSE" done -_SafariZoneEastText6:: +_SafariZoneEastTrainerTipsText:: text "TRAINER TIPS" para "The remaining time" @@ -10,7 +10,7 @@ _SafariZoneEastText6:: cont "while you walk!" done -_SafariZoneEastText7:: +_SafariZoneEastSignText:: text "CENTER AREA" line "NORTH: AREA 2" done diff --git a/text/SafariZoneEastRestHouse.asm b/text/SafariZoneEastRestHouse.asm index d5f7abc8..6ef33d89 100644 --- a/text/SafariZoneEastRestHouse.asm +++ b/text/SafariZoneEastRestHouse.asm @@ -1,10 +1,10 @@ -_SafariZoneRestHouse3Text1:: +_SafariZoneEastRestHouseScientistText:: text "How many did you" line "catch? I'm bushed" cont "from the work!" done -_SafariZoneRestHouse3Text2:: +_SafariZoneEastRestHouseRockerText:: text "I caught a" line "CHANSEY!" @@ -12,7 +12,7 @@ _SafariZoneRestHouse3Text2:: line "all worthwhile!" done -_SafariZoneRestHouse3Text3:: +_SafariZoneEastRestHouseSilphWorkerMText:: text "Whew! I'm tired" line "from all the fun!" done diff --git a/text/SafariZoneGate.asm b/text/SafariZoneGate.asm index bd7e8de4..ff009043 100644 --- a/text/SafariZoneGate.asm +++ b/text/SafariZoneGate.asm @@ -1,29 +1,29 @@ -_SafariZoneEntranceText1:: +_SafariZoneGateSafariZoneWorker1Text:: text "Welcome to the" line "SAFARI ZONE!" done -SafariZoneEntranceText_9e814:: +_SafariZoneGateSafariZoneWorker1LeavingEarlyText:: text "Leaving early?@" text_end -_SafariZoneEntranceText_753bb:: +_SafariZoneGateSafariZoneWorker1ReturnSafariBallsText:: text "Please return any" line "SAFARI BALLs you" cont "have left." done -_SafariZoneEntranceText_753c0:: +_SafariZoneGateSafariZoneWorker1GoodLuckText:: text "Good Luck!" done -_SafariZoneEntranceText_753c5:: +_SafariZoneGateSafariZoneWorker1GoodHaulComeAgainText:: text "Did you get a" line "good haul?" cont "Come again!" done -SafariZoneEntranceText_9e6e4:: +_SafariZoneGateSafariZoneWorker1WouldYouLikeToJoinText:: text "For just ¥500," line "you can catch all" cont "the #MON you" @@ -33,7 +33,7 @@ SafariZoneEntranceText_9e6e4:: line "join the hunt?@" text_end -SafariZoneEntranceText_9e747:: +_SafariZoneGateSafariZoneWorker1ThatllBe500PleaseText:: text "That'll be ¥@" text_bcd wPriceTemp, $c3 text "," @@ -47,7 +47,7 @@ SafariZoneEntranceText_9e747:: line "30 SAFARI BALLs!@" text_end -_SafariZoneEntranceText_75360:: +_SafariZoneGateSafariZoneWorker1CallYouOnThePAText:: text_start para "We'll call you on" @@ -56,22 +56,22 @@ _SafariZoneEntranceText_75360:: cont "or SAFARI BALLs!" done -_SafariZoneEntranceText_75365:: +_SafariZoneGateSafariZoneWorker1PleaseComeAgainText:: text "OK! Please come" line "again!" done -_SafariZoneEntranceText_7536a:: +_SafariZoneGateSafariZoneWorker1NotEnoughMoneyText:: text "Oops! Not enough" line "money!" done -_SafariZoneEntranceText_753e6:: +_SafariZoneGateSafariZoneWorker2FirstTimeHereText:: text "Hi! Is it your" line "first time here?" done -_SafariZoneEntranceText_753eb:: +_SafariZoneGateSafariZoneWorker2SafariZoneExplanationText:: text "SAFARI ZONE has 4" line "zones in it." @@ -93,7 +93,7 @@ _SafariZoneEntranceText_753eb:: cont "new #MON!" done -_SafariZoneEntranceText_753f0:: +_SafariZoneGateSafariZoneWorker2YoureARegularHereText:: text "Sorry, you're a" line "regular here!" done diff --git a/text/SafariZoneNorth.asm b/text/SafariZoneNorth.asm index 1e148f0b..83de9607 100644 --- a/text/SafariZoneNorth.asm +++ b/text/SafariZoneNorth.asm @@ -1,19 +1,19 @@ -_SafariZoneNorthText3:: +_SafariZoneNorthRestHouseSignText:: text "REST HOUSE" done -_SafariZoneNorthText4:: +_SafariZoneNorthTrainerTips1Text:: text "TRAINER TIPS" para "The SECRET HOUSE" line "is still ahead!" done -_SafariZoneNorthText5:: +_SafariZoneNorthSignText:: text "AREA 2" done -_SafariZoneNorthText6:: +_SafariZoneNorthTrainerTips2Text:: text "TRAINER TIPS" para "#MON hide in" @@ -24,7 +24,7 @@ _SafariZoneNorthText6:: cont "flush them out." done -_SafariZoneNorthText7:: +_SafariZoneNorthTrainerTips3Text:: text "TRAINER TIPS" para "Win a free HM for" diff --git a/text/SafariZoneNorthRestHouse.asm b/text/SafariZoneNorthRestHouse.asm index 93f02c8f..7e6871d0 100644 --- a/text/SafariZoneNorthRestHouse.asm +++ b/text/SafariZoneNorthRestHouse.asm @@ -1,4 +1,4 @@ -_SafariZoneRestHouse4Text1:: +_SafariZoneNorthRestHouseScientistText:: text "You can keep any" line "item you find on" cont "the ground here." @@ -9,14 +9,14 @@ _SafariZoneRestHouse4Text1:: cont "of them at once!" done -_SafariZoneRestHouse4Text2:: +_SafariZoneNorthRestHouseSafariZoneWorkerText:: text "Go to the deepest" line "part of the" cont "SAFARI ZONE. You" cont "will win a prize!" done -_SafariZoneRestHouse4Text3:: +_SafariZoneNorthRestHouseGentlemanText:: text "My EEVEE evolved" line "into FLAREON!" diff --git a/text/SafariZoneSecretHouse.asm b/text/SafariZoneSecretHouse.asm index c8006170..b0101c23 100644 --- a/text/SafariZoneSecretHouse.asm +++ b/text/SafariZoneSecretHouse.asm @@ -1,4 +1,4 @@ -_SecretHouseText_4a350:: +_SafariZoneSecretHouseFishingGuruYouHaveWonText:: text "Ah! Finally!" para "You're the first" @@ -14,14 +14,14 @@ _SecretHouseText_4a350:: line "You have won!" prompt -_ReceivedHM03Text:: +_SafariZoneSecretHouseFishingGuruReceivedHM03Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer text "!@" text_end -_HM03ExplanationText:: +_SafariZoneSecretHouseFishingGuruHM03ExplanationText:: text "HM03 is SURF!" para "#MON will be" @@ -38,7 +38,7 @@ _HM03ExplanationText:: cont "fabulous prize!" done -_HM03NoRoomText:: +_SafariZoneSecretHouseFishingGuruHM03NoRoomText:: text "You don't have" line "room for this" cont "fabulous prize!" diff --git a/text/SafariZoneWest.asm b/text/SafariZoneWest.asm index dcb2fe6c..a2af705c 100644 --- a/text/SafariZoneWest.asm +++ b/text/SafariZoneWest.asm @@ -1,8 +1,8 @@ -_SafariZoneWestText5:: +_SafariZoneWestRestHouseSignText:: text "REST HOUSE" done -_SafariZoneWestText6:: +_SafariZoneWestFindWardensTeethSignText:: text "REQUEST NOTICE" para "Please find the" @@ -15,7 +15,7 @@ _SafariZoneWestText6:: line "Contact: WARDEN" done -_SafariZoneWestText7:: +_SafariZoneWestTrainerTipsText:: text "TRAINER TIPS" para "Zone Exploration" @@ -25,7 +25,7 @@ _SafariZoneWestText7:: line "the SECRET HOUSE!" done -_SafariZoneWestText8:: +_SafariZoneWestSignText:: text "AREA 3" line "EAST: CENTER AREA" done diff --git a/text/SafariZoneWestRestHouse.asm b/text/SafariZoneWestRestHouse.asm index 94802b13..134577a3 100644 --- a/text/SafariZoneWestRestHouse.asm +++ b/text/SafariZoneWestRestHouse.asm @@ -1,4 +1,4 @@ -_SafariZoneRestHouse2Text1:: +_SafariZoneWestRestHouseScientistText:: text "Tossing ROCKs at" line "#MON might" cont "make them run," @@ -6,13 +6,13 @@ _SafariZoneRestHouse2Text1:: cont "easier to catch." done -_SafariZoneRestHouse2Text2:: +_SafariZoneWestRestHouseCooltrainerMText:: text "Using BAIT will" line "make #MON" cont "easier to catch." done -_SafariZoneRestHouse2Text3:: +_SafariZoneWestRestHouseSilphWorkerFText:: text "I hiked a lot, but" line "I didn't see any" cont "#MON I wanted." diff --git a/text/SaffronCity.asm b/text/SaffronCity.asm index ae9c44f2..67dc833e 100644 --- a/text/SaffronCity.asm +++ b/text/SaffronCity.asm @@ -1,60 +1,60 @@ -_SaffronCityText1:: +_SaffronCityRocket1Text:: text "What do you want?" line "Get lost!" done -_SaffronCityText2:: +_SaffronCityRocket2Text:: text "BOSS said he'll" line "take this town!" done -_SaffronCityText3:: +_SaffronCityRocket3Text:: text "Get out of the" line "way!" done -_SaffronCityText4:: +_SaffronCityRocket4Text:: text "SAFFRON belongs" line "to TEAM ROCKET!" done -_SaffronCityText5:: +_SaffronCityRocket5Text:: text "Being evil makes" line "me feel so alive!" done -_SaffronCityText6:: +_SaffronCityRocket6Text:: text "Ow! Watch where" line "you're walking!" done -_SaffronCityText7:: +_SaffronCityRocket7Text:: text "With SILPH under" line "control, we can" cont "exploit #MON" cont "around the world!" done -_SaffronCityText8:: +_SaffronCityScientistText:: text "You beat TEAM" line "ROCKET all alone?" cont "That's amazing!" done -_SaffronCityText9:: +_SaffronCitySilphWorkerMText:: text "Yeah! TEAM ROCKET" line "is gone!" cont "It's safe to go" cont "out again!" done -_SaffronCityText10:: +_SaffronCitySilphWorkerFText:: text "People should be" line "flocking back to" cont "SAFFRON now." done -_SaffronCityText11:: +_SaffronCityGentlemanText:: text "I flew here on my" line "PIDGEOT when I" cont "read about SILPH." @@ -64,17 +64,17 @@ _SaffronCityText11:: cont "media action." done -_SaffronCityText12:: +_SaffronCityPidgeotText:: text "PIDGEOT: Bi bibii!@" text_end -_SaffronCityText13:: +_SaffronCityRockerText:: text "I saw ROCKET" line "BOSS escaping" cont "SILPH's building." done -_SaffronCityText14:: +_SaffronCityRocket8Text:: text "I'm a security" line "guard." @@ -82,7 +82,7 @@ _SaffronCityText14:: line "don't allow in!" done -_SaffronCityText15:: +_SaffronCityRocket9Text:: text "..." line "Snore..." @@ -90,17 +90,17 @@ _SaffronCityText15:: line "a snooze!" done -_SaffronCityText16:: +_SaffronCitySignText:: text "SAFFRON CITY" line "Shining, Golden" cont "Land of Commerce" done -_SaffronCityText17:: +_SaffronCityFightingDojoSignText:: text "FIGHTING DOJO" done -_SaffronCityText18:: +_SaffronCityGymSignText:: text "SAFFRON CITY" line "#MON GYM" cont "LEADER: SABRINA" @@ -109,7 +109,7 @@ _SaffronCityText18:: line "Psychic #MON!" done -_SaffronCityText20:: +_SaffronCityTrainerTips1Text:: text "TRAINER TIPS" para "FULL HEAL cures" @@ -121,7 +121,7 @@ _SaffronCityText20:: cont "more convenient." done -_SaffronCityText21:: +_SaffronCityTrainerTips2Text:: text "TRAINER TIPS" para "New GREAT BALL" @@ -133,17 +133,17 @@ _SaffronCityText21:: cont "#MON." done -_SaffronCityText22:: +_SaffronCitySilphCoSignText:: text "SILPH CO." line "OFFICE BUILDING" done -_SaffronCityText24:: +_SaffronCityMrPsychicsHouseSignText:: text "MR.PSYCHIC's" line "HOUSE" done -_SaffronCityText25:: +_SaffronCitySilphCoLatestProductSignText:: text "SILPH's latest" line "product!" diff --git a/text/SaffronGates.asm b/text/SaffronGates.asm index 50e88a01..393c616f 100644 --- a/text/SaffronGates.asm +++ b/text/SaffronGates.asm @@ -1,4 +1,4 @@ -_SaffronGateText_1dfe7:: +_SaffronGateGuardGeeImThirstyText:: text "I'm on guard duty." line "Gee, I'm thirsty," cont "though!" @@ -7,7 +7,7 @@ _SaffronGateText_1dfe7:: line "the road's closed." done -_SaffronGateText_8aaa9:: +_SaffronGateGuardImParchedText:: text "Whoa, boy!" line "I'm parched!" cont "..." @@ -16,7 +16,7 @@ _SaffronGateText_8aaa9:: cont "Gee, thanks!@" text_end -_SaffronGateText_1dff1:: +_SaffronGateGuardYouCanGoOnThroughText:: text_start para "..." @@ -32,7 +32,7 @@ _SaffronGateText_1dff1:: cont "the other guards!" done -_SaffronGateText_1dff6:: +_SaffronGateGuardThanksForTheDrinkText:: text "Hi, thanks for" line "the cool drinks!" done diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index eab08aea..aa997f3c 100644 --- a/text/SaffronGym.asm +++ b/text/SaffronGym.asm @@ -1,4 +1,4 @@ -_SabrinaPreBattleText:: +_SaffronGymSabrinaText:: text "I had a vision of" line "your arrival!" @@ -16,7 +16,7 @@ _SabrinaPreBattleText:: cont "you my powers!" done -_ReceivedMarshBadgeText:: +_SaffronGymSabrinaReceivedMarshBadgeText:: text "I'm" line "shocked!" cont "But, a loss is a" @@ -30,14 +30,14 @@ _ReceivedMarshBadgeText:: line "MARSHBADGE!@" text_end -_SabrinaPostBattleAdviceText:: +_SaffronGymSabrinaPostBattleAdviceText:: text "Everyone has" line "psychic power!" cont "People just don't" cont "realize it!" done -_KogaMarshBadgeInfoText:: +_SaffronGymSabrinaMarshBadgeInfoText:: text "The MARSHBADGE" line "makes #MON up" cont "to L70 obey you!" @@ -55,7 +55,7 @@ _KogaMarshBadgeInfoText:: line "this TM with you!" done -_ReceivedTM46Text:: +_SaffronGymSabrinaReceivedTM46Text:: text "<PLAYER> received" line "TM46!@" text_end @@ -69,12 +69,12 @@ _TM46ExplanationText:: cont "inflict damage!" done -_TM46NoRoomText:: +_SaffronGymSabrinaTM46NoRoomText:: text "Your pack is full" line "of other items!" done -_SaffronGymGuidePreBattleText:: +_SaffronGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -91,7 +91,7 @@ _SaffronGymGuidePreBattleText:: cont "even aim a punch!" done -_SaffronGymGuidePostBattleText:: +_SaffronGymGuideBeatSabrinaText:: text "Psychic power," line "huh?" @@ -100,18 +100,18 @@ _SaffronGymGuidePostBattleText:: cont "at the slots!" done -_SaffronGymBattleText1:: +_SaffronGymChanneler1BattleText:: text "SABRINA is younger" line "than I, but I" cont "respect her!" done -_SaffronGymEndBattleText1:: +_SaffronGymChanneler1EndBattleText:: text "Not" line "good enough!" prompt -_SaffronGymAfterBattleText1:: +_SaffronGymChanneler1AfterBattleText:: text "In a battle of" line "equals, the one" cont "with the stronger" @@ -122,22 +122,22 @@ _SaffronGymAfterBattleText1:: cont "focus on winning!" done -_SaffronGymBattleText2:: +_SaffronGymYoungster1BattleText:: text "Does our unseen" line "power scare you?" done -_SaffronGymEndBattleText2:: +_SaffronGymYoungster1EndBattleText:: text "I never" line "foresaw this!" prompt -_SaffronGymAfterBattleText2:: +_SaffronGymYoungster1AfterBattleText:: text "Psychic #MON" line "fear only bugs!" done -_SaffronGymBattleText3:: +_SaffronGymChanneler2BattleText:: text "#MON take on" line "the appearance of" cont "their trainers." @@ -146,52 +146,52 @@ _SaffronGymBattleText3:: line "be tough, then!" done -_SaffronGymEndBattleText3:: +_SaffronGymChanneler2EndBattleText:: text "I knew" line "it!" prompt -_SaffronGymAfterBattleText3:: +_SaffronGymChanneler2AfterBattleText:: text "I must teach" line "better techniques" cont "to my #MON!" done -_SaffronGymBattleText4:: +_SaffronGymYoungster2BattleText:: text "You know that" line "power alone isn't" cont "enough!" done -_SaffronGymEndBattleText4:: +_SaffronGymYoungster2EndBattleText:: text "I don't" line "believe this!" prompt -_SaffronGymAfterBattleText4:: +_SaffronGymYoungster2AfterBattleText:: text "SABRINA just wiped" line "out the KARATE" cont "MASTER next door!" done -_SaffronGymBattleText5:: +_SaffronGymChanneler3BattleText:: text "You and I, our" line "#MON shall" cont "fight!" done -_SaffronGymEndBattleText5:: +_SaffronGymChanneler3EndBattleText:: text "I lost" line "after all!" prompt -_SaffronGymAfterBattleText5:: +_SaffronGymChanneler3AfterBattleText:: text "I knew that this" line "was going to take" cont "place." done -_SaffronGymBattleText6:: +_SaffronGymYoungster3BattleText:: text "SABRINA is young," line "but she's also" cont "our LEADER!" @@ -200,12 +200,12 @@ _SaffronGymBattleText6:: line "her easily!" done -_SaffronGymEndBattleText6:: +_SaffronGymYoungster3EndBattleText:: text "I lost" line "my concentration!" prompt -_SaffronGymAfterBattleText6:: +_SaffronGymYoungster3AfterBattleText:: text "There used to be" line "2 #MON GYMs in" cont "SAFFRON." @@ -217,7 +217,7 @@ _SaffronGymAfterBattleText6:: cont "creamed them!" done -_SaffronGymBattleText7:: +_SaffronGymYoungster4BattleText:: text "SAFFRON #MON" line "GYM is famous for" cont "its psychics!" @@ -227,11 +227,11 @@ _SaffronGymBattleText7:: cont "I can tell!" done -_SaffronGymEndBattleText7:: +_SaffronGymYoungster4EndBattleText:: text "Arrrgh!" prompt -_SaffronGymAfterBattleText7:: +_SaffronGymYoungster4AfterBattleText:: text "That's right! I" line "used telepathy to" cont "read your mind!" diff --git a/text/SaffronMart.asm b/text/SaffronMart.asm index a43b0d94..f5a0983a 100644 --- a/text/SaffronMart.asm +++ b/text/SaffronMart.asm @@ -1,4 +1,4 @@ -_SaffronMartText2:: +_SaffronMartSuperNerdText:: text "MAX REPEL lasts" line "longer than SUPER" cont "REPEL for keeping" @@ -6,7 +6,7 @@ _SaffronMartText2:: cont "away!" done -_SaffronMartText3:: +_SaffronMartCooltrainerFText:: text "REVIVE is costly," line "but it revives" cont "fainted #MON!" diff --git a/text/SaffronPidgeyHouse.asm b/text/SaffronPidgeyHouse.asm index d8666a07..80b1a0b8 100644 --- a/text/SaffronPidgeyHouse.asm +++ b/text/SaffronPidgeyHouse.asm @@ -1,4 +1,4 @@ -_SaffronHouse1Text1:: +_SaffronPidgeyHouseBrunetteGirlText:: text "Thank you for" line "writing. I hope" cont "to see you soon!" @@ -7,17 +7,17 @@ _SaffronHouse1Text1:: line "at my letter!" done -_SaffronHouse1Text2:: +_SaffronPidgeyHousePidgeyText:: text "PIDGEY: Kurukkoo!@" text_end -_SaffronHouse1Text3:: +_SaffronPidgeyHouseYoungsterText:: text "The COPYCAT is" line "cute! I'm getting" cont "her a # DOLL!" done -_SaffronHouse1Text4:: +_SaffronPidgeyHousePaperText:: text "I was given a PP" line "UP as a gift." diff --git a/text/SaffronPokecenter.asm b/text/SaffronPokecenter.asm index 6548aff8..9d20d649 100644 --- a/text/SaffronPokecenter.asm +++ b/text/SaffronPokecenter.asm @@ -1,10 +1,10 @@ -_SaffronPokecenterText2:: +_SaffronPokecenterBeautyText:: text "#MON growth" line "rates differ from" cont "specie to specie." done -_SaffronPokecenterText3:: +_SaffronPokecenterGentlemanText:: text "SILPH CO. is very" line "famous. That's" cont "why it attracted" diff --git a/text/SeafoamIslandsB4F.asm b/text/SeafoamIslandsB4F.asm index ea7eeaa2..8086a59f 100644 --- a/text/SeafoamIslandsB4F.asm +++ b/text/SeafoamIslandsB4F.asm @@ -1,14 +1,14 @@ -_ArticunoBattleText:: +_SeafoamIslandsB4FArticunoBattleText:: text "Gyaoo!@" text_end -_SeafoamIslands5Text4:: +_SeafoamIslandsB4FBouldersSignText:: text "Boulders might" line "change the flow" cont "of water!" done -_SeafoamIslands5Text5:: +_SeafoamIslandsB4FDangerSignText:: text "DANGER" line "Fast current!" done diff --git a/text/SilphCo10F.asm b/text/SilphCo10F.asm index fd4d4c7c..b159b5f6 100644 --- a/text/SilphCo10F.asm +++ b/text/SilphCo10F.asm @@ -1,41 +1,41 @@ -_SilphCo10Text_5a1d3:: +_SilphCo10FSilphWorkerFImScaredText:: text "Waaaaa!" line "I'm scared!" done -_SilphCo10Text_5a1d8:: +_SilphCo10FSilphWorkerFQuietAboutMyCryingText:: text "Please keep quiet" line "about my crying!" done -_SilphCo10BattleText1:: +_SilphCo10FRocketBattleText:: text "Welcome to the" line "10F! So good of" cont "you to join me!" done -_SilphCo10EndBattleText1:: +_SilphCo10FRocketEndBattleText:: text "I'm" line "stunned!" prompt -_SilphCo10AfterBattleText1:: +_SilphCo10FRocketAfterBattleText:: text "Nice try, but the" line "boardroom is up" cont "one more floor!" done -_SilphCo10BattleText2:: +_SilphCo10FScientistBattleText:: text "Enough of your" line "silly games!" done -_SilphCo10EndBattleText2:: +_SilphCo10FScientistEndBattleText:: text "No" line "continues left!" prompt -_SilphCo10AfterBattleText2:: +_SilphCo10FScientistAfterBattleText:: text "Are you satisfied" line "with beating me?" cont "Then go on home!" diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm index 2b13b0fc..0692a6d0 100644 --- a/text/SilphCo11F.asm +++ b/text/SilphCo11F.asm @@ -1,4 +1,4 @@ -_SilphCoPresidentText:: +_SilphCo11FSilphPresidentText:: text "PRESIDENT: Thank" line "you for saving" cont "SILPH!" @@ -19,14 +19,14 @@ _SilphCoPresidentText:: line "will do!" prompt -_ReceivedSilphCoMasterBallText:: +_SilphCo11FSilphPresidentReceivedMasterBallText:: text "<PLAYER> got a" line "@" text_ram wStringBuffer text "!@" text_end -_SilphCo10Text_6231c:: +_SilphCo11FSilphPresidentMasterBallDescriptionText:: text "PRESIDENT: You" line "can't buy that" cont "anywhere!" @@ -44,12 +44,12 @@ _SilphCo10Text_6231c:: cont "it, though." done -_SilphCoMasterBallNoRoomText:: +_SilphCo11FSilphPresidentNoRoomText:: text "You have no" line "room for this." done -_SilphCo11Text2:: +_SilphCo11FBeautyText:: text "SECRETARY: Thank" line "you for rescuing" cont "all of us!" @@ -58,7 +58,7 @@ _SilphCo11Text2:: line "courage." done -_SilphCo11Text3:: +_SilphCo11FGiovanniText:: text "Ah, <PLAYER>!" line "So we meet again!" @@ -75,12 +75,12 @@ _SilphCo11Text3:: line "world of pain!" done -_SilphCo10Text_62330:: +_SilphCo10FGiovanniILostAgainText:: text "Arrgh!!" line "I lost again!?" prompt -_SilphCo10Text_62335:: +_SilphCo11FGiovanniYouRuinedOurPlansText:: text "Blast it all!" line "You ruined our" cont "plans for SILPH!" @@ -97,18 +97,18 @@ _SilphCo10Text_62335:: line "shall return!" done -_SilphCo11BattleText2:: +_SilphCo11FRocket2BattleText:: text "Halt! Do you have" line "an appointment" cont "with my BOSS?" done -_SilphCo11EndBattleText2:: +_SilphCo11FRocket2EndBattleText:: text "Gaah!" line "Demolished!" prompt -_SilphCo11AfterBattleText2:: +_SilphCo11FRocket2AfterBattleText:: text "Watch your step," line "my BOSS likes his" cont "#MON tough!" diff --git a/text/SilphCo1F.asm b/text/SilphCo1F.asm index 1ef80189..d58be4d8 100644 --- a/text/SilphCo1F.asm +++ b/text/SilphCo1F.asm @@ -1,4 +1,4 @@ -_SilphCo1Text1:: +_SilphCo1FLinkReceptionistText:: text "Welcome!" para "The PRESIDENT is" diff --git a/text/SilphCo2F.asm b/text/SilphCo2F.asm index b8bfd9ed..6a7388a9 100644 --- a/text/SilphCo2F.asm +++ b/text/SilphCo2F.asm @@ -1,4 +1,4 @@ -_SilphCo2Text_59ded:: +SilphCo2FSilphWorkerFPleaseTakeThisText:: text "Eeek!" line "No! Stop! Help!" @@ -9,14 +9,14 @@ _SilphCo2Text_59ded:: cont "please take this!" prompt -_ReceivedTM36Text:: +_SilphCo2FSilphWorkerFReceivedTM36Text:: text "<PLAYER> got" line "@" text_ram wStringBuffer text "!@" text_end -_TM36ExplanationText:: +_SilphCo2FSilphWorkerFTM36ExplanationText:: text "TM36 is" line "SELFDESTRUCT!" @@ -26,53 +26,53 @@ _TM36ExplanationText:: cont "Be careful." done -_TM36NoRoomText:: +_SilphCo2FSilphWorkerFTM36NoRoomText:: text "You don't have any" line "room for this." done -_SilphCo2BattleText1:: +_SilphCo2FScientist1BattleText:: text "Help! I'm a SILPH" line "employee." done -_SilphCo2EndBattleText1:: +_SilphCo2FScientist1EndBattleText:: text "How" line "did you know I" cont "was a ROCKET?" prompt -_SilphCo2AfterBattleText1:: +_SilphCo2FScientist1AfterBattleText:: text "I work for both" line "SILPH and TEAM" cont "ROCKET!" done -_SilphCo2BattleText2:: +_SilphCo2FScientist2BattleText:: text "It's off limits" line "here! Go home!" done -_SilphCo2EndBattleText2:: +_SilphCo2FScientist2EndBattleText:: text "You're" line "good." prompt -_SilphCo2AfterBattleText2:: +_SilphCo2FScientist2AfterBattleText:: text "Can you solve the" line "maze in here?" done -_SilphCo2BattleText3:: +_SilphCo2FRocket1BattleText:: text "No kids are" line "allowed in here!" done -_SilphCo2EndBattleText3:: +_SilphCo2FRocket1EndBattleText:: text "Tough!" prompt -_SilphCo2AfterBattleText3:: +_SilphCo2FRocket1AfterBattleText:: text "Diamond-shaped" line "tiles are" cont "teleport blocks!" @@ -81,16 +81,16 @@ _SilphCo2AfterBattleText3:: line "transporters!" done -_SilphCo2BattleText4:: +_SilphCo2FRocket2BattleText:: text "Hey kid! What are" line "you doing here?" done -_SilphCo2EndBattleText4:: +_SilphCo2FRocket2EndBattleText:: text "I goofed!" prompt -_SilphCo2AfterBattleText4:: +_SilphCo2FRocket2AfterBattleText:: text "SILPH CO. will" line "be merged with" cont "TEAM ROCKET!" diff --git a/text/SilphCo3F.asm b/text/SilphCo3F.asm index b6a023f9..4bc62e0e 100644 --- a/text/SilphCo3F.asm +++ b/text/SilphCo3F.asm @@ -1,42 +1,42 @@ -_SilphCo3Text_59ff9:: +_SilphCo3FSilphWorkerMWhatShouldIDoText:: text "I work for SILPH." line "What should I do?" done -_SilphCo3Text_59ffe:: +_SilphCo3FSilphWorkerMYouSavedUsText:: text "<PLAYER>! You and" line "your #MON" cont "saved us!" done -_SilphCo3BattleText1:: +_SilphCo3FRocketBattleText:: text "Quit messing with" line "us, kid!" done -_SilphCo3EndBattleText1:: +_SilphCo3FRocketEndBattleText:: text "I give" line "up!" prompt -_SilphCo3AfterBattleText1:: +_SilphCo3FRocketAfterBattleText:: text "A hint? You can" line "open doors with a" cont "CARD KEY!" done -_SilphCo3BattleText2:: +_SilphCo3FScientistBattleText:: text "I support TEAM" line "ROCKET more than" cont "I support SILPH!" done -_SilphCo3EndBattleText2:: +_SilphCo3FScientistEndBattleText:: text "You" line "really got me!" prompt -_SilphCo3AfterBattleText2:: +_SilphCo3FScientistAfterBattleText:: text "Humph..." para "TEAM ROCKET said" diff --git a/text/SilphCo4F.asm b/text/SilphCo4F.asm index 5b484ec7..2d99ec95 100644 --- a/text/SilphCo4F.asm +++ b/text/SilphCo4F.asm @@ -1,56 +1,56 @@ -_SilphCo4Text_19de0:: +_SilphCo4FSilphWorkerMImHidingText:: text "Sssh! Can't you" line "see I'm hiding?" done -_SilphCo4Text_19de5:: +_SilphCo4FSilphWorkerMTeamRocketIsGoneText:: text "Huh? TEAM ROCKET" line "is gone?" done -_SilphCo4BattleText2:: +_SilphCo4FRocket1BattleText:: text "TEAM ROCKET has" line "taken command of" cont "SILPH CO.!" done -_SilphCo4EndBattleText2:: +_SilphCo4FRocket1EndBattleText:: text "Arrgh!" prompt -_SilphCo4AfterBattleText2:: +_SilphCo4FRocket1AfterBattleText:: text "Fwahahaha!" line "My BOSS has been" cont "after this place!" done -_SilphCo4BattleText3:: +_SilphCo4FScientistBattleText:: text "My #MON are my" line "loyal soldiers!" done -_SilphCo4EndBattleText3:: +_SilphCo4FScientistEndBattleText:: text "Darn!" line "You weak #MON!" prompt -_SilphCo4AfterBattleText3:: +_SilphCo4FScientistAfterBattleText:: text "The doors are" line "electronically" cont "locked! A CARD" cont "KEY opens them!" done -_SilphCo4BattleText4:: +_SilphCo4FRocket2BattleText:: text "Intruder spotted!" done -_SilphCo4EndBattleText4:: +_SilphCo4FRocket2EndBattleText:: text "Who" line "are you?" prompt -_SilphCo4AfterBattleText4:: +_SilphCo4FRocket2AfterBattleText:: text "I better tell the" line "BOSS on 11F!" done diff --git a/text/SilphCo5F.asm b/text/SilphCo5F.asm index 9c8bfd41..1a38d416 100644 --- a/text/SilphCo5F.asm +++ b/text/SilphCo5F.asm @@ -1,84 +1,84 @@ -_SilphCo5Text_1a010:: +_SilphCo5FSilphWorkerMThatsYouRightText:: text "TEAM ROCKET is" line "in an uproar over" cont "some intruder." cont "That's you right?" done -_SilphCo5Text_1a015:: +_SilphCo5FSilphWorkerMYoureOurHeroText:: text "TEAM ROCKET took" line "off! You're our" cont "hero! Thank you!" done -_SilphCo5BattleText2:: +_SilphCo5FRocket1BattleText:: text "I heard a kid was" line "wandering around." done -_SilphCo5EndBattleText2:: +_SilphCo5FRocket1EndBattleText:: text "Boom!" prompt -_SilphCo5AfterBattleText2:: +_SilphCo5FRocket1AfterBattleText:: text "It's not smart" line "to pick a fight" cont "with TEAM ROCKET!" done -_SilphCo5BattleText3:: +_SilphCo5FScientistBattleText:: text "We study #" line "BALL technology" cont "on this floor!" done -_SilphCo5EndBattleText3:: +_SilphCo5FScientistEndBattleText:: text "Dang!" line "Blast it!" prompt -_SilphCo5AfterBattleText3:: +_SilphCo5FScientistAfterBattleText:: text "We worked on the" line "ultimate #" cont "BALL which would" cont "catch anything!" done -_SilphCo5BattleText4:: +_SilphCo5FRockerBattleText:: text "Whaaat? There" line "shouldn't be any" cont "children here!" done -_SilphCo5EndBattleText4:: +_SilphCo5FRockerEndBattleText:: text "Oh" line "goodness!" prompt -_SilphCo5AfterBattleText4:: +_SilphCo5FRockerAfterBattleText:: text "You're only on 5F." line "It's a long way" cont "to my BOSS!" done -_SilphCo5BattleText5:: +_SilphCo5FRocket2BattleText:: text "Show TEAM ROCKET" line "a little respect!" done -_SilphCo5EndBattleText5:: +_SilphCo5FRocket2EndBattleText:: text "Cough..." line "Cough..." prompt -_SilphCo5AfterBattleText5:: +_SilphCo5FRocket2AfterBattleText:: text "Which reminds me." para "KOFFING evolves" line "into WEEZING!" done -_SilphCo5Text9:: +_SilphCo5FPokemonReport1Text:: text "It's a #MON" line "REPORT!" @@ -88,7 +88,7 @@ _SilphCo5Text9:: cont "reality #MON." done -_SilphCo5Text10:: +_SilphCo5FPokemonReport2Text:: text "It's a #MON" line "REPORT!" @@ -97,7 +97,7 @@ _SilphCo5Text10:: cont "been confirmed." done -_SilphCo5Text11:: +_SilphCo5FPokemonReport3Text:: text "It's a #MON" line "REPORT!" diff --git a/text/SilphCo6F.asm b/text/SilphCo6F.asm index 90456b5c..86581c24 100644 --- a/text/SilphCo6F.asm +++ b/text/SilphCo6F.asm @@ -1,77 +1,77 @@ -_SilphCo6Text_1a24a:: +_SilphCo6FSilphWorkerM1TookOverTheBuildingText:: text "The ROCKETs came" line "and took over the" cont "building!" done -_SilphCo6Text_1a24f:: +_SilphCo6FSilphWorkerM1BackToWorkText:: text "Well, better get" line "back to work!" done -_SilphCo6Text_1a261:: +_SilphCo6FSilphWorkerMHelpMePleaseText:: text "Oh dear, oh dear." line "Help me please!" done -_SilphCo6Text_1a266:: +_SilphCo6FSilphWorkerMWeGotEngagedText:: text "We got engaged!" line "Heheh!" done -_SilphCo6Text_1a278:: +_SilphCo6FSilphWorkerF1SuchACowardText:: text "Look at him! He's" line "such a coward!" done -_SilphCo6Text_1a27d:: +_SilphCo6FSilphWorkerF1HaveToMarryHimText:: text "I feel so sorry" line "for him, I have" cont "to marry him!" done -_SilphCo6Text_1a28f:: +_SilphCo6FSilphWorkerF2TeamRocketConquerWorldText:: text "TEAM ROCKET is" line "trying to conquer" cont "the world with" cont "#MON!" done -_SilphCo6Text_1a294:: +_SilphCo6FSilphWorkerF2TeamRocketRanText:: text "TEAM ROCKET ran" line "because of you!" done -_SilphCo6Text_1a2a6:: +_SilphCo6FSilphWorkerM3TargetedSilphText:: text "They must have" line "targeted SILPH" cont "for our #MON" cont "products." done -_SilphCo6Text_1a2ab:: +_SilphCo6FSilphWorkerM3WorkForSilphText:: text "Come work for" line "SILPH when you" cont "get older!" done -_SilphCo6BattleText2:: +_SilphCo6FRocket1BattleText:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo6EndBattleText2:: +_SilphCo6Rocket1EndBattleText:: text "Flame" line "out!" prompt -_SilphCo6AfterBattleText2:: +_SilphCo6Rocket1AfterBattleText:: text "No matter!" line "My brothers will" cont "avenge me!" done -_SilphCo6BattleText3:: +_SilphCo6FScientistBattleText:: text "That rotten" line "PRESIDENT!" @@ -80,27 +80,27 @@ _SilphCo6BattleText3:: cont "TIKSI BRANCH!" done -_SilphCo6EndBattleText3:: +_SilphCo6FScientistEndBattleText:: text "Shoot!" prompt -_SilphCo6AfterBattleText3:: +_SilphCo6FScientistAfterBattleText:: text "TIKSI BRANCH?" line "It's in Russian" cont "no man's land!" done -_SilphCo6BattleText4:: +_SilphCo6FRocket2BattleText:: text "You dare betray" line "TEAM ROCKET?" done -_SilphCo6EndBattleText4:: +_SilphCo6FRocket2EndBattleText:: text "You" line "traitor!" prompt -_SilphCo6AfterBattleText4:: +_SilphCo6FRocket2AfterBattleText:: text "If you stand for" line "justice, you" cont "betray evil!" diff --git a/text/SilphCo7F.asm b/text/SilphCo7F.asm index 8f7b6ca2..4980a9f0 100644 --- a/text/SilphCo7F.asm +++ b/text/SilphCo7F.asm @@ -1,4 +1,4 @@ -_MeetLaprasGuyText:: +_SilphCo7FSilphWorkerM1HaveThisPokemonText:: text "Oh! Hi! You're" line "not a ROCKET! You" cont "came to save us?" @@ -9,7 +9,7 @@ _MeetLaprasGuyText:: cont "for saving us." prompt -_HeresYourLaprasText:: +_SilphCo7FSilphWorkerM1LaprasDescriptionText:: text "It's LAPRAS. It's" line "very intelligent." @@ -27,129 +27,129 @@ _HeresYourLaprasText:: cont "give you a lift!" done -_LaprasGuyText:: +_SilphCo7FSilphWorkerM1IsOurPresidentOkText:: text "TEAM ROCKET's" line "BOSS went to the" cont "boardroom! Is our" cont "PRESIDENT OK?" done -_LaprasGuySavedText:: +_SilphCo7FSilphWorkerM1SavedText:: text "Saved at last!" line "Thank you!" done -_SilphCo7Text_51e00:: +_SilphCo7FSilphWorkerM2AfterTheMasterBallText:: text "TEAM ROCKET was" line "after the MASTER" cont "BALL which will" cont "catch any #MON!" done -_CanceledMasterBallText:: +_SilphCo7FSilphWorkerM2CancelledMasterBallText:: text "We canceled the" line "MASTER BALL" cont "project because" cont "of TEAM ROCKET." done -_SilphCo7Text_51e23:: +_SilphCo7FSilphWorkerM3ItWouldBeBadText:: text "It would be bad" line "if TEAM ROCKET" cont "took over SILPH" cont "or our #MON!" done -_SilphCo7Text_51e28:: +_SilphCo7FSilphWorkerM3YouChasedOffTeamRocketText:: text "Wow! You chased" line "off TEAM ROCKET" cont "all by yourself?" done -_SilphCo7Text_51e46:: +_SilphCo7FSilphWorkerM4ItsReallyDangerousHereText:: text "You! It's really" line "dangerous here!" cont "You came to save" cont "me? You can't!" done -_SilphCo7Text_51e4b:: +_SilphCo7FSilphWorkerM4SafeAtLastText:: text "Safe at last!" line "Oh thank you!" done -_SilphCo7BattleText1:: +_SilphCo7FRocket1BattleText:: text "Aha! I smell a" line "little rat!" done -_SilphCo7EndBattleText1:: +_SilphCo7FRocket1EndBattleText:: text "Lights" line "out!" prompt -_SilphCo7AfterBattleText1:: +_SilphCo7FRocket1AfterBattleText:: text "You won't find my" line "BOSS by just" cont "scurrying around!" done -_SilphCo7BattleText2:: +_SilphCo7FScientistBattleText:: text "Heheh!" para "You mistook me for" line "a SILPH worker?" done -_SilphCo7EndBattleText2:: +_SilphCo7FScientistEndBattleText:: text "I'm" line "done!" prompt -_SilphCo7AfterBattleText2:: +_SilphCo7FScientistAfterBattleText:: text "Despite your age," line "you are a skilled" cont "trainer!" done -_SilphCo7BattleText3:: +_SilphCo7FRocket2BattleText:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo7EndBattleText3:: +_SilphCo7FRocket2EndBattleText:: text "Aack!" line "Brothers, I lost!" prompt -_SilphCo7AfterBattleText3:: +_SilphCo7FRocket2AfterBattleText:: text "Doesn't matter." line "My brothers will" cont "repay the favor!" done -_SilphCo7BattleText4:: +_SilphCo7FRocket3BattleText:: text "A child intruder?" line "That must be you!" done -_SilphCo7EndBattleText4:: +_SilphCo7FRocket3EndBattleText:: text "Fine!" line "I lost!" prompt -_SilphCo7AfterBattleText4:: +_SilphCo7FRocket3AfterBattleText:: text "Go on home" line "before my BOSS" cont "gets ticked off!" done -_SilphCo7Text_51ebe:: +_SilphCo7FRivalText:: text "<RIVAL>: What" line "kept you <PLAYER>?" done -_SilphCo7Text_51ec3:: +_SilphCo7FRivalWaitedHereText:: text "<RIVAL>: Hahaha!" line "I thought you'd" cont "turn up if I" @@ -166,13 +166,13 @@ _SilphCo7Text_51ec3:: cont "you got better!" done -_SilphCo7Text_51ec8:: +_SilphCo7FRivalDefeatedText:: text "Oh-oh!" line "So, you are ready" cont "for BOSS ROCKET!" prompt -_SilphCo7Text_51ecd:: +_SilphCo7FRivalVictoryText:: text "<RIVAL>: How can" line "I put this?" @@ -181,7 +181,7 @@ _SilphCo7Text_51ecd:: cont "with us big boys!" prompt -_SilphCo7Text_51ed2:: +_SilphCo7FRivalGoodLuckToYouText:: text "Well, <PLAYER>!" para "I'm moving on up" diff --git a/text/SilphCo8F.asm b/text/SilphCo8F.asm index fabae5e6..8e4cf93f 100644 --- a/text/SilphCo8F.asm +++ b/text/SilphCo8F.asm @@ -1,56 +1,56 @@ -_SilphCo8Text_565be:: +__SilphCo8FSilphWorkerMThanksForSavingUsText:: text "I wonder if SILPH" line "is finished..." done -_SilphCo8Text_565c3:: +_SilphCo8FSilphWorkerMThanksForSavingUsText:: text "Thanks for saving" line "us!" done -_SilphCo8BattleText1:: +_SilphCo8FRocket1BattleText:: text "That's as far as" line "you'll go!" done -_SilphCo8EndBattleText1:: +_SilphCo8FRocket1EndBattleText:: text "Not" line "enough grit!" prompt -_SilphCo8AfterBattleText1:: +_SilphCo8FRocket1AfterBattleText:: text "If you don't turn" line "back, I'll call" cont "for backup!" done -_SilphCo8BattleText2:: +_SilphCo8FScientistBattleText:: text "You're causing us" line "problems!" done -_SilphCo8EndBattleText2:: +_SilphCo8FScientistEndBattleText:: text "Huh?" line "I lost?" prompt -_SilphCo8AfterBattleText2:: +_SilphCo8FScientistAfterBattleText:: text "So, what do you" line "think of SILPH" cont "BUILDING's maze?" done -_SilphCo8BattleText3:: +_SilphCo8FRocket2BattleText:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo8EndBattleText3:: +_SilphCo8FRocket2EndBattleText:: text "Whoo!" line "Oh brothers!" prompt -_SilphCo8AfterBattleText3:: +_SilphCo8FRocket2AfterBattleText:: text "I'll leave you up" line "to my brothers!" done diff --git a/text/SilphCo9F.asm b/text/SilphCo9F.asm index fd1aa91c..f9b09228 100644 --- a/text/SilphCo9F.asm +++ b/text/SilphCo9F.asm @@ -1,62 +1,62 @@ -_SilphCo9Text_5d8e5:: +SilphCo9FNurseYouLookTiredText:: text "You look tired!" line "You should take a" cont "quick nap!" prompt -_SilphCo9Text_5d8ea:: +SilphCo9FNurseDontGiveUpText:: text "Don't give up!" done -_SilphCo9Text_5d8ef:: +SilphCo9FNurseThankYouText:: text "Thank you so" line "much!" done -_SilphCo9BattleText1:: +_SilphCo9FRocket1BattleText:: text "Your #MON seem" line "to adore you, kid!" done -_SilphCo9EndBattleText1:: +_SilphCo9FRocket1EndBattleText:: text "Ghaaah!" prompt -_SilphCo9AfterBattleText1:: +_SilphCo9FRocket1AfterBattleText:: text "If I had started" line "as a trainer at" cont "your age..." done -_SilphCo9BattleText2:: +_SilphCo9FScientistBattleText:: text "Your #MON have" line "weak points! I" cont "can nail them!" done -_SilphCo9EndBattleText2:: +_SilphCo9FScientistEndBattleText:: text "You" line "hammered me!" prompt -_SilphCo9AfterBattleText2:: +_SilphCo9FScientistAfterBattleText:: text "Exploiting weak" line "spots does work!" cont "Think about" cont "element types!" done -_SilphCo9BattleText3:: +_SilphCo9FRocket2BattleText:: text "I am one of the 4" line "ROCKET BROTHERS!" done -_SilphCo9EndBattleText3:: +_SilphCo9FRocket2EndBattleText:: text "Warg!" line "Brothers, I lost!" prompt -_SilphCo9AfterBattleText3:: +_SilphCo9FRocket2AfterBattleText:: text "My brothers will" line "avenge me!" done diff --git a/text/SummerBeachHouse.asm b/text/SummerBeachHouse.asm index ed28fe06..bf96b358 100644 --- a/text/SummerBeachHouse.asm +++ b/text/SummerBeachHouse.asm @@ -1,4 +1,4 @@ -_SurfinDudeText1:: +_SummerBeachHouseSurfinDudeText1:: text "Whoa!" para "Your PIKACHU knows" @@ -12,16 +12,16 @@ _SurfinDudeText1:: para "Give it a go?" done -_SurfinDudeText2:: +_SummerBeachHouseSurfinDudeText2:: text "Come SURF anytime," line "my friend!" done -_SurfinDudeText3:: +_SummerBeachHouseSurfinDudeText3:: text "Wanna go SURF?" done -_SurfinDudeText4:: +_SummerBeachHouseSurfinDudeText4:: text "Dogs and burgers" line "on special today!" done @@ -30,7 +30,7 @@ _SummerBeachHousePikachuText:: text "PIKACHU: Pikaa" done -_SummerBeachHouseSign1Text1:: +_SummerBeachHousePoster1Text1:: text "SURFIN' DUDE's" line "scribbles..." @@ -39,12 +39,12 @@ _SummerBeachHouseSign1Text1:: cont "hit the groove!" done -_SummerBeachHouseSign1Text2:: +_SummerBeachHousePoster1Text2:: text "30 years of waves!" line "SURFIN' DUDE" done -_SummerBeachHouseSign2Text1:: +_SummerBeachHousePoster2Text1:: text "SURFING TIP 1!" para "After flips, line" @@ -53,12 +53,12 @@ _SummerBeachHouseSign2Text1:: cont "effect!" done -_SummerBeachHouseSign2Text2:: +_SummerBeachHousePoster2Text2:: text "SUMMER BEACH HOUSE" line "#MON welcome!" done -_SummerBeachHouseSign3Text1:: +_SummerBeachHousePoster3Text1:: text "SURFING TIP 2!" para "Pulling flips in" @@ -66,7 +66,7 @@ _SummerBeachHouseSign3Text1:: cont "rad!" done -_SummerBeachHouseSign3Text2:: +_SummerBeachHousePoster3Text2:: text "The sea unites" line "all in surfdom!" done diff --git a/text/UndergroundPathRoute6.asm b/text/UndergroundPathRoute6.asm index dacc44f7..85cfdda2 100644 --- a/text/UndergroundPathRoute6.asm +++ b/text/UndergroundPathRoute6.asm @@ -1,4 +1,4 @@ -_UndergrdTunnelEntRoute6Text1:: +_UndergroundPathRoute6GirlText:: text "People often lose" line "things in that" cont "UNDERGROUND PATH." diff --git a/text/UndergroundPathRoute7.asm b/text/UndergroundPathRoute7.asm index 5cde3614..e7562764 100644 --- a/text/UndergroundPathRoute7.asm +++ b/text/UndergroundPathRoute7.asm @@ -1,4 +1,4 @@ -_UndergroundPathEntRoute7Text1:: +_UndergroundPathRoute7MiddleAgedManText:: text "I heard a sleepy" line "#MON appeared" cont "near CELADON CITY." diff --git a/text/UndergroundPathRoute7Copy.asm b/text/UndergroundPathRoute7Copy.asm index 4e0dc3ca..09ba09ca 100644 --- a/text/UndergroundPathRoute7Copy.asm +++ b/text/UndergroundPathRoute7Copy.asm @@ -1,4 +1,4 @@ -_UGPathRoute7EntranceUnusedText_5d773:: +_UndergroundPathRoute7CopyUnusedGirlText:: text "I want to shop at" line "the dept. store" cont "in CELADON but..." @@ -8,13 +8,13 @@ _UGPathRoute7EntranceUnusedText_5d773:: cont "people there." done -_UGPathRoute7EntranceUnusedText_5d778:: +_UndergroundPathRoute7CopyUnusedTeamRocketHadAHideoutText:: text "TEAM ROCKET had a" line "secret hideout in" cont "CELADON CITY?" done -_UGPathRoute7EntranceUnusedText_5d77d:: +_UndergroundPathRoute7CopyUnusedMiddleAgedManText:: text "You're here to" line "shop in CELADON?" @@ -22,7 +22,7 @@ _UGPathRoute7EntranceUnusedText_5d77d:: line "and head west!" done -_UGPathRoute7EntranceUnusedText_5d782:: +_UndergroundPathRoute7CopyUnusedGoesUnderSaffronText:: text "The UNDERGROUND" line "PATH goes beneath" cont "SAFFRON and leads" diff --git a/text/UndergroundPathRoute8.asm b/text/UndergroundPathRoute8.asm index da785c8e..6aa54d3c 100644 --- a/text/UndergroundPathRoute8.asm +++ b/text/UndergroundPathRoute8.asm @@ -1,4 +1,4 @@ -_UndergroundPathEntRoute8Text1:: +_UndergroundPathRoute8GirlText:: text "The dept. store" line "in CELADON has a" cont "great selection!" diff --git a/text/VermilionCity.asm b/text/VermilionCity.asm index c65063cc..96318ebd 100644 --- a/text/VermilionCity.asm +++ b/text/VermilionCity.asm @@ -1,4 +1,4 @@ -_VermilionCityText1:: +_VermilionCityBeautyText:: text "We're careful" line "about pollution!" @@ -7,13 +7,13 @@ _VermilionCityText1:: cont "toxic sludge!" done -_VermilionCityTextDidYouSee:: +_VermilionCityGambler1DidYouSeeText:: text "Did you see S.S." line "ANNE moored in" cont "the harbor?" done -_VermilionCityTextSSAnneDeparted:: +_VermilionCityGambler1SSAnneDepartedText:: text "So, S.S.ANNE has" line "departed!" @@ -21,12 +21,12 @@ _VermilionCityTextSSAnneDeparted:: line "about a year." done -_SSAnneWelcomeText4:: +_VermilionCitySailor1WelcomeToSSAnneText:: text "Welcome to S.S." line "ANNE!" done -_SSAnneWelcomeText9:: +_VermilionCitySailor1DoYouHaveATicketText:: text "Welcome to S.S." line "ANNE!" @@ -34,7 +34,7 @@ _SSAnneWelcomeText9:: line "have a ticket?" prompt -_SSAnneFlashedTicketText:: +_VermilionCitySailor1FlashedTicketText:: text "<PLAYER> flashed" line "the S.S.TICKET!" @@ -42,7 +42,7 @@ _SSAnneFlashedTicketText:: line "S.S.ANNE!" done -_SSAnneNoTicketText:: +_VermilionCitySailor1YouNeedATicketText:: text "<PLAYER> doesn't" line "have the needed" cont "S.S.TICKET." @@ -53,11 +53,11 @@ _SSAnneNoTicketText:: line "to get aboard." done -_SSAnneNotHereText:: +_VermilionCitySailor1ShipSetSailText:: text "The ship set sail." done -_VermilionCityText4:: +_VermilionCityGambler2Text:: text "I'm putting up a" line "building on this" cont "plot of land." @@ -66,19 +66,19 @@ _VermilionCityText4:: line "tamping the land." done -_VermilionCityText5:: +_VermilionCityMachopText:: text "MACHOP: Guoh!" line "Gogogoh!@" text_end -_VermilionCityText15:: +_VermilionCityMachopStompingTheLandFlatText:: text_start para "A MACHOP is" line "stomping the land" cont "flat." done -_VermilionCityText6:: +_VermilionCitySailor2Text:: text "S.S.ANNE is a" line "famous luxury" cont "cruise ship." @@ -129,13 +129,13 @@ _OfficerJennyText5:: line "doing?" done -_VermilionCityText8:: +_VermilionCitySignText:: text "VERMILION CITY" line "The Port of" cont "Exquisite Sunsets" done -_VermilionCityText9:: +_VermilionCityNoticeSignText:: text "NOTICE!" para "ROUTE 12 may be" @@ -149,13 +149,13 @@ _VermilionCityText9:: para "VERMILION POLICE" done -_VermilionCityText12:: +_VermilionCityPokemonFanClubSignText:: text "#MON FAN CLUB" line "All #MON fans" cont "welcome!" done -_VermilionCityText13:: +_VermilionCityGymSignText:: text "VERMILION CITY" line "#MON GYM" cont "LEADER: LT.SURGE" @@ -164,6 +164,6 @@ _VermilionCityText13:: line "American!" done -_VermilionCityText14:: +_VermilionCityHarborSignText:: text "VERMILION HARBOR" done diff --git a/text/VermilionDock.asm b/text/VermilionDock.asm index aaf1ed34..91201cc2 100644 --- a/text/VermilionDock.asm +++ b/text/VermilionDock.asm @@ -1,3 +1,3 @@ -_VermilionDockText1:: +_VermilionDockUnusedText:: text_start done diff --git a/text/VermilionGym.asm b/text/VermilionGym.asm index 174d9293..0e518c5c 100644 --- a/text/VermilionGym.asm +++ b/text/VermilionGym.asm @@ -1,4 +1,4 @@ -_LTSurgePreBattleText:: +_VermilionGymLTSurgePreBattleText:: text "Ten-hut! Welcome" line "to VERMILION GYM!" @@ -20,7 +20,7 @@ _LTSurgePreBattleText:: line "into surrender!" done -_LTSurgePostBattleAdviceText:: +_VermilionGymLTSurgePostBattleAdviceText:: text "A little word of" line "advice, kid!" @@ -32,7 +32,7 @@ _LTSurgePostBattleAdviceText:: cont "type #MON!" done -_LTSurgeThunderBadgeInfoText:: +_VermilionGymLTSurgeThunderBadgeInfoText:: text "The THUNDERBADGE" line "cranks up your" cont "#MON's SPEED!" @@ -45,7 +45,7 @@ _LTSurgeThunderBadgeInfoText:: line "kid! Take this!" done -_ReceivedTM24Text:: +_VermilionGymLTSurgeReceivedTM24Text:: text "<PLAYER> received " line "@" text_ram wStringBuffer @@ -62,12 +62,12 @@ _TM24ExplanationText:: line "electric #MON!" done -_TM24NoRoomText:: +_VermilionGymLTSurgeTM24NoRoomText:: text "Yo kid, make room" line "in your pack!" done -_ReceivedThunderBadgeText:: +_VermilionGymLTSurgeReceivedThunderBadgeText:: text "Whoa!" para "You're the real" @@ -77,18 +77,18 @@ _ReceivedThunderBadgeText:: line "the THUNDERBADGE!" prompt -_VermilionGymBattleText1:: +_VermilionGymGentlemanBattleText:: text "When I was in the" line "Army, LT.SURGE" cont "was my strict CO!" done -_VermilionGymEndBattleText1:: +_VermilionGymGentlemanEndBattleText:: text "Stop!" line "You're very good!" prompt -_VermilionGymAfterBattleText1:: +_VermilionGymGentlemanAfterBattleText:: text "The door won't" line "open?" @@ -96,17 +96,17 @@ _VermilionGymAfterBattleText1:: line "was cautious!" done -_VermilionGymBattleText2:: +_VermilionGymSuperNerdBattleText:: text "I'm a lightweight," line "but I'm good with" cont "electricity!" done -_VermilionGymEndBattleText2:: +_VermilionGymSuperNerdEndBattleText:: text "Fried!" prompt -_VermilionGymAfterBattleText2:: +_VermilionGymSuperNerdAfterBattleText:: text "OK, I'll talk!" para "LT.SURGE said he" @@ -114,17 +114,17 @@ _VermilionGymAfterBattleText2:: cont "inside something!" done -_VermilionGymBattleText3:: +_VermilionGymSailorBattleText:: text "This is no place" line "for kids!" done -_VermilionGymEndBattleText3:: +_VermilionGymSailorEndBattleText:: text "Wow!" line "Surprised me!" prompt -_VermilionGymAfterBattleText3:: +_VermilionGymSailorAfterBattleText:: text "LT.SURGE set up" line "double locks!" cont "Here's a hint!" @@ -135,7 +135,7 @@ _VermilionGymAfterBattleText3:: cont "next to it!" done -_VermilionGymGuidePreBattleText:: +_VermilionGymGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -161,7 +161,7 @@ _VermilionGymGuidePreBattleText:: cont "get to him!" done -_VermilionGymGuidePostBattleText:: +_VermilionGymGymGuideBeatLTSurgeText:: text "Whew! That match" line "was electric!" done diff --git a/text/VermilionMart.asm b/text/VermilionMart.asm index 10743989..f2e36d11 100644 --- a/text/VermilionMart.asm +++ b/text/VermilionMart.asm @@ -1,4 +1,4 @@ -_VermilionMartText2:: +_VermilionMartCooltrainerMText:: text "There are evil" line "people who will" cont "use #MON for" @@ -15,7 +15,7 @@ _VermilionMartText2:: cont "useful." done -_VermilionMartText3:: +_VermilionMartCooltrainerFText:: text "I think #MON" line "can be good or" cont "evil. It depends" diff --git a/text/VermilionOldRodHouse.asm b/text/VermilionOldRodHouse.asm index 587681b2..e08f1712 100644 --- a/text/VermilionOldRodHouse.asm +++ b/text/VermilionOldRodHouse.asm @@ -1,4 +1,4 @@ -_VermilionHouse2Text_560b1:: +_VermilionOldRodHouseFishingGuruDoYouLikeToFishText:: text "I'm the FISHING" line "GURU!" @@ -9,7 +9,7 @@ _VermilionHouse2Text_560b1:: line "fish?" done -_VermilionHouse2Text_560b6:: +_VermilionOldRodHouseFishingGuruTakeThisText:: text "Grand! I like" line "your style!" @@ -22,7 +22,7 @@ _VermilionHouse2Text_560b6:: text "!@" text_end -_VermilionHouse2Text_560bb:: +_VermilionOldRodHouseFishingGuruFishingIsAWayOfLifeText:: text_start para "Fishing is a way" @@ -34,12 +34,12 @@ _VermilionHouse2Text_560bb:: cont "one, young one!" done -_VermilionHouse2Text_560c0:: +_VermilionOldRodHouseFishingGuruThatsSoDisappointingText:: text "Oh... That's so" line "disappointing..." done -_VermilionHouse2Text_560c5:: +_VermilionOldRodHouseFishingGuruHowAreTheFishBitingText:: text "Hello there," line "<PLAYER>!" @@ -47,7 +47,7 @@ _VermilionHouse2Text_560c5:: line "biting?" done -_VermilionHouse2Text_560ca:: +_VermilionOldRodHouseFishingGuruNoRoomText:: text "Oh no!" para "You have no room" diff --git a/text/VermilionPidgeyHouse.asm b/text/VermilionPidgeyHouse.asm index 858e84f3..ea238d6d 100644 --- a/text/VermilionPidgeyHouse.asm +++ b/text/VermilionPidgeyHouse.asm @@ -1,15 +1,15 @@ -_VermilionHouse1Text1:: +_VermilionPidgeyHouseYoungsterText:: text "I'm getting my" line "PIDGEY to fly a" cont "letter to SAFFRON" cont "in the north!" done -_VermilionHouse1Text2:: +_VermilionPidgeyHousePidgeyText:: text "PIDGEY: Kurukkoo!@" text_end -_VermilionHouse1Text3:: +_VermilionPidgeyHouseLetterText:: text "Dear PIPPI, I hope" line "to see you soon." diff --git a/text/VermilionPokecenter.asm b/text/VermilionPokecenter.asm index c9e9a581..e911d18b 100644 --- a/text/VermilionPokecenter.asm +++ b/text/VermilionPokecenter.asm @@ -1,4 +1,4 @@ -_VermilionPokecenterText2:: +_VermilionPokecenterFishingGuruText:: text "Even if they are" line "the same level," cont "#MON can have" @@ -11,7 +11,7 @@ _VermilionPokecenterText2:: cont "in the wild." done -_VermilionPokecenterText3:: +_VermilionPokecenterSailorText:: text "My #MON was" line "poisoned! It" cont "fainted while we" diff --git a/text/VictoryRoad1F.asm b/text/VictoryRoad1F.asm index 1523db88..a1c0526a 100644 --- a/text/VictoryRoad1F.asm +++ b/text/VictoryRoad1F.asm @@ -1,31 +1,31 @@ -_VictoryRoad1BattleText1:: +_VictoryRoad1FCooltrainerFBattleText:: text "I wonder if you" line "are good enough" cont "for me!" done -_VictoryRoad1EndBattleText1:: +_VictoryRoad1FCooltrainerFEndBattleText:: text "I" line "lost out!" prompt -_VictoryRoad1AfterBattleText1:: +_VictoryRoad1FCooltrainerFAfterBattleText:: text "I never wanted to" line "lose to anybody!" done -_VictoryRoad1BattleText2:: +_VictoryRoad1FCooltrainerMBattleText:: text "I can see you're" line "good! Let me see" cont "exactly how good!" done -_VictoryRoad1EndBattleText2:: +_VictoryRoad1FCooltrainerMEndBattleText:: text "I" line "had a chance..." prompt -_VictoryRoad1AfterBattleText2:: +_VictoryRoad1FCooltrainerMAfterBattleText:: text "I concede, you're" line "better than me!" done diff --git a/text/VictoryRoad2F.asm b/text/VictoryRoad2F.asm index ff72afaa..7275222d 100644 --- a/text/VictoryRoad2F.asm +++ b/text/VictoryRoad2F.asm @@ -1,85 +1,85 @@ -_MoltresBattleText:: +_VictoryRoad2FMoltresBattleText:: text "Gyaoo!@" text_end -_VictoryRoad2BattleText1:: +_VictoryRoad2FHikerBattleText:: text "VICTORY ROAD is" line "the final test" cont "for trainers!" done -_VictoryRoad2EndBattleText1:: +_VictoryRoad2FHikerEndBattleText:: text "Aiyah!" prompt -_VictoryRoad2AfterBattleText1:: +_VictoryRoad2FHikerAfterBattleText:: text "If you get stuck," line "try moving some" cont "boulders around!" done -_VictoryRoad2BattleText2:: +_VictoryRoad2FSuperNerd1BattleText:: text "Ah, so you wish" line "to challenge the" cont "ELITE FOUR?" done -_VictoryRoad2EndBattleText2:: +_VictoryRoad2FSuperNerd1EndBattleText:: text "You" line "got me!" prompt -_VictoryRoad2AfterBattleText2:: +_VictoryRoad2FSuperNerd1AfterBattleText:: text "<RIVAL> also came" line "through here!" done -_VictoryRoad2BattleText3:: +_VictoryRoad2FCooltrainerMBattleText:: text "Come on!" line "I'll whip you!" done -_VictoryRoad2EndBattleText3:: +_VictoryRoad2FCooltrainerMEndBattleText:: text "I got" line "whipped!" prompt -_VictoryRoad2AfterBattleText3:: +_VictoryRoad2FCooltrainerMAfterBattleText:: text "You earned the" line "right to be on" cont "VICTORY ROAD!" done -_VictoryRoad2BattleText4:: +_VictoryRoad2FSuperNerd2BattleText:: text "If you can get" line "through here, you" cont "can go meet the" cont "ELITE FOUR!" done -_VictoryRoad2EndBattleText4:: +_VictoryRoad2FSuperNerd2EndBattleText:: text "No!" line "Unbelievable!" prompt -_VictoryRoad2AfterBattleText4:: +_VictoryRoad2FSuperNerd2AfterBattleText:: text "I can beat you" line "when it comes to" cont "knowledge about" cont "#MON!" done -_VictoryRoad2BattleText5:: +_VictoryRoad2FSuperNerd3BattleText:: text "Is VICTORY ROAD" line "too tough?" done -_VictoryRoad2EndBattleText5:: +_VictoryRoad2FSuperNerd3EndBattleText:: text "Well" line "done!" prompt -_VictoryRoad2AfterBattleText5:: +_VictoryRoad2FSuperNerd3AfterBattleText:: text "Many trainers give" line "up the challenge" cont "here." diff --git a/text/VictoryRoad3F.asm b/text/VictoryRoad3F.asm index 07e0be70..95cdeb3f 100644 --- a/text/VictoryRoad3F.asm +++ b/text/VictoryRoad3F.asm @@ -1,62 +1,62 @@ -_VictoryRoad3BattleText2:: +_VictoryRoad3FCooltrainerM1BattleText:: text "I heard rumors of" line "a child prodigy!" done -_VictoryRoad3EndBattleText2:: +_VictoryRoad3FCooltrainerM1EndBattleText:: text "The" line "rumors were true!" prompt -_VictoryRoad3AfterBattleText2:: +_VictoryRoad3FCooltrainerM1AfterBattleText:: text "You beat GIOVANNI" line "of TEAM ROCKET?" done -_VictoryRoad3BattleText3:: +_VictoryRoad3FCooltrainerF1BattleText:: text "I'll show you just" line "how good you are!" done -_VictoryRoad3EndBattleText3:: +_VictoryRoad3FCooltrainerF1EndBattleText:: text "I'm" line "furious!" prompt -_VictoryRoad3AfterBattleText3:: +_VictoryRoad3FCooltrainerF1AfterBattleText:: text "You showed me just" line "how good I was!" done -_VictoryRoad3BattleText4:: +_VictoryRoad3FCooltrainerM2BattleText:: text "Only the chosen" line "can pass here!" done -_VictoryRoad3EndBattleText4:: +_VictoryRoad3FCooltrainerM2EndBattleText:: text "I" line "don't believe it!" prompt -_VictoryRoad3AfterBattleText4:: +_VictoryRoad3FCooltrainerM2AfterBattleText:: text "All trainers here" line "are headed to the" cont "#MON LEAGUE!" cont "Be careful!" done -_VictoryRoad3BattleText5:: +_VictoryRoad3FCooltrainerF2BattleText:: text "Trainers live to" line "seek stronger" cont "opponents!" done -_VictoryRoad3EndBattleText5:: +_VictoryRoad3FCooltrainerF2EndBattleText:: text "Oh!" line "So strong!" prompt -_VictoryRoad3AfterBattleText5:: +_VictoryRoad3FCooltrainerF2AfterBattleText:: text "By fighting tough" line "battles, you get" cont "stronger!" diff --git a/text/ViridianCity.asm b/text/ViridianCity.asm index 2ffee596..bea8b334 100644 --- a/text/ViridianCity.asm +++ b/text/ViridianCity.asm @@ -1,10 +1,10 @@ -_ViridianCityText_19219:: +_ViridianCityOldManYouNeedToWeakenTheTargetText:: text "First, you need" line "to weaken the" cont "target #MON." done -_ViridianCityText_1920a:: +_ViridianCityOldManHadMyCoffeeNowText:: text "Ahh, I've had my" line "coffee now and I" cont "feel great!" @@ -23,7 +23,7 @@ _ViridianCityText_1920a:: cont "as my apology." done -_OldManTextAfterBattle:: +_ViridianCityOldManLosingMyTouchText:: text "That didn't work!" line "I must be losing" cont "my touch." @@ -35,7 +35,7 @@ _OldManTextAfterBattle:: line "at #MON MART." done -_ViridianCityText1:: +_ViridianCityYoungster1Text:: text "Those # BALLs" line "at your waist!" cont "You have #MON!" @@ -46,7 +46,7 @@ _ViridianCityText1:: cont "time, anywhere!" done -_ViridianCityText_19122:: +_ViridianCityGambler1GymAlwaysClosedText:: text "This #MON GYM" line "is always closed." @@ -54,23 +54,23 @@ _ViridianCityText_19122:: line "LEADER is?" done -_ViridianCityText_19127:: +_ViridianCityGambler1GymLeaderReturnedText:: text "VIRIDIAN GYM's" line "LEADER returned!" done -_ViridianCityText_1914d:: +_ViridianCityYoungster2YouWantToKnowAboutText:: text "You want to know" line "about the 2 kinds" cont "of caterpillar" cont "#MON?" done -_ViridianCityText_19152:: +ViridianCityYoungster2OkThenText:: text "Oh, OK then!" done -_ViridianCityText_19157:: +ViridianCityYoungster2CaterpieAndWeedleDescriptionText:: text "CATERPIE has no" line "poison, but" cont "WEEDLE does." @@ -79,14 +79,14 @@ _ViridianCityText_19157:: line "POISON STING!" done -_ViridianCityText_19175:: +_ViridianCityGirlHasntHadHisCoffeeYetText:: text "Oh Grandpa! Don't" line "be so mean!" cont "He hasn't had his" cont "coffee yet." done -_ViridianCityText_1917a:: +_ViridianCityGirlWhenIGoShopText:: text "When I go shop in" line "PEWTER CITY, I" cont "have to take the" @@ -94,7 +94,7 @@ _ViridianCityText_1917a:: cont "VIRIDIAN FOREST." done -_ViridianCityText_19191:: +_ViridianCityOldManSleepyPrivatePropertyText:: text "You can't go" line "through here!" @@ -102,7 +102,7 @@ _ViridianCityText_19191:: line "property!" done -_ViridianCityText_191ca:: +ViridianCityFisherYouCanHaveThisText:: text "Yawn!" line "I must have dozed" cont "off in the sun." @@ -119,46 +119,46 @@ _ViridianCityText_191ca:: cont "have this TM." prompt -_ReceivedTM42Text:: +_ViridianCityFisherReceivedTM42Text:: text "<PLAYER> received" line "TM42!@" text_end -_TM42Explanation:: +_ViridianCityFisherTM42ExplanationText:: text "TM42 contains" line "DREAM EATER..." cont "...Snore..." done -_TM42NoRoomText:: +_ViridianCityFisherTM42NoRoomText:: text "You have too much" line "stuff already." done -_OldManAgainText1:: +_ViridianCityOldManWantMeToShowYouAgainText:: text "Hmm? You want me" line "to show you how" cont "to catch #MON" cont "again?" done -_OldManAgainText2:: +_ViridianCityOldManWatchCloselyText:: text "Dandy! Watch what" line "I do closely now!" done -_OldManAgainText3:: +_ViridianCityOldManNotGoodEnoughForYouText:: text "Oh... I'm not good" line "enough for you." done -_ViridianCityText8:: +_ViridianCitySignText:: text "VIRIDIAN CITY " line "The Eternally" cont "Green Paradise" done -_ViridianCityText9:: +_ViridianCityTrainerTips1Text:: text "TRAINER TIPS" para "Catch #MON" @@ -170,7 +170,7 @@ _ViridianCityText9:: cont "to fight!" done -_ViridianCityText10:: +_ViridianCityTrainerTips2Text:: text "TRAINER TIPS" para "The battle moves" @@ -184,12 +184,12 @@ _ViridianCityText10:: cont "#MON CENTER!" done -_ViridianCityText13:: +_ViridianCityGymSignText:: text "VIRIDIAN CITY" line "#MON GYM" done -_ViridianCityText14:: +_ViridianCityGymLockedText:: text "The GYM's doors" line "are locked..." done diff --git a/text/ViridianForest.asm b/text/ViridianForest.asm index f88a484c..2f4c147c 100644 --- a/text/ViridianForest.asm +++ b/text/ViridianForest.asm @@ -1,4 +1,4 @@ -_ViridianForestText1:: +_ViridianForestYoungster1Text:: text "I came here with" line "some friends!" @@ -6,53 +6,53 @@ _ViridianForestText1:: line "#MON fights!" done -_ViridianForestBattleText1:: +_ViridianForestYoungster2BattleText:: text "Hey! You have" line "#MON! Come on!" cont "Let's battle 'em!" done -_ViridianForestEndBattleText1:: +_ViridianForestYoungster2EndBattleText:: text "No!" line "CATERPIE can't" cont "cut it!" prompt -_ViridianFrstAfterBattleText1:: +_ViridianForestYoungster2AfterBattleText:: text "Ssh! You'll scare" line "the bugs away!" done -_ViridianForestBattleText2:: +_ViridianForestYoungster3BattleText:: text "Yo! You can't jam" line "out if you're a" cont "#MON trainer!" done -_ViridianForestEndBattleText2:: +_ViridianForestYoungster3EndBattleText:: text "Huh?" line "I ran out of" cont "#MON!" prompt -_ViridianFrstAfterBattleText2:: +_ViridianForestYoungster3AfterBattleText:: text "Darn! I'm going" line "to catch some" cont "stronger ones!" done -_ViridianForestBattleText3:: +_ViridianForestYoungster4BattleText:: text "Hey, wait up!" line "What's the hurry?" done -_ViridianForestEndBattleText3:: +_ViridianForestYoungster4EndBattleText:: text "I" line "give! You're good" cont "at this!" prompt -_ViridianFrstAfterBattleText3:: +_ViridianForestYoungster4AfterBattleText:: text "Sometimes, you" line "can find stuff on" cont "the ground!" @@ -62,41 +62,41 @@ _ViridianFrstAfterBattleText3:: cont "dropped!" done -_ViridianForestBattleTextPikaGirl:: +_ViridianForestCooltrainerFBattleText:: text "Hi, do you have a" line "PIKACHU?" done -_ViridianForestEndBattleTextPikaGirl:: +_ViridianForestCooltrainerFEndBattleText:: text "Oh no," line "really?" prompt -_ViridianForestAfterBattleTextPikaGirl:: +_ViridianForestCooltrainerFAfterBattleText:: text "I looked forever," line "but I never found" cont "a PIKACHU here!" done -_ViridianForestBattleTextSamurai:: +_ViridianForestYoungster5BattleText:: text "I'm gonna be the" line "best. You just" cont "can't beat me!" done -_ViridianForestEndBattleTextSamurai:: +_ViridianForestYoungster5EndBattleText:: text "After" line "all I did..." prompt -_ViridianForestAfterBattleTextSamurai:: +_ViridianForestYoungster5AfterBattleText:: text "A METAPOD is cool" line "because its" cont "attack is its" cont "defense!" done -_ViridianForestText8:: +_ViridianForestYoungster6Text:: text "I ran out of #" line "BALLs to catch" cont "#MON with!" @@ -105,7 +105,7 @@ _ViridianForestText8:: line "extras!" done -_ViridianForestText9:: +_ViridianForestTrainerTips1Text:: text "TRAINER TIPS" para "If you want to" @@ -114,13 +114,13 @@ _ViridianForestText9:: cont "grassy areas!" done -_ViridianForestText10:: +_ViridianForestUseAntidoteSignText:: text "For poison, use" line "ANTIDOTE! Get it" cont "at #MON MARTs!" done -_ViridianForestText11:: +_ViridianForestTrainerTips2Text:: text "TRAINER TIPS" para "Contact PROF.OAK" @@ -129,7 +129,7 @@ _ViridianForestText11:: cont "evaluated!" done -_ViridianForestText12:: +_ViridianForestTrainerTips3Text:: text "TRAINER TIPS" para "No stealing of" @@ -139,7 +139,7 @@ _ViridianForestText12:: cont "#MON!" done -_ViridianForestText13:: +_ViridianForestTrainerTips4Text:: text "TRAINER TIPS" para "Weaken #MON" @@ -150,7 +150,7 @@ _ViridianForestText13:: line "they may escape!" done -_ViridianForestText14:: +_ViridianForestLeavingSignText:: text "LEAVING" line "VIRIDIAN FOREST" cont "PEWTER CITY AHEAD" diff --git a/text/ViridianForestNorthGate.asm b/text/ViridianForestNorthGate.asm index ab6a5a1d..2939caa2 100644 --- a/text/ViridianForestNorthGate.asm +++ b/text/ViridianForestNorthGate.asm @@ -1,4 +1,4 @@ -_ViridianForestExitText1:: +_ViridianForestNorthGateSuperNerdText:: text "Many #MON live" line "only in forests " cont "and caves." @@ -8,7 +8,7 @@ _ViridianForestExitText1:: cont "different kinds!" done -_ViridianForestExitText2:: +_ViridianForestNorthGateGrampsText:: text "Have you noticed" line "the bushes on the" cont "roadside?" diff --git a/text/ViridianForestSouthGate.asm b/text/ViridianForestSouthGate.asm index a5278742..4e9ea4e7 100644 --- a/text/ViridianForestSouthGate.asm +++ b/text/ViridianForestSouthGate.asm @@ -1,11 +1,11 @@ -_ViridianForestEntranceText1:: +_ViridianForestSouthGateGirlText:: text "Are you going to" line "VIRIDIAN FOREST?" cont "Be careful, it's" cont "a natural maze!" done -_ViridianForestEntranceText2:: +_ViridianForestSouthGateLittleGirlText:: text "You have to roam" line "far to get new" cont "kinds of #MON." diff --git a/text/ViridianGym.asm b/text/ViridianGym.asm index 95fe63b3..2c1463b9 100644 --- a/text/ViridianGym.asm +++ b/text/ViridianGym.asm @@ -1,4 +1,4 @@ -_GiovanniPreBattleText:: +_ViridianGymGiovanniPreBattleText:: text "Fwahahaha! This is" line "my hideout!" @@ -18,7 +18,7 @@ _GiovanniPreBattleText:: cont "greatest trainer!" done -_ReceivedEarthBadgeText:: +_ViridianGymGiovanniReceivedEarthBadgeText:: text "Ha!" line "That was a truly" cont "intense fight!" @@ -27,7 +27,7 @@ _ReceivedEarthBadgeText:: cont "the EARTHBADGE!@" text_end -_GiovanniPostBattleAdviceText:: +_ViridianGymGiovanniPostBattleAdviceText:: text "Having lost, I" line "cannot face my" cont "underlings!" @@ -43,7 +43,7 @@ _GiovanniPostBattleAdviceText:: cont "Farewell!@" text_end -_GiovanniEarthBadgeInfoText:: +_ViridianGymGiovanniEarthBadgeInfoText:: text "The EARTHBADGE" line "makes #MON of" cont "any level obey!" @@ -61,12 +61,12 @@ _GiovanniEarthBadgeInfoText:: cont "LEAGUE challenge!" done -_ReceivedTM27Text:: +_ViridianGymGiovanniReceivedTM27Text:: text "<PLAYER> received" line "TM27!@" text_end -_TM27ExplanationText:: +_ViridianGymGiovanniTM27ExplanationText:: text_start para "TM27 is FISSURE!" @@ -79,136 +79,136 @@ _TM27ExplanationText:: cont "too long ago..." done -_TM27NoRoomText:: +_ViridianGymGiovanniTM27NoRoomText:: text "You do not have" line "space for this!" done -_ViridianGymBattleText1:: +_ViridianGymCooltrainerM1BattleText:: text "Heh! You must be" line "running out of" cont "steam by now!" done -_ViridianGymEndBattleText1:: +_ViridianGymCooltrainerM1EndBattleText:: text "I" line "ran out of gas!" prompt -_ViridianGymAfterBattleText1:: +_ViridianGymCooltrainerM1AfterBattleText:: text "You need power to" line "keep up with our" cont "GYM LEADER!" done -_ViridianGymBattleText2:: +_ViridianGymHiker1BattleText:: text "Rrrroar! I'm" line "working myself" cont "into a rage!" done -_ViridianGymEndBattleText2:: +_ViridianGymHiker1EndBattleText:: text "Wargh!" prompt -_ViridianGymAfterBattleText2:: +_ViridianGymHiker1AfterBattleText:: text "I'm still not" line "worthy!" done -_ViridianGymBattleText3:: +_ViridianGymRocker1BattleText:: text "#MON and I, we" line "make wonderful" cont "music together!" done -_ViridianGymEndBattleText3:: +_ViridianGymRocker1EndBattleText:: text "You are in" line "perfect harmony!" prompt -_ViridianGymAfterBattleText3:: +_ViridianGymRocker1AfterBattleText:: text "Do you know the" line "identity of our" cont "GYM LEADER?" done -_ViridianGymBattleText4:: +_ViridianGymHiker2BattleText:: text "Karate is the" line "ultimate form of" cont "martial arts!" done -_ViridianGymEndBattleText4:: +_ViridianGymHiker2EndBattleText:: text "Atcho!" prompt -_ViridianGymAfterBattleText4:: +_ViridianGymHiker2AfterBattleText:: text "If my #MON" line "were as good at" cont "Karate as I..." done -_ViridianGymBattleText5:: +_ViridianGymCooltrainerM2BattleText:: text "The truly talented" line "win with style!" done -_ViridianGymEndBattleText5:: +_ViridianGymCooltrainerM2EndBattleText:: text "I" line "lost my grip!" prompt -_ViridianGymAfterBattleText5:: +_ViridianGymCooltrainerM2AfterBattleText:: text "The LEADER will" line "scold me!" done -_ViridianGymBattleText6:: +_ViridianGymHiker3BattleText:: text "I'm the KARATE" line "KING! Your fate" cont "rests with me!" done -_ViridianGymEndBattleText6:: +_ViridianGymHiker3EndBattleText:: text "Ayah!" prompt -_ViridianGymAfterBattleText6:: +_ViridianGymHiker3AfterBattleText:: text "#MON LEAGUE?" line "You? Don't get" cont "cocky!" done -_ViridianGymBattleText7:: +_ViridianGymRocker2BattleText:: text "Your #MON will" line "cower at the" cont "crack of my whip!" done -_ViridianGymEndBattleText7:: +_ViridianGymRocker2EndBattleText:: text "Yowch!" line "Whiplash!" prompt -_ViridianGymAfterBattleText7:: +_ViridianGymRocker2AfterBattleText:: text "Wait! I was just" line "careless!" done -_ViridianGymBattleText8:: +_ViridianGymCooltrainerM3BattleText:: text "VIRIDIAN GYM was" line "closed for a long" cont "time, but now our" cont "LEADER is back!" done -_ViridianGymEndBattleText8:: +_ViridianGymCooltrainerM3EndBattleText:: text "I" line "was beaten?" prompt -_ViridianGymAfterBattleText8:: +_ViridianGymCooltrainerM3AfterBattleText:: text "You can go on to" line "#MON LEAGUE" cont "only by defeating" diff --git a/text/ViridianMart.asm b/text/ViridianMart.asm index 0152ea4c..7c8b0697 100644 --- a/text/ViridianMart.asm +++ b/text/ViridianMart.asm @@ -1,14 +1,14 @@ -_ViridianMartText1:: +_ViridianMartClerkSayHiToOakText:: text "Okay! Say hi to" line "PROF.OAK for me!" done -_ViridianMartText4:: +_ViridianMartClerkYouCameFromPalletTownText:: text "Hey! You came from" line "PALLET TOWN?" done -ViridianMartParcelQuestText:: +_ViridianMartClerkParcelQuestText:: text "You know PROF." line "OAK, right?" @@ -20,13 +20,13 @@ ViridianMartParcelQuestText:: line "OAK's PARCEL!@" text_end -_ViridianMartText2:: +_ViridianMartYoungsterText:: text "This shop sells a" line "lot of PARLYZ" cont "HEALs." done -_ViridianMartText3:: +_ViridianMartCooltrainerMText:: text "The shop finally" line "has some POTIONs" cont "in stock." diff --git a/text/ViridianNicknameHouse.asm b/text/ViridianNicknameHouse.asm index 757f597a..987ecb3a 100644 --- a/text/ViridianNicknameHouse.asm +++ b/text/ViridianNicknameHouse.asm @@ -1,4 +1,4 @@ -_ViridianHouseText1:: +_ViridianNicknameHouseBaldingGuyText:: text "Coming up with" line "nicknames is fun," cont "but hard." @@ -8,16 +8,16 @@ _ViridianHouseText1:: cont "remember." done -_ViridianHouseText2:: +_ViridianNicknameHouseLittleGirlText:: text "My Daddy loves" line "#MON too." done -_ViridianHouseText_1d5b1:: +_ViridianNicknameHouseSpearowText:: text "SPEARY: Tetweet!" done -_ViridianHouseText4:: +_ViridianNicknameHouseSpearySignText:: text "SPEAROW" line "Name: SPEARY" done diff --git a/text/ViridianPokecenter.asm b/text/ViridianPokecenter.asm index 4ac18bf6..b9e2a432 100644 --- a/text/ViridianPokecenter.asm +++ b/text/ViridianPokecenter.asm @@ -1,4 +1,4 @@ -_ViridianPokeCenterText2:: +_ViridianPokecenterGentlemanText:: text "You can use that" line "PC in the corner." @@ -6,7 +6,7 @@ _ViridianPokeCenterText2:: line "told me. So kind!" done -_ViridianPokeCenterText3:: +_ViridianPokecenterCooltrainerMText:: text "There's a #MON" line "CENTER in every" cont "town ahead." diff --git a/text/ViridianSchoolHouse.asm b/text/ViridianSchoolHouse.asm index 3c5f6379..ab28c8d4 100644 --- a/text/ViridianSchoolHouse.asm +++ b/text/ViridianSchoolHouse.asm @@ -1,17 +1,17 @@ -_SchoolText1:: +_ViridianSchoolHouseBrunetteGirlText:: text "Whew! I'm trying" line "to memorize all" cont "my notes." done -_SchoolText3:: +_ViridianSchoolHouseLittleGirlText:: text "Sis says #MON" line "will become tame" cont "if you treat them" cont "nicely." done -_SchoolText2:: +_ViridianSchoolHouseCooltrainerFText:: text "Okay!" para "Be sure to read" diff --git a/text/WardensHouse.asm b/text/WardensHouse.asm index 16ac6835..97689901 100644 --- a/text/WardensHouse.asm +++ b/text/WardensHouse.asm @@ -1,4 +1,4 @@ -_WardenGibberishText1:: +_WardensHouseWardenGibberish1Text:: text "WARDEN: Hif fuff" line "hefifoo!" @@ -7,30 +7,30 @@ _WardenGibberishText1:: cont "hee fwee!" done -_WardenGibberishText2:: +_WardensHouseWardenGibberish2Text:: text "Ah howhee ho hoo!" line "Eef ee hafahi ho!" done -_WardenGibberishText3:: +_WardensHouseWardenGibberish3Text:: text "Ha? He ohay heh" line "ha hoo ee haheh!" done -_WardenTeethText1:: +_WardensHouseWardenGaveTheGoldTeethText:: text "<PLAYER> gave the" line "GOLD TEETH to the" cont "WARDEN!@" text_end -_WardenTeethText2:: +_WardensHouseWardenTeethPoppedInHisTeethText:: text_start para "The WARDEN popped" line "in his teeth!" prompt -_WardenThankYouText:: +_WardensHouseWardenThanksText:: text "WARDEN: Thanks," line "kid! No one could" cont "understand a word" @@ -43,14 +43,14 @@ _WardenThankYouText:: cont "your trouble." prompt -_ReceivedHM04Text:: +_WardensHouseWardenReceivedHM04Text:: text "<PLAYER> received" line "@" text_ram wStringBuffer text "!@" text_end -_HM04ExplanationText:: +_WardensHouseWardenHM04ExplanationText:: text "WARDEN: HM04" line "teaches STRENGTH!" @@ -70,17 +70,17 @@ _HM04ExplanationText:: line "rare SURF HM." done -_HM04NoRoomText:: +_WardensHouseWardenHM04NoRoomText:: text "Your pack is" line "stuffed full!" done -_FuchsiaHouse2Text_75176:: +_WardensHouseDisplayPhotosAndFossilsText:: text "#MON photos" line "and fossils." done -_FuchsiaHouse2Text_7517b:: +_WardensHouseDisplayMerchandiseText:: text "Old #MON" line "merchandise." done |