Merge pull request #622 from mid-kid/master

TextBox -> Textbox
This commit is contained in:
Rangi
2019-04-13 11:50:16 -04:00
committed by GitHub
115 changed files with 478 additions and 478 deletions

View File

@@ -599,7 +599,7 @@ Unreferenced_Function1704ca:
ret
Function1704e1:
call SpeechTextBox
call SpeechTextbox
call FadeToMenu
call InitBattleTowerChallengeRAM
call .JumptableLoop

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
ProfOaksPC:
ld hl, OakPCText1
call MenuTextBox
call MenuTextbox
call YesNoBox
jr c, .shutdown
call ProfOaksPCBoot ; player chose "yes"?