summaryrefslogtreecommitdiff
path: root/engine/items
diff options
context:
space:
mode:
Diffstat (limited to 'engine/items')
-rw-r--r--engine/items/item_effects.asm10
-rw-r--r--engine/items/mart.asm32
-rw-r--r--engine/items/pack.asm4
-rw-r--r--engine/items/tmhm.asm2
-rw-r--r--engine/items/update_item_description.asm2
5 files changed, 25 insertions, 25 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index fe5ec5663..35c20db70 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1357,7 +1357,7 @@ RareCandyEffect:
hlcoord 9, 0
ld b, 10
ld c, 9
- call TextBox
+ call Textbox
hlcoord 11, 1
ld bc, 4
@@ -1632,7 +1632,7 @@ BitterBerryEffect:
call UseItemText
ld hl, ConfusedNoMoreText
- call StdBattleTextBox
+ call StdBattleTextbox
ld a, 0
@@ -2056,7 +2056,7 @@ Softboiled_MilkDrinkFunction:
.cant_use
push bc
ld hl, .Text_CantBeUsed
- call MenuTextBoxBackup
+ call MenuTextboxBackup
pop bc
jr .loop
@@ -2266,7 +2266,7 @@ PokeFluteEffect:
BlueCardEffect:
ld hl, .bluecardtext
- jp MenuTextBoxWaitButton
+ jp MenuTextboxWaitButton
.bluecardtext
text_far UnknownText_0x1c5c5e
@@ -2274,7 +2274,7 @@ BlueCardEffect:
CoinCaseEffect:
ld hl, .coincasetext
- jp MenuTextBoxWaitButton
+ jp MenuTextboxWaitButton
.coincasetext
text_far UnknownText_0x1c5c7b
diff --git a/engine/items/mart.asm b/engine/items/mart.asm
index ef06c4d11..6341e9e6e 100644
--- a/engine/items/mart.asm
+++ b/engine/items/mart.asm
@@ -35,10 +35,10 @@ HerbShop:
call FarReadMart
call LoadStandardMenuHeader
ld hl, Text_HerbShop_Intro
- call MartTextBox
+ call MartTextbox
call BuyMenu
ld hl, Text_HerbShop_ComeAgain
- call MartTextBox
+ call MartTextbox
ret
BargainShop:
@@ -48,7 +48,7 @@ BargainShop:
call ReadMart
call LoadStandardMenuHeader
ld hl, Text_BargainShop_Intro
- call MartTextBox
+ call MartTextbox
call BuyMenu
ld hl, wBargainShopFlags
ld a, [hli]
@@ -59,17 +59,17 @@ BargainShop:
.skip_set
ld hl, Text_BargainShop_ComeAgain
- call MartTextBox
+ call MartTextbox
ret
Pharmacist:
call FarReadMart
call LoadStandardMenuHeader
ld hl, Text_Pharmacist_Intro
- call MartTextBox
+ call MartTextbox
call BuyMenu
ld hl, Text_Pharmacist_ComeAgain
- call MartTextBox
+ call MartTextbox
ret
RooftopSale:
@@ -86,10 +86,10 @@ RooftopSale:
call ReadMart
call LoadStandardMenuHeader
ld hl, Text_Mart_HowMayIHelpYou
- call MartTextBox
+ call MartTextbox
call BuyMenu
ld hl, Text_Mart_ComeAgain
- call MartTextBox
+ call MartTextbox
ret
INCLUDE "data/items/rooftop_sale.asm"
@@ -203,7 +203,7 @@ StandardMart:
.Quit:
call ExitMenu
ld hl, Text_Mart_ComeAgain
- call MartTextBox
+ call MartTextbox
ld a, STANDARDMART_EXIT
ret
@@ -440,7 +440,7 @@ BuyMenuLoop:
ld [wMenuScrollPositionBackup], a
ld a, [wMenuCursorY]
ld [wMenuCursorBufferBackup], a
- call SpeechTextBox
+ call SpeechTextbox
ld a, [wMenuJoypad]
cp B_BUTTON
jr z, .set_carry
@@ -475,7 +475,7 @@ BuyMenuLoop:
call JoyWaitAorB
.cancel
- call SpeechTextBox
+ call SpeechTextbox
and a
ret
@@ -747,7 +747,7 @@ SellMenu:
.Unreferenced_NothingToSell:
ld hl, .NothingToSellText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
and a
ret
@@ -796,7 +796,7 @@ SellMenu:
lb bc, 3, 18
call ClearBox
ld hl, Text_Mart_ICanPayThisMuch
- call PrintTextBoxText
+ call PrintTextboxText
call YesNoBox
jr c, .declined
ld de, wMoney
@@ -810,7 +810,7 @@ SellMenu:
lb bc, 3, 18
call ClearBox
ld hl, Text_Mart_SoldForAmount
- call PrintTextBoxText
+ call PrintTextboxText
call PlayTransactionSound
farcall PlaceMoneyBottomLeft
call JoyWaitAorB
@@ -890,8 +890,8 @@ PlayTransactionSound:
call PlaySFX
ret
-MartTextBox:
- call MenuTextBox
+MartTextbox:
+ call MenuTextbox
call JoyWaitAorB
call ExitMenu
ret
diff --git a/engine/items/pack.asm b/engine/items/pack.asm
index 97f04f604..268a013bc 100644
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@@ -484,7 +484,7 @@ TossMenu:
jr c, .finish
call Pack_GetItemName
ld hl, Text_ConfirmThrowAway
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
push af
call ExitMenu
@@ -1358,7 +1358,7 @@ Pack_InitGFX:
; Place the textbox for displaying the item description
hlcoord 0, SCREEN_HEIGHT - 4 - 2
lb bc, 4, SCREEN_WIDTH - 2
- call TextBox
+ call Textbox
call EnableLCD
call DrawPackGFX
ret
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm
index 98222e4b6..d82b5829e 100644
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -247,7 +247,7 @@ TMHM_ShowTMMoveDescription:
hlcoord 0, 12
ld b, 4
ld c, SCREEN_WIDTH - 2
- call TextBox
+ call Textbox
ld a, [wCurItem]
cp NUM_TMS + NUM_HMS + 1
jr nc, TMHM_JoypadLoop
diff --git a/engine/items/update_item_description.asm b/engine/items/update_item_description.asm
index d4bc731a1..da56732a2 100644
--- a/engine/items/update_item_description.asm
+++ b/engine/items/update_item_description.asm
@@ -4,7 +4,7 @@ UpdateItemDescription:
hlcoord 0, 12
ld b, 4
ld c, SCREEN_WIDTH - 2
- call TextBox
+ call Textbox
ld a, [wMenuSelection]
cp -1
ret z