diff --git a/data/text/common_1.asm b/data/text/common_1.asm index 765260883..4aeb1331a 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -97,7 +97,7 @@ _GrewToLevelText:: text_promptbutton text_end - text_end ; unused + text_end ; unreferenced _CameToItsSensesText:: text_ram wStringBuffer1 @@ -246,23 +246,23 @@ UnknownText_0x1bc404:: cont "adapter." done -UnknownText_0x1bc42c:: +; Mobile Adapter End + +_ThePasswordIsText:: ; unreferenced text "The password is:" line "" done -UnknownText_0x1bc43f:: +_IsThisOKText:: ; unreferenced text "Is this OK?" done -UnknownText_0x1bc44c:: +_EnterTheIDNoText:: ; unreferenced text "Enter the" line "ID no." done -; Mobile Adapter End - -UnknownText_0x1bc45e:: +_EnterTheAmountText:: ; unreferenced text "Enter the" line "amount." done @@ -434,7 +434,7 @@ _WillTradeText:: text_ram wOTTrademonSpeciesName text_end - text_end ; unused + text_end ; unreferenced _ForYourMonWillTradeText:: text "for @" @@ -452,7 +452,7 @@ _MobilePlayerWillTradeMonText:: text_ram wPlayerTrademonSpeciesName text_end - text_end ; unused + text_end ; unreferenced _MobileForPartnersMonText:: text "for @" @@ -463,7 +463,7 @@ _MobileForPartnersMonText:: text "." done -; unused +; unreferenced _MobilePlayersMonTradeText:: text_ram wPlayerTrademonSenderName text "'s" @@ -523,7 +523,7 @@ _OPT_OakText1:: text_ram wMonOrItemNameBuffer text_end - text_end ; unused + text_end ; unreferenced _OPT_OakText2:: text_start @@ -714,7 +714,7 @@ _PokedexShowText:: text_ram wStringBuffer1 text_end - text_end ; unused + text_end ; unreferenced ; Pokémon Music Channel / Pokémusic @@ -865,7 +865,7 @@ _PnP_Text4:: text_ram wStringBuffer1 text_end - text_end ; unused + text_end ; unreferenced _PnP_CuteText:: text_start @@ -953,7 +953,7 @@ _PnP_Text5:: text_ram wStringBuffer1 text_end - text_end ; unused + text_end ; unreferenced _RocketRadioText1:: text_start @@ -1121,17 +1121,17 @@ _EnemyUsedOnText:: text "!" prompt -Text_ThatCantBeUsedRightNow:: +_ThatCantBeUsedRightNowText:: ; unreferenced text "That can't be used" line "right now." prompt -Text_ThatItemCantBePutInThePack:: +_ThatItemCantBePutInThePackText:: ; unreferenced text "That item can't be" line "put in the PACK." done -Text_TheItemWasPutInThePack:: +_TheItemWasPutInThePackText:: ; unreferenced text "The @" text_ram wStringBuffer1 text_start @@ -1139,42 +1139,42 @@ Text_TheItemWasPutInThePack:: cont "PACK." done -Text_RemainingTime:: +_RemainingTimeText:: ; unreferenced text "Remaining Time" done -Text_YourMonsHPWasHealed:: +_YourMonsHPWasHealedText:: ; unreferenced text "Your #MON's HP" line "was healed." prompt -Text_Warping:: +_WarpingText:: ; unreferenced text "Warping…" done -UnknownText_0x1bd05e:: +_ChangeWhichNumberText:: ; unreferenced text "Which number" line "should be changed?" done -UnknownText_0x1bd07f:: +_WillYouPlayWithMonText:: ; unreferenced text "Will you play with" line "@" text_ram wStringBuffer2 text "?" done -UnknownText_0x1bd09a:: +_YouNeedTwoMonForBreedingText:: ; unreferenced text "You need two #-" line "MON for breeding." prompt -Text_BreedingIsNotPossible:: +_BreedingIsNotPossibleText:: ; unreferenced text "Breeding is not" line "possible." prompt -UnknownText_0x1bd0d8:: +_CompatibilityShouldTheyBreedText:: ; unreferenced text "The compatibility" line "is @" text_decimal wBreedingCompatibility, 1, 3 @@ -1182,48 +1182,50 @@ UnknownText_0x1bd0d8:: cont "Should they breed?" done -UnknownText_0x1bd109:: +_ThereIsNoEggText:: ; unreferenced text "There is no EGG." line "" prompt -UnknownText_0x1bd11c:: +_ItsGoingToHatchText:: ; unreferenced text "It's going to" line "hatch!" prompt -UnknownText_0x1bd131:: +_TestEventText:: ; unreferenced text "Test event" line "@" text_decimal wStringBuffer2, 1, 2 text "?" done -UnknownText_0x1bd145:: +_StartText:: ; unreferenced text "Start!" done -UnknownText_0x1bd14d:: +_EndText:: ; unreferenced text "End!" done -UnknownText_0x1bd153:: +_ForABoyText:: ; unreferenced text "For a boy!" done -UnknownText_0x1bd15f:: +_ForAGirlText:: ; unreferenced text "For a girl!" done -UnknownText_0x1bd16c:: +_DoesntConcernABoyText:: ; unreferenced text "This doesn't" line "concern a boy!" done -UnknownText_0x1bd188:: +_TheBoxIsFullText:: ; unreferenced text "The BOX is full!" done +; Mobile Adapter + UnknownText_0x1bd19a:: text "A new CARD arrived" line "from @" @@ -1280,7 +1282,9 @@ UnknownText_0x1bd286:: text "…" done -UnknownText_0x1bd2a0:: +; Mobile Adapter End + +_ObtainedTheVoltorbBadgeText:: ; unreferenced text "Obtained the" line "VOLTORBBADGE!" done @@ -1346,7 +1350,7 @@ _ReceiveItemText:: text_promptbutton text_end - text_end ; unused + text_end ; unreferenced _NoCoinsText:: text "You have no coins." @@ -1377,7 +1381,7 @@ _NPCTradeFanfareText:: text_pause text_end - text_end ; unused + text_end ; unreferenced _NPCTradeIntroText1:: text "I collect #MON." diff --git a/data/text/common_2.asm b/data/text/common_2.asm index d71a69c20..6ef6162e1 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -317,7 +317,7 @@ _BlindingFlashText:: text_promptbutton text_end - text_end ; unused + text_end ; unreferenced _UsedSurfText:: text_ram wStringBuffer2 @@ -487,7 +487,7 @@ _RodNothingText:: text "Not even a nibble!" prompt -; unused +; unreferenced _UnusedNothingHereText:: text "Looks like there's" line "nothing here." @@ -672,7 +672,7 @@ Text_BattleEffectActivate:: text_ram wStringBuffer2 text_end - text_end ; unused + text_end ; unreferenced _BattleStatWentWayUpText:: text_pause @@ -689,7 +689,7 @@ Text_BattleFoeEffectActivate:: text_ram wStringBuffer2 text_end - text_end ; unused + text_end ; unreferenced _BattleStatSharplyFellText:: text_pause @@ -757,7 +757,7 @@ _MoveNameText:: text_ram wStringBuffer2 text_end - text_end ; unused + text_end ; unreferenced _EndUsedMove1Text:: text "!" @@ -797,7 +797,7 @@ _BreedEggHatchText:: text_promptbutton text_end - text_end ; unused + text_end ; unreferenced _BreedAskNicknameText:: text "Give a nickname to" @@ -889,17 +889,17 @@ _MailMovedFromBoxText:: line "from the MAILBOX." prompt -; unused +; unreferenced _YesPromptText:: text "Yes" prompt -; unused +; unreferenced _NoPromptText:: text "No" prompt -; unused +; unreferenced _AnimationTypeText:: text_decimal wcf64, 1, 3 text " @" @@ -909,9 +909,9 @@ _AnimationTypeText:: text_ram wStringBuffer2 text_end - text_end ; unused + text_end ; unreferenced -; unused +; unreferenced _MonNumberText:: text "#MON number?" done @@ -1058,7 +1058,7 @@ _KarpGuruRecordText:: text_promptbutton text_end - text_end ; unused + text_end ; unreferenced _LuckyNumberMatchPartyText:: text "Congratulations!" @@ -1352,7 +1352,7 @@ _OakPCText4:: line "OAK's PC closed." done -; unused +; unreferenced _TrainerRankingExplanationText:: text "Triple-theme" line "trainer ranking!" @@ -1364,7 +1364,7 @@ _TrainerRankingExplanationText:: para "" done -; unused +; unreferenced _TrainerRankingNoDataText:: text "There is no" line "ranking data." @@ -1554,7 +1554,7 @@ _OakText3:: text_promptbutton text_end - text_end ; unused + text_end ; unreferenced _OakText4:: text "People and #MON" diff --git a/data/text/common_3.asm b/data/text/common_3.asm index 19c1b7aeb..95342d174 100644 --- a/data/text/common_3.asm +++ b/data/text/common_3.asm @@ -228,8 +228,7 @@ _MoveMonWOMailSaveText:: cont "will be saved. OK?" done -; unused -_WindowAreaExceededErrorText:: +_WindowAreaExceededErrorText:: ; unreferenced text "The window save" line "area was exceeded." done @@ -239,8 +238,7 @@ _WindowPoppingErrorText:: line "able for popping." done -; unused -_CorruptedEventErrorText:: +_CorruptedEventText:: ; unreferenced text "Corrupted event!" prompt @@ -452,7 +450,7 @@ _CongratulationsYourPokemonText:: text_ram wStringBuffer2 text_end - text_end ; unused + text_end ; unreferenced _EvolvedIntoText:: text_start @@ -622,7 +620,7 @@ _PharmacyComeAgainText:: line "See you around." done -; unused +; unreferenced _NothingToSellText:: text "You don't have" line "anything to sell." @@ -746,25 +744,25 @@ _MainMenuTimeUnknownText:: text "Clock time unknown" done -; unused mobile +; unreferenced mobile _DeleteSavedLoginPasswordText:: text "Delete the saved" line "LOG-IN PASSWORD?" done -; unused mobile +; unreferenced mobile _DeletedTheLoginPasswordText:: text "Deleted the LOG-IN" line "PASSWORD." done -; unused mobile +; unreferenced mobile _MobilePickThreeMonForBattle:: text "Pick three #MON" line "for battle." prompt -; unused mobile +; unreferenced mobile _MobileUseTheseThreeMonText:: text_ram wMobileParticipant1Nickname text "," @@ -778,13 +776,13 @@ _MobileUseTheseThreeMonText:: para "Use these three?" done -; unused mobile +; unreferenced mobile _MobileOnlyThreeMonMayEnterText:: text "Only three #MON" line "may enter." prompt -; unused mobile +; unreferenced mobile _MobileCardFolderIntro1Text:: text "The CARD FOLDER" line "stores your and" @@ -802,7 +800,7 @@ _MobileCardFolderIntro1Text:: para "" done -; unused mobile +; unreferenced mobile _MobileCardFolderIntro2Text:: text "This is your CARD." @@ -816,7 +814,7 @@ _MobileCardFolderIntro2Text:: para "" done -; unused mobile +; unreferenced mobile _MobileCardFolderIntro3Text:: text "If you have your" line "friend's CARD, you" @@ -831,7 +829,7 @@ _MobileCardFolderIntro3Text:: para "" done -; unused mobile +; unreferenced mobile _MobileCardFolderIntro4Text:: text "To safely store" line "your collection of" @@ -843,7 +841,7 @@ _MobileCardFolderIntro4Text:: para "" done -; unused mobile +; unreferenced mobile _MobileCardFolderAskDeleteText:: text "If the CARD FOLDER" line "is deleted, all" @@ -860,13 +858,13 @@ _MobileCardFolderAskDeleteText:: line "your CARD FOLDER?" done -; unused mobile +; unreferenced mobile _MobileCardFolderDeleteAreYouSureText:: text "Are you sure you" line "want to delete it?" done -; unused mobile +; unreferenced mobile _MobileCardFolderDeletedText:: text "The CARD FOLDER" line "has been deleted." @@ -874,7 +872,7 @@ _MobileCardFolderDeletedText:: para "" done -; unused mobile +; unreferenced mobile _MobileCardFolderAskOpenOldText:: text "There is an older" line "CARD FOLDER from a" @@ -884,13 +882,13 @@ _MobileCardFolderAskOpenOldText:: line "open it?" done -; unused mobile +; unreferenced mobile _MobileCardFolderAskDeleteOldText:: text "Delete the old" line "CARD FOLDER?" done -; unused mobile +; unreferenced mobile _MobileCardFolderFinishRegisteringCardsText:: text "Finish registering" line "CARDS?" @@ -923,8 +921,7 @@ _PhoneThankYouText:: text "Thank you!" done -; unused -UnknownText_0x1c55d6:: +_SpaceSpaceColonText:: ; unreferenced text " :" done @@ -962,7 +959,7 @@ _LearnedMoveText:: text_promptbutton text_end - text_end ; unused + text_end ; unreferenced _MoveAskForgetText:: text "Which move should" @@ -1011,7 +1008,7 @@ Text_MoveForgetCount:: text_pause text_end - text_end ; unused + text_end ; unreferenced _MoveForgotText:: text " Poof!@" @@ -1072,7 +1069,7 @@ _GearTodayText:: text_today text_end - text_end ; unused + text_end ; unreferenced _GearEllipseText:: text "<……>" @@ -1241,13 +1238,13 @@ Text_BallCaught:: sound_caught_mon text_end - text_end ; unused + text_end ; unreferenced _WaitButtonText:: text_promptbutton text_end - text_end ; unused + text_end ; unreferenced _BallSentToPCText:: text_ram wMonOrItemNameBuffer @@ -1264,7 +1261,7 @@ _NewDexDataText:: text_promptbutton text_end - text_end ; unused + text_end ; unreferenced _AskGiveNicknameText:: text "Give a nickname to" @@ -1311,7 +1308,7 @@ Text_PlayedPokeFlute:: text_promptbutton text_end - text_end ; unused + text_end ; unreferenced _BlueCardBalanceText:: text "You now have" @@ -1326,7 +1323,7 @@ _CoinCaseCountText:: text_decimal wCoins, 2, 4 text_end - text_end ; unused + text_end ; unreferenced _RaiseThePPOfWhichMoveText:: text "Raise the PP of" diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 5fcc85f21..e3d8a19cb 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -154,7 +154,7 @@ MahoganyMart1FLanceGoDownStairsMovement: slow_step RIGHT step_end -UnknownText_0x6c414: +MahoganyMart1FRageCandyBarText: ; unreferenced text "Hello, kiddo!" para "How would you like" diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 1d1af2e4c..fdd24306a 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -731,8 +731,7 @@ RocketBaseLanceElectrodeDoneText: cont "any need for it." done -; unused -UnknownText_0x6d8e6: +RocketBaseReceivedHM06Text: ; unused text " received" line "HM06." done