diff options
Diffstat (limited to 'maps')
66 files changed, 184 insertions, 255 deletions
diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index bdd5e1281..26d6f0a4c 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -36,8 +36,7 @@ AzaleaPokecenter1FGentlemanText: line "fainted." done -AzaleaPokecenter1FUnusedText: -; unreferenced +AzaleaPokecenter1FUnusedText: ; unreferenced text "This BILL guy" line "created the system" diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 7e771e86a..85a42b83d 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -143,8 +143,7 @@ AzaleaTownSlowpokeScript: closetext end -UnusedWoosterScript: -; unused +UnusedWoosterScript: ; unreferenced faceplayer opentext writetext WoosterText diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 014c51cc1..c0396a481 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -364,7 +364,7 @@ Text_RightThisWayToYourBattleRoom: line "your BATTLE ROOM." done -Text_BattleTowerIntroduction_1: +Text_BattleTowerIntroduction_1: ; unreferenced text "BATTLE TOWER is a" line "facility made for" cont "#MON battles." @@ -473,7 +473,7 @@ Text_PleaseConfirmOnThisMonitor: line "this monitor." done -Text_ThankYou: +Text_ThankYou: ; unreferenced text "Thank you!" para "" @@ -484,7 +484,7 @@ Text_ThanksForVisiting: line "visiting!" done -Text_BeatenAllTheTrainers_Mobile: +Text_BeatenAllTheTrainers_Mobile: ; unreferenced text "Congratulations!" para "You've beaten all" @@ -514,7 +514,7 @@ Text_CongratulationsYouveBeatenAllTheTrainers: para "" done -Text_AskRegisterRecord_Mobile: +Text_AskRegisterRecord_Mobile: ; unreferenced text "Would you like to" line "register your" @@ -539,7 +539,7 @@ Text_YourPackIsStuffedFull: line "and come back." done -Text_YourRegistrationIsComplete: +Text_YourRegistrationIsComplete: ; unreferenced text "Your registration" line "is complete." @@ -582,7 +582,7 @@ Text_CantBeRegistered_PreviousRecordDeleted: cont "deleted. OK?" done -Text_CheckTheLeaderHonorRoll: +Text_CheckTheLeaderHonorRoll: ; unreferenced text "Check the LEADER" line "HONOR ROLL?" done @@ -639,7 +639,7 @@ Text_NextUpOpponentNo: text ". Ready?" done -Text_SaveBeforeConnecting_Mobile: +Text_SaveBeforeConnecting_Mobile: ; unreferenced text "Your session will" line "be SAVED before" @@ -673,7 +673,7 @@ Text_CancelYourBattleRoomChallenge: line "ROOM challenge?" done -Text_RegisterRecordOnFile_Mobile: +Text_RegisterRecordOnFile_Mobile: ; unreferenced text "We have your" line "previous record on" @@ -714,8 +714,8 @@ Text_TooMuchTimeElapsedNoRegister: cont "challenge." done -; a dupe? -Text_RegisterRecordTimedOut_Mobile: +Text_RegisterRecordTimedOut_Mobile: ; unreferenced +; duplicate of Text_TooMuchTimeElapsedNoRegister text "Sorry, but it's" line "not possible to" diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index a62182716..63816a724 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -131,7 +131,7 @@ Script_ChallengeCanceled: ; unreferenced closetext end -Text_ReturnedAfterSave_Mobile: +Text_ReturnedAfterSave_Mobile: ; unreferenced text "You'll be returned" line "after you SAVE." done diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index e38ab7c61..b7d70cd5f 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -30,8 +30,7 @@ BattleTowerOutsideSailorScript: BattleTowerOutsideSign: jumptext BattleTowerOutsideSignText -BattleTowerOutsideYoungsterText_NotYetOpen: -; unreferenced +BattleTowerOutsideYoungsterText_NotYetOpen: ; unreferenced text "Wow, the BATTLE" line "TOWER is huge! My" @@ -39,8 +38,7 @@ BattleTowerOutsideYoungsterText_NotYetOpen: line "looking up at it." done -BattleTowerOutsideYoungsterText_Mobile: -; unreferenced +BattleTowerOutsideYoungsterText_Mobile: ; unreferenced text "Wow, the BATTLE" line "TOWER is huge!" @@ -63,8 +61,7 @@ BattleTowerOutsideYoungsterText: cont "in there!" done -BattleTowerOutsideBeautyText_NotYetOpen: -; unreferenced +BattleTowerOutsideBeautyText_NotYetOpen: ; unreferenced text "What on earth do" line "they do here?" @@ -86,8 +83,7 @@ BattleTowerOutsideBeautyText: line "battle…" done -BattleTowerOutsideSailorText_Mobile: -; unreferenced +BattleTowerOutsideSailorText_Mobile: ; unreferenced text "Ehehehe…" line "I sneaked out of" cont "work to come here." @@ -108,8 +104,8 @@ BattleTowerOutsideSailorText: line "all. That I must!" done -BattleTowerOutsideSignText_NotYetOpen: -; unused; originally shown when the Battle Tower was closed +BattleTowerOutsideSignText_NotYetOpen: ; unreferenced +; originally shown when the Battle Tower was closed text "BATTLE TOWER" done @@ -120,14 +116,14 @@ BattleTowerOutsideSignText: line "Trainer Challenge!" done -BattleTowerOutsideText_DoorsClosed: -; unused; originally shown when the Battle Tower was closed +BattleTowerOutsideText_DoorsClosed: ; unreferenced +; originally shown when the Battle Tower was closed text "The BATTLE TOWER's" line "doors are closed…" done -BattleTowerOutsideText_DoorsOpen: -; unused; originally shown after the Battle Tower opened +BattleTowerOutsideText_DoorsOpen: ; unreferenced +; originally shown after the Battle Tower opened text "It's open!" done diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 9c1ed0e0a..8d33c0e51 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -18,12 +18,10 @@ BlackthornDragonSpeechHouseDratiniScript: closetext end -; unused -BlackthornDragonSpeechHousePictureBookshelf: +BlackthornDragonSpeechHousePictureBookshelf: ; unreferenced jumpstd PictureBookshelfScript -; unused -BlackthornDragonSpeechHouseMagazineBookshelf: +BlackthornDragonSpeechHouseMagazineBookshelf: ; unreferenced jumpstd MagazineBookshelfScript BlackthornDragonSpeechHouseGrannyText: diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 6f5535bba..c4b14df2c 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -155,8 +155,7 @@ BurnedTowerSuicuneMovement2: remove_sliding step_end -BurnedTowerUnusedMovement: -; unreferenced +BurnedTowerUnusedMovement: ; unreferenced set_sliding big_step DOWN remove_sliding diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index d2c34878e..9c5a83f31 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -164,8 +164,7 @@ CeladonCityTeacher2Text: line "a sales clerk." done -CeladonCityLassText_Mobile: -; unused +CeladonCityLassText_Mobile: ; unreferenced text "I love being" line "surrounded by tall" cont "buildings!" diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 27948375b..c37c4e6c8 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -98,8 +98,7 @@ CeladonDeptStore6FVendingMachine: CeladonDeptStore6FDirectory: jumptext CeladonDeptStore6FDirectoryText -; unused -CeladonDeptStore6FElevatorButton: +CeladonDeptStore6FElevatorButton: ; unreferenced jumpstd ElevatorButtonScript CeladonVendingText: diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index e006506bd..37686168c 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -141,8 +141,7 @@ CeladonGameCornerSodaCanScript: closetext end -CeladonGameCornerUnusedMovementData: -; unreferenced +CeladonGameCornerUnusedMovementData: ; unreferenced step RIGHT turn_head LEFT step_end diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 6012e1a75..8c818267e 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -57,8 +57,7 @@ GameFreakGraphicArtistScript: closetext end -.CancelPrinting: -; unused +.CancelPrinting: ; unreferenced writetext GameFreakGraphicArtistErrorText waitbutton closetext diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index bbdb46452..e9c40e77b 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -317,7 +317,7 @@ CherrygroveCity_RivalPushesYouOutOfTheWay: turn_head UP step_end -CherrygroveCity_UnusedMovementData: +CherrygroveCity_UnusedMovementData: ; unreferenced step LEFT turn_head DOWN step_end diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index d6d909af6..30c1d3939 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -118,8 +118,7 @@ CianwoodCityPokefanM: CianwoodCityLass: jumptextfaceplayer CianwoodCityLassText -CianwoodCityUnusedScript: -; unreferenced +CianwoodCityUnusedScript: ; unreferenced jumptextfaceplayer CianwoodCityUnusedText CianwoodCitySign: @@ -266,7 +265,6 @@ CianwoodCityLassText: done CianwoodCityUnusedText: -; unused text "There are several" line "islands between" cont "here and OLIVINE." diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index afe5c6c69..3559c2051 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -89,8 +89,7 @@ CianwoodGymGuideWinText: cont "looking at you!" done -CianwoodPokecenter1FUnusedText1: -; unreferenced +CianwoodPokecenter1FUnusedText1: ; unreferenced text "Don't you get the" line "urge to show off" @@ -104,8 +103,7 @@ CianwoodPokecenter1FUnusedText1: line "in VIOLET." done -CianwoodPokecenter1FUnusedText2: -; unreferenced +CianwoodPokecenter1FUnusedText2: ; unreferenced text "I've been battling" line "my pal in VIOLET" diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 45c2e37e8..ca7685046 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -78,7 +78,7 @@ Text_GrampsLookingForYou: line "for you." done -Text_DayCareManTalksAboutEggTicket: +Text_DayCareManTalksAboutEggTicket: ; unreferenced text "I'm the DAY-CARE" line "MAN." @@ -125,7 +125,7 @@ DayCareManText_GiveOddEgg: line "yours to keep!" done -DayCareText_ComeAgain: +DayCareText_ComeAgain: ; unreferenced text "Come again." done diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 5daa2bc13..1a228a988 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -56,7 +56,7 @@ DragonsDenB1F_ClairScene: giveitem TM_DRAGONBREATH iffalse .BagFull getitemname STRING_BUFFER_3, TM_DRAGONBREATH - writetext NotifyReceiveDragonbreath + writetext Text_ReceivedTM24 playsound SFX_ITEM waitsfx itemnotify @@ -214,7 +214,7 @@ ClairText_GiveDragonbreathDragonDen: line "my apology." done -NotifyReceiveDragonbreath: +Text_ReceivedTM24: text "<PLAYER> received" line "TM24." done diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index ab5da0057..07decf533 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -138,8 +138,7 @@ AcademyNotebook: closetext end -AcademyStickerMachine: -; unused +AcademyStickerMachine: ; unreferenced jumptext AcademyStickerMachineText AcademyBookshelf: @@ -271,8 +270,7 @@ AcademyBlackboardText: line "battle." done -AcademyBlackboardText2: -; unused +AcademyBlackboardText2: ; unreferenced text "Read which topic?" done diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index fec6d0bc3..6964768b6 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -88,8 +88,7 @@ EcruteakCityMartSign: EcruteakCityHiddenHyperPotion: hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION -UnusedMissingDaughterText: -; unused +UnusedMissingDaughterText: ; unreferenced text "Oh, no. Oh, no…" para "My daughter is" diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 1b2502435..f68c5935a 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -43,15 +43,13 @@ ElmsSonText: cont "professor!" done -ElmsHouseLabFoodText: -; unused +ElmsHouseLabFoodText: ; unreferenced text "There's some food" line "here. It must be" cont "for the LAB." done -ElmsHousePokemonFoodText: -; unused +ElmsHousePokemonFoodText: ; unreferenced text "There's some food" line "here. This must be" cont "for #MON." diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 48dfb226c..72978277f 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -601,8 +601,7 @@ ElmsLabTrashcan: ElmsLabPC: jumptext ElmsLabPCText -ElmsLabTrashcan2: -; unused +ElmsLabTrashcan2: ; unreferenced jumpstd TrashCanScript ElmsLabBookshelf: @@ -1209,7 +1208,7 @@ ElmGiveTicketText2: line "PROF.OAK in KANTO!" done -ElmsLabSignpostText_Egg: +ElmsLabMonEggText: ; unreferenced text "It's the #MON" line "EGG being studied" cont "by PROF.ELM." diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 14121e027..d788589d2 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -39,8 +39,7 @@ GoldenrodBikeShopClerkScript: closetext end -GoldenrodBikeShopJustReleasedCompactBike: -; unused +GoldenrodBikeShopJustReleasedCompactBike: ; unreferenced jumptext GoldenrodBikeShopJustReleasedCompactBikeText GoldenrodBikeShopBicycle: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 70f2d9ecc..42487b29c 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -476,8 +476,7 @@ GoldenrodCityUndergroundSignSouthText: line "ENTRANCE" done -GoldenrodCityPokeComCenterSignText: -; unused +GoldenrodCityPokeComCenterSignText: ; unreferenced text "For Mobile Tips!" line "#COM CENTER" done diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index facb495b1..7761ec961 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -39,8 +39,7 @@ GoldenrodDeptStore2FDirectory: GoldenrodDeptStore2FElevatorButton: jumpstd ElevatorButtonScript -GoldenrodDeptStore2FUnusedText1: -; unused +GoldenrodDeptStore2FUnusedText1: ; unreferenced text "We intend to sell" line "items for #MON" cont "to hold." @@ -50,8 +49,7 @@ GoldenrodDeptStore2FUnusedText1: cont "MON hold it." done -GoldenrodDeptStore2FUnusedText2: -; unused +GoldenrodDeptStore2FUnusedText2: ; unreferenced text "By giving #MON" line "items to hold, I" diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 0c915e52f..5195107f5 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -73,16 +73,13 @@ FlowerShopFloriaScript: closetext end -FlowerShopShelf1: -; unused +FlowerShopShelf1: ; unreferenced jumpstd PictureBookshelfScript -FlowerShopShelf2: -; unused +FlowerShopShelf2: ; unreferenced jumpstd MagazineBookshelfScript -FlowerShopRadio: -; unused +FlowerShopRadio: ; unreferenced jumpstd Radio2Script GoldenrodFlowerShopTeacherMySisterWentToSeeWigglyTreeRoute36Text: diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 8547606b4..0acaa7959 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -149,8 +149,7 @@ GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromRightDoorwayTileMovement: step DOWN step_end -; unused -UnknownText_0x61072: +UnknownText_0x61072: ; unreferenced text "Hello! Welcome to" line "#COM CENTER" cont "TRADE CORNER." @@ -160,7 +159,7 @@ UnknownText_0x61072: cont "people far away." done -UnknownText_0x610ce: +UnknownText_0x610ce: ; unreferenced text "To make a trade," line "we must hold your" cont "#MON." @@ -169,13 +168,13 @@ UnknownText_0x610ce: line "trade?" done -UnknownText_0x61111: +UnknownText_0x61111: ; unreferenced text "What kind of" line "#MON do you" cont "want in return?" done -UnknownText_0x6113b: +UnknownText_0x6113b: ; unreferenced text "Fine. We will try" line "to trade your" @@ -195,7 +194,7 @@ UnknownText_0x6113b: cont "room for it." done -UnknownText_0x611c9: +UnknownText_0x611c9: ; unreferenced text "Fine. We will try" line "to trade your" @@ -214,7 +213,7 @@ UnknownText_0x611c9: cont "room for it." done -UnknownText_0x61271: +UnknownText_0x61271: ; unreferenced text "Your trade #MON" line "has been received." @@ -225,7 +224,7 @@ UnknownText_0x61271: line "come back later." done -UnknownText_0x612d8: +UnknownText_0x612d8: ; unreferenced text "Oh? You have only" line "one #MON in" cont "your party. " @@ -236,28 +235,28 @@ UnknownText_0x612d8: cont "of your party." done -UnknownText_0x61344: +UnknownText_0x61344: ; unreferenced text "We hope to see you" line "again." done -UnknownText_0x6135f: +UnknownText_0x6135f: ; unreferenced text "Communication" line "error…" done -UnknownText_0x61375: +UnknownText_0x61375: ; unreferenced text "If we accept that" line "#MON, what will" cont "you battle with?" done -UnknownText_0x613a9: +UnknownText_0x613a9: ; unreferenced text "Sorry. We can't" line "accept an EGG." done -UnknownText_0x613c8: +UnknownText_0x613c8: ; unreferenced text "Sorry, but your" line "#MON appears to" @@ -265,20 +264,20 @@ UnknownText_0x613c8: line "can't accept it." done -UnknownText_0x61409: +UnknownText_0x61409: ; unreferenced text "Oh? Aren't we" line "already holding a" cont "#MON of yours?" done -UnknownText_0x61438: +UnknownText_0x61438: ; unreferenced text "We'll check the" line "rooms." para "Please wait." done -UnknownText_0x6145c: +UnknownText_0x6145c: ; unreferenced text "Thank you for your" line "patience." @@ -286,7 +285,7 @@ UnknownText_0x6145c: line "has been found." done -UnknownText_0x6149a: +UnknownText_0x6149a: ; unreferenced text "It's your new" line "partner." @@ -297,7 +296,7 @@ UnknownText_0x6149a: line "again." done -UnknownText_0x614ed: +UnknownText_0x614ed: ; unreferenced text "Uh-oh. Your party" line "is already full." @@ -306,7 +305,7 @@ UnknownText_0x614ed: cont "in your party." done -UnknownText_0x61544: +UnknownText_0x61544: ; unreferenced text "It's unfortunate," line "but no one has" @@ -317,12 +316,12 @@ UnknownText_0x61544: line "your #MON back?" done -UnknownText_0x615a5: +UnknownText_0x615a5: ; unreferenced text "We have returned" line "your #MON." done -UnknownText_0x615c2: +UnknownText_0x615c2: ; unreferenced text "It's unfortunate," line "but no one has" @@ -339,18 +338,18 @@ UnknownText_0x615c2: line "return it to you." done -UnknownText_0x6166e: +UnknownText_0x6166e: ; unreferenced text "We hope to see you" line "again." done -UnknownText_0x61689: +UnknownText_0x61689: ; unreferenced text "Fine. We will" line "continue to hold" cont "your #MON." done -UnknownText_0x616b4: +UnknownText_0x616b4: ; unreferenced text "Oh? You left your" line "#MON with us" cont "only recently." @@ -359,23 +358,23 @@ UnknownText_0x616b4: line "later." done -UnknownText_0x616fb: +UnknownText_0x616fb: ; unreferenced text "We'll SAVE before" line "connecting to the" cont "CENTER." done -UnknownText_0x61727: +UnknownText_0x61727: ; unreferenced text "Which #MON do" line "you want to trade?" done -UnknownText_0x61749: +UnknownText_0x61749: ; unreferenced text "Sorry, but we must" line "cancel the trade." done -UnknownText_0x6176f: +UnknownText_0x6176f: ; unreferenced text "Oh!" para "I see you have an" @@ -388,7 +387,7 @@ UnknownText_0x6176f: line "special #MON!" done -UnknownText_0x617d2: +UnknownText_0x617d2: ; unreferenced text "Let me give you a" line "quick briefing." @@ -421,12 +420,12 @@ UnknownText_0x617d2: line "chosen room." done -UnknownText_0x6191f: +UnknownText_0x6191f: ; unreferenced text "Please wait a" line "moment." done -UnknownText_0x61936: +UnknownText_0x61936: ; unreferenced text "Thank you for" line "waiting." @@ -439,7 +438,7 @@ UnknownText_0x61936: line "with loving care." done -UnknownText_0x61996: +UnknownText_0x61996: ; unreferenced text "I'm awfully sorry." para "The EGG TICKET" @@ -447,17 +446,17 @@ UnknownText_0x61996: cont "isn't running now." done -UnknownText_0x619db: +UnknownText_0x619db: ; unreferenced text "It's a #MON" line "NEWS MACHINE." done -UnknownText_0x619f5: +UnknownText_0x619f5: ; unreferenced text "What would you" line "like to do?" done -UnknownText_0x61a11: +UnknownText_0x61a11: ; unreferenced text "#MON NEWS is" line "news compiled from" @@ -492,22 +491,22 @@ UnknownText_0x61a11: line "in the NEWS!" done -UnknownText_0x61b7c: +UnknownText_0x61b7c: ; unreferenced text "Would you like to" line "get the NEWS?" done -UnknownText_0x61b9d: +UnknownText_0x61b9d: ; unreferenced text "Reading the latest" line "NEWS… Please wait." done -UnknownText_0x61bc4: +UnknownText_0x61bc4: ; unreferenced text "There is no old" line "NEWS…" done -UnknownText_0x61bdb: +UnknownText_0x61bdb: ; unreferenced text "The NEWS data is" line "corrupted." @@ -515,7 +514,7 @@ UnknownText_0x61bdb: line "the NEWS again." done -UnknownText_0x61c18: +UnknownText_0x61c18: ; unreferenced text "We're making" line "preparations." @@ -523,7 +522,7 @@ UnknownText_0x61c18: line "later." done -UnknownText_0x61c4b: +UnknownText_0x61c4b: ; unreferenced text "We will SAVE your" line "progress before" @@ -531,7 +530,7 @@ UnknownText_0x61c4b: line "MACHINE." done -UnknownText_0x61c89: +UnknownText_0x61c89: ; unreferenced text "Whoa, this #MON" line "CENTER is huge." @@ -542,7 +541,7 @@ UnknownText_0x61c89: line "new machines too." done -UnknownText_0x61cef: +UnknownText_0x61cef: ; unreferenced text "I thought up a fun" line "new thing for the" cont "TRADE CORNER!" @@ -570,7 +569,7 @@ UnknownText_0x61cef: line "friends!" done -UnknownText_0x61dfd: +UnknownText_0x61dfd: ; unreferenced text "They said you can" line "trade #MON with" @@ -581,7 +580,7 @@ UnknownText_0x61dfd: line "adjusting things." done -UnknownText_0x61e5c: +UnknownText_0x61e5c: ; unreferenced text "Some girl I don't" line "know sent me her" @@ -592,7 +591,7 @@ UnknownText_0x61e5c: line "you want." done -UnknownText_0x61eb2: +UnknownText_0x61eb2: ; unreferenced text "I received a" line "female HOPPIP, but" cont "its named STANLEY!" @@ -601,7 +600,7 @@ UnknownText_0x61eb2: line "name!" done -UnknownText_0x61efa: +UnknownText_0x61efa: ; unreferenced text "What is the NEWS" line "MACHINE?" @@ -610,7 +609,7 @@ UnknownText_0x61efa: cont "than the radio?" done -UnknownText_0x61f48: +UnknownText_0x61f48: ; unreferenced text "The #COM CENTER" line "will link with all" @@ -624,7 +623,7 @@ UnknownText_0x61f48: line "sorts of people." done -UnknownText_0x61fc9: +UnknownText_0x61fc9: ; unreferenced text "The machines here" line "can't be used yet." @@ -635,7 +634,7 @@ UnknownText_0x61fc9: line "people." done -UnknownText_0x6202c: +UnknownText_0x6202c: ; unreferenced text "My friend was in" line "the NEWS a while" @@ -643,13 +642,13 @@ UnknownText_0x6202c: line "surprised!" done -UnknownText_0x6206d: +UnknownText_0x6206d: ; unreferenced text "I get anxious if I" line "don't check out" cont "the latest NEWS!" done -UnknownText_0x620a1: +UnknownText_0x620a1: ; unreferenced text "If I get in the" line "NEWS and become" @@ -673,7 +672,7 @@ GoldenrodPokecenter1FGameboyKidText: line "afford to lose." done -UnknownText_0x62173: +UnknownText_0x62173: ; unreferenced text "I came over here" line "when I got word" @@ -691,7 +690,7 @@ UnknownText_0x62173: line "preparations…" done -UnknownText_0x62222: +UnknownText_0x62222: ; unreferenced text "Just seeing all" line "these new things" @@ -732,7 +731,7 @@ GoldenrodPokeCenter1FLinkReceptionistPleaseDoComeAgainText: line "again!" done -UnknownText_0x62370: +UnknownText_0x62370: ; unreferenced text "#COM CENTER" line "1F INFORMATION" @@ -746,7 +745,7 @@ UnknownText_0x62370: line "#MON NEWS" done -UnknownText_0x623c7: +UnknownText_0x623c7: ; unreferenced text "It's a #MON" line "NEWS MACHINE!" diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 9a457e068..d15b52390 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -58,7 +58,7 @@ GoldenrodUnderground_MapScripts: ifequal FRIDAY, .Friday ifequal SATURDAY, .Saturday -.Sunday: +; Sunday disappear GOLDENRODUNDERGROUND_GRAMPS disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index d26d18e8a..03a721af3 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -420,8 +420,7 @@ IlexForestHiddenSuperPotion: IlexForestHiddenFullHeal: hiddenitem FULL_HEAL, EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL -IlexForestBoulder: -; unused +IlexForestBoulder: ; unreferenced jumpstd StrengthBoulderScript IlexForestSignpost: diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index efcb8699c..c4d314e1f 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -83,8 +83,7 @@ MagikarpLengthRaterScript: closetext end -LakeOfRageMagikarpHouseUnusedRecordSign: -; unused +LakeOfRageMagikarpHouseUnusedRecordSign: ; unreferenced jumptext LakeOfRageMagikarpHouseUnusedRecordText MagikarpHouseBookshelf: @@ -205,7 +204,8 @@ LakeOfRageMagikarpHouseUnusedRecordText: text_ram wStringBuffer4 text_end - text_end ; unused +LakeOfRageMagikarpHouseUnusedDummyText: ; unreferenced + text_end LakeOfRageMagikarpHouse_MapEvents: db 0, 0 ; filler diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 346ef5768..0ec5efcf9 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -72,8 +72,7 @@ LavRadioTower1FDirectory: LavRadioTower1FPokeFluteSign: jumptext LavRadioTower1FPokeFluteSignText -LavRadioTower1FReferenceLibrary: -; unreferenced +LavRadioTower1FReferenceLibrary: ; unreferenced jumptext LavRadioTower1FReferenceLibraryText LavRadioTower1FReceptionistText: diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 2809d3152..02bb67ee0 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -18,8 +18,7 @@ LavenderNameRater: closetext end -LavenderNameRaterUnusedBookshelf: -; unused +LavenderNameRaterUnusedBookshelf: ; unreferenced jumpstd DifficultBookshelfScript LavenderNameRater_MapEvents: diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 78ddf6ced..0fdce56c6 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -26,12 +26,10 @@ MahoganyRedGyaradosSpeechHouseTeacherScript: closetext end -MahoganyRedGyaradosSpeechHouseUnusedBookshelf1: -; unused +MahoganyRedGyaradosSpeechHouseUnusedBookshelf1: ; unreferenced jumpstd PictureBookshelfScript -MahoganyRedGyaradosSpeechHouseUnusedBookshelf2: -; unused +MahoganyRedGyaradosSpeechHouseUnusedBookshelf2: ; unreferenced jumpstd MagazineBookshelfScript MahoganyRedGyaradosSpeechHouseBlackBeltText: diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 7d8cfee43..bb6b97c94 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -83,7 +83,7 @@ ManiaScript: closetext end -.nothingleft +.nothingleft ; unreferenced writetext ManiaText_ShuckleIsYourLastMon waitbutton closetext @@ -95,8 +95,7 @@ ManiaScript: closetext end -ManiasHouseUnusedBookshelf: -; unused +ManiasHouseUnusedBookshelf: ; unreferenced jumpstd PictureBookshelfScript ManiaText_AskLookAfterShuckle: diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 06d2345f5..f6484d868 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -9,7 +9,7 @@ OaksLab_MapScripts: def_callbacks -.DummyScene: +.DummyScene: ; unreferenced end Oak: diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index ad20726f2..ea83e0280 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -281,8 +281,8 @@ OlivineCityBattleTowerSignText: line "Opening Now!" done -OlivineCityBattleTowerSignText_NotYetOpen: -; unused; originally shown when the Battle Tower was closed +OlivineCityBattleTowerSignText_NotYetOpen: ; unreferenced +; originally shown when the Battle Tower was closed text "BATTLE TOWER AHEAD" done diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 8c1289921..fde165b42 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -35,8 +35,7 @@ GoodRodGuru: closetext end -GoodRodHouseBookshelf: -; unused +GoodRodHouseBookshelf: ; unreferenced jumpstd PictureBookshelfScript OfferGoodRodText: diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 27bb61006..2b59ca1c5 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -145,7 +145,7 @@ Jasmine_BadgeSpeech: line "this too…" done -Text_ReceivedTM09: +Text_ReceivedTM09: ; unreferenced text "<PLAYER> received" line "TM09." done diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 0529cb493..6159de99f 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -162,8 +162,7 @@ SailorHueyBeatenText: line "I lose!" done -SailorHueyUnusedText: -; unused +SailorHueyUnusedText: ; unreferenced text "What power!" line "How would you like" diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index ad99fb999..6f9e43dd3 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -27,7 +27,7 @@ OlivineLighthouseJasmine: .BroughtSecretpotion: writetext JasmineCureAmphyText yesorno - iffalse .no + iffalse .Refused writetext PlayerHandedSecretpotionText promptbutton takeitem SECRETPOTION @@ -84,7 +84,7 @@ OlivineLighthouseJasmine: disappear OLIVINELIGHTHOUSE6F_JASMINE end -.no: +.Refused: writetext JasmineISeeText waitbutton closetext @@ -97,8 +97,7 @@ OlivineLighthouseJasmine: closetext end -OlivineLighthouseUnusedDummyScript: -; unused +.Unused: ; unreferenced end OlivineLighthouseAmphy: diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 6d87dcdd0..73a9fdc58 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -11,8 +11,7 @@ PlayersHouse2F_MapScripts: callback MAPCALLBACK_NEWMAP, .InitializeRoom callback MAPCALLBACK_TILES, .SetUpTileDecorations -; unused -.Null: +.DummyScene: ; unreferenced end .InitializeRoom: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 744691971..97a396a3e 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -97,7 +97,7 @@ LinkReceptionistScript_Trade: iffalse .LinkedToFirstGen special CheckBothSelectedSameRoom iffalse .IncompatibleRooms - writetext Text_PleaseComeIn2 + writetext Text_PleaseComeIn waitbutton closetext scall Pokecenter2F_CheckGender @@ -152,7 +152,7 @@ LinkReceptionistScript_Trade: special TryQuickSave iffalse .Mobile_DidNotSave special Function1011f1 - writetext Text_PleaseComeIn2 + writetext Text_PleaseComeIn waitbutton closetext setval FALSE @@ -199,7 +199,7 @@ LinkReceptionistScript_Battle: iffalse .LinkedToFirstGen special CheckBothSelectedSameRoom iffalse .IncompatibleRooms - writetext Text_PleaseComeIn2 + writetext Text_PleaseComeIn waitbutton closetext scall Pokecenter2F_CheckGender @@ -256,7 +256,7 @@ LinkReceptionistScript_Battle: special Function103780 iffalse .Mobile_DidNotSave special Function1011f1 - writetext Text_PleaseComeIn2 + writetext Text_PleaseComeIn waitbutton closetext setval FALSE @@ -332,7 +332,7 @@ LinkReceptionistScript_TimeCapsule: .OK: special EnterTimeCapsule - writetext Text_PleaseComeIn2 + writetext Text_PleaseComeIn waitbutton closetext scall TimeCapsuleScript_CheckPlayerGender @@ -813,7 +813,7 @@ Text_TradeReceptionistMobile: line "mobile phone?" done -Text_ThisWayToMobileRoom: +Text_ThisWayToMobileRoom: ; unreferenced text "This way to the" line "MOBILE ROOM." done @@ -882,11 +882,11 @@ Text_PleaseComeAgain: text "Please come again." prompt -Text_PleaseComeIn: +Text_PleaseComeInDuplicate: ; unreferenced text "Please come in." prompt -Text_TemporaryStagingInLinkRoom: +Text_TemporaryStagingInLinkRoom: ; unreferenced text "We'll put you in" line "the link room for" cont "the time being." @@ -902,11 +902,11 @@ Text_IncompatibleRooms: line "were chosen." prompt -Text_PleaseComeIn2: +Text_PleaseComeIn: text "Please come in." done -Text_PleaseEnter: +Text_PleaseEnter: ; unreferenced text "Please enter." prompt diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index bf963d13b..1268f5451 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -16,8 +16,7 @@ RadioTower2F_MapScripts: def_callbacks -RadioTower2FUnusedDummyScene: -; unused +RadioTower2FUnusedDummyScene: ; unreferenced end RadioTower2FSuperNerdScript: diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index cef05c182..10cb41cef 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -32,8 +32,7 @@ Route12SuperRodHouseFishingGuruScript: closetext end -SuperRodHouseBookshelf: -; unused +SuperRodHouseBookshelf: ; unreferenced jumpstd PictureBookshelfScript OfferSuperRodText: diff --git a/maps/Route25.asm b/maps/Route25.asm index a20cb3f21..4ddb215f1 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -423,7 +423,7 @@ BillsHouseSignText: line "BILL'S HOUSE" done -; unused +UnusedBillsHouseSignText: ; unreferenced text "BILL'S HOUSE" done diff --git a/maps/Route29.asm b/maps/Route29.asm index 4b8d6bb1c..fa8e3ff15 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -322,8 +322,7 @@ Route29FisherText: line "progress." done -; unused -Text_WaitingForDay: +Text_WaitingForDay: ; unreferenced text "I'm waiting for" line "#MON that" diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index 147d72d69..93e8fbeb0 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -23,8 +23,7 @@ Route2NuggetHouseFisherScript: closetext end -Route2NuggetHouseBookshelf: -; unused +Route2NuggetHouseBookshelf: ; unreferenced jumpstd DifficultBookshelfScript Route2NuggetHouseFisherText: diff --git a/maps/Route32.asm b/maps/Route32.asm index 2caaf96d5..6e90ff1c3 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -542,7 +542,6 @@ Route32CooltrainerMText_AideIsWaiting: done Route32CooltrainerMText_UnusedSproutTower: -; unused text "Have you gone to" line "SPROUT TOWER?" @@ -679,9 +678,7 @@ FisherRalphSwarmText: line "as you can, kid!" done -; --- start a segment of unused text - -Route32UnusedFisher1SeenText: +Route32UnusedFisher1SeenText: ; unreferenced text "I keep catching" line "the same #MON…" @@ -690,29 +687,29 @@ Route32UnusedFisher1SeenText: cont "around for me." done -Route32UnusedFisher1BeatenText: +Route32UnusedFisher1BeatenText: ; unreferenced text "Nothing ever goes" line "right for me now…" done -Route32UnusedFisher1AfterText: +Route32UnusedFisher1AfterText: ; unreferenced text "How come the guy" line "next to me catches" cont "good #MON?" done -Route32UnusedFisher2SeenText: +Route32UnusedFisher2SeenText: ; unreferenced text "Heh, I'm on a roll" line "today. How about a" cont "battle, kid?" done -Route32UnusedFisher2BeatenText: +Route32UnusedFisher2BeatenText: ; unreferenced text "Oof. I wasn't" line "lucky that time." done -Route32UnusedFisher2AfterText: +Route32UnusedFisher2AfterText: ; unreferenced text "You have to have a" line "good ROD if you" @@ -720,8 +717,6 @@ Route32UnusedFisher2AfterText: line "#MON." done -; --- end a segment of unused texts - FisherHenrySeenText: text "My #MON?" line "Freshly caught!" @@ -835,8 +830,7 @@ BirdKeeperPeterAfterText: cont "in VIOLET CITY." done -Route32UnusedText: -; unused +Route32UnusedText: ; unreferenced text "The fishermen" line "yelled at me for" cont "bugging them…" diff --git a/maps/Route34.asm b/maps/Route34.asm index a688bbb49..a4f1155fd 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -470,8 +470,7 @@ TrainerCooltrainerfKate: closetext end -Route34IlexForestSign: -; unused +Route34IlexForestSign: ; unreferenced jumptext Route34IlexForestSignText Route34Sign: @@ -516,7 +515,7 @@ YoungsterSamuelBeatenText: line "passing stranger!" done -YoungsterSamuelMobileText: +YoungsterSamuelMobileText: ; unreferenced text "Have you been to" line "GOLDENROD CITY?" @@ -726,7 +725,6 @@ CooltrainerfKateAfterText: done Route34IlexForestSignText: -; unused text "ILEX FOREST" line "THROUGH THE GATE" done diff --git a/maps/Route36.asm b/maps/Route36.asm index 9ad2c83f4..f7842c58e 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -489,7 +489,7 @@ RockSmashGuyText2: cont "have this." done -UnusedReceivedTM08Text: +Text_ReceivedTM08: ; unreferenced text "<PLAYER> received" line "TM08." done @@ -509,7 +509,7 @@ RockSmashGuyText3: cont "smash 'em up!" done -UnusedOddTreeText: +UnusedOddTreeText: ; unreferenced text "An odd tree is" line "blocking the way" cont "to GOLDENROD CITY." diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index c0fd51773..1a2664e13 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -463,7 +463,7 @@ BugCatchingContestant10BScript: closetext end -UnusedBugCatchingContestExplanationSign: +UnusedBugCatchingContestExplanationSign: ; unreferenced ; duplicate of BugCatchingContestExplanationSign in Route35NationalParkGate.asm jumptext UnusedBugCatchingContestExplanationText @@ -795,10 +795,9 @@ BugCatchingContestant10BStillCompetingText: line "win." done -UnusedSudowoodoText: -; This text is unused and unreferenced in the final game. -; The tree Pokémon is Sudowoodo. -; The Silph Scope 2 was later reworked into the Squirtbottle. +UnusedSilphScope2Text: ; unreferenced +; This text is referring to Sudowoodo. +; The SILPHSCOPE2 was later reworked into the SQUIRTBOTTLE. text "I hear there's a" line "#MON that looks" cont "just like a tree." diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 29f08d911..8ea55dbf4 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -172,7 +172,7 @@ FarmerFText_HealedMiltank: line "fer your trouble." done -Text_ReceivedTM13: +Text_ReceivedTM13: ; unreferenced text "<PLAYER> received" line "TM13." done diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index b2da1a5eb..71d3d393f 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -18,7 +18,7 @@ Route40BattleTowerGateRockerScript: Route40BattleTowerGateTwinScript: jumptextfaceplayer Route40BattleTowerGateTwinText -UnknownText_0x9f66f: +Route40BattleTowerGateUnusedText1: ; unreferenced text "Did you come to" line "see the BATTLE" cont "TOWER too?" @@ -27,7 +27,7 @@ UnknownText_0x9f66f: line "can't go in yet." done -UnknownText_0x9f6ba: +Route40BattleTowerGateUnusedText2: ; unreferenced text "BATTLE TOWER has" line "opened." @@ -49,7 +49,7 @@ Route40BattleTowerGateRockerText: line "win special gifts." done -UnknownText_0x9f783: +Route40BattleTowerGateUnusedText3: ; unreferenced text "I'm going to train" line "my #MON so I'll" diff --git a/maps/Route41.asm b/maps/Route41.asm index 8272b93a6..1c446ad16 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -125,8 +125,7 @@ TrainerSwimmermMathew: closetext end -Route41Rock: -; unused +Route41Rock: ; unreferenced jumpstd SmashRockScript Route41HiddenMaxEther: diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 7645fdcc4..5301d952e 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -234,7 +234,7 @@ OfficerText_FoundTM: cont "you take it away?" done -Text_ReceivedTM30: +Text_ReceivedTM30: ; unreferenced text "<PLAYER> received" line "TM30." done diff --git a/maps/Route45.asm b/maps/Route45.asm index 827758ede..cf24706ac 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -285,7 +285,7 @@ TrainerCamperQuentin: closetext end -Route45DummyScript: +Route45DummyScript: ; unreferenced writetext Route45DummyText waitbutton closetext diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index ae75c199f..3012ae023 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -112,8 +112,7 @@ RuinsOfAlphAerodactylChamberWallPatternLeftText: line "on the walls…" done -RuinsOfAlphAerodactylChamberUnownText: -; unused +RuinsOfAlphAerodactylChamberUnownText: ; unreferenced text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 78ae152cf..e106f0b4d 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -113,8 +113,7 @@ RuinsOfAlphHoOhChamberWallPatternLeftText: line "on the walls…" done -RuinsOfAlphHoOhChamberUnownText: -; unused +RuinsOfAlphHoOhChamberUnownText: ; unreferenced text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 8e29a90ae..607b8ed45 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -200,8 +200,7 @@ RuinsOfAlphKabutoChamberScientistTremorText: cont "this wall here…" done -RuinsOfAlphKabutoChamberUnusedText: -; unused +RuinsOfAlphKabutoChamberUnusedText: ; unreferenced text "The patterns on" line "the wall appear to" cont "be words!" @@ -224,8 +223,7 @@ RuinsOfAlphKabutoChamberWallPatternLeftText: line "on the walls…" done -RuinsOfAlphKabutoChamberUnownText: -; unused +RuinsOfAlphKabutoChamberUnownText: ; unreferenced text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 4b7872912..3f80c72b2 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -113,8 +113,7 @@ RuinsOfAlphOmanyteChamberWallPatternLeftText: line "on the walls…" done -RuinsOfAlphOmanyteChamberUnownText: -; unused +RuinsOfAlphOmanyteChamberUnownText: ; unreferenced text "It's UNOWN text!" done diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 02c75fe4b..c229b6d92 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -110,7 +110,7 @@ TrainerPsychicNathan: closetext end -TrainerSuperNerdStan: +TrainerSuperNerdStan: ; unreferenced trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, SuperNerdStanSeenText, SuperNerdStanBeatenText, 0, .Script .Script: diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index f7506822d..7fc33ab52 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -167,8 +167,7 @@ RuinsOfAlphResearchCenterPrinter: closetext end -RuinsOfAlphResearchCenterPhoto: -; unreferenced +RuinsOfAlphResearchCenterPhoto: ; unreferenced jumptext RuinsOfAlphResearchCenterProfSilktreePhotoText RuinsOfAlphResearchCenterBookshelf: @@ -307,8 +306,7 @@ RuinsOfAlphResearchCenterScientist2Text_UnownAppeared: cont "kinds of them…" done -RuinsOfAlphResearchCenterUnusedText1: -; unused +RuinsOfAlphResearchCenterUnusedText1: ; unreferenced text "We think something" line "caused the cryptic" @@ -319,8 +317,7 @@ RuinsOfAlphResearchCenterUnusedText1: line "studies on that." done -RuinsOfAlphResearchCenterUnusedText2: -; unused +RuinsOfAlphResearchCenterUnusedText2: ; unreferenced text "According to my" line "research…" @@ -374,7 +371,6 @@ RuinsOfAlphResearchCenterUnownPrinterText: done RuinsOfAlphResearchCenterProfSilktreePhotoText: -; unused text "It's a photo of" line "the RESEARCH" diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 7c4dc38d0..cd299e748 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -731,7 +731,7 @@ RocketBaseLanceElectrodeDoneText: cont "any need for it." done -RocketBaseReceivedHM06Text: ; unused +RocketBaseReceivedHM06Text: ; unreferenced text "<PLAYER> received" line "HM06." done diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 908f1a6dd..694fd892b 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -9,13 +9,11 @@ TinTower9F_MapScripts: TinTower9FHPUp: itemball HP_UP -TinTower9FUnusedHoOhText: -; unused +TinTower9FUnusedHoOhText: ; unreferenced text "HO-OH: Shaoooh!" done -TinTower9FUnusedLugiaText: -; unused +TinTower9FUnusedLugiaText: ; unreferenced text "LUGIA: Gyaaan!" done diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 2282d9d5c..40405518b 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -39,15 +39,14 @@ TradeCenterConsoleScript: newloadmap MAPSETUP_LINKRETURN end -TradeCenterFriendScript: -; unreferenced +TradeCenterFriendScript: ; unreferenced opentext - writetext .FriendReadyText + writetext TradeCenterFriendReadyText waitbutton closetext end -.FriendReadyText: +TradeCenterFriendReadyText: text "Your friend is" line "ready." done diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 862afd58a..7721ed1a3 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -81,8 +81,7 @@ UnionCave1FPotion: UnionCave1FAwakening: itemball AWAKENING -UnionCave1FUnusedSign: -; unused +UnionCave1FUnusedSign: ; unreferenced jumptext UnionCave1FUnusedSignText HikerRussellSeenText: diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index 14715e116..1f0046b64 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -12,8 +12,7 @@ FishingDude: FishingDudesHousePhoto: jumptext FishingDudesHousePhotoText -FishingDudesHouseBookshelf: -; unused +FishingDudesHouseBookshelf: ; unreferenced jumpstd PictureBookshelfScript FishingDudeText: diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index a249f4a70..679b645c6 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -157,8 +157,7 @@ VioletPokecenterElmsAideAskEggText: line "take the EGG?" done -; unused -VioletPokecenterFarawayLinkText: +VioletPokecenterFarawayLinkText: ; unreferenced text "I've been thinking" line "it'd be great to" @@ -169,8 +168,7 @@ VioletPokecenterFarawayLinkText: line "far away." done -; unused -VioletPokecenterMobileAdapterText: +VioletPokecenterMobileAdapterText: ; unreferenced text "I just battled a" line "friend in CIANWOOD" cont "over a link." |