summaryrefslogtreecommitdiff
path: root/engine/items
diff options
context:
space:
mode:
Diffstat (limited to 'engine/items')
-rw-r--r--engine/items/item_effects.asm254
-rw-r--r--engine/items/mart.asm236
-rw-r--r--engine/items/pack.asm85
-rw-r--r--engine/items/tmhm.asm44
4 files changed, 267 insertions, 352 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 35c20db70..96e0e0047 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -218,7 +218,7 @@ PokeBallEffect:
ld hl, wOptions
res NO_TEXT_SCROLL, [hl]
- ld hl, UsedItemText
+ ld hl, ItemUsedText
call PrintText
ld a, [wEnemyMonCatchRate]
@@ -399,16 +399,16 @@ PokeBallEffect:
jr nz, .caught
ld a, [wBuffer2]
cp $1
- ld hl, Text_NoShake
+ ld hl, BallBrokeFreeText
jp z, .shake_and_break_free
cp $2
- ld hl, Text_OneShake
+ ld hl, BallAppearedCaughtText
jp z, .shake_and_break_free
cp $3
- ld hl, Text_TwoShakes
+ ld hl, BallAlmostHadItText
jp z, .shake_and_break_free
cp $4
- ld hl, Text_ThreeShakes
+ ld hl, BallSoCloseText
jp z, .shake_and_break_free
.caught
@@ -517,7 +517,7 @@ PokeBallEffect:
call CheckReceivedDex
jr z, .skip_pokedex
- ld hl, Text_AddedToPokedex
+ ld hl, NewDexDataText
call PrintText
call ClearSprites
@@ -562,7 +562,7 @@ PokeBallEffect:
ld [hl], a
.SkipPartyMonFriendBall:
- ld hl, Text_AskNicknameNewlyCaughtMon
+ ld hl, AskGiveNicknameText
call PrintText
ld a, [wCurPartySpecies]
@@ -622,7 +622,7 @@ PokeBallEffect:
.SkipBoxMonFriendBall:
call CloseSRAM
- ld hl, Text_AskNicknameNewlyCaughtMon
+ ld hl, AskGiveNicknameText
call PrintText
ld a, [wCurPartySpecies]
@@ -665,7 +665,7 @@ PokeBallEffect:
call CloseSRAM
- ld hl, Text_SentToBillsPC
+ ld hl, BallSentToPCText
call PrintText
call RotateThreePalettesRight
@@ -1061,39 +1061,33 @@ LevelBallMultiplier:
; These two texts were carried over from gen 1.
; They are not used in gen 2, and are dummied out.
-Text_RBY_CatchMarowak:
- ; It dodged the thrown BALL! This #MON can't be caught!
- text_far UnknownText_0x1c5a5a
+BallDodgedText:
+ text_far _BallDodgedText
text_end
-Text_RBY_NoShake:
- ; You missed the #MON!
- text_far UnknownText_0x1c5a90
+BallMissedText:
+ text_far _BallMissedText
text_end
-Text_NoShake:
- ; Oh no! The #MON broke free!
- text_far UnknownText_0x1c5aa6
+BallBrokeFreeText:
+ text_far _BallBrokeFreeText
text_end
-Text_OneShake:
- ; Aww! It appeared to be caught!
- text_far UnknownText_0x1c5ac3
+BallAppearedCaughtText:
+ text_far _BallAppearedCaughtText
text_end
-Text_TwoShakes:
- ; Aargh! Almost had it!
- text_far UnknownText_0x1c5ae3
+BallAlmostHadItText:
+ text_far _BallAlmostHadItText
text_end
-Text_ThreeShakes:
- ; Shoot! It was so close too!
- text_far UnknownText_0x1c5afa
+BallSoCloseText:
+ text_far _BallSoCloseText
text_end
Text_GotchaMonWasCaught:
; Gotcha! @ was caught!@ @
- text_far UnknownText_0x1c5b17
+ text_far Text_BallCaught
text_asm
call WaitSFX
push bc
@@ -1103,27 +1097,23 @@ Text_GotchaMonWasCaught:
ld de, MUSIC_CAPTURE
call PlayMusic
pop bc
- ld hl, TextJump_Waitbutton
+ ld hl, WaitButtonText
ret
-TextJump_Waitbutton:
- ; @
- text_far Text_Waitbutton_2
+WaitButtonText:
+ text_far _WaitButtonText
text_end
-Text_SentToBillsPC:
- ; was sent to BILL's PC.
- text_far UnknownText_0x1c5b38
+BallSentToPCText:
+ text_far _BallSentToPCText
text_end
-Text_AddedToPokedex:
- ; 's data was newly added to the #DEX.@ @
- text_far UnknownText_0x1c5b53
+NewDexDataText:
+ text_far _NewDexDataText
text_end
-Text_AskNicknameNewlyCaughtMon:
- ; Give a nickname to @ ?
- text_far UnknownText_0x1c5b7f
+AskGiveNicknameText:
+ text_far _AskGiveNicknameText
text_end
ReturnToBattle_UseBall:
@@ -1204,7 +1194,7 @@ VitaminEffect:
call Play_SFX_FULL_HEAL
- ld hl, Text_StatRose
+ ld hl, ItemStatRoseText
call PrintText
ld c, HAPPINESS_USEDITEM
@@ -1213,7 +1203,7 @@ VitaminEffect:
jp UseDisposableItem
NoEffectMessage:
- ld hl, WontHaveAnyEffectText
+ ld hl, ItemWontHaveEffectText
call PrintText
jp ClearPalettes
@@ -1232,9 +1222,8 @@ RareCandy_StatBooster_ExitMenu:
ld [wItemEffectSucceeded], a
jp ClearPalettes
-Text_StatRose:
- ; 's @ rose.
- text_far UnknownText_0x1c5b9a
+ItemStatRoseText:
+ text_far _ItemStatRoseText
text_end
StatStrings:
@@ -2055,14 +2044,13 @@ Softboiled_MilkDrinkFunction:
.cant_use
push bc
- ld hl, .Text_CantBeUsed
+ ld hl, .ItemCantUseOnMonText
call MenuTextboxBackup
pop bc
jr .loop
-.Text_CantBeUsed:
- ; That can't be used on this #MON.
- text_far UnknownText_0x1c5bac
+.ItemCantUseOnMonText:
+ text_far _ItemCantUseOnMonText
text_end
EscapeRopeEffect:
@@ -2089,16 +2077,15 @@ RepelEffect:
UseRepel:
ld a, [wRepelEffect]
and a
- ld hl, TextJump_RepelUsedEarlierIsStillInEffect
+ ld hl, RepelUsedEarlierIsStillInEffectText
jp nz, PrintText
ld a, b
ld [wRepelEffect], a
jp UseItemText
-TextJump_RepelUsedEarlierIsStillInEffect:
- ; The REPEL used earlier is still in effect.
- text_far Text_RepelUsedEarlierIsStillInEffect
+RepelUsedEarlierIsStillInEffectText:
+ text_far _RepelUsedEarlierIsStillInEffectText
text_end
XAccuracyEffect:
@@ -2205,7 +2192,7 @@ PokeFluteEffect:
ld a, [wd002]
and a
- ld hl, .CatchyTune
+ ld hl, .PlayedFluteText
jp z, PrintText
ld hl, .PlayedTheFlute
call PrintText
@@ -2214,7 +2201,7 @@ PokeFluteEffect:
and 1 << DANGER_ON_F
jr nz, .dummy2
.dummy2
- ld hl, .AllSleepingMonWokeUp
+ ld hl, .FluteWakeUpText
jp PrintText
.CureSleep:
@@ -2237,19 +2224,17 @@ PokeFluteEffect:
jr nz, .loop
ret
-.CatchyTune:
- ; Played the # FLUTE. Now, that's a catchy tune!
- text_far UnknownText_0x1c5bf9
+.PlayedFluteText:
+ text_far _PlayedFluteText
text_end
-.AllSleepingMonWokeUp:
- ; All sleeping #MON woke up.
- text_far UnknownText_0x1c5c28
+.FluteWakeUpText:
+ text_far _FluteWakeUpText
text_end
.PlayedTheFlute:
; played the # FLUTE.@ @
- text_far UnknownText_0x1c5c44
+ text_far Text_PlayedPokeFlute
text_asm
ld a, [wBattleMode]
and a
@@ -2265,19 +2250,19 @@ PokeFluteEffect:
jp PokeFluteTerminatorCharacter
BlueCardEffect:
- ld hl, .bluecardtext
+ ld hl, .BlueCardBalanceText
jp MenuTextboxWaitButton
-.bluecardtext
- text_far UnknownText_0x1c5c5e
+.BlueCardBalanceText:
+ text_far _BlueCardBalanceText
text_end
CoinCaseEffect:
- ld hl, .coincasetext
+ ld hl, .CoinCaseCountText
jp MenuTextboxWaitButton
-.coincasetext
- text_far UnknownText_0x1c5c7b
+.CoinCaseCountText:
+ text_far _CoinCaseCountText
text_end
OldRodEffect:
@@ -2317,11 +2302,11 @@ RestorePPEffect:
cp ELIXER
jp z, Elixer_RestorePPofAllMoves
- ld hl, TextJump_RaiseThePPOfWhichMove
+ ld hl, RaiseThePPOfWhichMoveText
ld a, [wd002]
cp PP_UP
jr z, .ppup
- ld hl, TextJump_RestoreThePPOfWhichMove
+ ld hl, RestoreThePPOfWhichMoveText
.ppup
call PrintText
@@ -2365,7 +2350,7 @@ RestorePPEffect:
.CantUsePPUpOnSketch:
.pp_is_maxed_out
- ld hl, TextJump_PPIsMaxedOut
+ ld hl, PPIsMaxedOutText
call PrintText
jr .loop2
@@ -2378,7 +2363,7 @@ RestorePPEffect:
call ApplyPPUp
call Play_SFX_FULL_HEAL
- ld hl, TextJump_PPsIncreased
+ ld hl, PPsIncreasedText
call PrintText
FinishPPRestore:
@@ -2401,7 +2386,7 @@ BattleRestorePP:
.not_in_battle
call Play_SFX_FULL_HEAL
- ld hl, UnknownText_0xf739
+ ld hl, PPRestoredText
call PrintText
jr FinishPPRestore
@@ -2530,29 +2515,24 @@ RestorePP:
xor a
ret
-TextJump_RaiseThePPOfWhichMove:
- ; Raise the PP of which move?
- text_far Text_RaiseThePPOfWhichMove
+RaiseThePPOfWhichMoveText:
+ text_far _RaiseThePPOfWhichMoveText
text_end
-TextJump_RestoreThePPOfWhichMove:
- ; Restore the PP of which move?
- text_far Text_RestoreThePPOfWhichMove
+RestoreThePPOfWhichMoveText:
+ text_far _RestoreThePPOfWhichMoveText
text_end
-TextJump_PPIsMaxedOut:
- ; 's PP is maxed out.
- text_far Text_PPIsMaxedOut
+PPIsMaxedOutText:
+ text_far _PPIsMaxedOutText
text_end
-TextJump_PPsIncreased:
- ; 's PP increased.
- text_far Text_PPsIncreased
+PPsIncreasedText:
+ text_far _PPsIncreasedText
text_end
-UnknownText_0xf739:
- ; PP was restored.
- text_far UnknownText_0x1c5cf1
+PPRestoredText:
+ text_far _PPRestoredText
text_end
SquirtbottleEffect:
@@ -2584,14 +2564,13 @@ GorgeousBoxEffect:
OpenBox:
farcall SetSpecificDecorationFlag
- ld hl, .text
+ ld hl, .SentTrophyHomeText
call PrintText
jp UseDisposableItem
-.text
- ; There was a trophy inside!
- text_far UnknownText_0x1c5d03
+.SentTrophyHomeText:
+ text_far _SentTrophyHomeText
text_end
NoEffect:
@@ -2605,7 +2584,7 @@ Play_SFX_FULL_HEAL:
ret
UseItemText:
- ld hl, UsedItemText
+ ld hl, ItemUsedText
call PrintText
call Play_SFX_FULL_HEAL
call WaitPressAorB_BlinkCursor
@@ -2627,14 +2606,14 @@ UseBallInTrainerBattle:
ldh [hBattleTurn], a
ld [wNumHits], a
predef PlayBattleAnim
- ld hl, BlockedTheBallText
+ ld hl, BallBlockedText
call PrintText
- ld hl, DontBeAThiefText
+ ld hl, BallDontBeAThiefText
call PrintText
jr UseDisposableItem
WontHaveAnyEffect_NotUsedMessage:
- ld hl, WontHaveAnyEffectText
+ ld hl, ItemWontHaveEffectText
call PrintText
; Item wasn't used.
@@ -2643,11 +2622,11 @@ WontHaveAnyEffect_NotUsedMessage:
ret
LooksBitterMessage:
- ld hl, LooksBitterText
+ ld hl, ItemLooksBitterText
jp PrintText
Ball_BoxIsFullMessage:
- ld hl, Ball_BoxIsFullText
+ ld hl, BallBoxFullText
call PrintText
; Item wasn't used.
@@ -2656,27 +2635,27 @@ Ball_BoxIsFullMessage:
ret
CantUseOnEggMessage:
- ld hl, CantUseOnEggText
+ ld hl, ItemCantUseOnEggText
jr CantUseItemMessage
IsntTheTimeMessage:
- ld hl, IsntTheTimeText
+ ld hl, ItemOakWarningText
jr CantUseItemMessage
WontHaveAnyEffectMessage:
- ld hl, WontHaveAnyEffectText
+ ld hl, ItemWontHaveEffectText
jr CantUseItemMessage
BelongsToSomeoneElseMessage:
- ld hl, BelongsToSomeoneElseText
+ ld hl, ItemBelongsToSomeoneElseText
jr CantUseItemMessage
CyclingIsntAllowedMessage:
- ld hl, CyclingIsntAllowedText
+ ld hl, NoCyclingText
jr CantUseItemMessage
CantGetOnYourBikeMessage:
- ld hl, CantGetOnYourBikeText
+ ld hl, ItemCantGetOnText
CantUseItemMessage:
; Item couldn't be used.
@@ -2684,69 +2663,56 @@ CantUseItemMessage:
ld [wItemEffectSucceeded], a
jp PrintText
-LooksBitterText:
- ; It looks bitter…
- text_far UnknownText_0x1c5d3e
+ItemLooksBitterText:
+ text_far _ItemLooksBitterText
text_end
-CantUseOnEggText:
- ; That can't be used on an EGG.
- text_far UnknownText_0x1c5d50
+ItemCantUseOnEggText:
+ text_far _ItemCantUseOnEggText
text_end
-IsntTheTimeText:
- ; OAK: ! This isn't the time to use that!
- text_far UnknownText_0x1c5d6e
+ItemOakWarningText:
+ text_far _ItemOakWarningText
text_end
-BelongsToSomeoneElseText:
- ; That belongs to someone else!
- text_far UnknownText_0x1c5d97
+ItemBelongsToSomeoneElseText:
+ text_far _ItemBelongsToSomeoneElseText
text_end
-WontHaveAnyEffectText:
- ; It won't have any effect.
- text_far UnknownText_0x1c5db6
+ItemWontHaveEffectText:
+ text_far _ItemWontHaveEffectText
text_end
-BlockedTheBallText:
- ; The trainer blocked the BALL!
- text_far UnknownText_0x1c5dd0
+BallBlockedText:
+ text_far _BallBlockedText
text_end
-DontBeAThiefText:
- ; Don't be a thief!
- text_far UnknownText_0x1c5def
+BallDontBeAThiefText:
+ text_far _BallDontBeAThiefText
text_end
-CyclingIsntAllowedText:
- ; Cycling isn't allowed here.
- text_far UnknownText_0x1c5e01
+NoCyclingText:
+ text_far _NoCyclingText
text_end
-CantGetOnYourBikeText:
- ; Can't get on your @ now.
- text_far UnknownText_0x1c5e1d
+ItemCantGetOnText:
+ text_far _ItemCantGetOnText
text_end
-Ball_BoxIsFullText:
- ; The #MON BOX is full. That can't be used now.
- text_far UnknownText_0x1c5e3a
+BallBoxFullText:
+ text_far _BallBoxFullText
text_end
-UsedItemText:
- ; used the@ .
- text_far UnknownText_0x1c5e68
+ItemUsedText:
+ text_far _ItemUsedText
text_end
-GotOnTheItemText:
- ; got on the@ .
- text_far UnknownText_0x1c5e7b
+ItemGotOnText:
+ text_far _ItemGotOnText
text_end
-GotOffTheItemText:
- ; got off@ the @ .
- text_far UnknownText_0x1c5e90
+ItemGotOffText:
+ text_far _ItemGotOffText
text_end
ApplyPPUp:
diff --git a/engine/items/mart.asm b/engine/items/mart.asm
index 0209aac23..98bb8324c 100644
--- a/engine/items/mart.asm
+++ b/engine/items/mart.asm
@@ -34,10 +34,10 @@ MartDialog:
HerbShop:
call FarReadMart
call LoadStandardMenuHeader
- ld hl, Text_HerbShop_Intro
+ ld hl, HerbShopLadyIntroText
call MartTextbox
call BuyMenu
- ld hl, Text_HerbShop_ComeAgain
+ ld hl, HerbalLadyComeAgainText
call MartTextbox
ret
@@ -47,7 +47,7 @@ BargainShop:
call LoadMartPointer
call ReadMart
call LoadStandardMenuHeader
- ld hl, Text_BargainShop_Intro
+ ld hl, BargainShopIntroText
call MartTextbox
call BuyMenu
ld hl, wBargainShopFlags
@@ -58,17 +58,17 @@ BargainShop:
set DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F, [hl]
.skip_set
- ld hl, Text_BargainShop_ComeAgain
+ ld hl, BargainShopComeAgainText
call MartTextbox
ret
Pharmacist:
call FarReadMart
call LoadStandardMenuHeader
- ld hl, Text_Pharmacist_Intro
+ ld hl, PharmacyIntroText
call MartTextbox
call BuyMenu
- ld hl, Text_Pharmacist_ComeAgain
+ ld hl, PharmacyComeAgainText
call MartTextbox
ret
@@ -85,10 +85,10 @@ RooftopSale:
call LoadMartPointer
call ReadMart
call LoadStandardMenuHeader
- ld hl, Text_Mart_HowMayIHelpYou
+ ld hl, MartWelcomeText
call MartTextbox
call BuyMenu
- ld hl, Text_Mart_ComeAgain
+ ld hl, MartComeAgainText
call MartTextbox
ret
@@ -161,7 +161,7 @@ StandardMart:
.HowMayIHelpYou:
call LoadStandardMenuHeader
- ld hl, Text_Mart_HowMayIHelpYou
+ ld hl, MartWelcomeText
call PrintText
ld a, STANDARDMART_TOPMENU
ret
@@ -202,14 +202,14 @@ StandardMart:
.Quit:
call ExitMenu
- ld hl, Text_Mart_ComeAgain
+ ld hl, MartComeAgainText
call MartTextbox
ld a, STANDARDMART_EXIT
ret
.AnythingElse:
call LoadStandardMenuHeader
- ld hl, Text_Mart_AnythingElse
+ ld hl, MartAskMoreText
call PrintText
ld a, STANDARDMART_TOPMENU
ret
@@ -395,35 +395,35 @@ GetMartDialogGroup:
dwb .StandardMartPointers, 2
.StandardMartPointers:
- dw Text_Mart_HowMany
- dw Text_Mart_CostsThisMuch
- dw Text_Mart_InsufficientFunds
- dw Text_Mart_BagFull
- dw Text_Mart_HereYouGo
+ dw MartHowManyText
+ dw MartFinalPriceText
+ dw MartNoMoneyText
+ dw MartPackFullText
+ dw MartThanksText
dw BuyMenuLoop
.HerbShopPointers:
- dw Text_HerbShop_HowMany
- dw Text_HerbShop_CostsThisMuch
- dw Text_HerbShop_InsufficientFunds
- dw Text_HerbShop_BagFull
- dw Text_HerbShop_HereYouGo
+ dw HerbalLadyHowManyText
+ dw HerbalLadyFinalPriceText
+ dw HerbalLadyNoMoneyText
+ dw HerbalLadyPackFullText
+ dw HerbalLadyThanksText
dw BuyMenuLoop
.BargainShopPointers:
dw BuyMenuLoop
- dw Text_BargainShop_CostsThisMuch
- dw Text_BargainShop_InsufficientFunds
- dw Text_BargainShop_BagFull
- dw Text_BargainShop_HereYouGo
- dw Text_BargainShop_SoldOut
+ dw BargainShopFinalPriceText
+ dw BargainShopNoFundsText
+ dw BargainShopPackFullText
+ dw BargainShopThanksText
+ dw BargainShopSoldOutText
.PharmacyPointers:
- dw Text_Pharmacy_HowMany
- dw Text_Pharmacy_CostsThisMuch
- dw Text_Pharmacy_InsufficientFunds
- dw Text_Pharmacy_BagFull
- dw Text_Pharmacy_HereYouGo
+ dw PharmacyHowManyText
+ dw PharmacyFinalPriceText
+ dw PharmacyNoMoneyText
+ dw PharmacyPackFullText
+ dw PharmacyThanksText
dw BuyMenuLoop
BuyMenuLoop:
@@ -581,14 +581,12 @@ RooftopSaleAskPurchaseQuantity:
ld d, [hl]
ret
-Text_Mart_HowMany:
- ; How many?
- text_far UnknownText_0x1c4bfd
+MartHowManyText:
+ text_far _MartHowManyText
text_end
-Text_Mart_CostsThisMuch:
- ; @ (S) will be ¥@ .
- text_far UnknownText_0x1c4c08
+MartFinalPriceText:
+ text_far _MartFinalPriceText
text_end
MenuHeader_Buy:
@@ -624,109 +622,88 @@ MenuHeader_Buy:
call PrintBCDNumber
ret
-Text_HerbShop_Intro:
- ; Hello, dear. I sell inexpensive herbal medicine. They're good, but a trifle bitter. Your #MON may not like them. Hehehehe…
- text_far UnknownText_0x1c4c28
+HerbShopLadyIntroText:
+ text_far _HerbShopLadyIntroText
text_end
-Text_HerbShop_HowMany:
- ; How many?
- text_far UnknownText_0x1c4ca3
+HerbalLadyHowManyText:
+ text_far _HerbalLadyHowManyText
text_end
-Text_HerbShop_CostsThisMuch:
- ; @ (S) will be ¥@ .
- text_far UnknownText_0x1c4cae
+HerbalLadyFinalPriceText:
+ text_far _HerbalLadyFinalPriceText
text_end
-Text_HerbShop_HereYouGo:
- ; Thank you, dear. Hehehehe…
- text_far UnknownText_0x1c4cce
+HerbalLadyThanksText:
+ text_far _HerbalLadyThanksText
text_end
-Text_HerbShop_BagFull:
- ; Oh? Your PACK is full, dear.
- text_far UnknownText_0x1c4cea
+HerbalLadyPackFullText:
+ text_far _HerbalLadyPackFullText
text_end
-Text_HerbShop_InsufficientFunds:
- ; Hehehe… You don't have the money.
- text_far UnknownText_0x1c4d08
+HerbalLadyNoMoneyText:
+ text_far _HerbalLadyNoMoneyText
text_end
-Text_HerbShop_ComeAgain:
- ; Come again, dear. Hehehehe…
- text_far UnknownText_0x1c4d2a
+HerbalLadyComeAgainText:
+ text_far _HerbalLadyComeAgainText
text_end
-Text_BargainShop_Intro:
- ; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item.
- text_far UnknownText_0x1c4d47
+BargainShopIntroText:
+ text_far _BargainShopIntroText
text_end
-Text_BargainShop_CostsThisMuch:
- ; costs ¥@ . Want it?
- text_far UnknownText_0x1c4db0
+BargainShopFinalPriceText:
+ text_far _BargainShopFinalPriceText
text_end
-Text_BargainShop_HereYouGo:
- ; Thanks.
- text_far UnknownText_0x1c4dcd
+BargainShopThanksText:
+ text_far _BargainShopThanksText
text_end
-Text_BargainShop_BagFull:
- ; Uh-oh, your PACK is chock-full.
- text_far UnknownText_0x1c4dd6
+BargainShopPackFullText:
+ text_far _BargainShopPackFullText
text_end
-Text_BargainShop_SoldOut:
- ; You bought that already. I'm all sold out of it.
- text_far UnknownText_0x1c4df7
+BargainShopSoldOutText:
+ text_far _BargainShopSoldOutText
text_end
-Text_BargainShop_InsufficientFunds:
- ; Uh-oh, you're short on funds.
- text_far UnknownText_0x1c4e28
+BargainShopNoFundsText:
+ text_far _BargainShopNoFundsText
text_end
-Text_BargainShop_ComeAgain:
- ; Come by again sometime.
- text_far UnknownText_0x1c4e46
+BargainShopComeAgainText:
+ text_far _BargainShopComeAgainText
text_end
-Text_Pharmacist_Intro:
- ; What's up? Need some medicine?
- text_far UnknownText_0x1c4e5f
+PharmacyIntroText:
+ text_far _PharmacyIntroText
text_end
-Text_Pharmacy_HowMany:
- ; How many?
- text_far UnknownText_0x1c4e7e
+PharmacyHowManyText:
+ text_far _PharmacyHowManyText
text_end
-Text_Pharmacy_CostsThisMuch:
- ; @ (S) will cost ¥@ .
- text_far UnknownText_0x1c4e89
+PharmacyFinalPriceText:
+ text_far _PharmacyFinalPriceText
text_end
-Text_Pharmacy_HereYouGo:
- ; Thanks much!
- text_far UnknownText_0x1c4eab
+PharmacyThanksText:
+ text_far _PharmacyThanksText
text_end
-Text_Pharmacy_BagFull:
- ; You don't have any more space.
- text_far UnknownText_0x1c4eb9
+PharmacyPackFullText:
+ text_far _PharmacyPackFullText
text_end
-Text_Pharmacy_InsufficientFunds:
- ; Huh? That's not enough money.
- text_far UnknownText_0x1c4ed8
+PharmacyNoMoneyText:
+ text_far _PharmacyNoMoneyText
text_end
-Text_Pharmacist_ComeAgain:
- ; All right. See you around.
- text_far UnknownText_0x1c4ef6
+PharmacyComeAgainText:
+ text_far _PharmacyComeAgainText
text_end
SellMenu:
@@ -752,8 +729,7 @@ SellMenu:
ret
.NothingToSellText:
- ; You don't have anything to sell.
- text_far UnknownText_0x1c4f12
+ text_far _NothingToSellText
text_end
.TryToSellItem:
@@ -780,13 +756,13 @@ SellMenu:
ld a, [wItemAttributeParamBuffer]
and a
jr z, .okay_to_sell
- ld hl, TextMart_CantBuyFromYou
+ ld hl, MartCantBuyText
call PrintText
and a
ret
.okay_to_sell
- ld hl, Text_Mart_SellHowMany
+ ld hl, MartSellHowManyText
call PrintText
farcall PlaceMoneyAtTopLeftOfTextbox
farcall SelectQuantityToSell
@@ -795,7 +771,7 @@ SellMenu:
hlcoord 1, 14
lb bc, 3, 18
call ClearBox
- ld hl, Text_Mart_ICanPayThisMuch
+ ld hl, MartSellPriceText
call PrintTextboxText
call YesNoBox
jr c, .declined
@@ -809,7 +785,7 @@ SellMenu:
hlcoord 1, 14
lb bc, 3, 18
call ClearBox
- ld hl, Text_Mart_SoldForAmount
+ ld hl, MartBoughtText
call PrintTextboxText
call PlayTransactionSound
farcall PlaceMoneyBottomLeft
@@ -820,22 +796,19 @@ SellMenu:
and a
ret
-Text_Mart_SellHowMany:
- ; How many?
- text_far UnknownText_0x1c4f33
+MartSellHowManyText:
+ text_far _MartSellHowManyText
text_end
-Text_Mart_ICanPayThisMuch:
- ; I can pay you ¥@ . Is that OK?
- text_far UnknownText_0x1c4f3e
+MartSellPriceText:
+ text_far _MartSellPriceText
text_end
.UnusedString15f7d:
db "！ダミー！@"
-Text_Mart_HowMayIHelpYou:
- ; Welcome! How may I help you?
- text_far UnknownText_0x1c4f62
+MartWelcomeText:
+ text_far _MartWelcomeText
text_end
MenuHeader_BuySell:
@@ -851,37 +824,32 @@ MenuHeader_BuySell:
db "SELL@"
db "QUIT@"
-Text_Mart_HereYouGo:
- ; Here you are. Thank you!
- text_far UnknownText_0x1c4f80
+MartThanksText:
+ text_far _MartThanksText
text_end
-Text_Mart_InsufficientFunds:
- ; You don't have enough money.
- text_far UnknownText_0x1c4f9a
+MartNoMoneyText:
+ text_far _MartNoMoneyText
text_end
-Text_Mart_BagFull:
- ; You can't carry any more items.
- text_far UnknownText_0x1c4fb7
+MartPackFullText:
+ text_far _MartPackFullText
text_end
-TextMart_CantBuyFromYou:
- ; Sorry, I can't buy that from you.
- text_far UnknownText_0x1c4fd7
+MartCantBuyText:
+ text_far _MartCantBuyText
text_end
-Text_Mart_ComeAgain:
- ; Please come again!
- text_far UnknownText_0x1c4ff9
+MartComeAgainText:
+ text_far _MartComeAgainText
text_end
-Text_Mart_AnythingElse:
- text_far UnknownText_0x1c500d
+MartAskMoreText:
+ text_far _MartAskMoreText
text_end
-Text_Mart_SoldForAmount:
- text_far UnknownText_0x1c502e
+MartBoughtText:
+ text_far _MartBoughtText
text_end
PlayTransactionSound:
diff --git a/engine/items/pack.asm b/engine/items/pack.asm
index d5d331720..f19539b88 100644
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@@ -440,7 +440,7 @@ UseItem:
dw .Field ; ITEMMENU_CLOSE
.Oak:
- ld hl, Text_ThisIsntTheTime
+ ld hl, OakThisIsntTheTimeText
call Pack_PrintTextNoScroll
ret
@@ -461,7 +461,7 @@ UseItem:
ret
.NoPokemon:
- ld hl, TextJump_YouDontHaveAMon
+ ld hl, YouDontHaveAMonText
call Pack_PrintTextNoScroll
ret
@@ -475,7 +475,7 @@ UseItem:
ret
TossMenu:
- ld hl, Text_ThrowAwayHowMany
+ ld hl, AskThrowAwayText
call Pack_PrintTextNoScroll
farcall SelectQuantityToToss
push af
@@ -483,7 +483,7 @@ TossMenu:
pop af
jr c, .finish
call Pack_GetItemName
- ld hl, Text_ConfirmThrowAway
+ ld hl, AskQuantityThrowAwayText
call MenuTextbox
call YesNoBox
push af
@@ -494,7 +494,7 @@ TossMenu:
ld a, [wCurItemQuantity]
call TossItem
call Pack_GetItemName
- ld hl, Text_ThrewAway
+ ld hl, ThrewAwayText
call Pack_PrintTextNoScroll
.finish
ret
@@ -547,12 +547,12 @@ RegisterItem:
call Pack_GetItemName
ld de, SFX_FULL_HEAL
call WaitPlaySFX
- ld hl, Text_RegisteredItem
+ ld hl, RegisteredItemText
call Pack_PrintTextNoScroll
ret
.cant_register
- ld hl, Text_CantRegister
+ ld hl, CantRegisterText
call Pack_PrintTextNoScroll
ret
@@ -581,7 +581,7 @@ GiveItem:
ld a, [wCurPartySpecies]
cp EGG
jr nz, .give
- ld hl, .Egg
+ ld hl, .AnEggCantHoldAnItemText
call PrintText
jr .loop
@@ -611,12 +611,11 @@ GiveItem:
ret
.NoPokemon:
- ld hl, TextJump_YouDontHaveAMon
+ ld hl, YouDontHaveAMonText
call Pack_PrintTextNoScroll
ret
-.Egg:
- ; An EGG can't hold an item.
- text_far Text_AnEGGCantHoldAnItem
+.AnEggCantHoldAnItemText:
+ text_far _AnEggCantHoldAnItemText
text_end
QuitItemSubmenu:
@@ -735,7 +734,7 @@ BattlePack:
xor a
ldh [hBGMapMode], a
call WaitBGMap_DrawPackGFX
- ld hl, Text_PackEmptyString
+ ld hl, PackEmptyText
call Pack_PrintTextNoScroll
call Pack_JumptableNext
ret
@@ -851,7 +850,7 @@ TMHMSubmenu:
dw .BattleOnly ; ITEMMENU_CLOSE
.Oak:
- ld hl, Text_ThisIsntTheTime
+ ld hl, OakThisIsntTheTimeText
call Pack_PrintTextNoScroll
ret
@@ -1298,7 +1297,7 @@ Pack_InterpretJoypad:
.select
farcall SwitchItemsInBag
- ld hl, Text_MoveItemWhere
+ ld hl, AskItemMoveText
call Pack_PrintTextNoScroll
scf
ret
@@ -1546,60 +1545,48 @@ PC_Mart_BallsPocketMenuHeader:
dba PlaceMenuItemQuantity
dba UpdateItemDescription
-Text_PackNoItems:
- ; No items.
- text_far UnknownText_0x1c0b9a
+PackNoItemText:
+ text_far _PackNoItemText
text_end
-Text_ThrowAwayHowMany:
- ; Throw away how many?
- text_far UnknownText_0x1c0ba5
+AskThrowAwayText:
+ text_far _AskThrowAwayText
text_end
-Text_ConfirmThrowAway:
- ; Throw away @ @ (S)?
- text_far UnknownText_0x1c0bbb
+AskQuantityThrowAwayText:
+ text_far _AskQuantityThrowAwayText
text_end
-Text_ThrewAway:
- ; Threw away @ (S).
- text_far UnknownText_0x1c0bd8
+ThrewAwayText:
+ text_far _ThrewAwayText
text_end
-Text_ThisIsntTheTime:
- ; OAK: ! This isn't the time to use that!
- text_far UnknownText_0x1c0bee
+OakThisIsntTheTimeText:
+ text_far _OakThisIsntTheTimeText
text_end
-TextJump_YouDontHaveAMon:
- ; You don't have a #MON!
- text_far Text_YouDontHaveAMon
+YouDontHaveAMonText:
+ text_far _YouDontHaveAMonText
text_end
-Text_RegisteredItem:
- ; Registered the @ .
- text_far UnknownText_0x1c0c2e
+RegisteredItemText:
+ text_far _RegisteredItemText
text_end
-Text_CantRegister:
- ; You can't register that item.
- text_far UnknownText_0x1c0c45
+CantRegisterText:
+ text_far _CantRegisterText
text_end
-Text_MoveItemWhere:
- ; Where should this be moved to?
- text_far UnknownText_0x1c0c63
+AskItemMoveText:
+ text_far _AskItemMoveText
text_end
-Text_PackEmptyString:
- ;
- text_far UnknownText_0x1c0c83
+PackEmptyText:
+ text_far _PackEmptyText
text_end
-TextJump_YouCantUseItInABattle:
- ; Doesn't seem to be used anywhere
- ; "You can't use it in a battle."
- text_far Text_YouCantUseItInABattle
+YouCantUseItInABattleText:
+ text_far _YouCantUseItInABattleText
text_end
PackMenuGFX:
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm
index d82b5829e..736f00cdb 100644
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -54,14 +54,14 @@ AskTeachTMHM:
ld [wPutativeTMHMMove], a
call GetMoveName
call CopyName1
- ld hl, Text_BootedTM ; Booted up a TM
+ ld hl, BootedTMText ; Booted up a TM
ld a, [wCurItem]
cp HM01
jr c, .TM
- ld hl, Text_BootedHM ; Booted up an HM
+ ld hl, BootedHMText ; Booted up an HM
.TM:
call PrintText
- ld hl, Text_ItContained
+ ld hl, ContainedMoveText
call PrintText
call YesNoBox
.NotTMHM:
@@ -132,7 +132,7 @@ TeachTMHM:
ld de, SFX_WRONG
call PlaySFX
pop de
- ld hl, Text_TMHMNotCompatible
+ ld hl, TMHMNotCompatibleText
call PrintText
jr .nope
@@ -166,24 +166,20 @@ TeachTMHM:
scf
ret
-Text_BootedTM:
- ; Booted up a TM.
- text_far UnknownText_0x1c0373
+BootedTMText:
+ text_far _BootedTMText
text_end
-Text_BootedHM:
- ; Booted up an HM.
- text_far UnknownText_0x1c0384
+BootedHMText:
+ text_far _BootedHMText
text_end
-Text_ItContained:
- ; It contained @ . Teach @ to a #MON?
- text_far UnknownText_0x1c0396
+ContainedMoveText:
+ text_far _ContainedMoveText
text_end
-Text_TMHMNotCompatible:
- ; is not compatible with @ . It can't learn @ .
- text_far UnknownText_0x1c03c2
+TMHMNotCompatibleText:
+ text_far _TMHMNotCompatibleText
text_end
TMHM_PocketLoop:
@@ -375,7 +371,7 @@ TMHM_DisplayPocketItems:
ld [hl], "H"
inc hl
ld de, wTempTMHM
- lb bc, PRINTNUM_RIGHTALIGN | 1, 2
+ lb bc, PRINTNUM_LEFTALIGN | 1, 2
call PrintNum
pop af
ld [wTempTMHM], a
@@ -491,20 +487,18 @@ TMHM_PlaySFX_ReadText2:
Unreferenced_Function2cadf:
call ConvertCurItemIntoCurTMHM
call .CheckHaveRoomForTMHM
- ld hl, .NoRoomText
+ ld hl, .NoRoomTMHMText
jr nc, .print
- ld hl, .ReceivedText
+ ld hl, .ReceivedTMHMText
.print
jp PrintText
-.NoRoomText:
- ; You have no room for any more @ S.
- text_far UnknownText_0x1c03fa
+.NoRoomTMHMText:
+ text_far _NoRoomTMHMText
text_end
-.ReceivedText:
- ; You received @ !
- text_far UnknownText_0x1c0421
+.ReceivedTMHMText:
+ text_far _ReceivedTMHMText
text_end
.CheckHaveRoomForTMHM:
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 12:34:04 +0000