pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

#641 fixes and additions. (#646)

Browse Source 
Name a lot of text labels according to our conventions
This commit is contained in:
mid-kid
2019-10-20 22:24:17 +00:00
committed by Rangi
parent 3fc2ba41f7
commit e3e0bcd653
203 changed files with 4077 additions and 4598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
engine/items/item_effects.asm
View File

File diff suppressed because it is too large Load Diff

236
engine/items/mart.asm
View File

@@ -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:

85
engine/items/pack.asm
View File

@@ -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:

42
engine/items/tmhm.asm
View File

@@ -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:
@@ -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: