summaryrefslogtreecommitdiff
path: root/data/text
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-10-26 15:45:57 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-10-26 20:29:58 -0400
commit9dcdad5e60fbc10ba81ae127743c78a6b00d3dd5 (patch)
tree1bbe56fe1c3b0ad4c95d191f0137007becef7169 /data/text
parenta2b6befd7d12b2ad8bb97979a10519500dcdd870 (diff)
Comment, remove, or revise many unreferenced labels
Diffstat (limited to 'data/text')
-rw-r--r--data/text/battle.asm2
-rw-r--r--data/text/common_1.asm1
-rw-r--r--data/text/common_2.asm5
-rw-r--r--data/text/common_3.asm16
-rw-r--r--data/text/unused_sweet_honey.asm16
5 files changed, 11 insertions, 29 deletions
diff --git a/data/text/battle.asm b/data/text/battle.asm
index 48d0ff483..072ab50d9 100644
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -1102,7 +1102,7 @@ BattleText_LinkErrorBattleCanceled:
line "been canceled…"
prompt
-BattleText_0x8188e:
+BattleText_NoTimeLeftToday: ; unreferenced
text "There is no time"
line "left today!"
done
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index e585a6320..a07617e2c 100644
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -463,7 +463,6 @@ _MobileForPartnersMonText::
text "."
done
-; unreferenced
_MobilePlayersMonTradeText::
text_ram wPlayerTrademonSenderName
text "'s"
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index 4b01a5294..71b610454 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -263,12 +263,12 @@ _MysteryGiftSentHomeText::
_MysteryGiftReceivedCardText::
text "Received"
line "@"
- text_ram wc850
+ text_ram wMysteryGiftCardHolderName
text "'s CARD."
prompt
_MysteryGiftListedCardText::
- text_ram wc850
+ text_ram wMysteryGiftCardHolderName
text "'s CARD was"
line "listed as no.@"
text_decimal wDeciramBuffer, 1, 2
@@ -487,7 +487,6 @@ _RodNothingText::
text "Not even a nibble!"
prompt
-; unreferenced
_UnusedNothingHereText::
text "Looks like there's"
line "nothing here."
diff --git a/data/text/common_3.asm b/data/text/common_3.asm
index 95342d174..cc5a53c2e 100644
--- a/data/text/common_3.asm
+++ b/data/text/common_3.asm
@@ -620,7 +620,6 @@ _PharmacyComeAgainText::
line "See you around."
done
-; unreferenced
_NothingToSellText::
text "You don't have"
line "anything to sell."
@@ -744,25 +743,21 @@ _MainMenuTimeUnknownText::
text "Clock time unknown"
done
-; unreferenced mobile
_DeleteSavedLoginPasswordText::
text "Delete the saved"
line "LOG-IN PASSWORD?"
done
-; unreferenced mobile
_DeletedTheLoginPasswordText::
text "Deleted the LOG-IN"
line "PASSWORD."
done
-; unreferenced mobile
_MobilePickThreeMonForBattle::
text "Pick three #MON"
line "for battle."
prompt
-; unreferenced mobile
_MobileUseTheseThreeMonText::
text_ram wMobileParticipant1Nickname
text ","
@@ -776,13 +771,11 @@ _MobileUseTheseThreeMonText::
para "Use these three?"
done
-; unreferenced mobile
_MobileOnlyThreeMonMayEnterText::
text "Only three #MON"
line "may enter."
prompt
-; unreferenced mobile
_MobileCardFolderIntro1Text::
text "The CARD FOLDER"
line "stores your and"
@@ -800,7 +793,6 @@ _MobileCardFolderIntro1Text::
para ""
done
-; unreferenced mobile
_MobileCardFolderIntro2Text::
text "This is your CARD."
@@ -814,7 +806,6 @@ _MobileCardFolderIntro2Text::
para ""
done
-; unreferenced mobile
_MobileCardFolderIntro3Text::
text "If you have your"
line "friend's CARD, you"
@@ -829,7 +820,6 @@ _MobileCardFolderIntro3Text::
para ""
done
-; unreferenced mobile
_MobileCardFolderIntro4Text::
text "To safely store"
line "your collection of"
@@ -841,7 +831,6 @@ _MobileCardFolderIntro4Text::
para ""
done
-; unreferenced mobile
_MobileCardFolderAskDeleteText::
text "If the CARD FOLDER"
line "is deleted, all"
@@ -858,13 +847,11 @@ _MobileCardFolderAskDeleteText::
line "your CARD FOLDER?"
done
-; unreferenced mobile
_MobileCardFolderDeleteAreYouSureText::
text "Are you sure you"
line "want to delete it?"
done
-; unreferenced mobile
_MobileCardFolderDeletedText::
text "The CARD FOLDER"
line "has been deleted."
@@ -872,7 +859,6 @@ _MobileCardFolderDeletedText::
para ""
done
-; unreferenced mobile
_MobileCardFolderAskOpenOldText::
text "There is an older"
line "CARD FOLDER from a"
@@ -882,13 +868,11 @@ _MobileCardFolderAskOpenOldText::
line "open it?"
done
-; unreferenced mobile
_MobileCardFolderAskDeleteOldText::
text "Delete the old"
line "CARD FOLDER?"
done
-; unreferenced mobile
_MobileCardFolderFinishRegisteringCardsText::
text "Finish registering"
line "CARDS?"
diff --git a/data/text/unused_sweet_honey.asm b/data/text/unused_sweet_honey.asm
index 04ceae2e6..d4970118a 100644
--- a/data/text/unused_sweet_honey.asm
+++ b/data/text/unused_sweet_honey.asm
@@ -8,7 +8,7 @@
; Most of these texts seem to be associated with a single NPC.
; The last text is associated with a second NPC, probably a Butterfree.
-UnusedSweetHoneyText:
+UnusedSweetHoneyText: ; unreferenced
text "My #MON is an"
line "expert at collect-"
cont "ing SWEET HONEY."
@@ -17,7 +17,7 @@ UnusedSweetHoneyText:
line "with you."
done
-UnusedSweetHoneyBagFullText:
+UnusedSweetHoneyBagFullText: ; unreferenced
text "I want to give you"
line "some SWEET HONEY,"
@@ -25,17 +25,17 @@ UnusedSweetHoneyBagFullText:
line "room for it."
done
-UnusedSweetHoneyGiveText:
+UnusedSweetHoneyGiveText: ; unreferenced
text "Here you go! Have"
line "some SWEET HONEY!"
done
-UnusedGotSweetHoneyText:
+UnusedGotSweetHoneyText: ; unreferenced
text "<PLAYER> received"
line "SWEET HONEY."
done
-UnusedSweetHoneyAfterText1:
+UnusedSweetHoneyAfterText1: ; unreferenced
text "My little brother"
line "takes SWEET HONEY"
@@ -46,7 +46,7 @@ UnusedSweetHoneyAfterText1:
line "up to?"
done
-UnusedSweetHoneyAfterText2:
+UnusedSweetHoneyAfterText2: ; unreferenced
text "Did you put SWEET"
line "HONEY on a tree?"
@@ -54,7 +54,7 @@ UnusedSweetHoneyAfterText2:
line "it?"
done
-UnusedSweetHoneyAfterText3:
+UnusedSweetHoneyAfterText3: ; unreferenced
text "Did you put SWEET"
line "HONEY on a tree?"
@@ -63,6 +63,6 @@ UnusedSweetHoneyAfterText3:
cont "be drawn to it."
done
-UnusedSweetHoneyButterfreeText:
+UnusedSweetHoneyButterfreeText: ; unreferenced
text "BUTTERFREE: Freeh!"
done