diff options
Diffstat (limited to 'maps')
53 files changed, 83 insertions, 133 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 27f87951..0afb71de 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -138,8 +138,7 @@ AzaleaTownSlowpokeScript: closetext end -UnusedWoosterScript: -; unused +UnusedWoosterScript: ; unreferenced faceplayer opentext writetext WoosterText diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 80fe72f5..a8a0ecfa 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/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 050dc7f1..3afdfec2 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -251,7 +251,7 @@ BlackthornGymClairText_YouKeptMeWaiting: line "this TM." done -BlackthornGymText_ReceivedTM24: +BlackthornGymText_ReceivedTM24: ; unreferenced text "<PLAYER> received" line "TM24." done diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 6c5cf833..fe91b47d 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -65,7 +65,7 @@ ReleaseTheBeasts: special InitRoamMons end -UnusedEnteiScript: +UnusedEnteiScript: ; unreferenced opentext writetext UnusedEnteiText cry ENTEI diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index fe27df8c..a0d4a0dc 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -93,8 +93,7 @@ CeladonDeptStore6FVendingMachine: CeladonDeptStore6FDirectory: jumptext CeladonDeptStore6FDirectoryText -; unused -CeladonDeptStore6FElevatorButton: +CeladonDeptStore6FElevatorButton: ; unreferenced jumpstd ElevatorButtonScript CeladonVendingText: diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 619b4767..f94a097d 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 6012e1a7..8c818267 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/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 3464a1f4..6630b22c 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -5,10 +5,10 @@ CeladonMansionRoof_MapScripts: def_callbacks -CeladonMansionRoofGraffiti: - jumptext CeladonMansionRoofGraffitiText +CeladonMansionRoofSign: ; unreferenced + jumptext CeladonMansionRoofSignText -CeladonMansionRoofGraffitiText: +CeladonMansionRoofSignText: text "I KNOW EVERYTHING!" done diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 35546fcd..60a13914 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 45adb946..a198c4b9 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -58,8 +58,7 @@ CianwoodCityPokefanM: CianwoodCityLass: jumptextfaceplayer CianwoodCityLassText -CianwoodCityUnusedScript: -; unreferenced +CianwoodCityUnusedScript: ; unreferenced jumptextfaceplayer CianwoodCityUnusedText CianwoodCitySign: @@ -172,7 +171,6 @@ CianwoodCityLassText: done CianwoodCityUnusedText: -; unused text "There are several" line "islands between" cont "here and OLIVINE." diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index a5073faf..99d65cbd 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -161,7 +161,7 @@ DragonShrineRisingBadgeExplanationText: line "have this TM." done -NotifyReceiveDragonbreath: +Text_ReceivedTM24: ; unreferenced text "<PLAYER> received" line "TM24." done diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index fdda6324..75d5649e 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 33462cb6..120bef56 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -84,8 +84,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 ec124148..836b3aef 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 17b460dd..09fd2971 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -555,8 +555,7 @@ ElmsLabTravelTip4: ElmsLabTrashcan: jumptext ElmsLabTrashcanText -ElmsLabTrashcan2: -; unused +ElmsLabTrashcan2: ; unreferenced jumpstd TrashCanScript ElmsLabBookshelf: @@ -1064,7 +1063,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 14121e02..d788589d 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/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 6047b790..2a0e4272 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 "Giving #MON" line "items to hold dur-" cont "ing battle could " diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index f35c0af1..b7b1ea1c 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -105,7 +105,7 @@ Carrie: faceplayer opentext special GameboyCheck - ifnotequal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver + ifnotequal GBCHECK_CGB, .NotGBC writetext GoldenrodDeptStore5FCarrieMysteryGiftExplanationText waitbutton closetext diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 4d54b95d..50033e2c 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -44,16 +44,13 @@ FlowerShopFloriaScript: closetext end -FlowerShopShelf1: -; unused +FlowerShopShelf1: ; unreferenced jumpstd PictureBookshelfScript -FlowerShopShelf2: -; unused +FlowerShopShelf2: ; unreferenced jumpstd MagazineBookshelfScript -FlowerShopRadio: -; unused +FlowerShopRadio: ; unreferenced jumpstd Radio2Script GoldenrodFlowerShopTeacherBetterThanWhitneyText: diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 44980aa9..b4ce3b18 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 33054d05..6eceac57 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -297,8 +297,7 @@ IlexForestHiddenSuperPotion: IlexForestHiddenFullHeal: hiddenitem FULL_HEAL, EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL -IlexForestBoulder: -; unused +IlexForestBoulder: ; unreferenced jumpstd StrengthBoulderScript IlexForestSignpost: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 98dc2eaf..793fb081 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -85,7 +85,6 @@ Kurt1: iftrue .GiveLoveBall writetext KurtsHouseKurtBallsFromApricornsText promptbutton -.CheckApricorns: checkitem RED_APRICORN iftrue .AskApricorn checkitem BLU_APRICORN diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index c827872e..fee872c5 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -83,8 +83,7 @@ MagikarpLengthRaterScript: closetext end -LakeOfRageMagikarpHouseUnusedRecordSign: -; unused +LakeOfRageMagikarpHouseUnusedRecordSign: ; unreferenced jumptext LakeOfRageMagikarpHouseUnusedRecordText MagikarpHouseBookshelf: diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 4cd54e6f..e1430ad0 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 2809d315..02bb67ee 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 78ddf6ce..0fdce56c 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 7d8cfee4..bb6b97c9 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/NewBarkTown.asm b/maps/NewBarkTown.asm index 37099708..95d410ef 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -137,7 +137,7 @@ NewBarkTownElmsLabSign: NewBarkTownElmsHouseSign: jumptext NewBarkTownElmsHouseSignText -MrChronoScript: +MrChronoScript: ; unreferenced faceplayer opentext writetext MrChronoText diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 492d9eb1..cbb43d08 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/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 8c128992..fde165b4 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 27bb6100..2b59ca1c 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/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index ad99fb99..6f9e43dd 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 16be3544..30e9ef51 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 b4178834..545d72a2 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -80,7 +80,7 @@ LinkReceptionistScript_Trade: iffalse .LinkedToFirstGen special CheckBothSelectedSameRoom iffalse .IncompatibleRooms - writetext Text_PleaseComeIn2 + writetext Text_PleaseComeIn waitbutton closetext applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight @@ -141,7 +141,7 @@ LinkReceptionistScript_Battle: iffalse .LinkedToFirstGen special CheckBothSelectedSameRoom iffalse .IncompatibleRooms - writetext Text_PleaseComeIn2 + writetext Text_PleaseComeIn waitbutton closetext applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight @@ -223,7 +223,7 @@ LinkReceptionistScript_TimeCapsule: .OK: special EnterTimeCapsule - writetext Text_PleaseComeIn2 + writetext Text_PleaseComeIn waitbutton closetext readvar VAR_FACING @@ -469,11 +469,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." @@ -489,11 +489,11 @@ Text_IncompatibleRooms: line "a different room." 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 1f27519b..1923d535 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -14,8 +14,7 @@ RadioTower2F_MapScripts: def_callbacks -RadioTower2FUnusedDummyScene: -; unused +RadioTower2FUnusedDummyScene: ; unreferenced end RadioTower2FSuperNerdScript: diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index cef05c18..10cb41ce 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/Route29.asm b/maps/Route29.asm index 4b8d6bb1..3009c4b6 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -322,8 +322,7 @@ Route29FisherText: line "progress." done -; unused -Text_WaitingForDay: +Route29CooltrainerMText_WaitingForDay: ; unreferenced text "I'm waiting for" line "#MON that" diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index 147d72d6..93e8fbeb 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 40ae7860..2141c593 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -466,7 +466,6 @@ Route32CooltrainerMText_AideIsWaiting: done Route32CooltrainerMText_UnusedSproutTower: -; unused text "Have you gone to" line "SPROUT TOWER?" @@ -589,9 +588,7 @@ FisherRalphAfterText: line "long friends!" done -; --- start a segment of unused text - -Route32UnusedFisher1SeenText: +Route32UnusedFisher1SeenText: ; unreferenced text "I keep catching" line "the same #MON…" @@ -600,29 +597,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" @@ -630,8 +627,6 @@ Route32UnusedFisher2AfterText: line "#MON." done -; --- end a segment of unused texts - FisherHenrySeenText: text "My #MON?" line "Freshly caught!" @@ -745,8 +740,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 a0496422..b545c927 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -372,8 +372,7 @@ TrainerCooltrainerfKate: closetext end -Route34IlexForestSign: -; unused +Route34IlexForestSign: ; unreferenced jumptext Route34IlexForestSignText Route34Sign: diff --git a/maps/Route36.asm b/maps/Route36.asm index 7f60bb72..9884cd50 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -307,7 +307,7 @@ RockSmashGuyText2: cont "have this." done -UnusedReceivedTM08Text: +Text_ReceivedTM08: ; unreferenced text "<PLAYER> received" line "TM08." done diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 93361f13..6d17da10 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 0d11179b..5765fdbd 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/Route41.asm b/maps/Route41.asm index 8272b93a..1c446ad1 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 9c4499ca..65e7f3ea 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -233,7 +233,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 6a077e90..9da24312 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -386,7 +386,7 @@ CooltrainerfKellyAfterBattleText: cont "to harm #MON." done -Route45DummyText: +Route45DummyText: ; unreferenced text "I'm pretty good at" line "#MON too." done diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 3b74ee26..cf26ca46 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -79,7 +79,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 de7e2c83..a3312842 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -150,8 +150,7 @@ RuinsOfAlphResearchCenterPrinter: closetext end -RuinsOfAlphResearchCenterPhoto: -; unreferenced +RuinsOfAlphResearchCenterPhoto: ; unreferenced jumptext RuinsOfAlphResearchCenterProfSilktreePhotoText RuinsOfAlphResearchCenterBookshelf: diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index c5de430a..3f7e2eef 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -730,7 +730,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 3685200b..803a65fd 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -3,13 +3,11 @@ TinTower9F_MapScripts: def_callbacks -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 2282d9d5..40405518 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 84883678..5a79ff3b 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -81,8 +81,7 @@ UnionCave1FXAttack: UnionCave1FAwakening: itemball AWAKENING -UnionCave1FUnusedSign: -; unused +UnionCave1FUnusedSign: ; unreferenced jumptext UnionCave1FUnusedSignText HikerRussellSeenText: diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index c855b636..377ac53f 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -12,8 +12,7 @@ FishingDude: FishingDudesHousePhoto: jumptext FishingDudesHousePhotoText -FishingDudesHouseBookshelf: -; unused +FishingDudesHouseBookshelf: ; unreferenced jumpstd PictureBookshelfScript FishingDudeText: |