ref: 1ada06f576ebd25bfd00cfdc9d197d93946ebd5b
parent: 31dc62ec5d1a8028cb1cb30ea0d3fa8eb553145a
parent: 3e78e5b2b604568b13a37e4603dbd798373b9805
author: Rangi <35663410+Rangi42@users.noreply.github.com>
date: Sat Apr 13 07:50:16 EDT 2019
Merge pull request #622 from mid-kid/master TextBox -> Textbox
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -37,7 +37,7 @@
TEXT_DELAY_MED EQU %011 ; 3
TEXT_DELAY_SLOW EQU %101 ; 5
-; wTextBoxFrame:: ; cfce
+; wTextboxFrame:: ; cfce
const_def
const FRAME_1 ; 0
const FRAME_2 ; 1
@@ -49,7 +49,7 @@
const FRAME_8 ; 7
NUM_FRAMES EQU const_value
-; wTextBoxFlags:: ; cfcf
+; wTextboxFlags:: ; cfcf
const_def
const FAST_TEXT_DELAY_F ; 0
const NO_TEXT_DELAY_F ; 1
--- a/data/default_options.asm
+++ b/data/default_options.asm
@@ -3,9 +3,9 @@
db TEXT_DELAY_MED
; wSaveFileExists: no
db FALSE
-; wTextBoxFrame: frame 1
+; wTextboxFrame: frame 1
db FRAME_1
-; wTextBoxFlags: use text speed
+; wTextboxFlags: use text speed
db 1 << FAST_TEXT_DELAY_F
; wGBPrinter: normal brightness
db GBPRINTER_NORMAL
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -306,7 +306,7 @@
...
ld hl, HurtItselfText
- call StdBattleTextBox
+ call StdBattleTextbox
call HitSelfInConfusion
- call BattleCommand_DamageCalc
@@ -319,7 +319,7 @@
```diff
HitConfusion:
ld hl, HurtItselfText
- call StdBattleTextBox
+ call StdBattleTextbox
xor a
ld [wCriticalHit], a
@@ -412,7 +412,7 @@
.force_struggle
ld hl, BattleText_MonHasNoMovesLeft
- call StdBattleTextBox
+ call StdBattleTextbox
ld c, 60
call DelayFrames
xor a
--- a/docs/menus.md
+++ b/docs/menus.md
@@ -12,7 +12,7 @@
## `ScrollingMenu`
-This is the only menu that does scrolling. It doesn't draw any `TextBox` around the menu.
+This is the only menu that does scrolling. It doesn't draw any `Textbox` around the menu.
Structure:
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -90,7 +90,7 @@
call NewBattleMonStatus
call BreakAttraction
call SendOutPlayerMon
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
call SetPlayerTurn
call SpikesDamage
@@ -140,7 +140,7 @@
ld hl, BattleText_LinkErrorBattleCanceled
.print_text
- call StdBattleTextBox
+ call StdBattleTextbox
.skip_text
call StopDangerSound
@@ -405,7 +405,7 @@
ld [hl], a
call GetItemName
ld hl, BattleText_UsersStringBuffer1Activated
- call StdBattleTextBox
+ call StdBattleTextbox
callfar BattleCommand_StatUpMessage
pop af
bit SUBSTATUS_CONFUSED, a
@@ -416,7 +416,7 @@
call Call_PlayBattleAnim_OnlyIfVisible
call SwitchTurnCore
ld hl, BecameConfusedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
EnemyTriesToFlee:
ld a, [wLinkMode]
@@ -725,7 +725,7 @@
res SUBSTATUS_ENCORED, [hl]
call SetEnemyTurn
ld hl, BattleText_TargetsEncoreEnded
- jp StdBattleTextBox
+ jp StdBattleTextbox
.do_enemy
ld hl, wEnemySubStatus5
@@ -749,7 +749,7 @@
res SUBSTATUS_ENCORED, [hl]
call SetPlayerTurn
ld hl, BattleText_TargetsEncoreEnded
- jp StdBattleTextBox
+ jp StdBattleTextbox
TryEnemyFlee:
ld a, [wBattleMode]
@@ -1019,7 +1019,7 @@
.got_anim
push de
- call StdBattleTextBox
+ call StdBattleTextbox
pop de
xor a
@@ -1077,7 +1077,7 @@
ldh [hBGMapMode], a
call RestoreHP
ld hl, LeechSeedSapsText
- call StdBattleTextBox
+ call StdBattleTextbox
.not_seeded
call HasUserFainted
@@ -1094,7 +1094,7 @@
call GetQuarterMaxHP
call SubtractHPFromUser
ld hl, HasANightmareText
- call StdBattleTextBox
+ call StdBattleTextbox
.not_nightmare
call HasUserFainted
@@ -1112,7 +1112,7 @@
call GetQuarterMaxHP
call SubtractHPFromUser
ld hl, HurtByCurseText
- call StdBattleTextBox
+ call StdBattleTextbox
.not_cursed
ld hl, wBattleMonHP
@@ -1164,7 +1164,7 @@
ld [wDeciramBuffer], a
push af
ld hl, PerishCountText
- call StdBattleTextBox
+ call StdBattleTextbox
pop af
ret nz
ld a, BATTLE_VARS_SUBSTATUS1
@@ -1263,7 +1263,7 @@
ld hl, BattleText_UserWasReleasedFromStringBuffer1
.print_text
- jp StdBattleTextBox
+ jp StdBattleTextbox
SwitchTurnCore:
ldh a, [hBattleTurn]
@@ -1318,7 +1318,7 @@
call SwitchTurnCore
call RestoreHP
ld hl, BattleText_TargetRecoveredWithItem
- jp StdBattleTextBox
+ jp StdBattleTextbox
HandleMysteryberry:
ldh a, [hSerialConnectionStatus]
@@ -1456,7 +1456,7 @@
call ItemRecoveryAnim
call SwitchTurnCore
ld hl, BattleText_UserRecoveredPPUsing
- jp StdBattleTextBox
+ jp StdBattleTextbox
HandleFutureSight:
ldh a, [hSerialConnectionStatus]
@@ -1489,7 +1489,7 @@
ret nz
ld hl, BattleText_TargetWasHitByFutureSight
- call StdBattleTextBox
+ call StdBattleTextbox
ld a, BATTLE_VARS_MOVE
call GetBattleVarAddr
@@ -1546,7 +1546,7 @@
call UpdateBattleHuds
call SetEnemyTurn
ld hl, DefrostedOpponentText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.do_enemy_turn
ld a, [wEnemyMonStatus]
@@ -1573,7 +1573,7 @@
call UpdateBattleHuds
call SetPlayerTurn
ld hl, DefrostedOpponentText
- jp StdBattleTextBox
+ jp StdBattleTextbox
HandleSafeguard:
ldh a, [hSerialConnectionStatus]
@@ -1610,7 +1610,7 @@
ldh [hBattleTurn], a
ld hl, BattleText_SafeguardFaded
- jp StdBattleTextBox
+ jp StdBattleTextbox
HandleScreens:
ldh a, [hSerialConnectionStatus]
@@ -1662,7 +1662,7 @@
push hl
push de
ld hl, BattleText_MonsLightScreenFell
- call StdBattleTextBox
+ call StdBattleTextbox
pop de
pop hl
ret
@@ -1675,7 +1675,7 @@
ret nz
res SCREENS_REFLECT, [hl]
ld hl, BattleText_MonsReflectFaded
- jp StdBattleTextBox
+ jp StdBattleTextbox
HandleWeather:
ld a, [wBattleWeather]
@@ -1746,7 +1746,7 @@
call SubtractHPFromUser
ld hl, SandstormHitsText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.ended
ld hl, .WeatherEndedMessages
@@ -1765,7 +1765,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp StdBattleTextBox
+ jp StdBattleTextbox
.WeatherMessages:
; entries correspond to WEATHER_* constants
@@ -1932,7 +1932,7 @@
sbc [hl]
ret
-RestoreHP
+RestoreHP:
ld hl, wEnemyMonMaxHP
ldh a, [hBattleTurn]
and a
@@ -2141,7 +2141,7 @@
ld a, [wBattleMode]
dec a
call z, PlayVictoryMusic
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
ld a, [wBattleResult]
and BATTLERESULT_BITMASK
@@ -2254,7 +2254,7 @@
lb bc, 5, 11
call ClearBox
ld hl, BattleText_MonFainted
- jp StdBattleTextBox
+ jp StdBattleTextbox
FaintEnemyPokemon:
call WaitSFX
@@ -2267,7 +2267,7 @@
lb bc, 4, 10
call ClearBox
ld hl, BattleText_EnemyMonFainted
- jp StdBattleTextBox
+ jp StdBattleTextbox
CheckEnemyTrainerDefeated:
ld a, [wOTPartyCount]
@@ -2351,7 +2351,7 @@
call z, PlayVictoryMusic
callfar Battle_GetTrainerName
ld hl, BattleText_EnemyWasDefeated
- call StdBattleTextBox
+ call StdBattleTextbox
call IsMobileBattle
jr z, .mobile
@@ -2391,7 +2391,7 @@
call BattleWinSlideInEnemyTrainerFrontpic
ld c, 40
call DelayFrames
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
ld c, BATTLETOWERTEXT_LOSS_TEXT
farcall BattleTowerText
call WaitPressAorB_BlinkCursor
@@ -2456,11 +2456,11 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp StdBattleTextBox
+ jp StdBattleTextbox
.KeepItAll:
ld hl, GotMoneyForWinningText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.AddMoneyToMom:
push bc
@@ -2681,7 +2681,7 @@
ret ; ??????????
AskUseNextPokemon:
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
; We don't need to be here if we're in a Trainer battle,
; as that decision is made for us.
@@ -2691,7 +2691,7 @@
ret nz
ld hl, BattleText_UseNextMon
- call StdBattleTextBox
+ call StdBattleTextbox
.loop
lb bc, 1, 7
call PlaceYesNoBox
@@ -2709,7 +2709,7 @@
jp TryToRunAwayFromBattle
ForcePlayerMonChoice:
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadStandardMenuHeader
call SetUpBattlePartyMenu_NoLoop
call ForcePickPartyMonInBattle
@@ -2762,7 +2762,7 @@
call NewBattleMonStatus
call BreakAttraction
call SendOutPlayerMon
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
call SetPlayerTurn
call SpikesDamage
@@ -2783,7 +2783,7 @@
call NewBattleMonStatus
call BreakAttraction
call SendOutPlayerMon
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
call SetPlayerTurn
jp SpikesDamage
@@ -2856,7 +2856,7 @@
jr nz, .notout
ld hl, BattleText_MonIsAlreadyOut
- call StdBattleTextBox
+ call StdBattleTextbox
scf
ret
@@ -2938,7 +2938,7 @@
ld c, 40
call DelayFrames
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
ld c, BATTLETOWERTEXT_WIN_TEXT
farcall BattleTowerText
call WaitPressAorB_BlinkCursor
@@ -2974,7 +2974,7 @@
jr z, .mobile
.text
- call StdBattleTextBox
+ call StdBattleTextbox
.end
scf
@@ -3192,7 +3192,7 @@
ret
ResetEnemyBattleVars:
-; and draw empty TextBox
+; and draw empty Textbox
xor a
ld [wLastPlayerCounterMove], a
ld [wLastEnemyCounterMove], a
@@ -3205,7 +3205,7 @@
hlcoord 18, 0
ld a, 8
call SlideBattlePicOut
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
jp LoadStandardMenuHeader
ResetBattleParticipants:
@@ -3480,7 +3480,7 @@
push af
callfar Battle_GetTrainerName
ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon
- call StdBattleTextBox
+ call StdBattleTextbox
lb bc, 1, 7
call PlaceYesNoBox
ld a, [wMenuCursorY]
@@ -3529,7 +3529,7 @@
Function_BattleTextEnemySentOut:
callfar Battle_GetTrainerName
ld hl, BattleText_EnemySentOut
- call StdBattleTextBox
+ call StdBattleTextbox
jp WaitBGMap
Function_SetEnemyMonAndSendOutAnimation:
@@ -3657,7 +3657,7 @@
ld hl, BattleText_TheresNoWillToBattle
.print_textbox
- call StdBattleTextBox
+ call StdBattleTextbox
.finish_fail
xor a
@@ -3710,7 +3710,7 @@
call SetPlayerTurn
call GetItemName
ld hl, BattleText_UserFledUsingAStringBuffer1
- call StdBattleTextBox
+ call StdBattleTextbox
jp .can_escape
.no_flee_item
@@ -3788,7 +3788,7 @@
ld hl, BattleText_TheresNoEscapeFromTrainerBattle
.print_inescapable_text
- call StdBattleTextBox
+ call StdBattleTextbox
ld a, TRUE
ld [wFailedToFlee], a
call LoadTileMapToTempTileMap
@@ -3831,7 +3831,7 @@
pop de
call WaitSFX
ld hl, BattleText_GotAwaySafely
- call StdBattleTextBox
+ call StdBattleTextbox
call WaitSFX
call LoadTileMapToTempTileMap
scf
@@ -3843,7 +3843,7 @@
bit 4, [hl]
jr nz, .skip_link_error
ld hl, BattleText_LinkErrorBattleCanceled
- call StdBattleTextBox
+ call StdBattleTextbox
.skip_link_error
call WaitSFX
@@ -4000,7 +4000,7 @@
call NewBattleMonStatus
call BreakAttraction
call SendOutPlayerMon
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
ld hl, wEnemyMonHP
ld a, [hli]
@@ -4124,7 +4124,7 @@
push bc
ld hl, BattleText_UserHurtBySpikes ; "hurt by SPIKES!"
- call StdBattleTextBox
+ call StdBattleTextbox
call GetEighthMaxHP
call SubtractHPFromTarget
@@ -4208,7 +4208,7 @@
ld hl, BattleText_EnemyMonFainted
.done_fainted
- call StdBattleTextBox
+ call StdBattleTextbox
scf
ret
@@ -4342,13 +4342,13 @@
call GetItemName
callfar ConsumeHeldItem
ld hl, RecoveredUsingText
- jp StdBattleTextBox
+ jp StdBattleTextbox
ItemRecoveryAnim:
push hl
push de
push bc
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
ld a, RECOVER
ld [wFXAnimID], a
call SwitchTurnCore
@@ -4439,7 +4439,7 @@
call GetItemName
call ItemRecoveryAnim
ld hl, BattleText_ItemHealedConfusion
- call StdBattleTextBox
+ call StdBattleTextbox
ldh a, [hBattleTurn]
and a
jr nz, .do_partymon
@@ -4518,7 +4518,7 @@
ld [de], a
call GetItemName
ld hl, BattleText_UsersStringBuffer1Activated
- call StdBattleTextBox
+ call StdBattleTextbox
callfar BattleCommand_StatUpMessage
ret
@@ -4867,9 +4867,9 @@
jr z, .ok
cp BATTLETYPE_TUTORIAL
jr z, .ok
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call UpdateBattleHuds
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
.ok
@@ -4929,7 +4929,7 @@
bit 4, [hl]
jr nz, .error
ld hl, BattleText_LinkErrorBattleCanceled
- call StdBattleTextBox
+ call StdBattleTextbox
ld c, 60
call DelayFrames
.error
@@ -4989,7 +4989,7 @@
.ItemsCantBeUsed:
ld hl, BattleText_ItemsCantBeUsedHere
- call StdBattleTextBox
+ call StdBattleTextbox
jp BattleMenu
.UseItem:
@@ -5139,7 +5139,7 @@
cp d
jr nz, .check_trapped
ld hl, BattleText_MonIsAlreadyOut
- call StdBattleTextBox
+ call StdBattleTextbox
jp BattleMenuPKMN_Loop
.check_trapped
@@ -5152,7 +5152,7 @@
.trapped
ld hl, BattleText_MonCantBeRecalled
- call StdBattleTextBox
+ call StdBattleTextbox
jp BattleMenuPKMN_Loop
.try_switch
@@ -5253,7 +5253,7 @@
call NewBattleMonStatus
call BreakAttraction
call SendOutPlayerMon
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
call SetPlayerTurn
call SpikesDamage
@@ -5277,7 +5277,7 @@
ld [wApplyStatLevelMultipliersToEnemy], a
call ApplyStatLevelMultiplierOnAllStats
call SendOutPlayerMon
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
call SetPlayerTurn
jp SpikesDamage
@@ -5347,7 +5347,7 @@
ld b, 4
ld c, 14
.got_dims
- call TextBox
+ call Textbox
hlcoord 6, 17 - NUM_MOVES
ld a, [wMoveSelectionMenuType]
@@ -5507,7 +5507,7 @@
ld hl, BattleText_TheresNoPPLeftForThisMove
.place_textbox_start_over
- call StdBattleTextBox
+ call StdBattleTextbox
call Call_LoadTempTileMapToTileMap
jp MoveSelectionScreen
@@ -5626,7 +5626,7 @@
hlcoord 0, 8
ld b, 3
ld c, 9
- call TextBox
+ call Textbox
call MobileTextBorder
ld a, [wPlayerDisableCount]
@@ -5757,7 +5757,7 @@
.force_struggle
ld hl, BattleText_MonHasNoMovesLeft
- call StdBattleTextBox
+ call StdBattleTextbox
ld c, 60
call DelayFrames
xor a
@@ -5770,7 +5770,7 @@
ld a, [wLinkMode]
and a
jr z, .not_linked
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
ld a, [wBattlePlayerAction]
and a ; BATTLEPLAYERACTION_USEMOVE?
@@ -6864,9 +6864,9 @@
lb bc, BANK(ExpBarGFX), 8
jp Get2bpp
-EmptyBattleTextBox:
+EmptyBattleTextbox:
ld hl, .empty
- jp BattleTextBox
+ jp BattleTextbox
.empty:
text_end
@@ -7107,7 +7107,7 @@
ld hl, wPartyMonNicknames
call GetNick
ld hl, Text_MonGainedExpPoint
- call BattleTextBox
+ call BattleTextbox
ld a, [wStringBuffer2 + 1]
ldh [hQuotient + 3], a
ld a, [wStringBuffer2]
@@ -7267,7 +7267,7 @@
callfar ApplyStatusEffectOnPlayerStats
callfar BadgeStatBoosts
callfar UpdatePlayerHUD
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
call LoadTileMapToTempTileMap
ld a, $1
ldh [hBGMapMode], a
@@ -7283,7 +7283,7 @@
call PlaySFX
call WaitSFX
ld hl, BattleText_StringBuffer1GrewToLevel
- call StdBattleTextBox
+ call StdBattleTextbox
call LoadTileMapToTempTileMap
.skip_exp_bar_animation
@@ -7293,7 +7293,7 @@
hlcoord 9, 0
ld b, 10
ld c, 9
- call TextBox
+ call Textbox
hlcoord 11, 1
ld bc, 4
predef PrintTempMonStats
@@ -7526,7 +7526,7 @@
farcall AnimateEndOfExpBar
call WaitSFX
ld hl, BattleText_StringBuffer1GrewToLevel
- call StdBattleTextBox
+ call StdBattleTextbox
pop de
inc e
ld b, $0
@@ -7666,7 +7666,7 @@
ld hl, JumpText_YourFoesWeakGetmMon
.skip_to_textbox
- jp BattleTextBox
+ jp BattleTextbox
JumpText_GoMon:
text_far Text_GoMon
@@ -7696,7 +7696,7 @@
WithdrawMonText:
ld hl, .WithdrawMonText
- jp BattleTextBox
+ jp BattleTextbox
.WithdrawMonText:
text_far Text_BattleMonNickComma
@@ -7799,7 +7799,7 @@
push hl
call Call_LoadTempTileMapToTileMap
pop hl
- jp StdBattleTextBox
+ jp StdBattleTextbox
FillInExpBar:
push hl
@@ -8056,7 +8056,7 @@
set rLCDC_WINDOW_TILEMAP, [hl] ; select 9C00-9FFF
xor a
ldh [hBGMapMode], a
- call EmptyBattleTextBox
+ call EmptyBattleTextbox
hlcoord 9, 7
lb bc, 5, 11
call ClearBox
@@ -8336,7 +8336,7 @@
ld de, wMoney + 2
call AddBattleMoneyToAccount
ld hl, BattleText_PlayerPickedUpPayDayMoney
- call StdBattleTextBox
+ call StdBattleTextbox
ld a, [wInBattleTowerBattle]
bit 0, a
ret z
@@ -8901,7 +8901,7 @@
hlcoord 0, 12
ld b, 4
ld c, 18
- call TextBox
+ call Textbox
farcall MobileTextBorder
hlcoord 1, 5
lb bc, 3, 7
@@ -9126,7 +9126,7 @@
push hl
farcall BattleStart_TrainerHuds
pop hl
- call StdBattleTextBox
+ call StdBattleTextbox
call IsMobileBattle2
ret nz
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -141,7 +141,7 @@
res SUBSTATUS_RECHARGE, [hl]
ld hl, MustRechargeText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
jp EndTurn
@@ -165,7 +165,7 @@
.woke_up
ld hl, WokeUpText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
call UpdateBattleMonInParty
ld hl, UpdatePlayerHUD
@@ -178,7 +178,7 @@
.fast_asleep
ld hl, FastAsleepText
- call StdBattleTextBox
+ call StdBattleTextbox
; Snore and Sleep Talk bypass sleep.
ld a, [wCurPlayerMove]
@@ -204,7 +204,7 @@
jr z, .not_frozen
ld hl, FrozenSolidText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
jp EndTurn
@@ -217,7 +217,7 @@
res SUBSTATUS_FLINCHED, [hl]
ld hl, FlinchedText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
jp EndTurn
@@ -237,7 +237,7 @@
ld [hl], a
ld [wDisabledMove], a
ld hl, DisabledNoMoreText
- call StdBattleTextBox
+ call StdBattleTextbox
.not_disabled
@@ -251,12 +251,12 @@
ld hl, wPlayerSubStatus3
res SUBSTATUS_CONFUSED, [hl]
ld hl, ConfusedNoMoreText
- call StdBattleTextBox
+ call StdBattleTextbox
jr .not_confused
.confused
ld hl, IsConfusedText
- call StdBattleTextBox
+ call StdBattleTextbox
xor a
ld [wNumHits], a
ld de, ANIM_CONFUSED
@@ -284,7 +284,7 @@
jr nc, .not_infatuated
ld hl, InLoveWithText
- call StdBattleTextBox
+ call StdBattleTextbox
xor a
ld [wNumHits], a
ld de, ANIM_IN_LOVE
@@ -296,7 +296,7 @@
jr c, .not_infatuated
ld hl, InfatuationText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
jp EndTurn
@@ -328,7 +328,7 @@
ret nc
ld hl, FullyParalyzedText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
jp EndTurn
@@ -370,7 +370,7 @@
res SUBSTATUS_RECHARGE, [hl]
ld hl, MustRechargeText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
jp EndTurn
@@ -387,7 +387,7 @@
jr z, .woke_up
ld hl, FastAsleepText
- call StdBattleTextBox
+ call StdBattleTextbox
xor a
ld [wNumHits], a
ld de, ANIM_SLP
@@ -396,7 +396,7 @@
.woke_up
ld hl, WokeUpText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
call UpdateEnemyMonInParty
ld hl, UpdateEnemyHUD
@@ -431,7 +431,7 @@
jr z, .not_frozen
ld hl, FrozenSolidText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
jp EndTurn
@@ -443,7 +443,7 @@
res SUBSTATUS_FLINCHED, [hl]
ld hl, FlinchedText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
jp EndTurn
@@ -464,7 +464,7 @@
ld [wEnemyDisabledMove], a
ld hl, DisabledNoMoreText
- call StdBattleTextBox
+ call StdBattleTextbox
.not_disabled
@@ -479,12 +479,12 @@
ld hl, wEnemySubStatus3
res SUBSTATUS_CONFUSED, [hl]
ld hl, ConfusedNoMoreText
- call StdBattleTextBox
+ call StdBattleTextbox
jr .not_confused
.confused
ld hl, IsConfusedText
- call StdBattleTextBox
+ call StdBattleTextbox
xor a
ld [wNumHits], a
@@ -503,7 +503,7 @@
ld [hl], a
ld hl, HurtItselfText
- call StdBattleTextBox
+ call StdBattleTextbox
call HitSelfInConfusion
call BattleCommand_DamageCalc
@@ -532,7 +532,7 @@
jr nc, .not_infatuated
ld hl, InLoveWithText
- call StdBattleTextBox
+ call StdBattleTextbox
xor a
ld [wNumHits], a
ld de, ANIM_IN_LOVE
@@ -544,7 +544,7 @@
jr c, .not_infatuated
ld hl, InfatuationText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
jp EndTurn
@@ -577,7 +577,7 @@
ret nc
ld hl, FullyParalyzedText
- call StdBattleTextBox
+ call StdBattleTextbox
call CantMove
; fallthrough
@@ -599,11 +599,11 @@
call GetMoveName
ld hl, DisabledMoveText
- jp StdBattleTextBox
+ jp StdBattleTextbox
HitConfusion:
ld hl, HurtItselfText
- call StdBattleTextBox
+ call StdBattleTextbox
xor a
ld [wCriticalHit], a
@@ -768,7 +768,7 @@
jr nc, .DoNothing
ld hl, WontObeyText
- call StdBattleTextBox
+ call StdBattleTextbox
call HitConfusion
jp .EndDisobedience
@@ -804,7 +804,7 @@
ld hl, IgnoredOrdersText
.Print:
- call StdBattleTextBox
+ call StdBattleTextbox
jp .EndDisobedience
.UseInstead:
@@ -934,7 +934,7 @@
; 'ignored orders…sleeping!'
ld hl, IgnoredSleepingText
- call StdBattleTextBox
+ call StdBattleTextbox
call EndMoveEffect
@@ -1077,7 +1077,7 @@
; 'but no pp is left for the move'
ld hl, NoPPLeftText
- call StdBattleTextBox
+ call StdBattleTextbox
ld b, 1
ret
@@ -1662,7 +1662,7 @@
; 'protecting itself!'
ld hl, ProtectingItselfText
- call StdBattleTextBox
+ call StdBattleTextbox
ld c, 40
call DelayFrames
@@ -2181,7 +2181,7 @@
dec a
jr nz, .focus_band_text
ld hl, EnduredText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.focus_band_text
call GetOpponentItem
@@ -2189,7 +2189,7 @@
ld [wNamedObjectIndexBuffer], a
call GetItemName
ld hl, HungOnText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.update_damage_taken
ld a, BATTLE_VARS_SUBSTATUS4_OPP
@@ -2270,7 +2270,7 @@
ld [hl], a
.do_at_least_1_damage
ld hl, CrashedText
- call StdBattleTextBox
+ call StdBattleTextbox
ld a, $1
ld [wKickCounter], a
call LoadMoveAnim
@@ -2288,7 +2288,7 @@
ld h, d
ld l, e
.not_protected
- jp StdBattleTextBox
+ jp StdBattleTextbox
BattleCommand_BideFailText:
ld a, [wAttackMissed]
@@ -2318,7 +2318,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- call StdBattleTextBox
+ call StdBattleTextbox
xor a
ld [wCriticalHit], a
@@ -2365,7 +2365,7 @@
jr nc, .print
ld hl, NotVeryEffectiveText
- jp StdBattleTextBox
+ jp StdBattleTextbox
BattleCommand_CheckFaint:
; checkfaint
@@ -2391,7 +2391,7 @@
jr z, .no_dbond
ld hl, TookDownWithItText
- call StdBattleTextBox
+ call StdBattleTextbox
ldh a, [hBattleTurn]
and a
@@ -2484,7 +2484,7 @@
call BattleCommand_SwitchTurn
ld hl, RageBuildingText
- call StdBattleTextBox
+ call StdBattleTextbox
jp BattleCommand_SwitchTurn
BattleCommand_RageDamage:
@@ -3522,7 +3522,7 @@
DoSubstituteDamage:
ld hl, SubTookDamageText
- call StdBattleTextBox
+ call StdBattleTextbox
ld de, wEnemySubstituteHP
ldh a, [hBattleTurn]
@@ -3548,7 +3548,7 @@
res SUBSTATUS_SUBSTITUTE, [hl]
ld hl, SubFadedText
- call StdBattleTextBox
+ call StdBattleTextbox
call BattleCommand_SwitchTurn
call BattleCommand_LowerSubNoAnim
@@ -3651,7 +3651,7 @@
call RefreshBattleHuds
ld hl, FellAsleepText
- call StdBattleTextBox
+ call StdBattleTextbox
farcall UseHeldStatusHealingItem
@@ -3662,7 +3662,7 @@
push hl
call AnimateFailedMove
pop hl
- jp StdBattleTextBox
+ jp StdBattleTextbox
.CheckAIRandomFail:
; Enemy turn
@@ -3722,7 +3722,7 @@
call RefreshBattleHuds
ld hl, WasPoisonedText
- call StdBattleTextBox
+ call StdBattleTextbox
farcall UseHeldStatusHealingItem
ret
@@ -3793,7 +3793,7 @@
call .apply_poison
ld hl, WasPoisonedText
- call StdBattleTextBox
+ call StdBattleTextbox
jr .finished
.toxic
@@ -3803,7 +3803,7 @@
call .apply_poison
ld hl, BadlyPoisonedText
- call StdBattleTextBox
+ call StdBattleTextbox
.finished
farcall UseHeldStatusHealingItem
@@ -3813,7 +3813,7 @@
push hl
call AnimateFailedMove
pop hl
- jp StdBattleTextBox
+ jp StdBattleTextbox
.apply_poison
call AnimateCurrentMove
@@ -3859,13 +3859,13 @@
; draintarget
call SapHealth
ld hl, SuckedHealthText
- jp StdBattleTextBox
+ jp StdBattleTextbox
BattleCommand_EatDream:
; eatdream
call SapHealth
ld hl, DreamEatenText
- jp StdBattleTextBox
+ jp StdBattleTextbox
SapHealth:
; Divide damage by 2, store it in hDividend
@@ -3996,7 +3996,7 @@
call RefreshBattleHuds
ld hl, WasBurnedText
- call StdBattleTextBox
+ call StdBattleTextbox
farcall UseHeldStatusHealingItem
ret
@@ -4024,7 +4024,7 @@
call UpdateOpponentInParty
ld hl, DefrostedOpponentText
- jp StdBattleTextBox
+ jp StdBattleTextbox
BattleCommand_FreezeTarget:
; freezetarget
@@ -4063,7 +4063,7 @@
call RefreshBattleHuds
ld hl, WasFrozenText
- call StdBattleTextBox
+ call StdBattleTextbox
farcall UseHeldStatusHealingItem
ret nz
@@ -4543,7 +4543,7 @@
inc b
call GetStatName
ld hl, .stat
- jp BattleTextBox
+ jp BattleTextbox
.stat
text_far UnknownText_0x1c0cc6
@@ -4573,7 +4573,7 @@
inc b
call GetStatName
ld hl, .stat
- jp BattleTextBox
+ jp BattleTextbox
.stat
text_far UnknownText_0x1c0ceb
@@ -4652,7 +4652,7 @@
inc b
call GetStatName
ld hl, WontRiseAnymoreText
- jp StdBattleTextBox
+ jp StdBattleTextbox
BattleCommand_StatDownFailText:
; statdownfailtext
@@ -4666,7 +4666,7 @@
jp z, TryPrintButItFailed
dec a
ld hl, ProtectedByMistText
- jp z, StdBattleTextBox
+ jp z, StdBattleTextbox
ld a, [wLoweredStat]
and $f
ld b, a
@@ -4673,7 +4673,7 @@
inc b
call GetStatName
ld hl, WontDropAnymoreText
- jp StdBattleTextBox
+ jp StdBattleTextbox
GetStatName:
ld hl, StatNames
@@ -5129,7 +5129,7 @@
callfar ForceEnemySwitch
ld hl, DraggedOutText
- call StdBattleTextBox
+ call StdBattleTextbox
ld hl, SpikesDamage
jp CallBattleCore
@@ -5226,7 +5226,7 @@
call CallBattleCore
ld hl, DraggedOutText
- call StdBattleTextBox
+ call StdBattleTextbox
ld hl, SpikesDamage
jp CallBattleCore
@@ -5252,7 +5252,7 @@
jr z, .do_text
ld hl, BlownAwayText
.do_text
- jp StdBattleTextBox
+ jp StdBattleTextbox
CheckPlayerHasMonToSwitchTo:
ld a, [wPartyCount]
@@ -5393,7 +5393,7 @@
call GetBattleVar
cp EFFECT_BEAT_UP
jr z, .beat_up_2
- call StdBattleTextBox
+ call StdBattleTextbox
.beat_up_2
pop bc
@@ -5582,7 +5582,7 @@
ld hl, IgnoredOrders2Text
ld a, [wAlreadyDisobeyed]
and a
- call nz, StdBattleTextBox
+ call nz, StdBattleTextbox
call BattleCommand_LowerSub
xor a
@@ -5631,7 +5631,7 @@
call ResetDamage
ld hl, .UsedText
- call BattleTextBox
+ call BattleTextbox
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
@@ -5752,7 +5752,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp StdBattleTextBox
+ jp StdBattleTextbox
.Traps:
dbw BIND, UsedBindText ; 'used BIND on'
@@ -5827,7 +5827,7 @@
predef AnimateHPBar
call RefreshBattleHuds
ld hl, RecoilText
- jp StdBattleTextBox
+ jp StdBattleTextbox
BattleCommand_ConfuseTarget:
; confusetarget
@@ -5861,7 +5861,7 @@
call GetItemName
call AnimateFailedMove
ld hl, ProtectedByText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.no_item_protection
ld a, BATTLE_VARS_SUBSTATUS3_OPP
@@ -5870,7 +5870,7 @@
jr z, .not_already_confused
call AnimateFailedMove
ld hl, AlreadyConfusedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.not_already_confused
call CheckSubstituteOpp
@@ -5909,7 +5909,7 @@
call PlayOpponentBattleAnim
ld hl, BecameConfusedText
- call StdBattleTextBox
+ call StdBattleTextbox
call GetOpponentItem
ld a, b
@@ -5951,7 +5951,7 @@
call GetItemName
call AnimateFailedMove
ld hl, ProtectedByText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.no_item_protection
ldh a, [hBattleTurn]
@@ -6003,7 +6003,7 @@
.paralyzed
call AnimateFailedMove
ld hl, AlreadyParalyzedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
jp PrintDidntAffect2
@@ -6131,7 +6131,7 @@
call AnimateCurrentMove
ld hl, EliminatedStatsText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.Fill:
ld b, wPlayerStatLevelsEnd - wPlayerStatLevels
@@ -6184,7 +6184,7 @@
jr z, .no_status_to_heal
ld hl, RestedText
.no_status_to_heal
- call StdBattleTextBox
+ call StdBattleTextbox
ldh a, [hBattleTurn]
and a
jr nz, .calc_enemy_stats
@@ -6216,12 +6216,12 @@
call UpdateUserInParty
call RefreshBattleHuds
ld hl, RegainedHealthText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.hp_full
call AnimateFailedMove
ld hl, HPIsFullText
- jp StdBattleTextBox
+ jp StdBattleTextbox
INCLUDE "engine/battle/move_effects/transform.asm"
@@ -6296,7 +6296,7 @@
.good
call AnimateCurrentMove
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
call AnimateFailedMove
@@ -6305,12 +6305,12 @@
PrintDoesntAffect:
; 'it doesn't affect'
ld hl, DoesntAffectText
- jp StdBattleTextBox
+ jp StdBattleTextbox
PrintNothingHappened:
; 'but nothing happened!'
ld hl, NothingHappenedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
TryPrintButItFailed:
ld a, [wAlreadyFailed]
@@ -6322,7 +6322,7 @@
PrintButItFailed:
; 'but it failed!'
ld hl, ButItFailedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
FailMove:
call AnimateFailedMove
@@ -6336,7 +6336,7 @@
PrintDidntAffect:
; 'it didn't affect'
ld hl, DidntAffect1Text
- jp StdBattleTextBox
+ jp StdBattleTextbox
PrintDidntAffect2:
call AnimateFailedMove
@@ -6347,7 +6347,7 @@
PrintParalyze:
; 'paralyzed! maybe it can't attack!'
ld hl, ParalyzedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
CheckSubstituteOpp:
ld a, BATTLE_VARS_SUBSTATUS4_OPP
@@ -6421,7 +6421,7 @@
set SUBSTATUS_CANT_RUN, [hl]
call AnimateCurrentMove
ld hl, CantEscapeNowText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
call AnimateFailedMove
@@ -6458,7 +6458,7 @@
.done
call RefreshBattleHuds
ld hl, WasDefrostedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
INCLUDE "engine/battle/move_effects/curse.asm"
@@ -6519,7 +6519,7 @@
ld [wAttackMissed], a
call BattleCommand_MoveDelay
ld hl, SafeguardProtectText
- call StdBattleTextBox
+ call StdBattleTextbox
jp EndMoveEffect
INCLUDE "engine/battle/move_effects/magnitude.asm"
@@ -6612,7 +6612,7 @@
; 'regained health!'
ld hl, RegainedHealthText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.Full:
call AnimateFailedMove
@@ -6619,7 +6619,7 @@
; 'hp is full!'
ld hl, HPIsFullText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.Multipliers:
dw GetEighthMaxHP
@@ -6845,7 +6845,7 @@
; Used in multi-hit moves.
ld hl, .text
- jp BattleTextBox
+ jp BattleTextbox
.text:
text_end
--- a/engine/battle/move_effects/attract.asm
+++ b/engine/battle/move_effects/attract.asm
@@ -17,7 +17,7 @@
; 'fell in love!'
ld hl, FellInLoveText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
jp FailMove
--- a/engine/battle/move_effects/beat_up.asm
+++ b/engine/battle/move_effects/beat_up.asm
@@ -52,7 +52,7 @@
ld a, $1
ld [wBeatUpHitAtLeastOnce], a
ld hl, BeatUpAttackText
- call StdBattleTextBox
+ call StdBattleTextbox
ld a, [wEnemyMonSpecies]
ld [wCurSpecies], a
@@ -159,12 +159,12 @@
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, BeatUpAttackText
- call StdBattleTextBox
+ call StdBattleTextbox
jp EnemyAttackDamage
.finish_beatup
ld hl, BeatUpAttackText
- call StdBattleTextBox
+ call StdBattleTextbox
ld a, [wBattleMonSpecies]
ld [wCurSpecies], a
--- a/engine/battle/move_effects/belly_drum.asm
+++ b/engine/battle/move_effects/belly_drum.asm
@@ -27,7 +27,7 @@
jr nz, .max_attack_loop
ld hl, BellyDrumText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
call AnimateFailedMove
--- a/engine/battle/move_effects/bide.asm
+++ b/engine/battle/move_effects/bide.asm
@@ -20,7 +20,7 @@
res SUBSTATUS_BIDE, [hl]
ld hl, UnleashedEnergyText
- call StdBattleTextBox
+ call StdBattleTextbox
ld a, BATTLE_VARS_MOVE_POWER
call GetBattleVarAddr
@@ -66,7 +66,7 @@
.still_storing
ld hl, StoringEnergyText
- call StdBattleTextBox
+ call StdBattleTextbox
jp EndMoveEffect
BattleCommand_UnleashEnergy:
--- a/engine/battle/move_effects/conversion.asm
+++ b/engine/battle/move_effects/conversion.asm
@@ -93,4 +93,4 @@
farcall GetTypeName
call AnimateCurrentMove
ld hl, TransformedTypeText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/conversion2.asm
+++ b/engine/battle/move_effects/conversion2.asm
@@ -58,7 +58,7 @@
ld [wNamedObjectIndexBuffer], a
predef GetTypeName
ld hl, TransformedTypeText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
jp FailMove
--- a/engine/battle/move_effects/curse.asm
+++ b/engine/battle/move_effects/curse.asm
@@ -76,7 +76,7 @@
call CallBattleCore
call UpdateUserInParty
ld hl, PutACurseText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
call AnimateFailedMove
@@ -90,4 +90,4 @@
call GetStatName
call AnimateFailedMove
ld hl, WontRiseAnymoreText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/destiny_bond.asm
+++ b/engine/battle/move_effects/destiny_bond.asm
@@ -6,4 +6,4 @@
set SUBSTATUS_DESTINY_BOND, [hl]
call AnimateCurrentMove
ld hl, DestinyBondEffectText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/disable.asm
+++ b/engine/battle/move_effects/disable.asm
@@ -66,7 +66,7 @@
ld [wNamedObjectIndexBuffer], a
call GetMoveName
ld hl, WasDisabledText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
jp FailMove
--- a/engine/battle/move_effects/encore.asm
+++ b/engine/battle/move_effects/encore.asm
@@ -114,7 +114,7 @@
.finish_move
call AnimateCurrentMove
ld hl, GotAnEncoreText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
jp PrintDidntAffect2
--- a/engine/battle/move_effects/endure.asm
+++ b/engine/battle/move_effects/endure.asm
@@ -13,4 +13,4 @@
call AnimateCurrentMove
ld hl, BracedItselfText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/focus_energy.asm
+++ b/engine/battle/move_effects/focus_energy.asm
@@ -8,7 +8,7 @@
set SUBSTATUS_FOCUS_ENERGY, [hl]
call AnimateCurrentMove
ld hl, GettingPumpedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.already_pumped
call AnimateFailedMove
--- a/engine/battle/move_effects/foresight.asm
+++ b/engine/battle/move_effects/foresight.asm
@@ -16,7 +16,7 @@
set SUBSTATUS_IDENTIFIED, [hl]
call AnimateCurrentMove
ld hl, IdentifiedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
jp FailMove
--- a/engine/battle/move_effects/future_sight.asm
+++ b/engine/battle/move_effects/future_sight.asm
@@ -54,7 +54,7 @@
call BattleCommand_LowerSub
call BattleCommand_MoveDelay
ld hl, ForesawAttackText
- call StdBattleTextBox
+ call StdBattleTextbox
call BattleCommand_RaiseSub
ld de, wPlayerFutureSightDamage
ldh a, [hBattleTurn]
--- a/engine/battle/move_effects/heal_bell.asm
+++ b/engine/battle/move_effects/heal_bell.asm
@@ -26,7 +26,7 @@
call AnimateCurrentMove
ld hl, BellChimedText
- call StdBattleTextBox
+ call StdBattleTextbox
ldh a, [hBattleTurn]
and a
--- a/engine/battle/move_effects/leech_seed.asm
+++ b/engine/battle/move_effects/leech_seed.asm
@@ -28,7 +28,7 @@
set SUBSTATUS_LEECH_SEED, [hl]
call AnimateCurrentMove
ld hl, WasSeededText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.grass
call AnimateFailedMove
@@ -37,4 +37,4 @@
.evaded
call AnimateFailedMove
ld hl, EvadedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/lock_on.asm
+++ b/engine/battle/move_effects/lock_on.asm
@@ -14,7 +14,7 @@
call AnimateCurrentMove
ld hl, TookAimText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.fail
call AnimateFailedMove
--- a/engine/battle/move_effects/magnitude.asm
+++ b/engine/battle/move_effects/magnitude.asm
@@ -21,7 +21,7 @@
ld [wDeciramBuffer], a
call BattleCommand_MoveDelay
ld hl, MagnitudeText
- call StdBattleTextBox
+ call StdBattleTextbox
pop de
pop bc
ret
--- a/engine/battle/move_effects/mimic.asm
+++ b/engine/battle/move_effects/mimic.asm
@@ -44,7 +44,7 @@
call GetMoveName
call AnimateCurrentMove
ld hl, LearnedMoveText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.fail
jp FailMimic
--- a/engine/battle/move_effects/mirror_move.asm
+++ b/engine/battle/move_effects/mirror_move.asm
@@ -18,7 +18,7 @@
call AnimateFailedMove
ld hl, MirrorMoveFailedText
- call StdBattleTextBox
+ call StdBattleTextbox
jp EndMoveEffect
.use
--- a/engine/battle/move_effects/mist.asm
+++ b/engine/battle/move_effects/mist.asm
@@ -8,7 +8,7 @@
set SUBSTATUS_MIST, [hl]
call AnimateCurrentMove
ld hl, MistText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.already_mist
call AnimateFailedMove
--- a/engine/battle/move_effects/nightmare.asm
+++ b/engine/battle/move_effects/nightmare.asm
@@ -30,7 +30,7 @@
set SUBSTATUS_NIGHTMARE, [hl]
call AnimateCurrentMove
ld hl, StartedNightmareText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
call AnimateFailedMove
--- a/engine/battle/move_effects/pain_split.asm
+++ b/engine/battle/move_effects/pain_split.asm
@@ -32,7 +32,7 @@
farcall _UpdateBattleHUDs
ld hl, SharedPainText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.PlayerShareHP:
ld a, [hld]
--- a/engine/battle/move_effects/pay_day.asm
+++ b/engine/battle/move_effects/pay_day.asm
@@ -23,4 +23,4 @@
inc [hl]
.done
ld hl, CoinsScatteredText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/perish_song.asm
+++ b/engine/battle/move_effects/perish_song.asm
@@ -31,7 +31,7 @@
.done
call AnimateCurrentMove
ld hl, StartPerishText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
call AnimateFailedMove
--- a/engine/battle/move_effects/present.asm
+++ b/engine/battle/move_effects/present.asm
@@ -70,7 +70,7 @@
call CallBattleCore
call BattleCommand_SwitchTurn
ld hl, RegainedHealthText
- call StdBattleTextBox
+ call StdBattleTextbox
call BattleCommand_SwitchTurn
call UpdateOpponentInParty
jr .do_animation
@@ -81,7 +81,7 @@
jr nc, .do_animation
call AnimateFailedMove
ld hl, RefusedGiftText
- call StdBattleTextBox
+ call StdBattleTextbox
.do_animation
jp EndMoveEffect
--- a/engine/battle/move_effects/protect.asm
+++ b/engine/battle/move_effects/protect.asm
@@ -10,7 +10,7 @@
call AnimateCurrentMove
ld hl, ProtectedItselfText
- jp StdBattleTextBox
+ jp StdBattleTextbox
ProtectChance:
ld de, wPlayerProtectCount
--- a/engine/battle/move_effects/psych_up.asm
+++ b/engine/battle/move_effects/psych_up.asm
@@ -46,4 +46,4 @@
.merge
call AnimateCurrentMove
ld hl, CopiedStatsText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/rain_dance.asm
+++ b/engine/battle/move_effects/rain_dance.asm
@@ -6,4 +6,4 @@
ld [wWeatherCount], a
call AnimateCurrentMove
ld hl, DownpourText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/rapid_spin.asm
+++ b/engine/battle/move_effects/rapid_spin.asm
@@ -7,7 +7,7 @@
jr z, .not_leeched
res SUBSTATUS_LEECH_SEED, [hl]
ld hl, ShedLeechSeedText
- call StdBattleTextBox
+ call StdBattleTextbox
.not_leeched
ld hl, wPlayerScreens
@@ -23,7 +23,7 @@
res SCREENS_SPIKES, [hl]
ld hl, BlewSpikesText
push de
- call StdBattleTextBox
+ call StdBattleTextbox
pop de
.no_spikes
@@ -33,4 +33,4 @@
xor a
ld [de], a
ld hl, ReleasedByText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/safeguard.asm
+++ b/engine/battle/move_effects/safeguard.asm
@@ -16,7 +16,7 @@
ld [de], a
call AnimateCurrentMove
ld hl, CoveredByVeilText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
call AnimateFailedMove
--- a/engine/battle/move_effects/sandstorm.asm
+++ b/engine/battle/move_effects/sandstorm.asm
@@ -11,7 +11,7 @@
ld [wWeatherCount], a
call AnimateCurrentMove
ld hl, SandstormBrewedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
call AnimateFailedMove
--- a/engine/battle/move_effects/sketch.asm
+++ b/engine/battle/move_effects/sketch.asm
@@ -110,7 +110,7 @@
call AnimateCurrentMove
ld hl, SketchedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.fail
call AnimateFailedMove
--- a/engine/battle/move_effects/spikes.asm
+++ b/engine/battle/move_effects/spikes.asm
@@ -20,7 +20,7 @@
call AnimateCurrentMove
ld hl, SpikesText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
jp FailMove
--- a/engine/battle/move_effects/spite.asm
+++ b/engine/battle/move_effects/spite.asm
@@ -80,7 +80,7 @@
ld a, d
ld [wDeciramBuffer], a
ld hl, SpiteEffectText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.failed
jp PrintDidntAffect2
--- a/engine/battle/move_effects/substitute.asm
+++ b/engine/battle/move_effects/substitute.asm
@@ -71,7 +71,7 @@
call BattleCommand_RaiseSubNoAnim
.finish
ld hl, MadeSubstituteText
- call StdBattleTextBox
+ call StdBattleTextbox
jp RefreshBattleHuds
.already_has_sub
@@ -85,4 +85,4 @@
call nz, BattleCommand_RaiseSub
ld hl, TooWeakSubText
.jp_stdbattletextbox
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/sunny_day.asm
+++ b/engine/battle/move_effects/sunny_day.asm
@@ -6,4 +6,4 @@
ld [wWeatherCount], a
call AnimateCurrentMove
ld hl, SunGotBrightText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/teleport.asm
+++ b/engine/battle/move_effects/teleport.asm
@@ -86,4 +86,4 @@
call SetBattleDraw
ld hl, FledFromBattleText
- jp StdBattleTextBox
+ jp StdBattleTextbox
--- a/engine/battle/move_effects/thief.asm
+++ b/engine/battle/move_effects/thief.asm
@@ -93,7 +93,7 @@
.stole
call GetItemName
ld hl, StoleText
- jp StdBattleTextBox
+ jp StdBattleTextbox
.playeritem
ld a, 1
--- a/engine/battle/move_effects/transform.asm
+++ b/engine/battle/move_effects/transform.asm
@@ -135,7 +135,7 @@
ld a, SUBSTITUTE
call nz, LoadAnim
ld hl, TransformedText
- jp StdBattleTextBox
+ jp StdBattleTextbox
BattleSideCopy:
; Copy bc bytes from hl to de if it's the player's turn.
--- a/engine/battle/trainer_huds.asm
+++ b/engine/battle/trainer_huds.asm
@@ -237,7 +237,7 @@
hlcoord 2, 3
ld b, 9
ld c, 14
- call TextBox
+ call Textbox
hlcoord 4, 5
ld de, wPlayerName
call PlaceString
--- a/engine/battle/used_move_text.asm
+++ b/engine/battle/used_move_text.asm
@@ -1,7 +1,7 @@
DisplayUsedMoveText:
; battle command 03
ld hl, UsedMoveText
- call BattleTextBox
+ call BattleTextbox
jp WaitBGMap
UsedMoveText:
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -1417,7 +1417,7 @@
ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
- ld [hl], $0
+ ld [hl], 0
call BGEffect_CheckBattleTurn
jr nz, .player_side
ld a, 2
@@ -1451,10 +1451,10 @@
ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
- ld [hl], $0
+ ld [hl], 0
call BGEffect_CheckBattleTurn
jr nz, .player_side
- ld a, 2
+ ld a, 2
jr .okay
.player_side
@@ -1473,7 +1473,7 @@
ld a, [hl]
cp -8
jr z, .reached_limit
- cp 8
+ cp 8
jr nz, .finish
.reached_limit
call BattleBGEffects_IncrementJumptable
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -599,7 +599,7 @@
ret
Function1704e1:
- call SpeechTextBox
+ call SpeechTextbox
call FadeToMenu
call InitBattleTowerChallengeRAM
call .JumptableLoop
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -12,12 +12,12 @@
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
--- a/engine/events/elevator.asm
+++ b/engine/events/elevator.asm
@@ -150,7 +150,7 @@
hlcoord 0, 0
ld b, 4
ld c, 8
- call TextBox
+ call Textbox
hlcoord 1, 2
ld de, Elevator_CurrentFloorText
call PlaceString
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -456,10 +456,10 @@
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 @@
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
--- a/engine/events/mom.asm
+++ b/engine/events/mom.asm
@@ -432,7 +432,7 @@
ldh [hBGMapMode], a
hlcoord 0, 0
lb bc, 6, 18
- call TextBox
+ call Textbox
hlcoord 1, 2
ld de, Mom_SavedString
call PlaceString
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -53,7 +53,7 @@
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 @@
FieldMoveFailed:
ld hl, .CantUseHere
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ret
.CantUseHere:
@@ -157,7 +157,7 @@
.FailCut:
ld hl, Text_NothingToCut
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
@@ -394,13 +394,13 @@
.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 @@
cp $2
jr nz, .failescaperope
ld hl, .Text_CantUseHere
- call MenuTextBox
+ call MenuTextbox
call WaitPressAorB_BlinkCursor
call CloseWindow
@@ -933,7 +933,7 @@
.FailTeleport:
ld hl, .Text_CantUseHere
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
@@ -987,7 +987,7 @@
.Unreferenced_AlreadyUsing:
ld hl, .JumpText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -298,7 +298,7 @@
push af
set NO_TEXT_SCROLL, a
ld [wOptions], a
- call MenuTextBox
+ call MenuTextbox
pop af
ld [wOptions], a
ret
@@ -336,7 +336,7 @@
.askquantity
ld hl, .HowManyText
- call MenuTextBox
+ call MenuTextbox
farcall SelectQuantityToToss
call ExitMenu
call ExitMenu
@@ -358,7 +358,7 @@
call TossItem
predef PartyMonItemName
ld hl, .WithdrewText
- call MenuTextBox
+ call MenuTextbox
xor a
ldh [hBGMapMode], a
call ExitMenu
@@ -366,7 +366,7 @@
.PackFull:
ld hl, .NoRoomText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ret
.done
@@ -438,7 +438,7 @@
farcall HasNoItems
ret nc
ld hl, .NoItemsInBag
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -496,7 +496,7 @@
.AskQuantity:
ld hl, .HowManyText
- call MenuTextBox
+ call MenuTextbox
farcall SelectQuantityToToss
push af
call ExitMenu
@@ -562,7 +562,7 @@
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 @@
dba UpdateItemDescription
PC_DisplayText:
- call MenuTextBox
+ call MenuTextbox
call ExitMenu
ret
--- a/engine/events/print_unown.asm
+++ b/engine/events/print_unown.asm
@@ -29,15 +29,15 @@
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
--- 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"?
--- a/engine/games/card_flip.asm
+++ b/engine/games/card_flip.asm
@@ -494,9 +494,9 @@
hlcoord 0, 12
ld b, 4
ld c, SCREEN_WIDTH - 2
- call TextBox
+ call Textbox
pop hl
- call PrintTextBoxText
+ call PrintTextboxText
call CardFlip_PrintCoinBalance
ret
@@ -504,7 +504,7 @@
hlcoord 9, 15
ld b, 1
ld c, 9
- call TextBox
+ call Textbox
hlcoord 10, 16
ld de, .CoinStr
call PlaceString
@@ -530,7 +530,7 @@
call CardFlip_CopyToBox
hlcoord 0, 12
lb bc, 4, 18
- call TextBox
+ call Textbox
ret
CardFlip_FillGreenBox:
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -1789,7 +1789,7 @@
.you_have_coins
ld hl, .Text_PlayAgain
call PrintText
- call LoadMenuTextBox
+ call LoadMenuTextbox
lb bc, 14, 12
call PlaceYesNoBox
ld a, [wMenuCursorY]
--- a/engine/gfx/load_font.asm
+++ b/engine/gfx/load_font.asm
@@ -75,7 +75,7 @@
jr LoadFrame
LoadFrame:
- ld a, [wTextBoxFrame]
+ ld a, [wTextboxFrame]
maskbits NUM_FRAMES
ld bc, 6 * LEN_1BPP_TILE
ld hl, Frames
@@ -86,8 +86,8 @@
lb bc, BANK(Frames), 6 ; "┌" to "┘"
call Get1bpp_2
ld hl, vTiles2 tile " " ; $7f
- ld de, TextBoxSpaceGFX
- lb bc, BANK(TextBoxSpaceGFX), 1
+ ld de, TextboxSpaceGFX
+ lb bc, BANK(TextboxSpaceGFX), 1
call Get1bpp_2
ret
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1357,7 +1357,7 @@
hlcoord 9, 0
ld b, 10
ld c, 9
- call TextBox
+ call Textbox
hlcoord 11, 1
ld bc, 4
@@ -1632,7 +1632,7 @@
call UseItemText
ld hl, ConfusedNoMoreText
- call StdBattleTextBox
+ call StdBattleTextbox
ld a, 0
@@ -2056,7 +2056,7 @@
.cant_use
push bc
ld hl, .Text_CantBeUsed
- call MenuTextBoxBackup
+ call MenuTextboxBackup
pop bc
jr .loop
@@ -2266,7 +2266,7 @@
BlueCardEffect:
ld hl, .bluecardtext
- jp MenuTextBoxWaitButton
+ jp MenuTextboxWaitButton
.bluecardtext
text_far UnknownText_0x1c5c5e
@@ -2274,7 +2274,7 @@
CoinCaseEffect:
ld hl, .coincasetext
- jp MenuTextBoxWaitButton
+ jp MenuTextboxWaitButton
.coincasetext
text_far UnknownText_0x1c5c7b
--- a/engine/items/mart.asm
+++ b/engine/items/mart.asm
@@ -35,10 +35,10 @@
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 @@
call ReadMart
call LoadStandardMenuHeader
ld hl, Text_BargainShop_Intro
- call MartTextBox
+ call MartTextbox
call BuyMenu
ld hl, wBargainShopFlags
ld a, [hli]
@@ -59,7 +59,7 @@
.skip_set
ld hl, Text_BargainShop_ComeAgain
- call MartTextBox
+ call MartTextbox
ret
Pharmacist:
@@ -66,10 +66,10 @@
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 @@
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 @@
.Quit:
call ExitMenu
ld hl, Text_Mart_ComeAgain
- call MartTextBox
+ call MartTextbox
ld a, STANDARDMART_EXIT
ret
@@ -440,7 +440,7 @@
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 @@
call JoyWaitAorB
.cancel
- call SpeechTextBox
+ call SpeechTextbox
and a
ret
@@ -747,7 +747,7 @@
.Unreferenced_NothingToSell:
ld hl, .NothingToSellText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
and a
ret
@@ -796,7 +796,7 @@
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 @@
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 @@
call PlaySFX
ret
-MartTextBox:
- call MenuTextBox
+MartTextbox:
+ call MenuTextbox
call JoyWaitAorB
call ExitMenu
ret
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@@ -484,7 +484,7 @@
jr c, .finish
call Pack_GetItemName
ld hl, Text_ConfirmThrowAway
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
push af
call ExitMenu
@@ -1358,7 +1358,7 @@
; 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
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -247,7 +247,7 @@
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
--- a/engine/items/update_item_description.asm
+++ b/engine/items/update_item_description.asm
@@ -4,7 +4,7 @@
hlcoord 0, 12
ld b, 4
ld c, SCREEN_WIDTH - 2
- call TextBox
+ call Textbox
ld a, [wMenuSelection]
cp -1
ret z
--- a/engine/link/place_waiting_text.asm
+++ b/engine/link/place_waiting_text.asm
@@ -7,7 +7,7 @@
and a
jr z, .notinbattle
- call TextBox
+ call Textbox
jr .proceed
.notinbattle
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -237,11 +237,11 @@
hlcoord 0, 14
ld b, 2
ld c, 18
- call TextBox
+ call Textbox
ret
.TimeFail:
- call SpeechTextBox
+ call SpeechTextbox
ret
.PlaceTime:
--- a/engine/menus/menu_2.asm
+++ b/engine/menus/menu_2.asm
@@ -30,12 +30,12 @@
PlaceMoneyTopRight:
ld hl, MenuHeader_0x24b15
call CopyMenuHeader
- jr PlaceMoneyTextBox
+ jr PlaceMoneyTextbox
PlaceMoneyBottomLeft:
ld hl, MenuHeader_0x24b1d
call CopyMenuHeader
- jr PlaceMoneyTextBox
+ jr PlaceMoneyTextbox
PlaceMoneyAtTopLeftOfTextbox:
ld hl, MenuHeader_0x24b15
@@ -42,7 +42,7 @@
lb de, 0, 11
call OffsetMenuHeader
-PlaceMoneyTextBox:
+PlaceMoneyTextbox:
call MenuBox
call MenuBoxCoord2Tile
ld de, SCREEN_WIDTH + 1
@@ -69,7 +69,7 @@
hlcoord 11, 0
ld b, 1
ld c, 7
- call TextBox
+ call Textbox
hlcoord 12, 0
ld de, CoinString
call PlaceString
@@ -86,7 +86,7 @@
hlcoord 5, 0
ld b, 3
ld c, 13
- call TextBox
+ call Textbox
hlcoord 6, 1
ld de, MoneyString
call PlaceString
@@ -119,7 +119,7 @@
hlcoord 0, 0
ld b, 3
ld c, 7
- call TextBox
+ call Textbox
hlcoord 1, 1
ld de, wSafariTimeRemaining
lb bc, 2, 3
@@ -147,7 +147,7 @@
hlcoord 0, 0
ld b, 5
ld c, 17
- call TextBox
+ call Textbox
ret
StartMenu_PrintBugContestStatus:
--- a/engine/menus/options_menu.asm
+++ b/engine/menus/options_menu.asm
@@ -7,7 +7,7 @@
hlcoord 0, 0
ld b, 16
ld c, 18
- call TextBox
+ call Textbox
hlcoord 2, 2
ld de, StringOptions
call PlaceString
@@ -448,7 +448,7 @@
.On: db "ON @"
Options_Frame:
- ld hl, wTextBoxFrame
+ ld hl, wTextboxFrame
ldh a, [hJoyPressed]
bit D_LEFT_F, a
jr nz, .LeftPressed
@@ -470,7 +470,7 @@
maskbits NUM_FRAMES
ld [hl], a
UpdateFrame:
- ld a, [wTextBoxFrame]
+ ld a, [wTextboxFrame]
hlcoord 16, 15 ; where on the screen the number is drawn
add "1"
ld [hl], a
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -1,7 +1,7 @@
SaveMenu:
call LoadStandardMenuHeader
farcall DisplaySaveInfoOnSave
- call SpeechTextBox
+ call SpeechTextbox
call UpdateSprites
farcall SaveMenu_CopyTilemapAtOnce
ld hl, Text_WouldYouLikeToSaveTheGame
@@ -39,7 +39,7 @@
ChangeBoxSaveGame:
push de
ld hl, Text_SaveOnBoxSwitch
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
call ExitMenu
jr c, .refused
@@ -116,7 +116,7 @@
StartMoveMonWOMail_SaveGame:
ld hl, Text_SaveOnMoveMonWOMail
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
call ExitMenu
jr c, .refused
@@ -198,7 +198,7 @@
SaveTheGame_yesorno:
ld b, BANK(Text_WouldYouLikeToSaveTheGame)
call MapTextbox
- call LoadMenuTextBox
+ call LoadMenuTextbox
lb bc, 0, 7
call PlaceYesNoBox
ld a, [wMenuCursorY]
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -379,7 +379,7 @@
hlcoord 0, 13
ld b, 3
ld c, 8
- jp TextBoxPalette
+ jp TextboxPalette
.IsMenuAccountOn:
ld a, [wOptions2]
--- a/engine/movie/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
@@ -931,7 +931,7 @@
hlcoord 3, 0
ld b, $6
ld c, $d
- call TextBox
+ call Textbox
hlcoord 4, 0
ld de, .OTMonData
call PlaceString
@@ -951,7 +951,7 @@
hlcoord 3, 0
ld b, 6
ld c, 13
- call TextBox
+ call Textbox
hlcoord 4, 2
ld de, .EggData
call PlaceString
--- a/engine/overworld/decorations.asm
+++ b/engine/overworld/decorations.asm
@@ -379,7 +379,7 @@
.empty
ld hl, .Text_nothing_to_choose
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ret
.Text_nothing_to_choose:
@@ -675,7 +675,7 @@
ld hl, wStringBuffer3
call GetDecorationName
ld hl, DecoText_PutAwayAndSetUp
- call MenuTextBoxBackup
+ call MenuTextboxBackup
xor a
ret
@@ -684,13 +684,13 @@
ld hl, wStringBuffer3
call GetDecorationName
ld hl, DecoText_SetUpTheDeco
- call MenuTextBoxBackup
+ call MenuTextboxBackup
xor a
ret
.alreadythere
ld hl, DecoText_AlreadySetUp
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -711,13 +711,13 @@
ld hl, wStringBuffer3
call GetDecorationName
ld hl, DecoText_PutAwayTheDeco
- call MenuTextBoxBackup
+ call MenuTextboxBackup
xor a
ret
.nothingthere
ld hl, DecoText_NothingToPutAway
- call MenuTextBoxBackup
+ call MenuTextboxBackup
xor a
ret
@@ -772,7 +772,7 @@
ld [wSelectedDecoration], a
call .getwhichside
ld hl, DecoText_PutAwayAndSetUp
- call MenuTextBoxBackup
+ call MenuTextboxBackup
xor a
ret
@@ -784,13 +784,13 @@
ld hl, wStringBuffer3
call GetDecorationName
ld hl, DecoText_SetUpTheDeco
- call MenuTextBoxBackup
+ call MenuTextboxBackup
xor a
ret
.failed
ld hl, DecoText_AlreadySetUp
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -820,13 +820,13 @@
xor a
ld [wSelectedDecoration], a
ld hl, DecoText_PutAwayTheDeco
- call MenuTextBoxBackup
+ call MenuTextboxBackup
xor a
ret
.nothingthere
ld hl, DecoText_NothingToPutAway
- call MenuTextBoxBackup
+ call MenuTextboxBackup
xor a
ret
@@ -836,7 +836,7 @@
text_end
DecoAction_AskWhichSide:
- call MenuTextBox
+ call MenuTextbox
ld hl, MenuHeader_0x26eab
call GetMenu2
call ExitMenu
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -498,7 +498,7 @@
; script command 0xa4
; parameters: bttext_id
- call SetUpTextBox
+ call SetUpTextbox
call GetScriptByte
ld c, a
farcall BattleTowerText
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -555,7 +555,7 @@
text_end
HangUp_BoopOff:
- call SpeechTextBox
+ call SpeechTextbox
ret
Phone_StartRinging:
@@ -593,7 +593,7 @@
hlcoord 0, 0
ld b, 2
ld c, SCREEN_WIDTH - 2
- call TextBox
+ call Textbox
ret
Function90380:
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -313,7 +313,7 @@
call PlaceString
hlcoord 0, 12
lb bc, 4, 18
- call TextBox
+ call Textbox
call Pokegear_UpdateClock
ret
@@ -351,7 +351,7 @@
call Pokegear_LoadTilemapRLE
hlcoord 0, 12
lb bc, 4, 18
- call TextBox
+ call Textbox
ret
.Phone:
@@ -359,7 +359,7 @@
call Pokegear_LoadTilemapRLE
hlcoord 0, 12
lb bc, 4, 18
- call TextBox
+ call Textbox
call .PlacePhoneBars
call PokegearPhone_UpdateDisplayList
ret
@@ -1138,7 +1138,7 @@
ld b, a
ld c, 8
push de
- call TextBox
+ call Textbox
pop de
pop hl
inc hl
@@ -1213,7 +1213,7 @@
.Delete:
ld hl, PokegearText_DeleteStoredNumber
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
call ExitMenu
jr c, .CancelDelete
@@ -1758,7 +1758,7 @@
call ClearBox
hlcoord 0, 12
lb bc, 4, 18
- call TextBox
+ call Textbox
ret
OaksPKMNTalkName: db "OAK's <PK><MN> Talk@"
@@ -1988,7 +1988,7 @@
push de
hlcoord 0, 12
lb bc, 4, 18
- call TextBox
+ call Textbox
hlcoord 1, 14
ld [hl], "“"
pop de
--- a/engine/pokegear/radio.asm
+++ b/engine/pokegear/radio.asm
@@ -142,7 +142,7 @@
call PlaceHLTextAtBC
jr .skip
- call PrintTextBoxText
+ call PrintTextboxText
.skip
ld a, RADIO_SCROLL
ld [wCurRadioLine], a
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -963,7 +963,7 @@
push de
hlcoord 0, 15
lb bc, 1, 18
- call TextBox
+ call Textbox
pop de
hlcoord 1, 16
call PlaceString
@@ -980,7 +980,7 @@
BillsPC_BoxName:
hlcoord 8, 0
lb bc, 1, 10
- call TextBox
+ call Textbox
ld a, [wBillsPC_LoadedBox]
and a
@@ -1219,7 +1219,7 @@
BillsPC_RefreshTextboxes:
hlcoord 8, 2
lb bc, 10, 10
- call TextBox
+ call Textbox
hlcoord 8, 2
ld [hl], "└"
@@ -1790,7 +1790,7 @@
call ClearBox
hlcoord 0, 15
lb bc, 1, 18
- call TextBox
+ call Textbox
call WaitBGMap
hlcoord 1, 16
ld de, PCString_Stored
@@ -1845,7 +1845,7 @@
call ClearBox
hlcoord 0, 15
lb bc, 1, 18
- call TextBox
+ call Textbox
call WaitBGMap
hlcoord 1, 16
ld de, PCString_Got
@@ -1881,7 +1881,7 @@
call ClearBox
hlcoord 0, 15
lb bc, 1, 18
- call TextBox
+ call Textbox
call WaitBGMap
ld a, [wCurPartySpecies]
@@ -1902,7 +1902,7 @@
call DelayFrames
hlcoord 0, 15
lb bc, 1, 18
- call TextBox
+ call Textbox
hlcoord 1, 16
ld de, PCString_Bye
call PlaceString
@@ -1925,7 +1925,7 @@
push af
hlcoord 0, 15
lb bc, 1, 18
- call TextBox
+ call Textbox
hlcoord 1, 16
ld de, .Saving_LeaveOn
call PlaceString
@@ -2241,7 +2241,7 @@
ld [wMenuScrollPosition], a
hlcoord 0, 4
lb bc, 8, 9
- call TextBox
+ call Textbox
call ScrollingMenu
ld a, [wMenuJoypad]
cp B_BUTTON
@@ -2306,7 +2306,7 @@
BillsPC_PrintBoxCountAndCapacity:
hlcoord 11, 7
lb bc, 5, 7
- call TextBox
+ call Textbox
ld a, [wMenuSelection]
cp -1
ret z
@@ -2394,7 +2394,7 @@
hlcoord 0, 0
ld b, 2
ld c, 18
- call TextBox
+ call Textbox
hlcoord 1, 2
ld de, .Current
call PlaceString
@@ -2522,7 +2522,7 @@
push de
hlcoord 0, 14
lb bc, 2, 18
- call TextBox
+ call Textbox
pop de
hlcoord 1, 16
call PlaceString
--- a/engine/pokemon/bills_pc_top.asm
+++ b/engine/pokemon/bills_pc_top.asm
@@ -10,7 +10,7 @@
and a
ret nz
ld hl, .Text_GottaHavePokemon
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -153,13 +153,13 @@
.no_mon
ld hl, .Text_NoMon
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
.only_one_mon
ld hl, .Text_ItsYourLastMon
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -220,7 +220,7 @@
.asm_e576
ld hl, UnknownText_0xe57e
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -246,10 +246,10 @@
call ByteFill
hlcoord 0, 0
lb bc, 10, 18
- call TextBox
+ call Textbox
hlcoord 0, 12
lb bc, 4, 18
- call TextBox
+ call Textbox
call WaitBGMap2
call SetPalettes ; load regular palettes?
ret
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -241,7 +241,7 @@
push hl
ld hl, Text_EvolvedIntoPKMN
- call PrintTextBoxText
+ call PrintTextboxText
farcall StubbedTrainerRankings_MonsEvolved
ld de, MUSIC_NONE
--- a/engine/pokemon/learn.asm
+++ b/engine/pokemon/learn.asm
@@ -139,7 +139,7 @@
hlcoord 5, 2
ld b, NUM_MOVES * 2
ld c, MOVE_NAME_LENGTH
- call TextBox
+ call Textbox
hlcoord 5 + 2, 2 + 2
ld a, SCREEN_WIDTH * 2
ld [wBuffer1], a
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -307,7 +307,7 @@
.nomail
ld hl, .EmptyMailboxText
- jp MenuTextBoxBackup
+ jp MenuTextboxBackup
.EmptyMailboxText:
text_far _EmptyMailboxText
@@ -429,7 +429,7 @@
.PutInPack:
ld hl, .MessageLostText
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
call ExitMenu
ret c
@@ -442,7 +442,7 @@
call ReceiveItem
jr c, .put_in_bag
ld hl, .PackFullText
- jp MenuTextBoxBackup
+ jp MenuTextboxBackup
.put_in_bag
ld a, [wMenuSelection]
@@ -450,7 +450,7 @@
ld b, a
call DeleteMailFromPC
ld hl, .PutAwayText
- jp MenuTextBoxBackup
+ jp MenuTextboxBackup
.PutAwayText:
text_far ClearedMailPutAwayText
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -30,7 +30,7 @@
and a
jr nz, .key_item
ld hl, .TossHowMany
- call MenuTextBox
+ call MenuTextbox
farcall SelectQuantityToToss
push af
call CloseWindow
@@ -38,7 +38,7 @@
pop af
jr c, .quit
ld hl, .ConfirmToss
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
push af
call ExitMenu
@@ -49,7 +49,7 @@
call TossItem
call PartyMonItemName
ld hl, .TossedThisMany
- call MenuTextBox
+ call MenuTextbox
call ExitMenu
and a
ret
@@ -78,7 +78,7 @@
.CantToss:
ld hl, .TooImportantToToss
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ret
.TooImportantToToss:
@@ -88,7 +88,7 @@
CantUseItem:
ld hl, CantUseItemText
- call MenuTextBoxWaitButton
+ call MenuTextboxWaitButton
ret
CantUseItemText:
@@ -265,7 +265,7 @@
.next
ld hl, CantBeHeldText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
jr .loop
.quit
@@ -272,7 +272,7 @@
ret
TryGiveItemToPartymon:
- call SpeechTextBox
+ call SpeechTextbox
call PartyMonItemName
call GetPartyItemLocation
ld a, [hl]
@@ -290,13 +290,13 @@
.give_item_to_mon
call GiveItemToPokemon
ld hl, MadeHoldText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
call GivePartyItem
ret
.please_remove_mail
ld hl, PleaseRemoveMailText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ret
.already_holding_item
@@ -317,7 +317,7 @@
jr nc, .bag_full
ld hl, TookAndMadeHoldText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, [wNamedObjectIndexBuffer]
ld [wCurItem], a
call GivePartyItem
@@ -328,7 +328,7 @@
ld [wCurItem], a
call ReceiveItemFromPokemon
ld hl, ItemStorageIsFullText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
.abort
ret
@@ -346,7 +346,7 @@
ret
TakePartyItem:
- call SpeechTextBox
+ call SpeechTextbox
call GetPartyItemLocation
ld a, [hl]
and a
@@ -363,17 +363,17 @@
ld [hl], NO_ITEM
call GetItemName
ld hl, TookFromText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
jr .asm_12c9a
.asm_12c8c
ld hl, IsntHoldingAnythingText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
jr .asm_12c9a
.asm_12c94
ld hl, ItemStorageIsFullText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
.asm_12c9a
ret
@@ -442,7 +442,7 @@
jp TossItem
StartMenuYesNo:
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
jp ExitMenu
@@ -514,12 +514,12 @@
farcall SendMailToPC
jr c, .MailboxFull
ld hl, .sentmailtopctext
- call MenuTextBoxBackup
+ call MenuTextboxBackup
jr .done
.MailboxFull:
ld hl, .mailboxfulltext
- call MenuTextBoxBackup
+ call MenuTextboxBackup
jr .done
.RemoveMailToBag:
@@ -535,12 +535,12 @@
ld [hl], $0
call GetCurNick
ld hl, .tookmailfrommontext
- call MenuTextBoxBackup
+ call MenuTextboxBackup
jr .done
.BagIsFull:
ld hl, .bagfulltext
- call MenuTextBoxBackup
+ call MenuTextboxBackup
jr .done
.done
@@ -1118,11 +1118,11 @@
hlcoord 0, 1
ld b, 9
ld c, 18
- call TextBox
+ call Textbox
hlcoord 0, 11
ld b, 5
ld c, 18
- call TextBox
+ call Textbox
hlcoord 2, 0
lb bc, 2, 3
call ClearBox
@@ -1169,7 +1169,7 @@
hlcoord 0, 11
ld b, 5
ld c, 18
- jp TextBox
+ jp Textbox
PrepareToPlaceMoveData:
ld hl, wPartyMon1Moves
--- a/engine/pokemon/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@@ -712,7 +712,7 @@
PrintPartyMenuText:
hlcoord 0, 14
lb bc, 2, 18
- call TextBox
+ call Textbox
ld a, [wPartyCount]
and a
jr nz, .haspokemon
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -843,7 +843,7 @@
ld a, [wCurPartySpecies]
call IsAPokemon
ret c
- call StatsScreen_LoadTextBoxSpaceGFX
+ call StatsScreen_LoadTextboxSpaceGFX
ld de, vTiles2 tile $00
predef GetAnimatedFrontpic
hlcoord 0, 0
@@ -919,7 +919,7 @@
xor a
ret
-StatsScreen_LoadTextBoxSpaceGFX:
+StatsScreen_LoadTextboxSpaceGFX:
nop
push hl
push de
@@ -930,8 +930,8 @@
push af
ld a, $1
ldh [rVBK], a
- ld de, TextBoxSpaceGFX
- lb bc, BANK(TextBoxSpaceGFX), 1
+ ld de, TextboxSpaceGFX
+ lb bc, BANK(TextboxSpaceGFX), 1
ld hl, vTiles2 tile " "
call Get2bpp
pop af
@@ -1042,7 +1042,7 @@
push de
ld a, $1
ld [wBoxAlignment], a
- call StatsScreen_LoadTextBoxSpaceGFX
+ call StatsScreen_LoadTextboxSpaceGFX
ld de, vTiles2 tile $00
predef GetAnimatedFrontpic
pop de
--- a/engine/printer/print_party.asm
+++ b/engine/printer/print_party.asm
@@ -159,7 +159,7 @@
hlcoord 0, 7
ld b, 9
ld c, 18
- call TextBox
+ call Textbox
hlcoord 8, 2
ld a, [wTempMonLevel]
call PrintLevel_Force3Digits
@@ -242,7 +242,7 @@
hlcoord 0, 0
ld b, 15
ld c, 18
- call TextBox
+ call Textbox
ld bc, SCREEN_WIDTH
decoord 0, 0
hlcoord 0, 1
--- a/engine/printer/printer.asm
+++ b/engine/printer/printer.asm
@@ -554,7 +554,7 @@
ldh [hBGMapMode], a
hlcoord 0, 5
lb bc, 10, 18
- call TextBox
+ call Textbox
pop af
ld e, a
ld d, 0
--- a/engine/rtc/restart_clock.asm
+++ b/engine/rtc/restart_clock.asm
@@ -189,7 +189,7 @@
hlcoord 0, 5
ld b, 5
ld c, 18
- call TextBox
+ call Textbox
decoord 1, 8
ld a, [wBuffer4]
ld b, a
--- a/engine/rtc/timeset.asm
+++ b/engine/rtc/timeset.asm
@@ -56,7 +56,7 @@
hlcoord 3, 7
ld b, 2
ld c, 15
- call TextBox
+ call Textbox
hlcoord 11, 7
ld [hl], $1
hlcoord 11, 10
@@ -86,7 +86,7 @@
call PrintText
hlcoord 11, 7
lb bc, 2, 7
- call TextBox
+ call Textbox
hlcoord 15, 7
ld [hl], $1
hlcoord 15, 10
@@ -408,7 +408,7 @@
.loop
hlcoord 0, 12
lb bc, 4, 18
- call TextBox
+ call Textbox
call LoadStandardMenuHeader
ld hl, .WhatDayIsItText
call PrintText
@@ -415,7 +415,7 @@
hlcoord 9, 3
ld b, 2
ld c, 9
- call TextBox
+ call Textbox
hlcoord 14, 3
ld [hl], TIMESET_UP_ARROW
hlcoord 14, 6
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -44,7 +44,7 @@
UnusedBoldFontGFX: ; unused bold letters + unown chars
INCBIN "gfx/font/unused_bold_font.1bpp"
-TextBoxSpaceGFX:
+TextboxSpaceGFX:
INCBIN "gfx/frames/space.1bpp"
FontsExtra_SolidBlackGFX:
--- a/home/battle.asm
+++ b/home/battle.asm
@@ -155,18 +155,18 @@
ld [hl], $5f ; bottom
ret
-BattleTextBox::
+BattleTextbox::
; Open a textbox and print text at hl.
push hl
- call SpeechTextBox
+ call SpeechTextbox
call MobileTextBorder
call UpdateSprites
call ApplyTilemap
pop hl
- call PrintTextBoxText
+ call PrintTextboxText
ret
-StdBattleTextBox::
+StdBattleTextbox::
; Open a textbox and print battle text at 20:hl.
ldh a, [hROMBank]
@@ -175,7 +175,7 @@
ld a, BANK(BattleText)
rst Bankswitch
- call BattleTextBox
+ call BattleTextbox
pop af
rst Bankswitch
--- a/home/map.asm
+++ b/home/map.asm
@@ -1025,13 +1025,13 @@
rst Bankswitch
push hl
- call SpeechTextBox
+ call SpeechTextbox
call SafeUpdateSprites
ld a, 1
ldh [hOAMUpdate], a
call ApplyTilemap
pop hl
- call PrintTextBoxText
+ call PrintTextboxText
xor a
ldh [hOAMUpdate], a
@@ -1932,7 +1932,7 @@
call ReloadTilesetAndPalettes
hlcoord 0, 12
lb bc, 4, 18
- call TextBox
+ call Textbox
ld hl, wVramState
set 0, [hl]
call UpdateSprites
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -17,9 +17,9 @@
ld [wMenuCursorBuffer], a
ret
-MenuTextBox::
+MenuTextbox::
push hl
- call LoadMenuTextBox
+ call LoadMenuTextbox
pop hl
jp PrintText
@@ -26,7 +26,7 @@
; unused
ret
-LoadMenuTextBox::
+LoadMenuTextbox::
ld hl, .MenuHeader
call LoadMenuHeader
ret
@@ -37,8 +37,8 @@
dw vTiles0
db 0 ; default option
-MenuTextBoxBackup::
- call MenuTextBox
+MenuTextboxBackup::
+ call MenuTextbox
call CloseWindow
ret
@@ -498,8 +498,8 @@
pop de
ret
-MenuTextBoxWaitButton::
- call MenuTextBox
+MenuTextboxWaitButton::
+ call MenuTextbox
call WaitButton
call ExitMenu
ret
--- a/home/menu_window.asm
+++ b/home/menu_window.asm
@@ -144,7 +144,7 @@
call GetMenuBoxDims
dec b
dec c
- jp TextBox
+ jp Textbox
GetMenuTextStartCoord::
ld a, [wMenuBorderTopCoord]
--- a/home/mobile.asm
+++ b/home/mobile.asm
@@ -159,7 +159,7 @@
ld c, 18
call .fill_attr
pop hl
- call PrintTextBoxText
+ call PrintTextboxText
ret
.fill_attr
@@ -174,7 +174,7 @@
call Function3f35
pop bc
pop hl
- call TextBoxBorder
+ call TextboxBorder
ret
Function3f20::
--- a/home/print_text.asm
+++ b/home/print_text.asm
@@ -6,8 +6,8 @@
; mid: 3 frames
; slow: 5 frames
-; wTextBoxFlags[!0] and A or B override text speed with a one-frame delay.
-; wOptions[4] and wTextBoxFlags[!1] disable the delay.
+; wTextboxFlags[!0] and A or B override text speed with a one-frame delay.
+; wOptions[4] and wTextboxFlags[!1] disable the delay.
ld a, [wOptions]
bit NO_TEXT_SCROLL, a
@@ -14,7 +14,7 @@
ret nz
; non-scrolling text?
- ld a, [wTextBoxFlags]
+ ld a, [wTextboxFlags]
bit NO_TEXT_DELAY_F, a
ret z
@@ -31,7 +31,7 @@
ld [hl], a
; force fast scroll?
- ld a, [wTextBoxFlags]
+ ld a, [wTextboxFlags]
bit FAST_TEXT_DELAY_F, a
jr z, .fast
--- a/home/scrolling_menu.asm
+++ b/home/scrolling_menu.asm
@@ -38,7 +38,7 @@
push de
call Coord2Tile
pop bc
- jp TextBox
+ jp Textbox
JoyTextDelay_ForcehJoyDown::
call DelayFrame
--- a/home/text.asm
+++ b/home/text.asm
@@ -40,18 +40,18 @@
call ByteFill
jr ClearTileMap
-TextBox::
+Textbox::
; Draw a text box at hl with room for b lines of c characters each.
; Places a border around the textbox, then switches the palette to the
; text black-and-white scheme.
push bc
push hl
- call TextBoxBorder
+ call TextboxBorder
pop hl
pop bc
- jr TextBoxPalette
+ jr TextboxPalette
-TextBoxBorder::
+TextboxBorder::
; Top
push hl
ld a, "┌"
@@ -97,7 +97,7 @@
jr nz, .loop
ret
-TextBoxPalette::
+TextboxPalette::
; Fill text box width c height b at hl with pal 7
ld de, wAttrMap - wTileMap
add hl, de
@@ -121,12 +121,12 @@
jr nz, .col
ret
-SpeechTextBox::
+SpeechTextbox::
; Standard textbox.
hlcoord TEXTBOX_X, TEXTBOX_Y
ld b, TEXTBOX_INNERH
ld c, TEXTBOX_INNERW
- jp TextBox
+ jp Textbox
TestText::
text "ゲームフりーク!"
@@ -140,7 +140,7 @@
text_end
PrintText::
- call SetUpTextBox
+ call SetUpTextbox
BuenaPrintText::
push hl
hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
@@ -148,14 +148,14 @@
call ClearBox
pop hl
-PrintTextBoxText::
+PrintTextboxText::
bccoord TEXTBOX_INNERX, TEXTBOX_INNERY
call PlaceHLTextAtBC
ret
-SetUpTextBox::
+SetUpTextbox::
push hl
- call SpeechTextBox
+ call SpeechTextbox
call UpdateSprites
call ApplyTilemap
pop hl
@@ -648,15 +648,15 @@
text_end
PlaceHLTextAtBC::
- ld a, [wTextBoxFlags]
+ ld a, [wTextboxFlags]
push af
set NO_TEXT_DELAY_F, a
- ld [wTextBoxFlags], a
+ ld [wTextboxFlags], a
call DoTextUntilTerminator
pop af
- ld [wTextBoxFlags], a
+ ld [wTextboxFlags], a
ret
DoTextUntilTerminator::
@@ -822,7 +822,7 @@
push hl
ld h, d
ld l, e
- call TextBox
+ call Textbox
pop hl
ret
--- a/home/window.asm
+++ b/home/window.asm
@@ -51,7 +51,7 @@
rst Bankswitch
call ReanchorBGMap_NoOAMUpdate ; clear bgmap
- call SpeechTextBox
+ call SpeechTextbox
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ; anchor bgmap
call LoadFonts_NoOAMUpdate ; load font
pop af
--- a/macros/scripts/battle_anims.asm
+++ b/macros/scripts/battle_anims.asm
@@ -209,8 +209,8 @@
anim_bgeffect: MACRO
db anim_bgeffect_command
db \1 ; effect
- db \2 ; unknown
- db \3 ; unknown
+ db \2 ; jumptable index
+ db \3 ; battle turn
db \4 ; unknown
ENDM
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -107,7 +107,7 @@
hlcoord 0, 14
ld b, $2
ld c, $12
- call TextBox
+ call Textbox
hlcoord 1, 16
ld de, MobileString_PersonalInfo
call PlaceString
--- a/mobile/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
@@ -671,7 +671,7 @@
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 @@
hlcoord 11, 9
ld b, $7
ld c, $7
- call TextBox
+ call Textbox
call Function4ad68
.asm_4ac96
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -1542,7 +1542,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
hlcoord 0, 12
ld b, $4
ld c, $12
- call TextBox
+ call Textbox
ld de, String_8ad9c
hlcoord 1, 14
call PlaceString
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -284,7 +284,7 @@
push bc
push de
call Function8b4d8
- call TextBox
+ call Textbox
pop de
pop bc
call Function8b4cc
@@ -940,7 +940,7 @@
hlcoord 0, 14
ld b, $2
ld c, $12
- call TextBox
+ call Textbox
ld a, [wd033]
ld b, 0
ld c, a
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -1396,7 +1396,7 @@
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 @@
ld hl, BattleText_TheresNoPPLeftForThisMove
.print_text
- call StdBattleTextBox
+ call StdBattleTextbox
call Call_LoadTempTileMapToTileMap
jp .GetMoveSelection
@@ -1868,7 +1868,7 @@
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 @@
ld [wdc5f], a
ld [wdc60], a
farcall BlankScreen
- call SpeechTextBox
+ call SpeechTextbox
farcall Function100846
ld c, 120
call DelayFrames
@@ -4741,7 +4741,7 @@
call Function10218d
call Function102180
ld hl, UnknownText_0x1021d1
- call MenuTextBox
+ call MenuTextbox
ld de, SFX_LEVEL_UP
call PlaySFX
call JoyWaitAorB
@@ -4748,7 +4748,7 @@
call ExitMenu
call Function10219f
ld hl, UnknownText_0x1021d6
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
call ExitMenu
jr c, .asm_10217c
@@ -4814,7 +4814,7 @@
text_end
Function1021e0:
- call MenuTextBox
+ call MenuTextbox
call JoyWaitAorB
call ExitMenu
ret
@@ -6472,7 +6472,7 @@
ld a, [wBattleMode]
and a
jr z, .link_battle
- call TextBox
+ call Textbox
jr .okay
.link_battle
@@ -6573,7 +6573,7 @@
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, UnknownText_0x102ee2
- call PrintTextBoxText
+ call PrintTextboxText
ret
UnknownText_0x102ee2:
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -1029,7 +1029,7 @@
ret
Function10649b:
- ld a, [wTextBoxFrame]
+ ld a, [wTextboxFrame]
maskbits NUM_FRAMES
ld bc, 6 * LEN_1BPP_TILE
ld hl, Frames
@@ -1041,9 +1041,9 @@
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
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -1255,7 +1255,7 @@
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 @@
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 @@
hlcoord 4, 0
ld b, 6
ld c, 10
- call TextBox
+ call Textbox
hlcoord 5, 0
ld de, .MonTemplate
call PlaceString
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -7015,7 +7015,7 @@
jp MobilePassword_IncrementJumptable
Function117942:
- call SpeechTextBox
+ call SpeechTextbox
hlcoord 1, 14
ld de, SavedPasswordString
call PlaceString
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1744,7 +1744,7 @@
Function118ec6:
call Function118440
- call SpeechTextBox
+ call SpeechTextbox
ld hl, $d80e
ld de, $c320
ld bc, $0026
@@ -5253,7 +5253,7 @@
Function11a90f:
ld a, $1
ldh [rSVBK], a
- call SpeechTextBox
+ call SpeechTextbox
ld a, $50
ld hl, $c320
ld bc, $008c
@@ -5503,7 +5503,7 @@
done
Function11ac3e:
- call SpeechTextBox
+ call SpeechTextbox
call FadeToMenu
callfar ClearSpriteAnims2
call Function11ac51
@@ -7316,7 +7316,7 @@
farcall GetCaughtGender
ld a, c
ld [wOTTrademonCaughtData], a
- call SpeechTextBox
+ call SpeechTextbox
call FadeToMenu
farcall MobileTradeAnimation_ReceiveGetmonFromGTS
farcall Function17d1f1
--- a/mobile/mobile_5e.asm
+++ b/mobile/mobile_5e.asm
@@ -816,7 +816,7 @@
ld a, [$d088]
bit 4, a
jr nz, .bit_4_set
- call TextBox
+ call Textbox
ret
.bit_4_set
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -289,7 +289,7 @@
farcall GetCaughtGender
ld a, c
ld [wOTTrademonCaughtData], a
- call SpeechTextBox
+ call SpeechTextbox
call FadeToMenu
farcall Function10804d
farcall Function17d1f1
@@ -520,7 +520,7 @@
.asm_17d2e2
call Function17d314
ret c
- call SpeechTextBox
+ call SpeechTextbox
call FadeToMenu
ldh a, [rSVBK]
push af
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -23,7 +23,7 @@
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 @@
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 @@
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 @@
hlcoord 0, 12
ld b, $4
ld c, $12
- call TextBox
+ call Textbox
xor a
ld hl, Strings_4a5f6
ld d, h
--- 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
--- a/wram.asm
+++ b/wram.asm
@@ -1569,10 +1569,10 @@
; bit 7: battle scene off/on
db
wSaveFileExists:: db
-wTextBoxFrame:: ; cfce
+wTextboxFrame:: ; cfce
; bits 0-2: textbox frame 0-7
db
-wTextBoxFlags::
+wTextboxFlags::
; bit 0: 1-frame text delay
; bit 4: no text delay
db