summaryrefslogtreecommitdiff
path: root/engine/events
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2019-04-13 11:50:16 -0400
committerGitHub <noreply@github.com>2019-04-13 11:50:16 -0400
commit1ada06f576ebd25bfd00cfdc9d197d93946ebd5b (patch)
tree5e6e4603ccc68538fbf242cb463becda5b71ea75 /engine/events
parent31dc62ec5d1a8028cb1cb30ea0d3fa8eb553145a (diff)
parent3e78e5b2b604568b13a37e4603dbd798373b9805 (diff)
Merge pull request #622 from mid-kid/master
TextBox -> Textbox
Diffstat (limited to 'engine/events')
-rw-r--r--engine/events/battle_tower/battle_tower.asm2
-rw-r--r--engine/events/bug_contest/display_stats.asm4
-rw-r--r--engine/events/elevator.asm2
-rw-r--r--engine/events/halloffame.asm8
-rw-r--r--engine/events/mom.asm2
-rw-r--r--engine/events/overworld.asm16
-rw-r--r--engine/events/pokecenter_pc.asm16
-rw-r--r--engine/events/print_unown.asm6
-rw-r--r--engine/events/prof_oaks_pc.asm2
9 files changed, 29 insertions, 29 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index dcfe6ae22..bfcbbba5c 100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -599,7 +599,7 @@ Unreferenced_Function1704ca:
ret
Function1704e1:
- call SpeechTextBox
+ call SpeechTextbox
call FadeToMenu
call InitBattleTowerChallengeRAM
call .JumptableLoop
diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm
index 0e9ba5fd0..6969bc893 100644
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -12,12 +12,12 @@ DisplayCaughtContestMonStats:
hlcoord 0, 0
ld b, 4
ld c, 13
- call TextBox
+ call Textbox
hlcoord 0, 6
ld b, 4
ld c, 13
- call TextBox
+ call Textbox
hlcoord 2, 0
ld de, .Stock
diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm
index 71b25bef7..37de3f1b6 100644
--- a/engine/events/elevator.asm
+++ b/engine/events/elevator.asm
@@ -150,7 +150,7 @@ Elevator_GetCurrentFloorText:
hlcoord 0, 0
ld b, 4
ld c, 8
- call TextBox
+ call Textbox
hlcoord 1, 2
ld de, Elevator_CurrentFloorText
call PlaceString
diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm
index 00b910166..a4350c2f7 100644
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -456,10 +456,10 @@ DisplayHOFMon:
call ByteFill
hlcoord 0, 0
lb bc, 3, SCREEN_WIDTH - 2
- call TextBox
+ call Textbox
hlcoord 0, 12
lb bc, 4, SCREEN_WIDTH - 2
- call TextBox
+ call Textbox
ld a, [wTempMonSpecies]
ld [wCurPartySpecies], a
ld [wDeciramBuffer], a
@@ -567,10 +567,10 @@ HOF_AnimatePlayerPic:
ldh [hBGMapMode], a
hlcoord 0, 2
lb bc, 8, 9
- call TextBox
+ call Textbox
hlcoord 0, 12
lb bc, 4, 18
- call TextBox
+ call Textbox
hlcoord 2, 4
ld de, wPlayerName
call PlaceString
diff --git a/engine/events/mom.asm b/engine/events/mom.asm
index 043e639c7..9a3c107e0 100644
--- a/engine/events/mom.asm
+++ b/engine/events/mom.asm
@@ -432,7 +432,7 @@ Mom_ContinueMenuSetup:
ldh [hBGMapMode], a
hlcoord 0, 0
lb bc, 6, 18
- call TextBox
+ call Textbox
hlcoord 1, 2
ld de, Mom_SavedString
call PlaceString
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 788b0eb92..e74bdf0aa 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -53,7 +53,7 @@ CheckBadge:
call CheckEngineFlag
ret nc
ld hl, .BadgeRequiredText
- call MenuTextBoxBackup ; push text to queue
+ call MenuTextboxBackup ; push text to queue
scf
ret
@@ -109,7 +109,7 @@ CheckPartyMove:
FieldMoveFailed:
ld hl, .CantUseHere
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ret
.CantUseHere:
@@ -157,7 +157,7 @@ CutFunction:
.FailCut:
ld hl, Text_NothingToCut
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
@@ -394,13 +394,13 @@ SurfFunction:
.FailSurf:
ld hl, CantSurfText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
.AlreadySurfing:
ld hl, AlreadySurfingText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
@@ -830,7 +830,7 @@ dig_incave
cp $2
jr nz, .failescaperope
ld hl, .Text_CantUseHere
- call MenuTextBox
+ call MenuTextbox
call WaitPressAorB_BlinkCursor
call CloseWindow
@@ -933,7 +933,7 @@ TeleportFunction:
.FailTeleport:
ld hl, .Text_CantUseHere
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
@@ -987,7 +987,7 @@ StrengthFunction:
.Unreferenced_AlreadyUsing:
ld hl, .JumpText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm
index 767495592..b899f9323 100644
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -298,7 +298,7 @@ PC_DisplayTextWaitMenu:
push af
set NO_TEXT_SCROLL, a
ld [wOptions], a
- call MenuTextBox
+ call MenuTextbox
pop af
ld [wOptions], a
ret
@@ -336,7 +336,7 @@ PlayerWithdrawItemMenu:
.askquantity
ld hl, .HowManyText
- call MenuTextBox
+ call MenuTextbox
farcall SelectQuantityToToss
call ExitMenu
call ExitMenu
@@ -358,7 +358,7 @@ PlayerWithdrawItemMenu:
call TossItem
predef PartyMonItemName
ld hl, .WithdrewText
- call MenuTextBox
+ call MenuTextbox
xor a
ldh [hBGMapMode], a
call ExitMenu
@@ -366,7 +366,7 @@ PlayerWithdrawItemMenu:
.PackFull:
ld hl, .NoRoomText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ret
.done
@@ -438,7 +438,7 @@ PlayerDepositItemMenu:
farcall HasNoItems
ret nc
ld hl, .NoItemsInBag
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -496,7 +496,7 @@ PlayerDepositItemMenu:
.AskQuantity:
ld hl, .HowManyText
- call MenuTextBox
+ call MenuTextbox
farcall SelectQuantityToToss
push af
call ExitMenu
@@ -562,7 +562,7 @@ PCItemsJoypad:
hlcoord 0, 0
ld b, 10
ld c, 18
- call TextBox
+ call Textbox
ld a, [wPCItemsCursor]
ld [wMenuCursorBuffer], a
ld a, [wPCItemsScrollPosition]
@@ -634,7 +634,7 @@ PCItemsJoypad:
dba UpdateItemDescription
PC_DisplayText:
- call MenuTextBox
+ call MenuTextbox
call ExitMenu
ret
diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm
index 9319ecb3e..176a8725c 100644
--- a/engine/events/print_unown.asm
+++ b/engine/events/print_unown.asm
@@ -29,15 +29,15 @@ _UnownPrinter:
hlcoord 0, 0
lb bc, 3, 18
- call TextBox
+ call Textbox
hlcoord 0, 5
lb bc, 7, 7
- call TextBox
+ call Textbox
hlcoord 0, 14
lb bc, 2, 18
- call TextBox
+ call Textbox
hlcoord 1, 2
ld de, AlphRuinsStampString
diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm
index 07c14ea01..7954963e6 100644
--- a/engine/events/prof_oaks_pc.asm
+++ b/engine/events/prof_oaks_pc.asm
@@ -1,6 +1,6 @@
ProfOaksPC:
ld hl, OakPCText1
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
jr c, .shutdown
call ProfOaksPCBoot ; player chose "yes"?