Merge pull request #622 from mid-kid/master

TextBox -> Textbox

13 files changed, 39 insertions, 39 deletions

diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm
index c3e0aa6ab..2f9041d1f 100644
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -107,7 +107,7 @@ InitMobileProfile:
 	hlcoord 0, 14
 	ld b, $2
 	ld c, $12
-	call TextBox
+	call Textbox
 	hlcoord 1, 16
 	ld de, MobileString_PersonalInfo
 	call PlaceString
diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm
index cd5a7b233..7c3adbbcb 100644
--- a/mobile/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
@@ -671,7 +671,7 @@ Function4ac58:
 	hlcoord 11, 13
 	ld b, $3
 	ld c, $7
-	call TextBox
+	call Textbox
 	hlcoord 13, 14
 	ld de, String_4ada7
 	call PlaceString
@@ -681,7 +681,7 @@ Function4ac58:
 	hlcoord 11, 9
 	ld b, $7
 	ld c, $7
-	call TextBox
+	call Textbox
 	call Function4ad68
 
 .asm_4ac96
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm
index 6f17e09de..3920e44c9 100644
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -1542,7 +1542,7 @@ Function89a2e:
 	hlcoord 11, 12
 	ld b, $2
 	ld c, $6
-	call TextBox
+	call Textbox
 	hlcoord 13, 13
 	ld de, String_89a4e
 	call PlaceString
@@ -2737,7 +2737,7 @@ Function8a1b0:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call TextBox
+	call Textbox
 	hlcoord 1, 14
 	ld a, [wMenuCursorY]
 	ld de, Strings_8a1cc
@@ -3057,7 +3057,7 @@ Function8a453:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call TextBox
+	call Textbox
 	hlcoord 1, 14
 	ld de, String_8a476
 	ld a, [wMenuSelection]
@@ -4035,7 +4035,7 @@ Function8aba9:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call TextBox
+	call Textbox
 	hlcoord 1, 14
 	ld de, String_8ac3b
 	call PlaceString
@@ -4188,7 +4188,7 @@ Function8ad0b:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call TextBox
+	call Textbox
 	ld de, String_8ad89
 	hlcoord 1, 14
 	call PlaceString
@@ -4199,7 +4199,7 @@ Function8ad0b:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call TextBox
+	call Textbox
 	ld de, String_8ad9c
 	hlcoord 1, 14
 	call PlaceString
diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm
index 136df59d6..c86b0711b 100644
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -284,7 +284,7 @@ Function8b4a4:
 	push bc
 	push de
 	call Function8b4d8
-	call TextBox
+	call Textbox
 	pop de
 	pop bc
 	call Function8b4cc
@@ -940,7 +940,7 @@ Function8b8c8:
 	hlcoord 0, 14
 	ld b, $2
 	ld c, $12
-	call TextBox
+	call Textbox
 	ld a, [wd033]
 	ld b, 0
 	ld c, a
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index d018168ab..c342388dd 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -1396,7 +1396,7 @@ Function100902:
 	hlcoord 3, 10
 	ld b, $01
 	ld c, $0b
-	call TextBox
+	call Textbox
 	ld a, [wcd6d]
 	ld c, a
 	ld a, $0a
@@ -1860,7 +1860,7 @@ MobileMoveSelectionScreen:
 	ld hl, BattleText_TheresNoPPLeftForThisMove
 
 .print_text
-	call StdBattleTextBox
+	call StdBattleTextbox
 	call Call_LoadTempTileMapToTileMap
 	jp .GetMoveSelection
 
@@ -1868,7 +1868,7 @@ Function100c74:
 	hlcoord 0, 8
 	ld b, 8
 	ld c, 8
-	call TextBox
+	call Textbox
 	ld hl, wBattleMonMoves
 	ld de, wListMoves_MoveIndicesBuffer
 	ld bc, NUM_MOVES
@@ -3788,7 +3788,7 @@ _StartMobileBattle:
 	ld [wdc5f], a
 	ld [wdc60], a
 	farcall BlankScreen
-	call SpeechTextBox
+	call SpeechTextbox
 	farcall Function100846
 	ld c, 120
 	call DelayFrames
@@ -4741,14 +4741,14 @@ Function102142:
 	call Function10218d
 	call Function102180
 	ld hl, UnknownText_0x1021d1
-	call MenuTextBox
+	call MenuTextbox
 	ld de, SFX_LEVEL_UP
 	call PlaySFX
 	call JoyWaitAorB
 	call ExitMenu
 	call Function10219f
 	ld hl, UnknownText_0x1021d6
-	call MenuTextBox
+	call MenuTextbox
 	call YesNoBox
 	call ExitMenu
 	jr c, .asm_10217c
@@ -4814,7 +4814,7 @@ UnknownText_0x1021db:
 	text_end
 
 Function1021e0:
-	call MenuTextBox
+	call MenuTextbox
 	call JoyWaitAorB
 	call ExitMenu
 	ret
@@ -6472,7 +6472,7 @@ Function102e07:
 	ld a, [wBattleMode]
 	and a
 	jr z, .link_battle
-	call TextBox
+	call Textbox
 	jr .okay
 
 .link_battle
@@ -6573,7 +6573,7 @@ Function102ea8:
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
 	ld hl, UnknownText_0x102ee2
-	call PrintTextBoxText
+	call PrintTextboxText
 	ret
 
 UnknownText_0x102ee2:
diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm
index da5e95347..66acfb5ac 100644
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -1029,7 +1029,7 @@ Function106464::
 	ret
 
 Function10649b:
-	ld a, [wTextBoxFrame]
+	ld a, [wTextboxFrame]
 	maskbits NUM_FRAMES
 	ld bc, 6 * LEN_1BPP_TILE
 	ld hl, Frames
@@ -1041,9 +1041,9 @@ Function10649b:
 	ld b, BANK(Frames)
 	call Function1064c3
 	ld hl, vTiles2 tile " " ; $7f
-	ld de, TextBoxSpaceGFX
+	ld de, TextboxSpaceGFX
 	ld c, 1
-	ld b, BANK(TextBoxSpaceGFX)
+	ld b, BANK(TextboxSpaceGFX)
 	call Function1064c3
 	ret
 
diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm
index 294f80193..3eaa12436 100644
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -1255,7 +1255,7 @@ MobileTradeAnim_DisplayEggData:
 	hlcoord 5, 0
 	ld b, 6
 	ld c, 9
-	call TextBox
+	call Textbox
 	hlcoord 6, 2
 	ld de, .EggTemplate
 	call PlaceString
@@ -1276,7 +1276,7 @@ Function108a33:
 	hlcoord 5, 0
 	ld b, 6
 	ld c, 9
-	call TextBox
+	call Textbox
 	hlcoord 7, 4
 	ld de, .OddEgg
 	call PlaceString
@@ -1294,7 +1294,7 @@ MobileTradeAnim_LoadMonTemplate:
 	hlcoord 4, 0
 	ld b,  6
 	ld c, 10
-	call TextBox
+	call Textbox
 	hlcoord 5, 0
 	ld de, .MonTemplate
 	call PlaceString
diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm
index 8067f5f30..dc0e4966b 100644
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -7015,7 +7015,7 @@ Function1178e8:
 	jp MobilePassword_IncrementJumptable
 
 Function117942:
-	call SpeechTextBox
+	call SpeechTextbox
 	hlcoord 1, 14
 	ld de, SavedPasswordString
 	call PlaceString
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index b919a9f52..75ed452b9 100644
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1744,7 +1744,7 @@ Function118eb0:
 
 Function118ec6:
 	call Function118440
-	call SpeechTextBox
+	call SpeechTextbox
 	ld hl, $d80e
 	ld de, $c320
 	ld bc, $0026
@@ -5253,7 +5253,7 @@ BattleTowerRoomMenu_WriteMessage:
 Function11a90f:
 	ld a, $1
 	ldh [rSVBK], a
-	call SpeechTextBox
+	call SpeechTextbox
 	ld a, $50
 	ld hl, $c320
 	ld bc, $008c
@@ -5503,7 +5503,7 @@ Text_ThisBattleRoomPleaseWait:
 	done
 
 Function11ac3e:
-	call SpeechTextBox
+	call SpeechTextbox
 	call FadeToMenu
 	callfar ClearSpriteAnims2
 	call Function11ac51
@@ -7316,7 +7316,7 @@ Function11b7e5:
 	farcall GetCaughtGender
 	ld a, c
 	ld [wOTTrademonCaughtData], a
-	call SpeechTextBox
+	call SpeechTextbox
 	call FadeToMenu
 	farcall MobileTradeAnimation_ReceiveGetmonFromGTS
 	farcall Function17d1f1
diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm
index 748a71d55..589d9d444 100644
--- a/mobile/mobile_5e.asm
+++ b/mobile/mobile_5e.asm
@@ -816,7 +816,7 @@ Function17ac46:
 	ld a, [$d088]
 	bit 4, a
 	jr nz, .bit_4_set
-	call TextBox
+	call Textbox
 	ret
 
 .bit_4_set
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index 48ba99276..9d8a8b831 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -289,7 +289,7 @@ Function17d0f3:
 	farcall GetCaughtGender
 	ld a, c
 	ld [wOTTrademonCaughtData], a
-	call SpeechTextBox
+	call SpeechTextbox
 	call FadeToMenu
 	farcall Function10804d
 	farcall Function17d1f1
@@ -520,7 +520,7 @@ Function17d2ce:
 .asm_17d2e2
 	call Function17d314
 	ret c
-	call SpeechTextBox
+	call SpeechTextbox
 	call FadeToMenu
 	ldh a, [rSVBK]
 	push af
diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm
index 3b971ee83..ea54ff85c 100644
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -23,7 +23,7 @@ Function49f16:
 	hlcoord 0, 12
 	ld b, 4
 	ld c, SCREEN_HEIGHT
-	call TextBox
+	call Textbox
 	xor a
 	ld de, String_0x49fe9
 	hlcoord 1, 14
@@ -258,7 +258,7 @@ Function4a149:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call TextBox
+	call Textbox
 	ld a, [wMenuCursorY]
 	dec a
 	ld hl, Strings_4a23d
@@ -418,7 +418,7 @@ Function4a28a:
 	hlcoord 14, 7
 	ld b, 3
 	ld c, 4
-	call TextBox
+	call Textbox
 	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
 	ld hl, DeletePassword_YesNo_MenuHeader
 	call LoadMenuHeader
@@ -667,7 +667,7 @@ Function4a4c4:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call TextBox
+	call Textbox
 	xor a
 	ld hl, Strings_4a5f6
 	ld d, h
diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm
index fc9d7d9c7..77cbbbdfc 100644
--- a/mobile/print_opp_message.asm
+++ b/mobile/print_opp_message.asm
@@ -1,7 +1,7 @@
 Mobile_PrintOpponentBattleMessage:
 	ld a, c
 	push af
-	call SpeechTextBox
+	call SpeechTextbox
 	call MobileTextBorder
 	pop af
 	dec a