summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/text/common_1.asm50
-rw-r--r--data/text/common_2.asm12
-rw-r--r--data/text/common_3.asm9
-rw-r--r--maps/MahoganyMart1F.asm2
-rw-r--r--maps/TeamRocketBaseB2F.asm11
5 files changed, 42 insertions, 42 deletions
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index 3bbffb45..97750d47 100644
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -171,17 +171,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
@@ -189,42 +189,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_0x1902f9::
+_ChangeWhichNumberText:: ; unreferenced
text "Which number"
line "should be changed?"
done
-UnknownText_0x19031a::
+_WillYouPlayWithMonText:: ; unreferenced
text "Will you play with"
line "@"
text_ram wStringBuffer2
text "?"
done
-UnknownText_0x190335::
+_YouNeedTwoMonForBreedingText:: ; unreferenced
text "You need two #-"
line "MON for breeding."
prompt
-Text_BreedingIsNotPossible::
+_BreedingIsNotPossibleText:: ; unreferenced
text "Breeding is not"
line "possible."
prompt
-UnknownText_0x190373::
+_CompatibilityShouldTheyBreedText:: ; unreferenced
text "The compatibility"
line "is @"
text_decimal wBreedingCompatibility, 1, 3
@@ -232,54 +232,56 @@ UnknownText_0x190373::
cont "Should they breed?"
done
-UnknownText_0x1903a4::
+_ThereIsNoEggText:: ; unreferenced
text "There is no EGG."
line ""
prompt
-UnknownText_0x1903b7::
+_ItsGoingToHatchText:: ; unreferenced
text "It's going to"
line "hatch!"
prompt
-UnknownText_0x1903cc::
+_TestEventText:: ; unreferenced
text "Test event"
line "@"
text_decimal wStringBuffer2, 1, 2
text "?"
done
+_WhatDoYouWantToPlayWithText:: ; unreferenced
text "What do you want"
line "to play with?"
done
+_YouCanHaveThisText:: ; unreferenced
text "You can have this."
prompt
-UnknownText_0x190414::
+_TheBoxIsFullText:: ; unreferenced
text "The BOX is full!"
done
-UnknownText_0x190426::
+_ObtainedTheVoltorbBadgeText:: ; unreferenced
text "Obtained the"
line "VOLTORBBADGE!"
done
-UnknownText_0x190442::
+_ThePasswordIsText:: ; unreferenced
text "The password is:"
line ""
done
-UnknownText_0x190455::
+_IsThisOKText:: ; unreferenced
text "Is this OK?"
done
-UnknownText_0x190462::
+_EnterTheIDNoText:: ; unreferenced
text "Enter the"
line "ID no."
done
-UnknownText_0x190474::
+_EnterTheAmountText:: ; unreferenced
text "Enter the"
line "amount."
done
@@ -451,7 +453,7 @@ _WillTradeText::
text_ram wOTTrademonSpeciesName
text_end
- text_end ; unused
+ text_end ; unreferenced
_ForYourMonWillTradeText::
text "for @"
@@ -485,7 +487,7 @@ _OPT_OakText1::
text_ram wMonOrItemNameBuffer
text_end
- text_end ; unused
+ text_end ; unreferenced
_OPT_OakText2::
text_start
@@ -825,7 +827,7 @@ _PnP_Text4::
text_ram wStringBuffer1
text_end
- text_end ; unused
+ text_end ; unreferenced
_PnP_CuteText::
text_start
@@ -913,7 +915,7 @@ _PnP_Text5::
text_ram wStringBuffer1
text_end
- text_end ; unused
+ text_end ; unreferenced
_RocketRadioText1::
text_start
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index cb1685c2..5f5f0e5d 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -160,7 +160,7 @@ _RodNothingText::
text "Not even a nibble!"
prompt
-; unused
+; unreferenced
_UnusedNothingHereText::
text "Looks like there's"
line "nothing here."
@@ -379,7 +379,7 @@ Text_BattleEffectActivate::
text_ram wStringBuffer2
text_end
- text_end ; unused
+ text_end ; unreferenced
_BattleStatWentWayUpText::
text_pause
@@ -396,7 +396,7 @@ Text_BattleFoeEffectActivate::
text_ram wStringBuffer2
text_end
- text_end ; unused
+ text_end ; unreferenced
_BattleStatSharplyFellText::
text_pause
@@ -1316,7 +1316,7 @@ _MoveMonWOMailSaveText::
cont "will be saved. OK?"
done
-UnknownText_0x195b29::
+_WindowAreaExceededErrorText:: ; unreferenced
text "The window save"
line "area was exceeded."
done
@@ -1326,7 +1326,7 @@ _WindowPoppingErrorText::
line "able for popping."
done
-UnknownText_0x195b72::
+_CorruptedEventText:: ; unreferenced
text "Corrupted event!"
prompt
@@ -1372,7 +1372,7 @@ _CongratulationsYourPokemonText::
text_ram wStringBuffer2
text_end
- text_end ; unused
+ text_end ; unreferenced
_EvolvedIntoText::
text_start
diff --git a/data/text/common_3.asm b/data/text/common_3.asm
index 45f31824..cc3ee20c 100644
--- a/data/text/common_3.asm
+++ b/data/text/common_3.asm
@@ -82,8 +82,7 @@ _PhoneThankYouText::
text "Thank you!"
done
-; unused
-UnknownText_0x198152::
+_SpaceSpaceColonText:: ; unreferenced
text " :"
done
@@ -168,7 +167,7 @@ Text_MoveForgetCount::
text_pause
text_end
- text_end ; unused
+ text_end ; unreferenced
_MoveForgotText::
text " Poof!@"
@@ -266,7 +265,7 @@ Text_BallCaught::
sound_caught_mon
text_end
- text_end ; unused
+ text_end ; unreferenced
_WaitButtonText::
text_promptbutton
@@ -332,7 +331,7 @@ Text_PlayedPokeFlute::
text_promptbutton
text_end
- text_end ; unused
+ text_end ; unreferenced
; BUG: "done" is not a valid terminator here, needs to change to "text_end"
_CoinCaseCountText::
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 85f261fa..b3cb7ab0 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -154,7 +154,7 @@ MahoganyMart1FLanceGoDownStairsMovement:
slow_step RIGHT
step_end
-UnknownText_0x1140cb:
+MahoganyMart1FRageCandyBarText: ; unreferenced
text "Hello, youngster!"
para "How would you like"
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 076e2ec3..a3569fc1 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -176,12 +176,12 @@ LanceHealsCommon:
setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
readvar VAR_FACING
ifequal RIGHT, .FacingRight
- applymovement TEAMROCKETBASEB2F_LANCE, UnknownText_0x114eca
+ applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114eca
disappear TEAMROCKETBASEB2F_LANCE
end
.FacingRight:
- applymovement TEAMROCKETBASEB2F_LANCE, UnknownText_0x114ed1
+ applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x114ed1
disappear TEAMROCKETBASEB2F_LANCE
end
@@ -355,7 +355,7 @@ TeamRocketBaseB2FTMThief:
TeamRocketBaseB2FHiddenFullHeal:
hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL
-UnknownText_0x114eca:
+MovementData_0x114eca:
step RIGHT
step RIGHT
step RIGHT
@@ -364,7 +364,7 @@ UnknownText_0x114eca:
step RIGHT
step_end
-UnknownText_0x114ed1:
+MovementData_0x114ed1:
step RIGHT
step RIGHT
step RIGHT
@@ -730,8 +730,7 @@ RocketBaseLanceElectrodeDoneText:
cont "any need for it."
done
-; unused
-UnknownText_0x11559e:
+RocketBaseReceivedHM06Text: ; unused
text "<PLAYER> received"
line "HM06."
done
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 14:07:51 +0000