pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #622 from mid-kid/master

Browse Source 
TextBox -> Textbox
This commit is contained in:
Rangi 2019-04-13 11:50:16 -04:00 committed by GitHub
commit 1ada06f576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
115 changed files with 478 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/wram_constants.asm
View File

@ -37,7 +37,7 @@ TEXT_DELAY_FAST EQU %001 ; 1
TEXT_DELAY_MED EQU %011 ; 3 TEXT_DELAY_MED EQU %011 ; 3
TEXT_DELAY_SLOW EQU %101 ; 5 TEXT_DELAY_SLOW EQU %101 ; 5
; wTextBoxFrame:: ; cfce ; wTextboxFrame:: ; cfce
const_def const_def
const FRAME_1 ; 0 const FRAME_1 ; 0
const FRAME_2 ; 1 const FRAME_2 ; 1
@ -49,7 +49,7 @@ TEXT_DELAY_SLOW EQU %101 ; 5
const FRAME_8 ; 7 const FRAME_8 ; 7
NUM_FRAMES EQU const_value NUM_FRAMES EQU const_value
; wTextBoxFlags:: ; cfcf ; wTextboxFlags:: ; cfcf
const_def const_def
const FAST_TEXT_DELAY_F ; 0 const FAST_TEXT_DELAY_F ; 0
const NO_TEXT_DELAY_F ; 1 const NO_TEXT_DELAY_F ; 1

4
data/default_options.asm
View File

@ -3,9 +3,9 @@ DefaultOptions:
db TEXT_DELAY_MED db TEXT_DELAY_MED
; wSaveFileExists: no ; wSaveFileExists: no
db FALSE db FALSE
; wTextBoxFrame: frame 1 ; wTextboxFrame: frame 1
db FRAME_1 db FRAME_1
; wTextBoxFlags: use text speed ; wTextboxFlags: use text speed
db 1 << FAST_TEXT_DELAY_F db 1 << FAST_TEXT_DELAY_F
; wGBPrinter: normal brightness ; wGBPrinter: normal brightness
db GBPRINTER_NORMAL db GBPRINTER_NORMAL

6
docs/bugs_and_glitches.md
View File

@ -306,7 +306,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co
... ...
ld hl, HurtItselfText ld hl, HurtItselfText
call StdBattleTextBox call StdBattleTextbox
call HitSelfInConfusion call HitSelfInConfusion
- call BattleCommand_DamageCalc - call BattleCommand_DamageCalc
@ -319,7 +319,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co
```diff ```diff
HitConfusion: HitConfusion:
ld hl, HurtItselfText ld hl, HurtItselfText
call StdBattleTextBox call StdBattleTextbox
xor a xor a
ld [wCriticalHit], a ld [wCriticalHit], a
@ -412,7 +412,7 @@ Add this to the end of each file:
.force_struggle .force_struggle
ld hl, BattleText_MonHasNoMovesLeft ld hl, BattleText_MonHasNoMovesLeft
call StdBattleTextBox call StdBattleTextbox
ld c, 60 ld c, 60
call DelayFrames call DelayFrames
xor a xor a

2
docs/menus.md
View File

@ -12,7 +12,7 @@
## `ScrollingMenu` ## `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: Structure:

162
engine/battle/core.asm
View File

@ -90,7 +90,7 @@ DoBattle:
call NewBattleMonStatus call NewBattleMonStatus
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
call SetPlayerTurn call SetPlayerTurn
call SpikesDamage call SpikesDamage
@ -140,7 +140,7 @@ WildFled_EnemyFled_LinkBattleCanceled:
ld hl, BattleText_LinkErrorBattleCanceled ld hl, BattleText_LinkErrorBattleCanceled
.print_text .print_text
call StdBattleTextBox call StdBattleTextbox
.skip_text .skip_text
call StopDangerSound call StopDangerSound
@ -405,7 +405,7 @@ HandleBerserkGene:
ld [hl], a ld [hl], a
call GetItemName call GetItemName
ld hl, BattleText_UsersStringBuffer1Activated ld hl, BattleText_UsersStringBuffer1Activated
call StdBattleTextBox call StdBattleTextbox
callfar BattleCommand_StatUpMessage callfar BattleCommand_StatUpMessage
pop af pop af
bit SUBSTATUS_CONFUSED, a bit SUBSTATUS_CONFUSED, a
@ -416,7 +416,7 @@ HandleBerserkGene:
call Call_PlayBattleAnim_OnlyIfVisible call Call_PlayBattleAnim_OnlyIfVisible
call SwitchTurnCore call SwitchTurnCore
ld hl, BecameConfusedText ld hl, BecameConfusedText
jp StdBattleTextBox jp StdBattleTextbox
EnemyTriesToFlee: EnemyTriesToFlee:
ld a, [wLinkMode] ld a, [wLinkMode]
@ -725,7 +725,7 @@ HandleEncore:
res SUBSTATUS_ENCORED, [hl] res SUBSTATUS_ENCORED, [hl]
call SetEnemyTurn call SetEnemyTurn
ld hl, BattleText_TargetsEncoreEnded ld hl, BattleText_TargetsEncoreEnded
jp StdBattleTextBox jp StdBattleTextbox
.do_enemy .do_enemy
ld hl, wEnemySubStatus5 ld hl, wEnemySubStatus5
@ -749,7 +749,7 @@ HandleEncore:
res SUBSTATUS_ENCORED, [hl] res SUBSTATUS_ENCORED, [hl]
call SetPlayerTurn call SetPlayerTurn
ld hl, BattleText_TargetsEncoreEnded ld hl, BattleText_TargetsEncoreEnded
jp StdBattleTextBox jp StdBattleTextbox
TryEnemyFlee: TryEnemyFlee:
ld a, [wBattleMode] ld a, [wBattleMode]
@ -1019,7 +1019,7 @@ ResidualDamage:
.got_anim .got_anim
push de push de
call StdBattleTextBox call StdBattleTextbox
pop de pop de
xor a xor a
@ -1077,7 +1077,7 @@ ResidualDamage:
ldh [hBGMapMode], a ldh [hBGMapMode], a
call RestoreHP call RestoreHP
ld hl, LeechSeedSapsText ld hl, LeechSeedSapsText
call StdBattleTextBox call StdBattleTextbox
.not_seeded .not_seeded
call HasUserFainted call HasUserFainted
@ -1094,7 +1094,7 @@ ResidualDamage:
call GetQuarterMaxHP call GetQuarterMaxHP
call SubtractHPFromUser call SubtractHPFromUser
ld hl, HasANightmareText ld hl, HasANightmareText
call StdBattleTextBox call StdBattleTextbox
.not_nightmare .not_nightmare
call HasUserFainted call HasUserFainted
@ -1112,7 +1112,7 @@ ResidualDamage:
call GetQuarterMaxHP call GetQuarterMaxHP
call SubtractHPFromUser call SubtractHPFromUser
ld hl, HurtByCurseText ld hl, HurtByCurseText
call StdBattleTextBox call StdBattleTextbox
.not_cursed .not_cursed
ld hl, wBattleMonHP ld hl, wBattleMonHP
@ -1164,7 +1164,7 @@ HandlePerishSong:
ld [wDeciramBuffer], a ld [wDeciramBuffer], a
push af push af
ld hl, PerishCountText ld hl, PerishCountText
call StdBattleTextBox call StdBattleTextbox
pop af pop af
ret nz ret nz
ld a, BATTLE_VARS_SUBSTATUS1 ld a, BATTLE_VARS_SUBSTATUS1
@ -1263,7 +1263,7 @@ HandleWrap:
ld hl, BattleText_UserWasReleasedFromStringBuffer1 ld hl, BattleText_UserWasReleasedFromStringBuffer1
.print_text .print_text
jp StdBattleTextBox jp StdBattleTextbox
SwitchTurnCore: SwitchTurnCore:
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
@ -1318,7 +1318,7 @@ HandleLeftovers:
call SwitchTurnCore call SwitchTurnCore
call RestoreHP call RestoreHP
ld hl, BattleText_TargetRecoveredWithItem ld hl, BattleText_TargetRecoveredWithItem
jp StdBattleTextBox jp StdBattleTextbox
HandleMysteryberry: HandleMysteryberry:
ldh a, [hSerialConnectionStatus] ldh a, [hSerialConnectionStatus]
@ -1456,7 +1456,7 @@ HandleMysteryberry:
call ItemRecoveryAnim call ItemRecoveryAnim
call SwitchTurnCore call SwitchTurnCore
ld hl, BattleText_UserRecoveredPPUsing ld hl, BattleText_UserRecoveredPPUsing
jp StdBattleTextBox jp StdBattleTextbox
HandleFutureSight: HandleFutureSight:
ldh a, [hSerialConnectionStatus] ldh a, [hSerialConnectionStatus]
@ -1489,7 +1489,7 @@ HandleFutureSight:
ret nz ret nz
ld hl, BattleText_TargetWasHitByFutureSight ld hl, BattleText_TargetWasHitByFutureSight
call StdBattleTextBox call StdBattleTextbox
ld a, BATTLE_VARS_MOVE ld a, BATTLE_VARS_MOVE
call GetBattleVarAddr call GetBattleVarAddr
@ -1546,7 +1546,7 @@ HandleDefrost:
call UpdateBattleHuds call UpdateBattleHuds
call SetEnemyTurn call SetEnemyTurn
ld hl, DefrostedOpponentText ld hl, DefrostedOpponentText
jp StdBattleTextBox jp StdBattleTextbox
.do_enemy_turn .do_enemy_turn
ld a, [wEnemyMonStatus] ld a, [wEnemyMonStatus]
@ -1573,7 +1573,7 @@ HandleDefrost:
call UpdateBattleHuds call UpdateBattleHuds
call SetPlayerTurn call SetPlayerTurn
ld hl, DefrostedOpponentText ld hl, DefrostedOpponentText
jp StdBattleTextBox jp StdBattleTextbox
HandleSafeguard: HandleSafeguard:
ldh a, [hSerialConnectionStatus] ldh a, [hSerialConnectionStatus]
@ -1610,7 +1610,7 @@ HandleSafeguard:
.print .print
ldh [hBattleTurn], a ldh [hBattleTurn], a
ld hl, BattleText_SafeguardFaded ld hl, BattleText_SafeguardFaded
jp StdBattleTextBox jp StdBattleTextbox
HandleScreens: HandleScreens:
ldh a, [hSerialConnectionStatus] ldh a, [hSerialConnectionStatus]
@ -1662,7 +1662,7 @@ HandleScreens:
push hl push hl
push de push de
ld hl, BattleText_MonsLightScreenFell ld hl, BattleText_MonsLightScreenFell
call StdBattleTextBox call StdBattleTextbox
pop de pop de
pop hl pop hl
ret ret
@ -1675,7 +1675,7 @@ HandleScreens:
ret nz ret nz
res SCREENS_REFLECT, [hl] res SCREENS_REFLECT, [hl]
ld hl, BattleText_MonsReflectFaded ld hl, BattleText_MonsReflectFaded
jp StdBattleTextBox jp StdBattleTextbox
HandleWeather: HandleWeather:
ld a, [wBattleWeather] ld a, [wBattleWeather]
@ -1746,7 +1746,7 @@ HandleWeather:
call SubtractHPFromUser call SubtractHPFromUser
ld hl, SandstormHitsText ld hl, SandstormHitsText
jp StdBattleTextBox jp StdBattleTextbox
.ended .ended
ld hl, .WeatherEndedMessages ld hl, .WeatherEndedMessages
@ -1765,7 +1765,7 @@ HandleWeather:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp StdBattleTextBox jp StdBattleTextbox
.WeatherMessages: .WeatherMessages:
; entries correspond to WEATHER_* constants ; entries correspond to WEATHER_* constants
@ -1932,7 +1932,7 @@ CheckUserHasEnoughHP:
sbc [hl] sbc [hl]
ret ret
RestoreHP RestoreHP:
ld hl, wEnemyMonMaxHP ld hl, wEnemyMonMaxHP
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -2141,7 +2141,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint:
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
call z, PlayVictoryMusic call z, PlayVictoryMusic
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
ld a, [wBattleResult] ld a, [wBattleResult]
and BATTLERESULT_BITMASK and BATTLERESULT_BITMASK
@ -2254,7 +2254,7 @@ FaintYourPokemon:
lb bc, 5, 11 lb bc, 5, 11
call ClearBox call ClearBox
ld hl, BattleText_MonFainted ld hl, BattleText_MonFainted
jp StdBattleTextBox jp StdBattleTextbox
FaintEnemyPokemon: FaintEnemyPokemon:
call WaitSFX call WaitSFX
@ -2267,7 +2267,7 @@ FaintEnemyPokemon:
lb bc, 4, 10 lb bc, 4, 10
call ClearBox call ClearBox
ld hl, BattleText_EnemyMonFainted ld hl, BattleText_EnemyMonFainted
jp StdBattleTextBox jp StdBattleTextbox
CheckEnemyTrainerDefeated: CheckEnemyTrainerDefeated:
ld a, [wOTPartyCount] ld a, [wOTPartyCount]
@ -2351,7 +2351,7 @@ WinTrainerBattle:
call z, PlayVictoryMusic call z, PlayVictoryMusic
callfar Battle_GetTrainerName callfar Battle_GetTrainerName
ld hl, BattleText_EnemyWasDefeated ld hl, BattleText_EnemyWasDefeated
call StdBattleTextBox call StdBattleTextbox
call IsMobileBattle call IsMobileBattle
jr z, .mobile jr z, .mobile
@ -2391,7 +2391,7 @@ WinTrainerBattle:
call BattleWinSlideInEnemyTrainerFrontpic call BattleWinSlideInEnemyTrainerFrontpic
ld c, 40 ld c, 40
call DelayFrames call DelayFrames
call EmptyBattleTextBox call EmptyBattleTextbox
ld c, BATTLETOWERTEXT_LOSS_TEXT ld c, BATTLETOWERTEXT_LOSS_TEXT
farcall BattleTowerText farcall BattleTowerText
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
@ -2456,11 +2456,11 @@ WinTrainerBattle:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp StdBattleTextBox jp StdBattleTextbox
.KeepItAll: .KeepItAll:
ld hl, GotMoneyForWinningText ld hl, GotMoneyForWinningText
jp StdBattleTextBox jp StdBattleTextbox
.AddMoneyToMom: .AddMoneyToMom:
push bc push bc
@ -2681,7 +2681,7 @@ UpdateFaintedPlayerMon:
ret ; ?????????? ret ; ??????????
AskUseNextPokemon: AskUseNextPokemon:
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
; We don't need to be here if we're in a Trainer battle, ; We don't need to be here if we're in a Trainer battle,
; as that decision is made for us. ; as that decision is made for us.
@ -2691,7 +2691,7 @@ AskUseNextPokemon:
ret nz ret nz
ld hl, BattleText_UseNextMon ld hl, BattleText_UseNextMon
call StdBattleTextBox call StdBattleTextbox
.loop .loop
lb bc, 1, 7 lb bc, 1, 7
call PlaceYesNoBox call PlaceYesNoBox
@ -2709,7 +2709,7 @@ AskUseNextPokemon:
jp TryToRunAwayFromBattle jp TryToRunAwayFromBattle
ForcePlayerMonChoice: ForcePlayerMonChoice:
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadStandardMenuHeader call LoadStandardMenuHeader
call SetUpBattlePartyMenu_NoLoop call SetUpBattlePartyMenu_NoLoop
call ForcePickPartyMonInBattle call ForcePickPartyMonInBattle
@ -2762,7 +2762,7 @@ ForcePlayerMonChoice:
call NewBattleMonStatus call NewBattleMonStatus
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
call SetPlayerTurn call SetPlayerTurn
call SpikesDamage call SpikesDamage
@ -2783,7 +2783,7 @@ PlayerPartyMonEntrance:
call NewBattleMonStatus call NewBattleMonStatus
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
call SetPlayerTurn call SetPlayerTurn
jp SpikesDamage jp SpikesDamage
@ -2856,7 +2856,7 @@ SwitchMonAlreadyOut:
jr nz, .notout jr nz, .notout
ld hl, BattleText_MonIsAlreadyOut ld hl, BattleText_MonIsAlreadyOut
call StdBattleTextBox call StdBattleTextbox
scf scf
ret ret
@ -2938,7 +2938,7 @@ LostBattle:
ld c, 40 ld c, 40
call DelayFrames call DelayFrames
call EmptyBattleTextBox call EmptyBattleTextbox
ld c, BATTLETOWERTEXT_WIN_TEXT ld c, BATTLETOWERTEXT_WIN_TEXT
farcall BattleTowerText farcall BattleTowerText
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
@ -2974,7 +2974,7 @@ LostBattle:
jr z, .mobile jr z, .mobile
.text .text
call StdBattleTextBox call StdBattleTextbox
.end .end
scf scf
@ -3192,7 +3192,7 @@ CheckWhetherSwitchmonIsPredetermined:
ret ret
ResetEnemyBattleVars: ResetEnemyBattleVars:
; and draw empty TextBox ; and draw empty Textbox
xor a xor a
ld [wLastPlayerCounterMove], a ld [wLastPlayerCounterMove], a
ld [wLastEnemyCounterMove], a ld [wLastEnemyCounterMove], a
@ -3205,7 +3205,7 @@ ResetEnemyBattleVars:
hlcoord 18, 0 hlcoord 18, 0
ld a, 8 ld a, 8
call SlideBattlePicOut call SlideBattlePicOut
call EmptyBattleTextBox call EmptyBattleTextbox
jp LoadStandardMenuHeader jp LoadStandardMenuHeader
ResetBattleParticipants: ResetBattleParticipants:
@ -3480,7 +3480,7 @@ OfferSwitch:
push af push af
callfar Battle_GetTrainerName callfar Battle_GetTrainerName
ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon
call StdBattleTextBox call StdBattleTextbox
lb bc, 1, 7 lb bc, 1, 7
call PlaceYesNoBox call PlaceYesNoBox
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
@ -3529,7 +3529,7 @@ ClearEnemyMonBox:
Function_BattleTextEnemySentOut: Function_BattleTextEnemySentOut:
callfar Battle_GetTrainerName callfar Battle_GetTrainerName
ld hl, BattleText_EnemySentOut ld hl, BattleText_EnemySentOut
call StdBattleTextBox call StdBattleTextbox
jp WaitBGMap jp WaitBGMap
Function_SetEnemyMonAndSendOutAnimation: Function_SetEnemyMonAndSendOutAnimation:
@ -3657,7 +3657,7 @@ CheckIfCurPartyMonIsFitToFight:
ld hl, BattleText_TheresNoWillToBattle ld hl, BattleText_TheresNoWillToBattle
.print_textbox .print_textbox
call StdBattleTextBox call StdBattleTextbox
.finish_fail .finish_fail
xor a xor a
@ -3710,7 +3710,7 @@ TryToRunAwayFromBattle:
call SetPlayerTurn call SetPlayerTurn
call GetItemName call GetItemName
ld hl, BattleText_UserFledUsingAStringBuffer1 ld hl, BattleText_UserFledUsingAStringBuffer1
call StdBattleTextBox call StdBattleTextbox
jp .can_escape jp .can_escape
.no_flee_item .no_flee_item
@ -3788,7 +3788,7 @@ TryToRunAwayFromBattle:
ld hl, BattleText_TheresNoEscapeFromTrainerBattle ld hl, BattleText_TheresNoEscapeFromTrainerBattle
.print_inescapable_text .print_inescapable_text
call StdBattleTextBox call StdBattleTextbox
ld a, TRUE ld a, TRUE
ld [wFailedToFlee], a ld [wFailedToFlee], a
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
@ -3831,7 +3831,7 @@ TryToRunAwayFromBattle:
pop de pop de
call WaitSFX call WaitSFX
ld hl, BattleText_GotAwaySafely ld hl, BattleText_GotAwaySafely
call StdBattleTextBox call StdBattleTextbox
call WaitSFX call WaitSFX
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
scf scf
@ -3843,7 +3843,7 @@ TryToRunAwayFromBattle:
bit 4, [hl] bit 4, [hl]
jr nz, .skip_link_error jr nz, .skip_link_error
ld hl, BattleText_LinkErrorBattleCanceled ld hl, BattleText_LinkErrorBattleCanceled
call StdBattleTextBox call StdBattleTextbox
.skip_link_error .skip_link_error
call WaitSFX call WaitSFX
@ -4000,7 +4000,7 @@ SwitchPlayerMon:
call NewBattleMonStatus call NewBattleMonStatus
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
ld hl, wEnemyMonHP ld hl, wEnemyMonHP
ld a, [hli] ld a, [hli]
@ -4124,7 +4124,7 @@ SpikesDamage:
push bc push bc
ld hl, BattleText_UserHurtBySpikes ; "hurt by SPIKES!" ld hl, BattleText_UserHurtBySpikes ; "hurt by SPIKES!"
call StdBattleTextBox call StdBattleTextbox
call GetEighthMaxHP call GetEighthMaxHP
call SubtractHPFromTarget call SubtractHPFromTarget
@ -4208,7 +4208,7 @@ PursuitSwitch:
ld hl, BattleText_EnemyMonFainted ld hl, BattleText_EnemyMonFainted
.done_fainted .done_fainted
call StdBattleTextBox call StdBattleTextbox
scf scf
ret ret
@ -4342,13 +4342,13 @@ UseOpponentItem:
call GetItemName call GetItemName
callfar ConsumeHeldItem callfar ConsumeHeldItem
ld hl, RecoveredUsingText ld hl, RecoveredUsingText
jp StdBattleTextBox jp StdBattleTextbox
ItemRecoveryAnim: ItemRecoveryAnim:
push hl push hl
push de push de
push bc push bc
call EmptyBattleTextBox call EmptyBattleTextbox
ld a, RECOVER ld a, RECOVER
ld [wFXAnimID], a ld [wFXAnimID], a
call SwitchTurnCore call SwitchTurnCore
@ -4439,7 +4439,7 @@ UseConfusionHealingItem:
call GetItemName call GetItemName
call ItemRecoveryAnim call ItemRecoveryAnim
ld hl, BattleText_ItemHealedConfusion ld hl, BattleText_ItemHealedConfusion
call StdBattleTextBox call StdBattleTextbox
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
jr nz, .do_partymon jr nz, .do_partymon
@ -4518,7 +4518,7 @@ HandleStatBoostingHeldItems:
ld [de], a ld [de], a
call GetItemName call GetItemName
ld hl, BattleText_UsersStringBuffer1Activated ld hl, BattleText_UsersStringBuffer1Activated
call StdBattleTextBox call StdBattleTextbox
callfar BattleCommand_StatUpMessage callfar BattleCommand_StatUpMessage
ret ret
@ -4867,9 +4867,9 @@ BattleMenu:
jr z, .ok jr z, .ok
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .ok jr z, .ok
call EmptyBattleTextBox call EmptyBattleTextbox
call UpdateBattleHuds call UpdateBattleHuds
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
.ok .ok
@ -4929,7 +4929,7 @@ LoadBattleMenu2:
bit 4, [hl] bit 4, [hl]
jr nz, .error jr nz, .error
ld hl, BattleText_LinkErrorBattleCanceled ld hl, BattleText_LinkErrorBattleCanceled
call StdBattleTextBox call StdBattleTextbox
ld c, 60 ld c, 60
call DelayFrames call DelayFrames
.error .error
@ -4989,7 +4989,7 @@ BattleMenu_Pack:
.ItemsCantBeUsed: .ItemsCantBeUsed:
ld hl, BattleText_ItemsCantBeUsedHere ld hl, BattleText_ItemsCantBeUsedHere
call StdBattleTextBox call StdBattleTextbox
jp BattleMenu jp BattleMenu
.UseItem: .UseItem:
@ -5139,7 +5139,7 @@ TryPlayerSwitch:
cp d cp d
jr nz, .check_trapped jr nz, .check_trapped
ld hl, BattleText_MonIsAlreadyOut ld hl, BattleText_MonIsAlreadyOut
call StdBattleTextBox call StdBattleTextbox
jp BattleMenuPKMN_Loop jp BattleMenuPKMN_Loop
.check_trapped .check_trapped
@ -5152,7 +5152,7 @@ TryPlayerSwitch:
.trapped .trapped
ld hl, BattleText_MonCantBeRecalled ld hl, BattleText_MonCantBeRecalled
call StdBattleTextBox call StdBattleTextbox
jp BattleMenuPKMN_Loop jp BattleMenuPKMN_Loop
.try_switch .try_switch
@ -5253,7 +5253,7 @@ BattleMonEntrance:
call NewBattleMonStatus call NewBattleMonStatus
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
call SetPlayerTurn call SetPlayerTurn
call SpikesDamage call SpikesDamage
@ -5277,7 +5277,7 @@ PassedBattleMonEntrance:
ld [wApplyStatLevelMultipliersToEnemy], a ld [wApplyStatLevelMultipliersToEnemy], a
call ApplyStatLevelMultiplierOnAllStats call ApplyStatLevelMultiplierOnAllStats
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
call SetPlayerTurn call SetPlayerTurn
jp SpikesDamage jp SpikesDamage
@ -5347,7 +5347,7 @@ MoveSelectionScreen:
ld b, 4 ld b, 4
ld c, 14 ld c, 14
.got_dims .got_dims
call TextBox call Textbox
hlcoord 6, 17 - NUM_MOVES hlcoord 6, 17 - NUM_MOVES
ld a, [wMoveSelectionMenuType] ld a, [wMoveSelectionMenuType]
@ -5507,7 +5507,7 @@ MoveSelectionScreen:
ld hl, BattleText_TheresNoPPLeftForThisMove ld hl, BattleText_TheresNoPPLeftForThisMove
.place_textbox_start_over .place_textbox_start_over
call StdBattleTextBox call StdBattleTextbox
call Call_LoadTempTileMapToTileMap call Call_LoadTempTileMapToTileMap
jp MoveSelectionScreen jp MoveSelectionScreen
@ -5626,7 +5626,7 @@ MoveInfoBox:
hlcoord 0, 8 hlcoord 0, 8
ld b, 3 ld b, 3
ld c, 9 ld c, 9
call TextBox call Textbox
call MobileTextBorder call MobileTextBorder
ld a, [wPlayerDisableCount] ld a, [wPlayerDisableCount]
@ -5757,7 +5757,7 @@ CheckPlayerHasUsableMoves:
.force_struggle .force_struggle
ld hl, BattleText_MonHasNoMovesLeft ld hl, BattleText_MonHasNoMovesLeft
call StdBattleTextBox call StdBattleTextbox
ld c, 60 ld c, 60
call DelayFrames call DelayFrames
xor a xor a
@ -5770,7 +5770,7 @@ ParseEnemyAction:
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
jr z, .not_linked jr z, .not_linked
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
ld a, [wBattlePlayerAction] ld a, [wBattlePlayerAction]
and a ; BATTLEPLAYERACTION_USEMOVE? and a ; BATTLEPLAYERACTION_USEMOVE?
@ -6864,9 +6864,9 @@ Unreferenced_LoadHPExpBarGFX:
lb bc, BANK(ExpBarGFX), 8 lb bc, BANK(ExpBarGFX), 8
jp Get2bpp jp Get2bpp
EmptyBattleTextBox: EmptyBattleTextbox:
ld hl, .empty ld hl, .empty
jp BattleTextBox jp BattleTextbox
.empty: .empty:
text_end text_end
@ -7107,7 +7107,7 @@ GiveExperiencePoints:
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNick
ld hl, Text_MonGainedExpPoint ld hl, Text_MonGainedExpPoint
call BattleTextBox call BattleTextbox
ld a, [wStringBuffer2 + 1] ld a, [wStringBuffer2 + 1]
ldh [hQuotient + 3], a ldh [hQuotient + 3], a
ld a, [wStringBuffer2] ld a, [wStringBuffer2]
@ -7267,7 +7267,7 @@ GiveExperiencePoints:
callfar ApplyStatusEffectOnPlayerStats callfar ApplyStatusEffectOnPlayerStats
callfar BadgeStatBoosts callfar BadgeStatBoosts
callfar UpdatePlayerHUD callfar UpdatePlayerHUD
call EmptyBattleTextBox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
ld a, $1 ld a, $1
ldh [hBGMapMode], a ldh [hBGMapMode], a
@ -7283,7 +7283,7 @@ GiveExperiencePoints:
call PlaySFX call PlaySFX
call WaitSFX call WaitSFX
ld hl, BattleText_StringBuffer1GrewToLevel ld hl, BattleText_StringBuffer1GrewToLevel
call StdBattleTextBox call StdBattleTextbox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
.skip_exp_bar_animation .skip_exp_bar_animation
@ -7293,7 +7293,7 @@ GiveExperiencePoints:
hlcoord 9, 0 hlcoord 9, 0
ld b, 10 ld b, 10
ld c, 9 ld c, 9
call TextBox call Textbox
hlcoord 11, 1 hlcoord 11, 1
ld bc, 4 ld bc, 4
predef PrintTempMonStats predef PrintTempMonStats
@ -7526,7 +7526,7 @@ AnimateExpBar:
farcall AnimateEndOfExpBar farcall AnimateEndOfExpBar
call WaitSFX call WaitSFX
ld hl, BattleText_StringBuffer1GrewToLevel ld hl, BattleText_StringBuffer1GrewToLevel
call StdBattleTextBox call StdBattleTextbox
pop de pop de
inc e inc e
ld b, $0 ld b, $0
@ -7666,7 +7666,7 @@ SendOutMonText:
ld hl, JumpText_YourFoesWeakGetmMon ld hl, JumpText_YourFoesWeakGetmMon
.skip_to_textbox .skip_to_textbox
jp BattleTextBox jp BattleTextbox
JumpText_GoMon: JumpText_GoMon:
text_far Text_GoMon text_far Text_GoMon
@ -7696,7 +7696,7 @@ TextJump_BattleMonNick01:
WithdrawMonText: WithdrawMonText:
ld hl, .WithdrawMonText ld hl, .WithdrawMonText
jp BattleTextBox jp BattleTextbox
.WithdrawMonText: .WithdrawMonText:
text_far Text_BattleMonNickComma text_far Text_BattleMonNickComma
@ -7799,7 +7799,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
push hl push hl
call Call_LoadTempTileMapToTileMap call Call_LoadTempTileMapToTileMap
pop hl pop hl
jp StdBattleTextBox jp StdBattleTextbox
FillInExpBar: FillInExpBar:
push hl push hl
@ -8056,7 +8056,7 @@ BattleIntro:
set rLCDC_WINDOW_TILEMAP, [hl] ; select 9C00-9FFF set rLCDC_WINDOW_TILEMAP, [hl] ; select 9C00-9FFF
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call EmptyBattleTextBox call EmptyBattleTextbox
hlcoord 9, 7 hlcoord 9, 7
lb bc, 5, 11 lb bc, 5, 11
call ClearBox call ClearBox
@ -8336,7 +8336,7 @@ CheckPayDay:
ld de, wMoney + 2 ld de, wMoney + 2
call AddBattleMoneyToAccount call AddBattleMoneyToAccount
ld hl, BattleText_PlayerPickedUpPayDayMoney ld hl, BattleText_PlayerPickedUpPayDayMoney
call StdBattleTextBox call StdBattleTextbox
ld a, [wInBattleTowerBattle] ld a, [wInBattleTowerBattle]
bit 0, a bit 0, a
ret z ret z
@ -8901,7 +8901,7 @@ InitBattleDisplay:
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call TextBox call Textbox
farcall MobileTextBorder farcall MobileTextBorder
hlcoord 1, 5 hlcoord 1, 5
lb bc, 3, 7 lb bc, 3, 7
@ -9126,7 +9126,7 @@ BattleStartMessage:
push hl push hl
farcall BattleStart_TrainerHuds farcall BattleStart_TrainerHuds
pop hl pop hl
call StdBattleTextBox call StdBattleTextbox
call IsMobileBattle2 call IsMobileBattle2
ret nz ret nz

170
engine/battle/effect_commands.asm
View File

@ -141,7 +141,7 @@ CheckPlayerTurn:
res SUBSTATUS_RECHARGE, [hl] res SUBSTATUS_RECHARGE, [hl]
ld hl, MustRechargeText ld hl, MustRechargeText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
jp EndTurn jp EndTurn
@ -165,7 +165,7 @@ CheckPlayerTurn:
.woke_up .woke_up
ld hl, WokeUpText ld hl, WokeUpText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
call UpdateBattleMonInParty call UpdateBattleMonInParty
ld hl, UpdatePlayerHUD ld hl, UpdatePlayerHUD
@ -178,7 +178,7 @@ CheckPlayerTurn:
.fast_asleep .fast_asleep
ld hl, FastAsleepText ld hl, FastAsleepText
call StdBattleTextBox call StdBattleTextbox
; Snore and Sleep Talk bypass sleep. ; Snore and Sleep Talk bypass sleep.
ld a, [wCurPlayerMove] ld a, [wCurPlayerMove]
@ -204,7 +204,7 @@ CheckPlayerTurn:
jr z, .not_frozen jr z, .not_frozen
ld hl, FrozenSolidText ld hl, FrozenSolidText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
jp EndTurn jp EndTurn
@ -217,7 +217,7 @@ CheckPlayerTurn:
res SUBSTATUS_FLINCHED, [hl] res SUBSTATUS_FLINCHED, [hl]
ld hl, FlinchedText ld hl, FlinchedText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
jp EndTurn jp EndTurn
@ -237,7 +237,7 @@ CheckPlayerTurn:
ld [hl], a ld [hl], a
ld [wDisabledMove], a ld [wDisabledMove], a
ld hl, DisabledNoMoreText ld hl, DisabledNoMoreText
call StdBattleTextBox call StdBattleTextbox
.not_disabled .not_disabled
@ -251,12 +251,12 @@ CheckPlayerTurn:
ld hl, wPlayerSubStatus3 ld hl, wPlayerSubStatus3
res SUBSTATUS_CONFUSED, [hl] res SUBSTATUS_CONFUSED, [hl]
ld hl, ConfusedNoMoreText ld hl, ConfusedNoMoreText
call StdBattleTextBox call StdBattleTextbox
jr .not_confused jr .not_confused
.confused .confused
ld hl, IsConfusedText ld hl, IsConfusedText
call StdBattleTextBox call StdBattleTextbox
xor a xor a
ld [wNumHits], a ld [wNumHits], a
ld de, ANIM_CONFUSED ld de, ANIM_CONFUSED
@ -284,7 +284,7 @@ CheckPlayerTurn:
jr nc, .not_infatuated jr nc, .not_infatuated
ld hl, InLoveWithText ld hl, InLoveWithText
call StdBattleTextBox call StdBattleTextbox
xor a xor a
ld [wNumHits], a ld [wNumHits], a
ld de, ANIM_IN_LOVE ld de, ANIM_IN_LOVE
@ -296,7 +296,7 @@ CheckPlayerTurn:
jr c, .not_infatuated jr c, .not_infatuated
ld hl, InfatuationText ld hl, InfatuationText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
jp EndTurn jp EndTurn
@ -328,7 +328,7 @@ CheckPlayerTurn:
ret nc ret nc
ld hl, FullyParalyzedText ld hl, FullyParalyzedText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
jp EndTurn jp EndTurn
@ -370,7 +370,7 @@ CheckEnemyTurn:
res SUBSTATUS_RECHARGE, [hl] res SUBSTATUS_RECHARGE, [hl]
ld hl, MustRechargeText ld hl, MustRechargeText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
jp EndTurn jp EndTurn
@ -387,7 +387,7 @@ CheckEnemyTurn:
jr z, .woke_up jr z, .woke_up
ld hl, FastAsleepText ld hl, FastAsleepText
call StdBattleTextBox call StdBattleTextbox
xor a xor a
ld [wNumHits], a ld [wNumHits], a
ld de, ANIM_SLP ld de, ANIM_SLP
@ -396,7 +396,7 @@ CheckEnemyTurn:
.woke_up .woke_up
ld hl, WokeUpText ld hl, WokeUpText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
call UpdateEnemyMonInParty call UpdateEnemyMonInParty
ld hl, UpdateEnemyHUD ld hl, UpdateEnemyHUD
@ -431,7 +431,7 @@ CheckEnemyTurn:
jr z, .not_frozen jr z, .not_frozen
ld hl, FrozenSolidText ld hl, FrozenSolidText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
jp EndTurn jp EndTurn
@ -443,7 +443,7 @@ CheckEnemyTurn:
res SUBSTATUS_FLINCHED, [hl] res SUBSTATUS_FLINCHED, [hl]
ld hl, FlinchedText ld hl, FlinchedText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
jp EndTurn jp EndTurn
@ -464,7 +464,7 @@ CheckEnemyTurn:
ld [wEnemyDisabledMove], a ld [wEnemyDisabledMove], a
ld hl, DisabledNoMoreText ld hl, DisabledNoMoreText
call StdBattleTextBox call StdBattleTextbox
.not_disabled .not_disabled
@ -479,12 +479,12 @@ CheckEnemyTurn:
ld hl, wEnemySubStatus3 ld hl, wEnemySubStatus3
res SUBSTATUS_CONFUSED, [hl] res SUBSTATUS_CONFUSED, [hl]
ld hl, ConfusedNoMoreText ld hl, ConfusedNoMoreText
call StdBattleTextBox call StdBattleTextbox
jr .not_confused jr .not_confused
.confused .confused
ld hl, IsConfusedText ld hl, IsConfusedText
call StdBattleTextBox call StdBattleTextbox
xor a xor a
ld [wNumHits], a ld [wNumHits], a
@ -503,7 +503,7 @@ CheckEnemyTurn:
ld [hl], a ld [hl], a
ld hl, HurtItselfText ld hl, HurtItselfText
call StdBattleTextBox call StdBattleTextbox
call HitSelfInConfusion call HitSelfInConfusion
call BattleCommand_DamageCalc call BattleCommand_DamageCalc
@ -532,7 +532,7 @@ CheckEnemyTurn:
jr nc, .not_infatuated jr nc, .not_infatuated
ld hl, InLoveWithText ld hl, InLoveWithText
call StdBattleTextBox call StdBattleTextbox
xor a xor a
ld [wNumHits], a ld [wNumHits], a
ld de, ANIM_IN_LOVE ld de, ANIM_IN_LOVE
@ -544,7 +544,7 @@ CheckEnemyTurn:
jr c, .not_infatuated jr c, .not_infatuated
ld hl, InfatuationText ld hl, InfatuationText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
jp EndTurn jp EndTurn
@ -577,7 +577,7 @@ CheckEnemyTurn:
ret nc ret nc
ld hl, FullyParalyzedText ld hl, FullyParalyzedText
call StdBattleTextBox call StdBattleTextbox
call CantMove call CantMove
; fallthrough ; fallthrough
@ -599,11 +599,11 @@ MoveDisabled:
call GetMoveName call GetMoveName
ld hl, DisabledMoveText ld hl, DisabledMoveText
jp StdBattleTextBox jp StdBattleTextbox
HitConfusion: HitConfusion:
ld hl, HurtItselfText ld hl, HurtItselfText
call StdBattleTextBox call StdBattleTextbox
xor a xor a
ld [wCriticalHit], a ld [wCriticalHit], a
@ -768,7 +768,7 @@ BattleCommand_CheckObedience:
jr nc, .DoNothing jr nc, .DoNothing
ld hl, WontObeyText ld hl, WontObeyText
call StdBattleTextBox call StdBattleTextbox
call HitConfusion call HitConfusion
jp .EndDisobedience jp .EndDisobedience
@ -804,7 +804,7 @@ BattleCommand_CheckObedience:
ld hl, IgnoredOrdersText ld hl, IgnoredOrdersText
.Print: .Print:
call StdBattleTextBox call StdBattleTextbox
jp .EndDisobedience jp .EndDisobedience
.UseInstead: .UseInstead:
@ -934,7 +934,7 @@ IgnoreSleepOnly:
; 'ignored orders…sleeping!' ; 'ignored orders…sleeping!'
ld hl, IgnoredSleepingText ld hl, IgnoredSleepingText
call StdBattleTextBox call StdBattleTextbox
call EndMoveEffect call EndMoveEffect
@ -1077,7 +1077,7 @@ BattleCommand_DoTurn:
; 'but no pp is left for the move' ; 'but no pp is left for the move'
ld hl, NoPPLeftText ld hl, NoPPLeftText
.print .print
call StdBattleTextBox call StdBattleTextbox
ld b, 1 ld b, 1
ret ret
@ -1662,7 +1662,7 @@ BattleCommand_CheckHit:
; 'protecting itself!' ; 'protecting itself!'
ld hl, ProtectingItselfText ld hl, ProtectingItselfText
call StdBattleTextBox call StdBattleTextbox
ld c, 40 ld c, 40
call DelayFrames call DelayFrames
@ -2181,7 +2181,7 @@ BattleCommand_ApplyDamage:
dec a dec a
jr nz, .focus_band_text jr nz, .focus_band_text
ld hl, EnduredText ld hl, EnduredText
jp StdBattleTextBox jp StdBattleTextbox
.focus_band_text .focus_band_text
call GetOpponentItem call GetOpponentItem
@ -2189,7 +2189,7 @@ BattleCommand_ApplyDamage:
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetItemName call GetItemName
ld hl, HungOnText ld hl, HungOnText
jp StdBattleTextBox jp StdBattleTextbox
.update_damage_taken .update_damage_taken
ld a, BATTLE_VARS_SUBSTATUS4_OPP ld a, BATTLE_VARS_SUBSTATUS4_OPP
@ -2270,7 +2270,7 @@ endr
ld [hl], a ld [hl], a
.do_at_least_1_damage .do_at_least_1_damage
ld hl, CrashedText ld hl, CrashedText
call StdBattleTextBox call StdBattleTextbox
ld a, $1 ld a, $1
ld [wKickCounter], a ld [wKickCounter], a
call LoadMoveAnim call LoadMoveAnim
@ -2288,7 +2288,7 @@ FailText_CheckOpponentProtect:
ld h, d ld h, d
ld l, e ld l, e
.not_protected .not_protected
jp StdBattleTextBox jp StdBattleTextbox
BattleCommand_BideFailText: BattleCommand_BideFailText:
ld a, [wAttackMissed] ld a, [wAttackMissed]
@ -2318,7 +2318,7 @@ BattleCommand_CriticalText:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
call StdBattleTextBox call StdBattleTextbox
xor a xor a
ld [wCriticalHit], a ld [wCriticalHit], a
@ -2365,7 +2365,7 @@ BattleCommand_SuperEffectiveText:
jr nc, .print jr nc, .print
ld hl, NotVeryEffectiveText ld hl, NotVeryEffectiveText
.print .print
jp StdBattleTextBox jp StdBattleTextbox
BattleCommand_CheckFaint: BattleCommand_CheckFaint:
; checkfaint ; checkfaint
@ -2391,7 +2391,7 @@ BattleCommand_CheckFaint:
jr z, .no_dbond jr z, .no_dbond
ld hl, TookDownWithItText ld hl, TookDownWithItText
call StdBattleTextBox call StdBattleTextbox
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
@ -2484,7 +2484,7 @@ BattleCommand_BuildOpponentRage:
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
ld hl, RageBuildingText ld hl, RageBuildingText
call StdBattleTextBox call StdBattleTextbox
jp BattleCommand_SwitchTurn jp BattleCommand_SwitchTurn
BattleCommand_RageDamage: BattleCommand_RageDamage:
@ -3522,7 +3522,7 @@ DoPlayerDamage:
DoSubstituteDamage: DoSubstituteDamage:
ld hl, SubTookDamageText ld hl, SubTookDamageText
call StdBattleTextBox call StdBattleTextbox
ld de, wEnemySubstituteHP ld de, wEnemySubstituteHP
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
@ -3548,7 +3548,7 @@ DoSubstituteDamage:
res SUBSTATUS_SUBSTITUTE, [hl] res SUBSTATUS_SUBSTITUTE, [hl]
ld hl, SubFadedText ld hl, SubFadedText
call StdBattleTextBox call StdBattleTextbox
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
call BattleCommand_LowerSubNoAnim call BattleCommand_LowerSubNoAnim
@ -3651,7 +3651,7 @@ BattleCommand_SleepTarget:
call RefreshBattleHuds call RefreshBattleHuds
ld hl, FellAsleepText ld hl, FellAsleepText
call StdBattleTextBox call StdBattleTextbox
farcall UseHeldStatusHealingItem farcall UseHeldStatusHealingItem
@ -3662,7 +3662,7 @@ BattleCommand_SleepTarget:
push hl push hl
call AnimateFailedMove call AnimateFailedMove
pop hl pop hl
jp StdBattleTextBox jp StdBattleTextbox
.CheckAIRandomFail: .CheckAIRandomFail:
; Enemy turn ; Enemy turn
@ -3722,7 +3722,7 @@ BattleCommand_PoisonTarget:
call RefreshBattleHuds call RefreshBattleHuds
ld hl, WasPoisonedText ld hl, WasPoisonedText
call StdBattleTextBox call StdBattleTextbox
farcall UseHeldStatusHealingItem farcall UseHeldStatusHealingItem
ret ret
@ -3793,7 +3793,7 @@ BattleCommand_Poison:
call .apply_poison call .apply_poison
ld hl, WasPoisonedText ld hl, WasPoisonedText
call StdBattleTextBox call StdBattleTextbox
jr .finished jr .finished
.toxic .toxic
@ -3803,7 +3803,7 @@ BattleCommand_Poison:
call .apply_poison call .apply_poison
ld hl, BadlyPoisonedText ld hl, BadlyPoisonedText
call StdBattleTextBox call StdBattleTextbox
.finished .finished
farcall UseHeldStatusHealingItem farcall UseHeldStatusHealingItem
@ -3813,7 +3813,7 @@ BattleCommand_Poison:
push hl push hl
call AnimateFailedMove call AnimateFailedMove
pop hl pop hl
jp StdBattleTextBox jp StdBattleTextbox
.apply_poison .apply_poison
call AnimateCurrentMove call AnimateCurrentMove
@ -3859,13 +3859,13 @@ BattleCommand_DrainTarget:
; draintarget ; draintarget
call SapHealth call SapHealth
ld hl, SuckedHealthText ld hl, SuckedHealthText
jp StdBattleTextBox jp StdBattleTextbox
BattleCommand_EatDream: BattleCommand_EatDream:
; eatdream ; eatdream
call SapHealth call SapHealth
ld hl, DreamEatenText ld hl, DreamEatenText
jp StdBattleTextBox jp StdBattleTextbox
SapHealth: SapHealth:
; Divide damage by 2, store it in hDividend ; Divide damage by 2, store it in hDividend
@ -3996,7 +3996,7 @@ BattleCommand_BurnTarget:
call RefreshBattleHuds call RefreshBattleHuds
ld hl, WasBurnedText ld hl, WasBurnedText
call StdBattleTextBox call StdBattleTextbox
farcall UseHeldStatusHealingItem farcall UseHeldStatusHealingItem
ret ret
@ -4024,7 +4024,7 @@ Defrost:
call UpdateOpponentInParty call UpdateOpponentInParty
ld hl, DefrostedOpponentText ld hl, DefrostedOpponentText
jp StdBattleTextBox jp StdBattleTextbox
BattleCommand_FreezeTarget: BattleCommand_FreezeTarget:
; freezetarget ; freezetarget
@ -4063,7 +4063,7 @@ BattleCommand_FreezeTarget:
call RefreshBattleHuds call RefreshBattleHuds
ld hl, WasFrozenText ld hl, WasFrozenText
call StdBattleTextBox call StdBattleTextbox
farcall UseHeldStatusHealingItem farcall UseHeldStatusHealingItem
ret nz ret nz
@ -4543,7 +4543,7 @@ BattleCommand_StatUpMessage:
inc b inc b
call GetStatName call GetStatName
ld hl, .stat ld hl, .stat
jp BattleTextBox jp BattleTextbox
.stat .stat
text_far UnknownText_0x1c0cc6 text_far UnknownText_0x1c0cc6
@ -4573,7 +4573,7 @@ BattleCommand_StatDownMessage:
inc b inc b
call GetStatName call GetStatName
ld hl, .stat ld hl, .stat
jp BattleTextBox jp BattleTextbox
.stat .stat
text_far UnknownText_0x1c0ceb text_far UnknownText_0x1c0ceb
@ -4652,7 +4652,7 @@ BattleCommand_StatUpFailText:
inc b inc b
call GetStatName call GetStatName
ld hl, WontRiseAnymoreText ld hl, WontRiseAnymoreText
jp StdBattleTextBox jp StdBattleTextbox
BattleCommand_StatDownFailText: BattleCommand_StatDownFailText:
; statdownfailtext ; statdownfailtext
@ -4666,14 +4666,14 @@ BattleCommand_StatDownFailText:
jp z, TryPrintButItFailed jp z, TryPrintButItFailed
dec a dec a
ld hl, ProtectedByMistText ld hl, ProtectedByMistText
jp z, StdBattleTextBox jp z, StdBattleTextbox
ld a, [wLoweredStat] ld a, [wLoweredStat]
and $f and $f
ld b, a ld b, a
inc b inc b
call GetStatName call GetStatName
ld hl, WontDropAnymoreText ld hl, WontDropAnymoreText
jp StdBattleTextBox jp StdBattleTextbox
GetStatName: GetStatName:
ld hl, StatNames ld hl, StatNames
@ -5129,7 +5129,7 @@ BattleCommand_ForceSwitch:
callfar ForceEnemySwitch callfar ForceEnemySwitch
ld hl, DraggedOutText ld hl, DraggedOutText
call StdBattleTextBox call StdBattleTextbox
ld hl, SpikesDamage ld hl, SpikesDamage
jp CallBattleCore jp CallBattleCore
@ -5226,7 +5226,7 @@ BattleCommand_ForceSwitch:
call CallBattleCore call CallBattleCore
ld hl, DraggedOutText ld hl, DraggedOutText
call StdBattleTextBox call StdBattleTextbox
ld hl, SpikesDamage ld hl, SpikesDamage
jp CallBattleCore jp CallBattleCore
@ -5252,7 +5252,7 @@ BattleCommand_ForceSwitch:
jr z, .do_text jr z, .do_text
ld hl, BlownAwayText ld hl, BlownAwayText
.do_text .do_text
jp StdBattleTextBox jp StdBattleTextbox
CheckPlayerHasMonToSwitchTo: CheckPlayerHasMonToSwitchTo:
ld a, [wPartyCount] ld a, [wPartyCount]
@ -5393,7 +5393,7 @@ BattleCommand_EndLoop:
call GetBattleVar call GetBattleVar
cp EFFECT_BEAT_UP cp EFFECT_BEAT_UP
jr z, .beat_up_2 jr z, .beat_up_2
call StdBattleTextBox call StdBattleTextbox
.beat_up_2 .beat_up_2
pop bc pop bc
@ -5582,7 +5582,7 @@ BattleCommand_Charge:
ld hl, IgnoredOrders2Text ld hl, IgnoredOrders2Text
ld a, [wAlreadyDisobeyed] ld a, [wAlreadyDisobeyed]
and a and a
call nz, StdBattleTextBox call nz, StdBattleTextbox
call BattleCommand_LowerSub call BattleCommand_LowerSub
xor a xor a
@ -5631,7 +5631,7 @@ BattleCommand_Charge:
call ResetDamage call ResetDamage
ld hl, .UsedText ld hl, .UsedText
call BattleTextBox call BattleTextbox
ld a, BATTLE_VARS_MOVE_EFFECT ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar call GetBattleVar
@ -5752,7 +5752,7 @@ BattleCommand_TrapTarget:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp StdBattleTextBox jp StdBattleTextbox
.Traps: .Traps:
dbw BIND, UsedBindText ; 'used BIND on' dbw BIND, UsedBindText ; 'used BIND on'
@ -5827,7 +5827,7 @@ BattleCommand_Recoil:
predef AnimateHPBar predef AnimateHPBar
call RefreshBattleHuds call RefreshBattleHuds
ld hl, RecoilText ld hl, RecoilText
jp StdBattleTextBox jp StdBattleTextbox
BattleCommand_ConfuseTarget: BattleCommand_ConfuseTarget:
; confusetarget ; confusetarget
@ -5861,7 +5861,7 @@ BattleCommand_Confuse:
call GetItemName call GetItemName
call AnimateFailedMove call AnimateFailedMove
ld hl, ProtectedByText ld hl, ProtectedByText
jp StdBattleTextBox jp StdBattleTextbox
.no_item_protection .no_item_protection
ld a, BATTLE_VARS_SUBSTATUS3_OPP ld a, BATTLE_VARS_SUBSTATUS3_OPP
@ -5870,7 +5870,7 @@ BattleCommand_Confuse:
jr z, .not_already_confused jr z, .not_already_confused
call AnimateFailedMove call AnimateFailedMove
ld hl, AlreadyConfusedText ld hl, AlreadyConfusedText
jp StdBattleTextBox jp StdBattleTextbox
.not_already_confused .not_already_confused
call CheckSubstituteOpp call CheckSubstituteOpp
@ -5909,7 +5909,7 @@ BattleCommand_FinishConfusingTarget:
call PlayOpponentBattleAnim call PlayOpponentBattleAnim
ld hl, BecameConfusedText ld hl, BecameConfusedText
call StdBattleTextBox call StdBattleTextbox
call GetOpponentItem call GetOpponentItem
ld a, b ld a, b
@ -5951,7 +5951,7 @@ BattleCommand_Paralyze:
call GetItemName call GetItemName
call AnimateFailedMove call AnimateFailedMove
ld hl, ProtectedByText ld hl, ProtectedByText
jp StdBattleTextBox jp StdBattleTextbox
.no_item_protection .no_item_protection
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
@ -6003,7 +6003,7 @@ BattleCommand_Paralyze:
.paralyzed .paralyzed
call AnimateFailedMove call AnimateFailedMove
ld hl, AlreadyParalyzedText ld hl, AlreadyParalyzedText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp PrintDidntAffect2 jp PrintDidntAffect2
@ -6131,7 +6131,7 @@ BattleCommand_ResetStats:
call AnimateCurrentMove call AnimateCurrentMove
ld hl, EliminatedStatsText ld hl, EliminatedStatsText
jp StdBattleTextBox jp StdBattleTextbox
.Fill: .Fill:
ld b, wPlayerStatLevelsEnd - wPlayerStatLevels ld b, wPlayerStatLevelsEnd - wPlayerStatLevels
@ -6184,7 +6184,7 @@ BattleCommand_Heal:
jr z, .no_status_to_heal jr z, .no_status_to_heal
ld hl, RestedText ld hl, RestedText
.no_status_to_heal .no_status_to_heal
call StdBattleTextBox call StdBattleTextbox
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a
jr nz, .calc_enemy_stats jr nz, .calc_enemy_stats
@ -6216,12 +6216,12 @@ BattleCommand_Heal:
call UpdateUserInParty call UpdateUserInParty
call RefreshBattleHuds call RefreshBattleHuds
ld hl, RegainedHealthText ld hl, RegainedHealthText
jp StdBattleTextBox jp StdBattleTextbox
.hp_full .hp_full
call AnimateFailedMove call AnimateFailedMove
ld hl, HPIsFullText ld hl, HPIsFullText
jp StdBattleTextBox jp StdBattleTextbox
INCLUDE "engine/battle/move_effects/transform.asm" INCLUDE "engine/battle/move_effects/transform.asm"
@ -6296,7 +6296,7 @@ BattleCommand_Screen:
.good .good
call AnimateCurrentMove call AnimateCurrentMove
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
call AnimateFailedMove call AnimateFailedMove
@ -6305,12 +6305,12 @@ BattleCommand_Screen:
PrintDoesntAffect: PrintDoesntAffect:
; 'it doesn't affect' ; 'it doesn't affect'
ld hl, DoesntAffectText ld hl, DoesntAffectText
jp StdBattleTextBox jp StdBattleTextbox
PrintNothingHappened: PrintNothingHappened:
; 'but nothing happened!' ; 'but nothing happened!'
ld hl, NothingHappenedText ld hl, NothingHappenedText
jp StdBattleTextBox jp StdBattleTextbox
TryPrintButItFailed: TryPrintButItFailed:
ld a, [wAlreadyFailed] ld a, [wAlreadyFailed]
@ -6322,7 +6322,7 @@ TryPrintButItFailed:
PrintButItFailed: PrintButItFailed:
; 'but it failed!' ; 'but it failed!'
ld hl, ButItFailedText ld hl, ButItFailedText
jp StdBattleTextBox jp StdBattleTextbox
FailMove: FailMove:
call AnimateFailedMove call AnimateFailedMove
@ -6336,7 +6336,7 @@ FailMimic:
PrintDidntAffect: PrintDidntAffect:
; 'it didn't affect' ; 'it didn't affect'
ld hl, DidntAffect1Text ld hl, DidntAffect1Text
jp StdBattleTextBox jp StdBattleTextbox
PrintDidntAffect2: PrintDidntAffect2:
call AnimateFailedMove call AnimateFailedMove
@ -6347,7 +6347,7 @@ PrintDidntAffect2:
PrintParalyze: PrintParalyze:
; 'paralyzed! maybe it can't attack!' ; 'paralyzed! maybe it can't attack!'
ld hl, ParalyzedText ld hl, ParalyzedText
jp StdBattleTextBox jp StdBattleTextbox
CheckSubstituteOpp: CheckSubstituteOpp:
ld a, BATTLE_VARS_SUBSTATUS4_OPP ld a, BATTLE_VARS_SUBSTATUS4_OPP
@ -6421,7 +6421,7 @@ BattleCommand_ArenaTrap:
set SUBSTATUS_CANT_RUN, [hl] set SUBSTATUS_CANT_RUN, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, CantEscapeNowText ld hl, CantEscapeNowText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
call AnimateFailedMove call AnimateFailedMove
@ -6458,7 +6458,7 @@ BattleCommand_Defrost:
.done .done
call RefreshBattleHuds call RefreshBattleHuds
ld hl, WasDefrostedText ld hl, WasDefrostedText
jp StdBattleTextBox jp StdBattleTextbox
INCLUDE "engine/battle/move_effects/curse.asm" INCLUDE "engine/battle/move_effects/curse.asm"
@ -6519,7 +6519,7 @@ BattleCommand_CheckSafeguard:
ld [wAttackMissed], a ld [wAttackMissed], a
call BattleCommand_MoveDelay call BattleCommand_MoveDelay
ld hl, SafeguardProtectText ld hl, SafeguardProtectText
call StdBattleTextBox call StdBattleTextbox
jp EndMoveEffect jp EndMoveEffect
INCLUDE "engine/battle/move_effects/magnitude.asm" INCLUDE "engine/battle/move_effects/magnitude.asm"
@ -6612,14 +6612,14 @@ BattleCommand_TimeBasedHealContinue:
; 'regained health!' ; 'regained health!'
ld hl, RegainedHealthText ld hl, RegainedHealthText
jp StdBattleTextBox jp StdBattleTextbox
.Full: .Full:
call AnimateFailedMove call AnimateFailedMove
; 'hp is full!' ; 'hp is full!'
ld hl, HPIsFullText ld hl, HPIsFullText
jp StdBattleTextBox jp StdBattleTextbox
.Multipliers: .Multipliers:
dw GetEighthMaxHP dw GetEighthMaxHP
@ -6845,7 +6845,7 @@ BattleCommand_ClearText:
; Used in multi-hit moves. ; Used in multi-hit moves.
ld hl, .text ld hl, .text
jp BattleTextBox jp BattleTextbox
.text: .text:
text_end text_end

2
engine/battle/move_effects/attract.asm
View File

@ -17,7 +17,7 @@ BattleCommand_Attract:
; 'fell in love!' ; 'fell in love!'
ld hl, FellInLoveText ld hl, FellInLoveText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp FailMove jp FailMove

6
engine/battle/move_effects/beat_up.asm
View File

@ -52,7 +52,7 @@ BattleCommand_BeatUp:
ld a, $1 ld a, $1
ld [wBeatUpHitAtLeastOnce], a ld [wBeatUpHitAtLeastOnce], a
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
call StdBattleTextBox call StdBattleTextbox
ld a, [wEnemyMonSpecies] ld a, [wEnemyMonSpecies]
ld [wCurSpecies], a ld [wCurSpecies], a
@ -159,12 +159,12 @@ BattleCommand_BeatUp:
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
call StdBattleTextBox call StdBattleTextbox
jp EnemyAttackDamage jp EnemyAttackDamage
.finish_beatup .finish_beatup
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
call StdBattleTextBox call StdBattleTextbox
ld a, [wBattleMonSpecies] ld a, [wBattleMonSpecies]
ld [wCurSpecies], a ld [wCurSpecies], a

2
engine/battle/move_effects/belly_drum.asm
View File

@ -27,7 +27,7 @@ BattleCommand_BellyDrum:
jr nz, .max_attack_loop jr nz, .max_attack_loop
ld hl, BellyDrumText ld hl, BellyDrumText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
call AnimateFailedMove call AnimateFailedMove

4
engine/battle/move_effects/bide.asm
View File

@ -20,7 +20,7 @@ BattleCommand_StoreEnergy:
res SUBSTATUS_BIDE, [hl] res SUBSTATUS_BIDE, [hl]
ld hl, UnleashedEnergyText ld hl, UnleashedEnergyText
call StdBattleTextBox call StdBattleTextbox
ld a, BATTLE_VARS_MOVE_POWER ld a, BATTLE_VARS_MOVE_POWER
call GetBattleVarAddr call GetBattleVarAddr
@ -66,7 +66,7 @@ BattleCommand_StoreEnergy:
.still_storing .still_storing
ld hl, StoringEnergyText ld hl, StoringEnergyText
call StdBattleTextBox call StdBattleTextbox
jp EndMoveEffect jp EndMoveEffect
BattleCommand_UnleashEnergy: BattleCommand_UnleashEnergy:

2
engine/battle/move_effects/conversion.asm
View File

@ -93,4 +93,4 @@ BattleCommand_Conversion:
farcall GetTypeName farcall GetTypeName
call AnimateCurrentMove call AnimateCurrentMove
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/conversion2.asm
View File

@ -58,7 +58,7 @@ BattleCommand_Conversion2:
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
predef GetTypeName predef GetTypeName
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp FailMove jp FailMove

4
engine/battle/move_effects/curse.asm
View File

@ -76,7 +76,7 @@ BattleCommand_Curse:
call CallBattleCore call CallBattleCore
call UpdateUserInParty call UpdateUserInParty
ld hl, PutACurseText ld hl, PutACurseText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
call AnimateFailedMove call AnimateFailedMove
@ -90,4 +90,4 @@ BattleCommand_Curse:
call GetStatName call GetStatName
call AnimateFailedMove call AnimateFailedMove
ld hl, WontRiseAnymoreText ld hl, WontRiseAnymoreText
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/destiny_bond.asm
View File

@ -6,4 +6,4 @@ BattleCommand_DestinyBond:
set SUBSTATUS_DESTINY_BOND, [hl] set SUBSTATUS_DESTINY_BOND, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, DestinyBondEffectText ld hl, DestinyBondEffectText
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/disable.asm
View File

@ -66,7 +66,7 @@ BattleCommand_Disable:
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetMoveName call GetMoveName
ld hl, WasDisabledText ld hl, WasDisabledText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp FailMove jp FailMove

2
engine/battle/move_effects/encore.asm
View File

@ -114,7 +114,7 @@ BattleCommand_Encore:
.finish_move .finish_move
call AnimateCurrentMove call AnimateCurrentMove
ld hl, GotAnEncoreText ld hl, GotAnEncoreText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp PrintDidntAffect2 jp PrintDidntAffect2

2
engine/battle/move_effects/endure.asm
View File

@ -13,4 +13,4 @@ BattleCommand_Endure:
call AnimateCurrentMove call AnimateCurrentMove
ld hl, BracedItselfText ld hl, BracedItselfText
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/focus_energy.asm
View File

@ -8,7 +8,7 @@ BattleCommand_FocusEnergy:
set SUBSTATUS_FOCUS_ENERGY, [hl] set SUBSTATUS_FOCUS_ENERGY, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, GettingPumpedText ld hl, GettingPumpedText
jp StdBattleTextBox jp StdBattleTextbox
.already_pumped .already_pumped
call AnimateFailedMove call AnimateFailedMove

2
engine/battle/move_effects/foresight.asm
View File

@ -16,7 +16,7 @@ BattleCommand_Foresight:
set SUBSTATUS_IDENTIFIED, [hl] set SUBSTATUS_IDENTIFIED, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, IdentifiedText ld hl, IdentifiedText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp FailMove jp FailMove

2
engine/battle/move_effects/future_sight.asm
View File

@ -54,7 +54,7 @@ BattleCommand_FutureSight:
call BattleCommand_LowerSub call BattleCommand_LowerSub
call BattleCommand_MoveDelay call BattleCommand_MoveDelay
ld hl, ForesawAttackText ld hl, ForesawAttackText
call StdBattleTextBox call StdBattleTextbox
call BattleCommand_RaiseSub call BattleCommand_RaiseSub
ld de, wPlayerFutureSightDamage ld de, wPlayerFutureSightDamage
ldh a, [hBattleTurn] ldh a, [hBattleTurn]

2
engine/battle/move_effects/heal_bell.asm
View File

@ -26,7 +26,7 @@ BattleCommand_HealBell:
call AnimateCurrentMove call AnimateCurrentMove
ld hl, BellChimedText ld hl, BellChimedText
call StdBattleTextBox call StdBattleTextbox
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a

4
engine/battle/move_effects/leech_seed.asm
View File

@ -28,7 +28,7 @@ BattleCommand_LeechSeed:
set SUBSTATUS_LEECH_SEED, [hl] set SUBSTATUS_LEECH_SEED, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, WasSeededText ld hl, WasSeededText
jp StdBattleTextBox jp StdBattleTextbox
.grass .grass
call AnimateFailedMove call AnimateFailedMove
@ -37,4 +37,4 @@ BattleCommand_LeechSeed:
.evaded .evaded
call AnimateFailedMove call AnimateFailedMove
ld hl, EvadedText ld hl, EvadedText
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/lock_on.asm
View File

@ -14,7 +14,7 @@ BattleCommand_LockOn:
call AnimateCurrentMove call AnimateCurrentMove
ld hl, TookAimText ld hl, TookAimText
jp StdBattleTextBox jp StdBattleTextbox
.fail .fail
call AnimateFailedMove call AnimateFailedMove

2
engine/battle/move_effects/magnitude.asm
View File

@ -21,7 +21,7 @@ BattleCommand_GetMagnitude:
ld [wDeciramBuffer], a ld [wDeciramBuffer], a
call BattleCommand_MoveDelay call BattleCommand_MoveDelay
ld hl, MagnitudeText ld hl, MagnitudeText
call StdBattleTextBox call StdBattleTextbox
pop de pop de
pop bc pop bc
ret ret

2
engine/battle/move_effects/mimic.asm
View File

@ -44,7 +44,7 @@ BattleCommand_Mimic:
call GetMoveName call GetMoveName
call AnimateCurrentMove call AnimateCurrentMove
ld hl, LearnedMoveText ld hl, LearnedMoveText
jp StdBattleTextBox jp StdBattleTextbox
.fail .fail
jp FailMimic jp FailMimic

2
engine/battle/move_effects/mirror_move.asm
View File

@ -18,7 +18,7 @@ BattleCommand_MirrorMove:
call AnimateFailedMove call AnimateFailedMove
ld hl, MirrorMoveFailedText ld hl, MirrorMoveFailedText
call StdBattleTextBox call StdBattleTextbox
jp EndMoveEffect jp EndMoveEffect
.use .use

2
engine/battle/move_effects/mist.asm
View File

@ -8,7 +8,7 @@ BattleCommand_Mist:
set SUBSTATUS_MIST, [hl] set SUBSTATUS_MIST, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, MistText ld hl, MistText
jp StdBattleTextBox jp StdBattleTextbox
.already_mist .already_mist
call AnimateFailedMove call AnimateFailedMove

2
engine/battle/move_effects/nightmare.asm
View File

@ -30,7 +30,7 @@ BattleCommand_Nightmare:
set SUBSTATUS_NIGHTMARE, [hl] set SUBSTATUS_NIGHTMARE, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, StartedNightmareText ld hl, StartedNightmareText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
call AnimateFailedMove call AnimateFailedMove

2
engine/battle/move_effects/pain_split.asm
View File

@ -32,7 +32,7 @@ BattleCommand_PainSplit:
farcall _UpdateBattleHUDs farcall _UpdateBattleHUDs
ld hl, SharedPainText ld hl, SharedPainText
jp StdBattleTextBox jp StdBattleTextbox
.PlayerShareHP: .PlayerShareHP:
ld a, [hld] ld a, [hld]

2
engine/battle/move_effects/pay_day.asm
View File

@ -23,4 +23,4 @@ BattleCommand_PayDay:
inc [hl] inc [hl]
.done .done
ld hl, CoinsScatteredText ld hl, CoinsScatteredText
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/perish_song.asm
View File

@ -31,7 +31,7 @@ BattleCommand_PerishSong:
.done .done
call AnimateCurrentMove call AnimateCurrentMove
ld hl, StartPerishText ld hl, StartPerishText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
call AnimateFailedMove call AnimateFailedMove

4
engine/battle/move_effects/present.asm
View File

@ -70,7 +70,7 @@ BattleCommand_Present:
call CallBattleCore call CallBattleCore
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
ld hl, RegainedHealthText ld hl, RegainedHealthText
call StdBattleTextBox call StdBattleTextbox
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
call UpdateOpponentInParty call UpdateOpponentInParty
jr .do_animation jr .do_animation
@ -81,7 +81,7 @@ BattleCommand_Present:
jr nc, .do_animation jr nc, .do_animation
call AnimateFailedMove call AnimateFailedMove
ld hl, RefusedGiftText ld hl, RefusedGiftText
call StdBattleTextBox call StdBattleTextbox
.do_animation .do_animation
jp EndMoveEffect jp EndMoveEffect

2
engine/battle/move_effects/protect.asm
View File

@ -10,7 +10,7 @@ BattleCommand_Protect:
call AnimateCurrentMove call AnimateCurrentMove
ld hl, ProtectedItselfText ld hl, ProtectedItselfText
jp StdBattleTextBox jp StdBattleTextbox
ProtectChance: ProtectChance:
ld de, wPlayerProtectCount ld de, wPlayerProtectCount

2
engine/battle/move_effects/psych_up.asm
View File

@ -46,4 +46,4 @@ BattleCommand_PsychUp:
.merge .merge
call AnimateCurrentMove call AnimateCurrentMove
ld hl, CopiedStatsText ld hl, CopiedStatsText
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/rain_dance.asm
View File

@ -6,4 +6,4 @@ BattleCommand_StartRain:
ld [wWeatherCount], a ld [wWeatherCount], a
call AnimateCurrentMove call AnimateCurrentMove
ld hl, DownpourText ld hl, DownpourText
jp StdBattleTextBox jp StdBattleTextbox

6
engine/battle/move_effects/rapid_spin.asm
View File

@ -7,7 +7,7 @@ BattleCommand_ClearHazards:
jr z, .not_leeched jr z, .not_leeched
res SUBSTATUS_LEECH_SEED, [hl] res SUBSTATUS_LEECH_SEED, [hl]
ld hl, ShedLeechSeedText ld hl, ShedLeechSeedText
call StdBattleTextBox call StdBattleTextbox
.not_leeched .not_leeched
ld hl, wPlayerScreens ld hl, wPlayerScreens
@ -23,7 +23,7 @@ BattleCommand_ClearHazards:
res SCREENS_SPIKES, [hl] res SCREENS_SPIKES, [hl]
ld hl, BlewSpikesText ld hl, BlewSpikesText
push de push de
call StdBattleTextBox call StdBattleTextbox
pop de pop de
.no_spikes .no_spikes
@ -33,4 +33,4 @@ BattleCommand_ClearHazards:
xor a xor a
ld [de], a ld [de], a
ld hl, ReleasedByText ld hl, ReleasedByText
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/safeguard.asm
View File

@ -16,7 +16,7 @@ BattleCommand_Safeguard:
ld [de], a ld [de], a
call AnimateCurrentMove call AnimateCurrentMove
ld hl, CoveredByVeilText ld hl, CoveredByVeilText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
call AnimateFailedMove call AnimateFailedMove

2
engine/battle/move_effects/sandstorm.asm
View File

@ -11,7 +11,7 @@ BattleCommand_StartSandstorm:
ld [wWeatherCount], a ld [wWeatherCount], a
call AnimateCurrentMove call AnimateCurrentMove
ld hl, SandstormBrewedText ld hl, SandstormBrewedText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
call AnimateFailedMove call AnimateFailedMove

2
engine/battle/move_effects/sketch.asm
View File

@ -110,7 +110,7 @@ BattleCommand_Sketch:
call AnimateCurrentMove call AnimateCurrentMove
ld hl, SketchedText ld hl, SketchedText
jp StdBattleTextBox jp StdBattleTextbox
.fail .fail
call AnimateFailedMove call AnimateFailedMove

2
engine/battle/move_effects/spikes.asm
View File

@ -20,7 +20,7 @@ BattleCommand_Spikes:
call AnimateCurrentMove call AnimateCurrentMove
ld hl, SpikesText ld hl, SpikesText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp FailMove jp FailMove

2
engine/battle/move_effects/spite.asm
View File

@ -80,7 +80,7 @@ BattleCommand_Spite:
ld a, d ld a, d
ld [wDeciramBuffer], a ld [wDeciramBuffer], a
ld hl, SpiteEffectText ld hl, SpiteEffectText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp PrintDidntAffect2 jp PrintDidntAffect2

4
engine/battle/move_effects/substitute.asm
View File

@ -71,7 +71,7 @@ BattleCommand_Substitute:
call BattleCommand_RaiseSubNoAnim call BattleCommand_RaiseSubNoAnim
.finish .finish
ld hl, MadeSubstituteText ld hl, MadeSubstituteText
call StdBattleTextBox call StdBattleTextbox
jp RefreshBattleHuds jp RefreshBattleHuds
.already_has_sub .already_has_sub
@ -85,4 +85,4 @@ BattleCommand_Substitute:
call nz, BattleCommand_RaiseSub call nz, BattleCommand_RaiseSub
ld hl, TooWeakSubText ld hl, TooWeakSubText
.jp_stdbattletextbox .jp_stdbattletextbox
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/sunny_day.asm
View File

@ -6,4 +6,4 @@ BattleCommand_StartSun:
ld [wWeatherCount], a ld [wWeatherCount], a
call AnimateCurrentMove call AnimateCurrentMove
ld hl, SunGotBrightText ld hl, SunGotBrightText
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/teleport.asm
View File

@ -86,4 +86,4 @@ BattleCommand_Teleport:
call SetBattleDraw call SetBattleDraw
ld hl, FledFromBattleText ld hl, FledFromBattleText
jp StdBattleTextBox jp StdBattleTextbox

2
engine/battle/move_effects/thief.asm
View File

@ -93,7 +93,7 @@ BattleCommand_Thief:
.stole .stole
call GetItemName call GetItemName
ld hl, StoleText ld hl, StoleText
jp StdBattleTextBox jp StdBattleTextbox
.playeritem .playeritem
ld a, 1 ld a, 1

2
engine/battle/move_effects/transform.asm
View File

@ -135,7 +135,7 @@ BattleCommand_Transform:
ld a, SUBSTITUTE ld a, SUBSTITUTE
call nz, LoadAnim call nz, LoadAnim
ld hl, TransformedText ld hl, TransformedText
jp StdBattleTextBox jp StdBattleTextbox
BattleSideCopy: BattleSideCopy:
; Copy bc bytes from hl to de if it's the player's turn. ; Copy bc bytes from hl to de if it's the player's turn.

2
engine/battle/trainer_huds.asm
View File

@ -237,7 +237,7 @@ _ShowLinkBattleParticipants:
hlcoord 2, 3 hlcoord 2, 3
ld b, 9 ld b, 9
ld c, 14 ld c, 14
call TextBox call Textbox
hlcoord 4, 5 hlcoord 4, 5
ld de, wPlayerName ld de, wPlayerName
call PlaceString call PlaceString

2
engine/battle/used_move_text.asm
View File

@ -1,7 +1,7 @@
DisplayUsedMoveText: DisplayUsedMoveText:
; battle command 03 ; battle command 03
ld hl, UsedMoveText ld hl, UsedMoveText
call BattleTextBox call BattleTextbox
jp WaitBGMap jp WaitBGMap
UsedMoveText: UsedMoveText:

4
engine/battle_anims/bg_effects.asm
View File

@ -1417,7 +1417,7 @@ BattleBGEffect_Tackle:
ldh [hLYOverrideEnd], a ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_03 ld hl, BG_EFFECT_STRUCT_03
add hl, bc add hl, bc
ld [hl], $0 ld [hl], 0
call BGEffect_CheckBattleTurn call BGEffect_CheckBattleTurn
jr nz, .player_side jr nz, .player_side
ld a, 2 ld a, 2
@ -1451,7 +1451,7 @@ BattleBGEffect_25:
ldh [hLYOverrideEnd], a ldh [hLYOverrideEnd], a
ld hl, BG_EFFECT_STRUCT_03 ld hl, BG_EFFECT_STRUCT_03
add hl, bc add hl, bc
ld [hl], $0 ld [hl], 0
call BGEffect_CheckBattleTurn call BGEffect_CheckBattleTurn
jr nz, .player_side jr nz, .player_side
ld a, 2 ld a, 2

2
engine/events/battle_tower/battle_tower.asm
View File

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

4
engine/events/bug_contest/display_stats.asm
View File

@ -12,12 +12,12 @@ DisplayCaughtContestMonStats:
hlcoord 0, 0 hlcoord 0, 0
ld b, 4 ld b, 4
ld c, 13 ld c, 13
call TextBox call Textbox
hlcoord 0, 6 hlcoord 0, 6
ld b, 4 ld b, 4
ld c, 13 ld c, 13
call TextBox call Textbox
hlcoord 2, 0 hlcoord 2, 0
ld de, .Stock ld de, .Stock

2
engine/events/elevator.asm
View File

@ -150,7 +150,7 @@ Elevator_GetCurrentFloorText:
hlcoord 0, 0 hlcoord 0, 0
ld b, 4 ld b, 4
ld c, 8 ld c, 8
call TextBox call Textbox
hlcoord 1, 2 hlcoord 1, 2
ld de, Elevator_CurrentFloorText ld de, Elevator_CurrentFloorText
call PlaceString call PlaceString

8
engine/events/halloffame.asm
View File

@ -456,10 +456,10 @@ DisplayHOFMon:
call ByteFill call ByteFill
hlcoord 0, 0 hlcoord 0, 0
lb bc, 3, SCREEN_WIDTH - 2 lb bc, 3, SCREEN_WIDTH - 2
call TextBox call Textbox
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, SCREEN_WIDTH - 2 lb bc, 4, SCREEN_WIDTH - 2
call TextBox call Textbox
ld a, [wTempMonSpecies] ld a, [wTempMonSpecies]
ld [wCurPartySpecies], a ld [wCurPartySpecies], a
ld [wDeciramBuffer], a ld [wDeciramBuffer], a
@ -567,10 +567,10 @@ HOF_AnimatePlayerPic:
ldh [hBGMapMode], a ldh [hBGMapMode], a
hlcoord 0, 2 hlcoord 0, 2
lb bc, 8, 9 lb bc, 8, 9
call TextBox call Textbox
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call Textbox
hlcoord 2, 4 hlcoord 2, 4
ld de, wPlayerName ld de, wPlayerName
call PlaceString call PlaceString

2
engine/events/mom.asm
View File

@ -432,7 +432,7 @@ Mom_ContinueMenuSetup:
ldh [hBGMapMode], a ldh [hBGMapMode], a
hlcoord 0, 0 hlcoord 0, 0
lb bc, 6, 18 lb bc, 6, 18
call TextBox call Textbox
hlcoord 1, 2 hlcoord 1, 2
ld de, Mom_SavedString ld de, Mom_SavedString
call PlaceString call PlaceString

16
engine/events/overworld.asm
View File

@ -53,7 +53,7 @@ CheckBadge:
call CheckEngineFlag call CheckEngineFlag
ret nc ret nc
ld hl, .BadgeRequiredText ld hl, .BadgeRequiredText
call MenuTextBoxBackup ; push text to queue call MenuTextboxBackup ; push text to queue
scf scf
ret ret
@ -109,7 +109,7 @@ CheckPartyMove:
FieldMoveFailed: FieldMoveFailed:
ld hl, .CantUseHere ld hl, .CantUseHere
call MenuTextBoxBackup call MenuTextboxBackup
ret ret
.CantUseHere: .CantUseHere:
@ -157,7 +157,7 @@ CutFunction:
.FailCut: .FailCut:
ld hl, Text_NothingToCut ld hl, Text_NothingToCut
call MenuTextBoxBackup call MenuTextboxBackup
ld a, $80 ld a, $80
ret ret
@ -394,13 +394,13 @@ SurfFunction:
.FailSurf: .FailSurf:
ld hl, CantSurfText ld hl, CantSurfText
call MenuTextBoxBackup call MenuTextboxBackup
ld a, $80 ld a, $80
ret ret
.AlreadySurfing: .AlreadySurfing:
ld hl, AlreadySurfingText ld hl, AlreadySurfingText
call MenuTextBoxBackup call MenuTextboxBackup
ld a, $80 ld a, $80
ret ret
@ -830,7 +830,7 @@ dig_incave
cp $2 cp $2
jr nz, .failescaperope jr nz, .failescaperope
ld hl, .Text_CantUseHere ld hl, .Text_CantUseHere
call MenuTextBox call MenuTextbox
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
call CloseWindow call CloseWindow
@ -933,7 +933,7 @@ TeleportFunction:
.FailTeleport: .FailTeleport:
ld hl, .Text_CantUseHere ld hl, .Text_CantUseHere
call MenuTextBoxBackup call MenuTextboxBackup
ld a, $80 ld a, $80
ret ret
@ -987,7 +987,7 @@ StrengthFunction:
.Unreferenced_AlreadyUsing: .Unreferenced_AlreadyUsing:
ld hl, .JumpText ld hl, .JumpText
call MenuTextBoxBackup call MenuTextboxBackup
ld a, $80 ld a, $80
ret ret

16
engine/events/pokecenter_pc.asm
View File

@ -298,7 +298,7 @@ PC_DisplayTextWaitMenu:
push af push af
set NO_TEXT_SCROLL, a set NO_TEXT_SCROLL, a
ld [wOptions], a ld [wOptions], a
call MenuTextBox call MenuTextbox
pop af pop af
ld [wOptions], a ld [wOptions], a
ret ret
@ -336,7 +336,7 @@ PlayerWithdrawItemMenu:
.askquantity .askquantity
ld hl, .HowManyText ld hl, .HowManyText
call MenuTextBox call MenuTextbox
farcall SelectQuantityToToss farcall SelectQuantityToToss
call ExitMenu call ExitMenu
call ExitMenu call ExitMenu
@ -358,7 +358,7 @@ PlayerWithdrawItemMenu:
call TossItem call TossItem
predef PartyMonItemName predef PartyMonItemName
ld hl, .WithdrewText ld hl, .WithdrewText
call MenuTextBox call MenuTextbox
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call ExitMenu call ExitMenu
@ -366,7 +366,7 @@ PlayerWithdrawItemMenu:
.PackFull: .PackFull:
ld hl, .NoRoomText ld hl, .NoRoomText
call MenuTextBoxBackup call MenuTextboxBackup
ret ret
.done .done
@ -438,7 +438,7 @@ PlayerDepositItemMenu:
farcall HasNoItems farcall HasNoItems
ret nc ret nc
ld hl, .NoItemsInBag ld hl, .NoItemsInBag
call MenuTextBoxBackup call MenuTextboxBackup
scf scf
ret ret
@ -496,7 +496,7 @@ PlayerDepositItemMenu:
.AskQuantity: .AskQuantity:
ld hl, .HowManyText ld hl, .HowManyText
call MenuTextBox call MenuTextbox
farcall SelectQuantityToToss farcall SelectQuantityToToss
push af push af
call ExitMenu call ExitMenu
@ -562,7 +562,7 @@ PCItemsJoypad:
hlcoord 0, 0 hlcoord 0, 0
ld b, 10 ld b, 10
ld c, 18 ld c, 18
call TextBox call Textbox
ld a, [wPCItemsCursor] ld a, [wPCItemsCursor]
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wPCItemsScrollPosition] ld a, [wPCItemsScrollPosition]
@ -634,7 +634,7 @@ PCItemsJoypad:
dba UpdateItemDescription dba UpdateItemDescription
PC_DisplayText: PC_DisplayText:
call MenuTextBox call MenuTextbox
call ExitMenu call ExitMenu
ret ret

6
engine/events/print_unown.asm
View File

@ -29,15 +29,15 @@ _UnownPrinter:
hlcoord 0, 0 hlcoord 0, 0
lb bc, 3, 18 lb bc, 3, 18
call TextBox call Textbox
hlcoord 0, 5 hlcoord 0, 5
lb bc, 7, 7 lb bc, 7, 7
call TextBox call Textbox
hlcoord 0, 14 hlcoord 0, 14
lb bc, 2, 18 lb bc, 2, 18
call TextBox call Textbox
hlcoord 1, 2 hlcoord 1, 2
ld de, AlphRuinsStampString ld de, AlphRuinsStampString

2
engine/events/prof_oaks_pc.asm
View File

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

8
engine/games/card_flip.asm
View File

@ -494,9 +494,9 @@ CardFlip_UpdateCoinBalanceDisplay:
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, SCREEN_WIDTH - 2 ld c, SCREEN_WIDTH - 2
call TextBox call Textbox
pop hl pop hl
call PrintTextBoxText call PrintTextboxText
call CardFlip_PrintCoinBalance call CardFlip_PrintCoinBalance
ret ret
@ -504,7 +504,7 @@ CardFlip_PrintCoinBalance:
hlcoord 9, 15 hlcoord 9, 15
ld b, 1 ld b, 1
ld c, 9 ld c, 9
call TextBox call Textbox
hlcoord 10, 16 hlcoord 10, 16
ld de, .CoinStr ld de, .CoinStr
call PlaceString call PlaceString
@ -530,7 +530,7 @@ CardFlip_InitTilemap:
call CardFlip_CopyToBox call CardFlip_CopyToBox
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call Textbox
ret ret
CardFlip_FillGreenBox: CardFlip_FillGreenBox:

2
engine/games/slot_machine.asm
View File

@ -1789,7 +1789,7 @@ Slots_AskPlayAgain:
.you_have_coins .you_have_coins
ld hl, .Text_PlayAgain ld hl, .Text_PlayAgain
call PrintText call PrintText
call LoadMenuTextBox call LoadMenuTextbox
lb bc, 14, 12 lb bc, 14, 12
call PlaceYesNoBox call PlaceYesNoBox
ld a, [wMenuCursorY] ld a, [wMenuCursorY]

6
engine/gfx/load_font.asm
View File

@ -75,7 +75,7 @@ _LoadFontsBattleExtra::
jr LoadFrame jr LoadFrame
LoadFrame: LoadFrame:
ld a, [wTextBoxFrame] ld a, [wTextboxFrame]
maskbits NUM_FRAMES maskbits NUM_FRAMES
ld bc, 6 * LEN_1BPP_TILE ld bc, 6 * LEN_1BPP_TILE
ld hl, Frames ld hl, Frames
@ -86,8 +86,8 @@ LoadFrame:
lb bc, BANK(Frames), 6 ; "┌" to "┘" lb bc, BANK(Frames), 6 ; "┌" to "┘"
call Get1bpp_2 call Get1bpp_2
ld hl, vTiles2 tile " " ; $7f ld hl, vTiles2 tile " " ; $7f
ld de, TextBoxSpaceGFX ld de, TextboxSpaceGFX
lb bc, BANK(TextBoxSpaceGFX), 1 lb bc, BANK(TextboxSpaceGFX), 1
call Get1bpp_2 call Get1bpp_2
ret ret

10
engine/items/item_effects.asm
View File

@ -1357,7 +1357,7 @@ RareCandyEffect:
hlcoord 9, 0 hlcoord 9, 0
ld b, 10 ld b, 10
ld c, 9 ld c, 9
call TextBox call Textbox
hlcoord 11, 1 hlcoord 11, 1
ld bc, 4 ld bc, 4
@ -1632,7 +1632,7 @@ BitterBerryEffect:
call UseItemText call UseItemText
ld hl, ConfusedNoMoreText ld hl, ConfusedNoMoreText
call StdBattleTextBox call StdBattleTextbox
ld a, 0 ld a, 0
@ -2056,7 +2056,7 @@ Softboiled_MilkDrinkFunction:
.cant_use .cant_use
push bc push bc
ld hl, .Text_CantBeUsed ld hl, .Text_CantBeUsed
call MenuTextBoxBackup call MenuTextboxBackup
pop bc pop bc
jr .loop jr .loop
@ -2266,7 +2266,7 @@ PokeFluteEffect:
BlueCardEffect: BlueCardEffect:
ld hl, .bluecardtext ld hl, .bluecardtext
jp MenuTextBoxWaitButton jp MenuTextboxWaitButton
.bluecardtext .bluecardtext
text_far UnknownText_0x1c5c5e text_far UnknownText_0x1c5c5e
@ -2274,7 +2274,7 @@ BlueCardEffect:
CoinCaseEffect: CoinCaseEffect:
ld hl, .coincasetext ld hl, .coincasetext
jp MenuTextBoxWaitButton jp MenuTextboxWaitButton
.coincasetext .coincasetext
text_far UnknownText_0x1c5c7b text_far UnknownText_0x1c5c7b

32
engine/items/mart.asm
View File

@ -35,10 +35,10 @@ HerbShop:
call FarReadMart call FarReadMart
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, Text_HerbShop_Intro ld hl, Text_HerbShop_Intro
call MartTextBox call MartTextbox
call BuyMenu call BuyMenu
ld hl, Text_HerbShop_ComeAgain ld hl, Text_HerbShop_ComeAgain
call MartTextBox call MartTextbox
ret ret
BargainShop: BargainShop:
@ -48,7 +48,7 @@ BargainShop:
call ReadMart call ReadMart
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, Text_BargainShop_Intro ld hl, Text_BargainShop_Intro
call MartTextBox call MartTextbox
call BuyMenu call BuyMenu
ld hl, wBargainShopFlags ld hl, wBargainShopFlags
ld a, [hli] ld a, [hli]
@ -59,17 +59,17 @@ BargainShop:
.skip_set .skip_set
ld hl, Text_BargainShop_ComeAgain ld hl, Text_BargainShop_ComeAgain
call MartTextBox call MartTextbox
ret ret
Pharmacist: Pharmacist:
call FarReadMart call FarReadMart
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, Text_Pharmacist_Intro ld hl, Text_Pharmacist_Intro
call MartTextBox call MartTextbox
call BuyMenu call BuyMenu
ld hl, Text_Pharmacist_ComeAgain ld hl, Text_Pharmacist_ComeAgain
call MartTextBox call MartTextbox
ret ret
RooftopSale: RooftopSale:
@ -86,10 +86,10 @@ RooftopSale:
call ReadMart call ReadMart
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, Text_Mart_HowMayIHelpYou ld hl, Text_Mart_HowMayIHelpYou
call MartTextBox call MartTextbox
call BuyMenu call BuyMenu
ld hl, Text_Mart_ComeAgain ld hl, Text_Mart_ComeAgain
call MartTextBox call MartTextbox
ret ret
INCLUDE "data/items/rooftop_sale.asm" INCLUDE "data/items/rooftop_sale.asm"
@ -203,7 +203,7 @@ StandardMart:
.Quit: .Quit:
call ExitMenu call ExitMenu
ld hl, Text_Mart_ComeAgain ld hl, Text_Mart_ComeAgain
call MartTextBox call MartTextbox
ld a, STANDARDMART_EXIT ld a, STANDARDMART_EXIT
ret ret
@ -440,7 +440,7 @@ BuyMenuLoop:
ld [wMenuScrollPositionBackup], a ld [wMenuScrollPositionBackup], a
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
ld [wMenuCursorBufferBackup], a ld [wMenuCursorBufferBackup], a
call SpeechTextBox call SpeechTextbox
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp B_BUTTON cp B_BUTTON
jr z, .set_carry jr z, .set_carry
@ -475,7 +475,7 @@ BuyMenuLoop:
call JoyWaitAorB call JoyWaitAorB
.cancel .cancel
call SpeechTextBox call SpeechTextbox
and a and a
ret ret
@ -747,7 +747,7 @@ SellMenu:
.Unreferenced_NothingToSell: .Unreferenced_NothingToSell:
ld hl, .NothingToSellText ld hl, .NothingToSellText
call MenuTextBoxBackup call MenuTextboxBackup
and a and a
ret ret
@ -796,7 +796,7 @@ SellMenu:
lb bc, 3, 18 lb bc, 3, 18
call ClearBox call ClearBox
ld hl, Text_Mart_ICanPayThisMuch ld hl, Text_Mart_ICanPayThisMuch
call PrintTextBoxText call PrintTextboxText
call YesNoBox call YesNoBox
jr c, .declined jr c, .declined
ld de, wMoney ld de, wMoney
@ -810,7 +810,7 @@ SellMenu:
lb bc, 3, 18 lb bc, 3, 18
call ClearBox call ClearBox
ld hl, Text_Mart_SoldForAmount ld hl, Text_Mart_SoldForAmount
call PrintTextBoxText call PrintTextboxText
call PlayTransactionSound call PlayTransactionSound
farcall PlaceMoneyBottomLeft farcall PlaceMoneyBottomLeft
call JoyWaitAorB call JoyWaitAorB
@ -890,8 +890,8 @@ PlayTransactionSound:
call PlaySFX call PlaySFX
ret ret
MartTextBox: MartTextbox:
call MenuTextBox call MenuTextbox
call JoyWaitAorB call JoyWaitAorB
call ExitMenu call ExitMenu
ret ret

4
engine/items/pack.asm
View File

@ -484,7 +484,7 @@ TossMenu:
jr c, .finish jr c, .finish
call Pack_GetItemName call Pack_GetItemName
ld hl, Text_ConfirmThrowAway ld hl, Text_ConfirmThrowAway
call MenuTextBox call MenuTextbox
call YesNoBox call YesNoBox
push af push af
call ExitMenu call ExitMenu
@ -1358,7 +1358,7 @@ Pack_InitGFX:
; Place the textbox for displaying the item description ; Place the textbox for displaying the item description
hlcoord 0, SCREEN_HEIGHT - 4 - 2 hlcoord 0, SCREEN_HEIGHT - 4 - 2
lb bc, 4, SCREEN_WIDTH - 2 lb bc, 4, SCREEN_WIDTH - 2
call TextBox call Textbox
call EnableLCD call EnableLCD
call DrawPackGFX call DrawPackGFX
ret ret

2
engine/items/tmhm.asm
View File

@ -247,7 +247,7 @@ TMHM_ShowTMMoveDescription:
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, SCREEN_WIDTH - 2 ld c, SCREEN_WIDTH - 2
call TextBox call Textbox
ld a, [wCurItem] ld a, [wCurItem]
cp NUM_TMS + NUM_HMS + 1 cp NUM_TMS + NUM_HMS + 1
jr nc, TMHM_JoypadLoop jr nc, TMHM_JoypadLoop

2
engine/items/update_item_description.asm
View File

@ -4,7 +4,7 @@ UpdateItemDescription:
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, SCREEN_WIDTH - 2 ld c, SCREEN_WIDTH - 2
call TextBox call Textbox
ld a, [wMenuSelection] ld a, [wMenuSelection]
cp -1 cp -1
ret z ret z

2
engine/link/place_waiting_text.asm
View File

@ -7,7 +7,7 @@ PlaceWaitingText::
and a and a
jr z, .notinbattle jr z, .notinbattle
call TextBox call Textbox
jr .proceed jr .proceed
.notinbattle .notinbattle

4
engine/menus/main_menu.asm
View File

@ -237,11 +237,11 @@ MainMenu_PrintCurrentTimeAndDay:
hlcoord 0, 14 hlcoord 0, 14
ld b, 2 ld b, 2
ld c, 18 ld c, 18
call TextBox call Textbox
ret ret
.TimeFail: .TimeFail:
call SpeechTextBox call SpeechTextbox
ret ret
.PlaceTime: .PlaceTime:

14
engine/menus/menu_2.asm
View File

@ -30,19 +30,19 @@ PlaceMenuItemQuantity:
PlaceMoneyTopRight: PlaceMoneyTopRight:
ld hl, MenuHeader_0x24b15 ld hl, MenuHeader_0x24b15
call CopyMenuHeader call CopyMenuHeader
jr PlaceMoneyTextBox jr PlaceMoneyTextbox
PlaceMoneyBottomLeft: PlaceMoneyBottomLeft:
ld hl, MenuHeader_0x24b1d ld hl, MenuHeader_0x24b1d
call CopyMenuHeader call CopyMenuHeader
jr PlaceMoneyTextBox jr PlaceMoneyTextbox
PlaceMoneyAtTopLeftOfTextbox: PlaceMoneyAtTopLeftOfTextbox:
ld hl, MenuHeader_0x24b15 ld hl, MenuHeader_0x24b15
lb de, 0, 11 lb de, 0, 11
call OffsetMenuHeader call OffsetMenuHeader
PlaceMoneyTextBox: PlaceMoneyTextbox:
call MenuBox call MenuBox
call MenuBoxCoord2Tile call MenuBoxCoord2Tile
ld de, SCREEN_WIDTH + 1 ld de, SCREEN_WIDTH + 1
@ -69,7 +69,7 @@ DisplayCoinCaseBalance:
hlcoord 11, 0 hlcoord 11, 0
ld b, 1 ld b, 1
ld c, 7 ld c, 7
call TextBox call Textbox
hlcoord 12, 0 hlcoord 12, 0
ld de, CoinString ld de, CoinString
call PlaceString call PlaceString
@ -86,7 +86,7 @@ DisplayMoneyAndCoinBalance:
hlcoord 5, 0 hlcoord 5, 0
ld b, 3 ld b, 3
ld c, 13 ld c, 13
call TextBox call Textbox
hlcoord 6, 1 hlcoord 6, 1
ld de, MoneyString ld de, MoneyString
call PlaceString call PlaceString
@ -119,7 +119,7 @@ Unreferenced_Function24b8f:
hlcoord 0, 0 hlcoord 0, 0
ld b, 3 ld b, 3
ld c, 7 ld c, 7
call TextBox call Textbox
hlcoord 1, 1 hlcoord 1, 1
ld de, wSafariTimeRemaining ld de, wSafariTimeRemaining
lb bc, 2, 3 lb bc, 2, 3
@ -147,7 +147,7 @@ StartMenu_DrawBugContestStatusBox:
hlcoord 0, 0 hlcoord 0, 0
ld b, 5 ld b, 5
ld c, 17 ld c, 17
call TextBox call Textbox
ret ret
StartMenu_PrintBugContestStatus: StartMenu_PrintBugContestStatus:

6
engine/menus/options_menu.asm
View File

@ -7,7 +7,7 @@ _OptionsMenu:
hlcoord 0, 0 hlcoord 0, 0
ld b, 16 ld b, 16
ld c, 18 ld c, 18
call TextBox call Textbox
hlcoord 2, 2 hlcoord 2, 2
ld de, StringOptions ld de, StringOptions
call PlaceString call PlaceString
@ -448,7 +448,7 @@ Options_MenuAccount:
.On: db "ON @" .On: db "ON @"
Options_Frame: Options_Frame:
ld hl, wTextBoxFrame ld hl, wTextboxFrame
ldh a, [hJoyPressed] ldh a, [hJoyPressed]
bit D_LEFT_F, a bit D_LEFT_F, a
jr nz, .LeftPressed jr nz, .LeftPressed
@ -470,7 +470,7 @@ Options_Frame:
maskbits NUM_FRAMES maskbits NUM_FRAMES
ld [hl], a ld [hl], a
UpdateFrame: UpdateFrame:
ld a, [wTextBoxFrame] ld a, [wTextboxFrame]
hlcoord 16, 15 ; where on the screen the number is drawn hlcoord 16, 15 ; where on the screen the number is drawn
add "1" add "1"
ld [hl], a ld [hl], a

8
engine/menus/save.asm
View File

@ -1,7 +1,7 @@
SaveMenu: SaveMenu:
call LoadStandardMenuHeader call LoadStandardMenuHeader
farcall DisplaySaveInfoOnSave farcall DisplaySaveInfoOnSave
call SpeechTextBox call SpeechTextbox
call UpdateSprites call UpdateSprites
farcall SaveMenu_CopyTilemapAtOnce farcall SaveMenu_CopyTilemapAtOnce
ld hl, Text_WouldYouLikeToSaveTheGame ld hl, Text_WouldYouLikeToSaveTheGame
@ -39,7 +39,7 @@ SaveAfterLinkTrade:
ChangeBoxSaveGame: ChangeBoxSaveGame:
push de push de
ld hl, Text_SaveOnBoxSwitch ld hl, Text_SaveOnBoxSwitch
call MenuTextBox call MenuTextbox
call YesNoBox call YesNoBox
call ExitMenu call ExitMenu
jr c, .refused jr c, .refused
@ -116,7 +116,7 @@ MoveMonWOMail_InsertMon_SaveGame:
StartMoveMonWOMail_SaveGame: StartMoveMonWOMail_SaveGame:
ld hl, Text_SaveOnMoveMonWOMail ld hl, Text_SaveOnMoveMonWOMail
call MenuTextBox call MenuTextbox
call YesNoBox call YesNoBox
call ExitMenu call ExitMenu
jr c, .refused jr c, .refused
@ -198,7 +198,7 @@ AskOverwriteSaveFile:
SaveTheGame_yesorno: SaveTheGame_yesorno:
ld b, BANK(Text_WouldYouLikeToSaveTheGame) ld b, BANK(Text_WouldYouLikeToSaveTheGame)
call MapTextbox call MapTextbox
call LoadMenuTextBox call LoadMenuTextbox
lb bc, 0, 7 lb bc, 0, 7
call PlaceYesNoBox call PlaceYesNoBox
ld a, [wMenuCursorY] ld a, [wMenuCursorY]

2
engine/menus/start_menu.asm
View File

@ -379,7 +379,7 @@ endr
hlcoord 0, 13 hlcoord 0, 13
ld b, 3 ld b, 3
ld c, 8 ld c, 8
jp TextBoxPalette jp TextboxPalette
.IsMenuAccountOn: .IsMenuAccountOn:
ld a, [wOptions2] ld a, [wOptions2]

4
engine/movie/trade_animation.asm
View File

@ -931,7 +931,7 @@ TrademonStats_MonTemplate:
hlcoord 3, 0 hlcoord 3, 0
ld b, $6 ld b, $6
ld c, $d ld c, $d
call TextBox call Textbox
hlcoord 4, 0 hlcoord 4, 0
ld de, .OTMonData ld de, .OTMonData
call PlaceString call PlaceString
@ -951,7 +951,7 @@ TrademonStats_Egg:
hlcoord 3, 0 hlcoord 3, 0
ld b, 6 ld b, 6
ld c, 13 ld c, 13
call TextBox call Textbox
hlcoord 4, 2 hlcoord 4, 2
ld de, .EggData ld de, .EggData
call PlaceString call PlaceString

24
engine/overworld/decorations.asm
View File

@ -379,7 +379,7 @@ PopulateDecoCategoryMenu:
.empty .empty
ld hl, .Text_nothing_to_choose ld hl, .Text_nothing_to_choose
call MenuTextBoxBackup call MenuTextboxBackup
ret ret
.Text_nothing_to_choose: .Text_nothing_to_choose:
@ -675,7 +675,7 @@ DecoAction_SetItUp:
ld hl, wStringBuffer3 ld hl, wStringBuffer3
call GetDecorationName call GetDecorationName
ld hl, DecoText_PutAwayAndSetUp ld hl, DecoText_PutAwayAndSetUp
call MenuTextBoxBackup call MenuTextboxBackup
xor a xor a
ret ret
@ -684,13 +684,13 @@ DecoAction_SetItUp:
ld hl, wStringBuffer3 ld hl, wStringBuffer3
call GetDecorationName call GetDecorationName
ld hl, DecoText_SetUpTheDeco ld hl, DecoText_SetUpTheDeco
call MenuTextBoxBackup call MenuTextboxBackup
xor a xor a
ret ret
.alreadythere .alreadythere
ld hl, DecoText_AlreadySetUp ld hl, DecoText_AlreadySetUp
call MenuTextBoxBackup call MenuTextboxBackup
scf scf
ret ret
@ -711,13 +711,13 @@ DecoAction_TryPutItAway:
ld hl, wStringBuffer3 ld hl, wStringBuffer3
call GetDecorationName call GetDecorationName
ld hl, DecoText_PutAwayTheDeco ld hl, DecoText_PutAwayTheDeco
call MenuTextBoxBackup call MenuTextboxBackup
xor a xor a
ret ret
.nothingthere .nothingthere
ld hl, DecoText_NothingToPutAway ld hl, DecoText_NothingToPutAway
call MenuTextBoxBackup call MenuTextboxBackup
xor a xor a
ret ret
@ -772,7 +772,7 @@ DecoAction_SetItUp_Ornament:
ld [wSelectedDecoration], a ld [wSelectedDecoration], a
call .getwhichside call .getwhichside
ld hl, DecoText_PutAwayAndSetUp ld hl, DecoText_PutAwayAndSetUp
call MenuTextBoxBackup call MenuTextboxBackup
xor a xor a
ret ret
@ -784,13 +784,13 @@ DecoAction_SetItUp_Ornament:
ld hl, wStringBuffer3 ld hl, wStringBuffer3
call GetDecorationName call GetDecorationName
ld hl, DecoText_SetUpTheDeco ld hl, DecoText_SetUpTheDeco
call MenuTextBoxBackup call MenuTextboxBackup
xor a xor a
ret ret
.failed .failed
ld hl, DecoText_AlreadySetUp ld hl, DecoText_AlreadySetUp
call MenuTextBoxBackup call MenuTextboxBackup
scf scf
ret ret
@ -820,13 +820,13 @@ DecoAction_PutItAway_Ornament:
xor a xor a
ld [wSelectedDecoration], a ld [wSelectedDecoration], a
ld hl, DecoText_PutAwayTheDeco ld hl, DecoText_PutAwayTheDeco
call MenuTextBoxBackup call MenuTextboxBackup
xor a xor a
ret ret
.nothingthere .nothingthere
ld hl, DecoText_NothingToPutAway ld hl, DecoText_NothingToPutAway
call MenuTextBoxBackup call MenuTextboxBackup
xor a xor a
ret ret
@ -836,7 +836,7 @@ DecoText_WhichSide:
text_end text_end
DecoAction_AskWhichSide: DecoAction_AskWhichSide:
call MenuTextBox call MenuTextbox
ld hl, MenuHeader_0x26eab ld hl, MenuHeader_0x26eab
call GetMenu2 call GetMenu2
call ExitMenu call ExitMenu

2
engine/overworld/scripting.asm
View File

@ -498,7 +498,7 @@ Script_battletowertext:
; script command 0xa4 ; script command 0xa4
; parameters: bttext_id ; parameters: bttext_id
call SetUpTextBox call SetUpTextbox
call GetScriptByte call GetScriptByte
ld c, a ld c, a
farcall BattleTowerText farcall BattleTowerText

4
engine/phone/phone.asm
View File

@ -555,7 +555,7 @@ UnknownText_0x90336:
text_end text_end
HangUp_BoopOff: HangUp_BoopOff:
call SpeechTextBox call SpeechTextbox
ret ret
Phone_StartRinging: Phone_StartRinging:
@ -593,7 +593,7 @@ Phone_CallerTextbox:
hlcoord 0, 0 hlcoord 0, 0
ld b, 2 ld b, 2
ld c, SCREEN_WIDTH - 2 ld c, SCREEN_WIDTH - 2
call TextBox call Textbox
ret ret
Function90380: Function90380:

14
engine/pokegear/pokegear.asm
View File

@ -313,7 +313,7 @@ InitPokegearTilemap:
call PlaceString call PlaceString
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call Textbox
call Pokegear_UpdateClock call Pokegear_UpdateClock
ret ret
@ -351,7 +351,7 @@ InitPokegearTilemap:
call Pokegear_LoadTilemapRLE call Pokegear_LoadTilemapRLE
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call Textbox
ret ret
.Phone: .Phone:
@ -359,7 +359,7 @@ InitPokegearTilemap:
call Pokegear_LoadTilemapRLE call Pokegear_LoadTilemapRLE
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call Textbox
call .PlacePhoneBars call .PlacePhoneBars
call PokegearPhone_UpdateDisplayList call PokegearPhone_UpdateDisplayList
ret ret
@ -1138,7 +1138,7 @@ PokegearPhoneContactSubmenu:
ld b, a ld b, a
ld c, 8 ld c, 8
push de push de
call TextBox call Textbox
pop de pop de
pop hl pop hl
inc hl inc hl
@ -1213,7 +1213,7 @@ PokegearPhoneContactSubmenu:
.Delete: .Delete:
ld hl, PokegearText_DeleteStoredNumber ld hl, PokegearText_DeleteStoredNumber
call MenuTextBox call MenuTextbox
call YesNoBox call YesNoBox
call ExitMenu call ExitMenu
jr c, .CancelDelete jr c, .CancelDelete
@ -1758,7 +1758,7 @@ NoRadioName:
call ClearBox call ClearBox
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call Textbox
ret ret
OaksPKMNTalkName: db "OAK's <PK><MN> Talk@" OaksPKMNTalkName: db "OAK's <PK><MN> Talk@"
@ -1988,7 +1988,7 @@ PlayRadio:
push de push de
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call Textbox
hlcoord 1, 14 hlcoord 1, 14
ld [hl], "“" ld [hl], "“"
pop de pop de

2
engine/pokegear/radio.asm
View File

@ -142,7 +142,7 @@ PrintRadioLine:
call PlaceHLTextAtBC call PlaceHLTextAtBC
jr .skip jr .skip
.print .print
call PrintTextBoxText call PrintTextboxText
.skip .skip
ld a, RADIO_SCROLL ld a, RADIO_SCROLL
ld [wCurRadioLine], a ld [wCurRadioLine], a

24
engine/pokemon/bills_pc.asm
View File

@ -963,7 +963,7 @@ BillsPC_PlaceString:
push de push de
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call TextBox call Textbox
pop de pop de
hlcoord 1, 16 hlcoord 1, 16
call PlaceString call PlaceString
@ -980,7 +980,7 @@ BillsPC_MoveMonWOMail_BoxNameAndArrows:
BillsPC_BoxName: BillsPC_BoxName:
hlcoord 8, 0 hlcoord 8, 0
lb bc, 1, 10 lb bc, 1, 10
call TextBox call Textbox
ld a, [wBillsPC_LoadedBox] ld a, [wBillsPC_LoadedBox]
and a and a
@ -1219,7 +1219,7 @@ BillsPC_LoadMonStats:
BillsPC_RefreshTextboxes: BillsPC_RefreshTextboxes:
hlcoord 8, 2 hlcoord 8, 2
lb bc, 10, 10 lb bc, 10, 10
call TextBox call Textbox
hlcoord 8, 2 hlcoord 8, 2
ld [hl], "└" ld [hl], "└"
@ -1790,7 +1790,7 @@ DepositPokemon:
call ClearBox call ClearBox
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call TextBox call Textbox
call WaitBGMap call WaitBGMap
hlcoord 1, 16 hlcoord 1, 16
ld de, PCString_Stored ld de, PCString_Stored
@ -1845,7 +1845,7 @@ TryWithdrawPokemon:
call ClearBox call ClearBox
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call TextBox call Textbox
call WaitBGMap call WaitBGMap
hlcoord 1, 16 hlcoord 1, 16
ld de, PCString_Got ld de, PCString_Got
@ -1881,7 +1881,7 @@ ReleasePKMN_ByePKMN:
call ClearBox call ClearBox
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call TextBox call Textbox
call WaitBGMap call WaitBGMap
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
@ -1902,7 +1902,7 @@ ReleasePKMN_ByePKMN:
call DelayFrames call DelayFrames
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call TextBox call Textbox
hlcoord 1, 16 hlcoord 1, 16
ld de, PCString_Bye ld de, PCString_Bye
call PlaceString call PlaceString
@ -1925,7 +1925,7 @@ MovePKMNWitoutMail_InsertMon:
push af push af
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call TextBox call Textbox
hlcoord 1, 16 hlcoord 1, 16
ld de, .Saving_LeaveOn ld de, .Saving_LeaveOn
call PlaceString call PlaceString
@ -2241,7 +2241,7 @@ _ChangeBox:
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
hlcoord 0, 4 hlcoord 0, 4
lb bc, 8, 9 lb bc, 8, 9
call TextBox call Textbox
call ScrollingMenu call ScrollingMenu
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp B_BUTTON cp B_BUTTON
@ -2306,7 +2306,7 @@ GetBoxName:
BillsPC_PrintBoxCountAndCapacity: BillsPC_PrintBoxCountAndCapacity:
hlcoord 11, 7 hlcoord 11, 7
lb bc, 5, 7 lb bc, 5, 7
call TextBox call Textbox
ld a, [wMenuSelection] ld a, [wMenuSelection]
cp -1 cp -1
ret z ret z
@ -2394,7 +2394,7 @@ BillsPC_PrintBoxName:
hlcoord 0, 0 hlcoord 0, 0
ld b, 2 ld b, 2
ld c, 18 ld c, 18
call TextBox call Textbox
hlcoord 1, 2 hlcoord 1, 2
ld de, .Current ld de, .Current
call PlaceString call PlaceString
@ -2522,7 +2522,7 @@ BillsPC_PlaceChangeBoxString:
push de push de
hlcoord 0, 14 hlcoord 0, 14
lb bc, 2, 18 lb bc, 2, 18
call TextBox call Textbox
pop de pop de
hlcoord 1, 16 hlcoord 1, 16
call PlaceString call PlaceString

12
engine/pokemon/bills_pc_top.asm
View File

@ -10,7 +10,7 @@ _BillsPC:
and a and a
ret nz ret nz
ld hl, .Text_GottaHavePokemon ld hl, .Text_GottaHavePokemon
call MenuTextBoxBackup call MenuTextboxBackup
scf scf
ret ret
@ -153,13 +153,13 @@ Unreferenced_Functione512:
.no_mon .no_mon
ld hl, .Text_NoMon ld hl, .Text_NoMon
call MenuTextBoxBackup call MenuTextboxBackup
scf scf
ret ret
.only_one_mon .only_one_mon
ld hl, .Text_ItsYourLastMon ld hl, .Text_ItsYourLastMon
call MenuTextBoxBackup call MenuTextboxBackup
scf scf
ret ret
@ -220,7 +220,7 @@ Unreferenced_Functione56d:
.asm_e576 .asm_e576
ld hl, UnknownText_0xe57e ld hl, UnknownText_0xe57e
call MenuTextBoxBackup call MenuTextboxBackup
scf scf
ret ret
@ -246,10 +246,10 @@ ClearPCItemScreen:
call ByteFill call ByteFill
hlcoord 0, 0 hlcoord 0, 0
lb bc, 10, 18 lb bc, 10, 18
call TextBox call Textbox
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call Textbox
call WaitBGMap2 call WaitBGMap2
call SetPalettes ; load regular palettes? call SetPalettes ; load regular palettes?
ret ret

2
engine/pokemon/evolve.asm
View File

@ -241,7 +241,7 @@ EvolveAfterBattle_MasterLoop:
push hl push hl
ld hl, Text_EvolvedIntoPKMN ld hl, Text_EvolvedIntoPKMN
call PrintTextBoxText call PrintTextboxText
farcall StubbedTrainerRankings_MonsEvolved farcall StubbedTrainerRankings_MonsEvolved
ld de, MUSIC_NONE ld de, MUSIC_NONE

2
engine/pokemon/learn.asm
View File

@ -139,7 +139,7 @@ ForgetMove:
hlcoord 5, 2 hlcoord 5, 2
ld b, NUM_MOVES * 2 ld b, NUM_MOVES * 2
ld c, MOVE_NAME_LENGTH ld c, MOVE_NAME_LENGTH
call TextBox call Textbox
hlcoord 5 + 2, 2 + 2 hlcoord 5 + 2, 2 + 2
ld a, SCREEN_WIDTH * 2 ld a, SCREEN_WIDTH * 2
ld [wBuffer1], a ld [wBuffer1], a

8
engine/pokemon/mail.asm
View File

@ -307,7 +307,7 @@ _PlayerMailBoxMenu:
.nomail .nomail
ld hl, .EmptyMailboxText ld hl, .EmptyMailboxText
jp MenuTextBoxBackup jp MenuTextboxBackup
.EmptyMailboxText: .EmptyMailboxText:
text_far _EmptyMailboxText text_far _EmptyMailboxText
@ -429,7 +429,7 @@ MailboxPC:
.PutInPack: .PutInPack:
ld hl, .MessageLostText ld hl, .MessageLostText
call MenuTextBox call MenuTextbox
call YesNoBox call YesNoBox
call ExitMenu call ExitMenu
ret c ret c
@ -442,7 +442,7 @@ MailboxPC:
call ReceiveItem call ReceiveItem
jr c, .put_in_bag jr c, .put_in_bag
ld hl, .PackFullText ld hl, .PackFullText
jp MenuTextBoxBackup jp MenuTextboxBackup
.put_in_bag .put_in_bag
ld a, [wMenuSelection] ld a, [wMenuSelection]
@ -450,7 +450,7 @@ MailboxPC:
ld b, a ld b, a
call DeleteMailFromPC call DeleteMailFromPC
ld hl, .PutAwayText ld hl, .PutAwayText
jp MenuTextBoxBackup jp MenuTextboxBackup
.PutAwayText: .PutAwayText:
text_far ClearedMailPutAwayText text_far ClearedMailPutAwayText

46
engine/pokemon/mon_menu.asm
View File

@ -30,7 +30,7 @@ TossItemFromPC:
and a and a
jr nz, .key_item jr nz, .key_item
ld hl, .TossHowMany ld hl, .TossHowMany
call MenuTextBox call MenuTextbox
farcall SelectQuantityToToss farcall SelectQuantityToToss
push af push af
call CloseWindow call CloseWindow
@ -38,7 +38,7 @@ TossItemFromPC:
pop af pop af
jr c, .quit jr c, .quit
ld hl, .ConfirmToss ld hl, .ConfirmToss
call MenuTextBox call MenuTextbox
call YesNoBox call YesNoBox
push af push af
call ExitMenu call ExitMenu
@ -49,7 +49,7 @@ TossItemFromPC:
call TossItem call TossItem
call PartyMonItemName call PartyMonItemName
ld hl, .TossedThisMany ld hl, .TossedThisMany
call MenuTextBox call MenuTextbox
call ExitMenu call ExitMenu
and a and a
ret ret
@ -78,7 +78,7 @@ TossItemFromPC:
.CantToss: .CantToss:
ld hl, .TooImportantToToss ld hl, .TooImportantToToss
call MenuTextBoxBackup call MenuTextboxBackup
ret ret
.TooImportantToToss: .TooImportantToToss:
@ -88,7 +88,7 @@ TossItemFromPC:
CantUseItem: CantUseItem:
ld hl, CantUseItemText ld hl, CantUseItemText
call MenuTextBoxWaitButton call MenuTextboxWaitButton
ret ret
CantUseItemText: CantUseItemText:
@ -265,14 +265,14 @@ GiveTakePartyMonItem:
.next .next
ld hl, CantBeHeldText ld hl, CantBeHeldText
call MenuTextBoxBackup call MenuTextboxBackup
jr .loop jr .loop
.quit .quit
ret ret
TryGiveItemToPartymon: TryGiveItemToPartymon:
call SpeechTextBox call SpeechTextbox
call PartyMonItemName call PartyMonItemName
call GetPartyItemLocation call GetPartyItemLocation
ld a, [hl] ld a, [hl]
@ -290,13 +290,13 @@ TryGiveItemToPartymon:
.give_item_to_mon .give_item_to_mon
call GiveItemToPokemon call GiveItemToPokemon
ld hl, MadeHoldText ld hl, MadeHoldText
call MenuTextBoxBackup call MenuTextboxBackup
call GivePartyItem call GivePartyItem
ret ret
.please_remove_mail .please_remove_mail
ld hl, PleaseRemoveMailText ld hl, PleaseRemoveMailText
call MenuTextBoxBackup call MenuTextboxBackup
ret ret
.already_holding_item .already_holding_item
@ -317,7 +317,7 @@ TryGiveItemToPartymon:
jr nc, .bag_full jr nc, .bag_full
ld hl, TookAndMadeHoldText ld hl, TookAndMadeHoldText
call MenuTextBoxBackup call MenuTextboxBackup
ld a, [wNamedObjectIndexBuffer] ld a, [wNamedObjectIndexBuffer]
ld [wCurItem], a ld [wCurItem], a
call GivePartyItem call GivePartyItem
@ -328,7 +328,7 @@ TryGiveItemToPartymon:
ld [wCurItem], a ld [wCurItem], a
call ReceiveItemFromPokemon call ReceiveItemFromPokemon
ld hl, ItemStorageIsFullText ld hl, ItemStorageIsFullText
call MenuTextBoxBackup call MenuTextboxBackup
.abort .abort
ret ret
@ -346,7 +346,7 @@ GivePartyItem:
ret ret
TakePartyItem: TakePartyItem:
call SpeechTextBox call SpeechTextbox
call GetPartyItemLocation call GetPartyItemLocation
ld a, [hl] ld a, [hl]
and a and a
@ -363,17 +363,17 @@ TakePartyItem:
ld [hl], NO_ITEM ld [hl], NO_ITEM
call GetItemName call GetItemName
ld hl, TookFromText ld hl, TookFromText
call MenuTextBoxBackup call MenuTextboxBackup
jr .asm_12c9a jr .asm_12c9a
.asm_12c8c .asm_12c8c
ld hl, IsntHoldingAnythingText ld hl, IsntHoldingAnythingText
call MenuTextBoxBackup call MenuTextboxBackup
jr .asm_12c9a jr .asm_12c9a
.asm_12c94 .asm_12c94
ld hl, ItemStorageIsFullText ld hl, ItemStorageIsFullText
call MenuTextBoxBackup call MenuTextboxBackup
.asm_12c9a .asm_12c9a
ret ret
@ -442,7 +442,7 @@ GiveItemToPokemon:
jp TossItem jp TossItem
StartMenuYesNo: StartMenuYesNo:
call MenuTextBox call MenuTextbox
call YesNoBox call YesNoBox
jp ExitMenu jp ExitMenu
@ -514,12 +514,12 @@ MonMailAction:
farcall SendMailToPC farcall SendMailToPC
jr c, .MailboxFull jr c, .MailboxFull
ld hl, .sentmailtopctext ld hl, .sentmailtopctext
call MenuTextBoxBackup call MenuTextboxBackup
jr .done jr .done
.MailboxFull: .MailboxFull:
ld hl, .mailboxfulltext ld hl, .mailboxfulltext
call MenuTextBoxBackup call MenuTextboxBackup
jr .done jr .done
.RemoveMailToBag: .RemoveMailToBag:
@ -535,12 +535,12 @@ MonMailAction:
ld [hl], $0 ld [hl], $0
call GetCurNick call GetCurNick
ld hl, .tookmailfrommontext ld hl, .tookmailfrommontext
call MenuTextBoxBackup call MenuTextboxBackup
jr .done jr .done
.BagIsFull: .BagIsFull:
ld hl, .bagfulltext ld hl, .bagfulltext
call MenuTextBoxBackup call MenuTextboxBackup
jr .done jr .done
.done .done
@ -1118,11 +1118,11 @@ SetUpMoveScreenBG:
hlcoord 0, 1 hlcoord 0, 1
ld b, 9 ld b, 9
ld c, 18 ld c, 18
call TextBox call Textbox
hlcoord 0, 11 hlcoord 0, 11
ld b, 5 ld b, 5
ld c, 18 ld c, 18
call TextBox call Textbox
hlcoord 2, 0 hlcoord 2, 0
lb bc, 2, 3 lb bc, 2, 3
call ClearBox call ClearBox
@ -1169,7 +1169,7 @@ SetUpMoveList:
hlcoord 0, 11 hlcoord 0, 11
ld b, 5 ld b, 5
ld c, 18 ld c, 18
jp TextBox jp Textbox
PrepareToPlaceMoveData: PrepareToPlaceMoveData:
ld hl, wPartyMon1Moves ld hl, wPartyMon1Moves

2
engine/pokemon/party_menu.asm
View File

@ -712,7 +712,7 @@ PartyMenuSelect:
PrintPartyMenuText: PrintPartyMenuText:
hlcoord 0, 14 hlcoord 0, 14
lb bc, 2, 18 lb bc, 2, 18
call TextBox call Textbox
ld a, [wPartyCount] ld a, [wPartyCount]
and a and a
jr nz, .haspokemon jr nz, .haspokemon

10
engine/pokemon/stats_screen.asm
View File

@ -843,7 +843,7 @@ StatsScreen_PlaceFrontpic:
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
call IsAPokemon call IsAPokemon
ret c ret c
call StatsScreen_LoadTextBoxSpaceGFX call StatsScreen_LoadTextboxSpaceGFX
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
predef GetAnimatedFrontpic predef GetAnimatedFrontpic
hlcoord 0, 0 hlcoord 0, 0
@ -919,7 +919,7 @@ StatsScreen_GetAnimationParam:
xor a xor a
ret ret
StatsScreen_LoadTextBoxSpaceGFX: StatsScreen_LoadTextboxSpaceGFX:
nop nop
push hl push hl
push de push de
@ -930,8 +930,8 @@ StatsScreen_LoadTextBoxSpaceGFX:
push af push af
ld a, $1 ld a, $1
ldh [rVBK], a ldh [rVBK], a
ld de, TextBoxSpaceGFX ld de, TextboxSpaceGFX
lb bc, BANK(TextBoxSpaceGFX), 1 lb bc, BANK(TextboxSpaceGFX), 1
ld hl, vTiles2 tile " " ld hl, vTiles2 tile " "
call Get2bpp call Get2bpp
pop af pop af
@ -1042,7 +1042,7 @@ StatsScreen_AnimateEgg:
push de push de
ld a, $1 ld a, $1
ld [wBoxAlignment], a ld [wBoxAlignment], a
call StatsScreen_LoadTextBoxSpaceGFX call StatsScreen_LoadTextboxSpaceGFX
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
predef GetAnimatedFrontpic predef GetAnimatedFrontpic
pop de pop de

4
engine/printer/print_party.asm
View File

@ -159,7 +159,7 @@ PrintPartyMonPage1:
hlcoord 0, 7 hlcoord 0, 7
ld b, 9 ld b, 9
ld c, 18 ld c, 18
call TextBox call Textbox
hlcoord 8, 2 hlcoord 8, 2
ld a, [wTempMonLevel] ld a, [wTempMonLevel]
call PrintLevel_Force3Digits call PrintLevel_Force3Digits
@ -242,7 +242,7 @@ PrintPartyMonPage2:
hlcoord 0, 0 hlcoord 0, 0
ld b, 15 ld b, 15
ld c, 18 ld c, 18
call TextBox call Textbox
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
decoord 0, 0 decoord 0, 0
hlcoord 0, 1 hlcoord 0, 1

2
engine/printer/printer.asm
View File

@ -554,7 +554,7 @@ PlacePrinterStatusString:
ldh [hBGMapMode], a ldh [hBGMapMode], a
hlcoord 0, 5 hlcoord 0, 5
lb bc, 10, 18 lb bc, 10, 18
call TextBox call Textbox
pop af pop af
ld e, a ld e, a
ld d, 0 ld d, 0

2
engine/rtc/restart_clock.asm
View File

@ -189,7 +189,7 @@ RestartClock:
hlcoord 0, 5 hlcoord 0, 5
ld b, 5 ld b, 5
ld c, 18 ld c, 18
call TextBox call Textbox
decoord 1, 8 decoord 1, 8
ld a, [wBuffer4] ld a, [wBuffer4]
ld b, a ld b, a

8
engine/rtc/timeset.asm
View File

@ -56,7 +56,7 @@ InitClock:
hlcoord 3, 7 hlcoord 3, 7
ld b, 2 ld b, 2
ld c, 15 ld c, 15
call TextBox call Textbox
hlcoord 11, 7 hlcoord 11, 7
ld [hl], $1 ld [hl], $1
hlcoord 11, 10 hlcoord 11, 10
@ -86,7 +86,7 @@ InitClock:
call PrintText call PrintText
hlcoord 11, 7 hlcoord 11, 7
lb bc, 2, 7 lb bc, 2, 7
call TextBox call Textbox
hlcoord 15, 7 hlcoord 15, 7
ld [hl], $1 ld [hl], $1
hlcoord 15, 10 hlcoord 15, 10
@ -408,14 +408,14 @@ SetDayOfWeek:
.loop .loop
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call Textbox
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, .WhatDayIsItText ld hl, .WhatDayIsItText
call PrintText call PrintText
hlcoord 9, 3 hlcoord 9, 3
ld b, 2 ld b, 2
ld c, 9 ld c, 9
call TextBox call Textbox
hlcoord 14, 3 hlcoord 14, 3
ld [hl], TIMESET_UP_ARROW ld [hl], TIMESET_UP_ARROW
hlcoord 14, 6 hlcoord 14, 6

2
gfx/font.asm
View File

@ -44,7 +44,7 @@ INCBIN "gfx/font/phone_icon.2bpp"
UnusedBoldFontGFX: ; unused bold letters + unown chars UnusedBoldFontGFX: ; unused bold letters + unown chars
INCBIN "gfx/font/unused_bold_font.1bpp" INCBIN "gfx/font/unused_bold_font.1bpp"
TextBoxSpaceGFX: TextboxSpaceGFX:
INCBIN "gfx/frames/space.1bpp" INCBIN "gfx/frames/space.1bpp"
FontsExtra_SolidBlackGFX: FontsExtra_SolidBlackGFX:

10
home/battle.asm
View File

@ -155,18 +155,18 @@ MobileTextBorder::
ld [hl], $5f ; bottom ld [hl], $5f ; bottom
ret ret
BattleTextBox:: BattleTextbox::
; Open a textbox and print text at hl. ; Open a textbox and print text at hl.
push hl push hl
call SpeechTextBox call SpeechTextbox
call MobileTextBorder call MobileTextBorder
call UpdateSprites call UpdateSprites
call ApplyTilemap call ApplyTilemap
pop hl pop hl
call PrintTextBoxText call PrintTextboxText
ret ret
StdBattleTextBox:: StdBattleTextbox::
; Open a textbox and print battle text at 20:hl. ; Open a textbox and print battle text at 20:hl.
ldh a, [hROMBank] ldh a, [hROMBank]
@ -175,7 +175,7 @@ StdBattleTextBox::
ld a, BANK(BattleText) ld a, BANK(BattleText)
rst Bankswitch rst Bankswitch
call BattleTextBox call BattleTextbox
pop af pop af
rst Bankswitch rst Bankswitch

6
home/map.asm
View File

@ -1025,13 +1025,13 @@ MapTextbox::
rst Bankswitch rst Bankswitch
push hl push hl
call SpeechTextBox call SpeechTextbox
call SafeUpdateSprites call SafeUpdateSprites
ld a, 1 ld a, 1
ldh [hOAMUpdate], a ldh [hOAMUpdate], a
call ApplyTilemap call ApplyTilemap
pop hl pop hl
call PrintTextBoxText call PrintTextboxText
xor a xor a
ldh [hOAMUpdate], a ldh [hOAMUpdate], a
@ -1932,7 +1932,7 @@ ReturnToMapWithSpeechTextbox::
call ReloadTilesetAndPalettes call ReloadTilesetAndPalettes
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call TextBox call Textbox
ld hl, wVramState ld hl, wVramState
set 0, [hl] set 0, [hl]
call UpdateSprites call UpdateSprites

14
home/menu.asm
View File

@ -17,16 +17,16 @@ StoreTo_wMenuCursorBuffer::
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ret ret
MenuTextBox:: MenuTextbox::
push hl push hl
call LoadMenuTextBox call LoadMenuTextbox
pop hl pop hl
jp PrintText jp PrintText
; unused ; unused
ret ret
LoadMenuTextBox:: LoadMenuTextbox::
ld hl, .MenuHeader ld hl, .MenuHeader
call LoadMenuHeader call LoadMenuHeader
ret ret
@ -37,8 +37,8 @@ LoadMenuTextBox::
dw vTiles0 dw vTiles0
db 0 ; default option db 0 ; default option
MenuTextBoxBackup:: MenuTextboxBackup::
call MenuTextBox call MenuTextbox
call CloseWindow call CloseWindow
ret ret
@ -498,8 +498,8 @@ PlayClickSFX::
pop de pop de
ret ret
MenuTextBoxWaitButton:: MenuTextboxWaitButton::
call MenuTextBox call MenuTextbox
call WaitButton call WaitButton
call ExitMenu call ExitMenu
ret ret

2
home/menu_window.asm
View File

@ -144,7 +144,7 @@ MenuBox::
call GetMenuBoxDims call GetMenuBoxDims
dec b dec b
dec c dec c
jp TextBox jp Textbox
GetMenuTextStartCoord:: GetMenuTextStartCoord::
ld a, [wMenuBorderTopCoord] ld a, [wMenuBorderTopCoord]

4
home/mobile.asm
View File

@ -159,7 +159,7 @@ Unreferenced_Function3efd::
ld c, 18 ld c, 18
call .fill_attr call .fill_attr
pop hl pop hl
call PrintTextBoxText call PrintTextboxText
ret ret
.fill_attr .fill_attr
@ -174,7 +174,7 @@ Unreferenced_Function3efd::
call Function3f35 call Function3f35
pop bc pop bc
pop hl pop hl
call TextBoxBorder call TextboxBorder
ret ret
Function3f20:: Function3f20::

8
home/print_text.asm
View File

@ -6,15 +6,15 @@ PrintLetterDelay::
; mid: 3 frames ; mid: 3 frames
; slow: 5 frames ; slow: 5 frames
; wTextBoxFlags[!0] and A or B override text speed with a one-frame delay. ; wTextboxFlags[!0] and A or B override text speed with a one-frame delay.
; wOptions[4] and wTextBoxFlags[!1] disable the delay. ; wOptions[4] and wTextboxFlags[!1] disable the delay.
ld a, [wOptions] ld a, [wOptions]
bit NO_TEXT_SCROLL, a bit NO_TEXT_SCROLL, a
ret nz ret nz
; non-scrolling text? ; non-scrolling text?
ld a, [wTextBoxFlags] ld a, [wTextboxFlags]
bit NO_TEXT_DELAY_F, a bit NO_TEXT_DELAY_F, a
ret z ret z
@ -31,7 +31,7 @@ PrintLetterDelay::
ld [hl], a ld [hl], a
; force fast scroll? ; force fast scroll?
ld a, [wTextBoxFlags] ld a, [wTextboxFlags]
bit FAST_TEXT_DELAY_F, a bit FAST_TEXT_DELAY_F, a
jr z, .fast jr z, .fast

2
home/scrolling_menu.asm
View File

@ -38,7 +38,7 @@ InitScrollingMenu::
push de push de
call Coord2Tile call Coord2Tile
pop bc pop bc
jp TextBox jp Textbox
JoyTextDelay_ForcehJoyDown:: JoyTextDelay_ForcehJoyDown::
call DelayFrame call DelayFrame

30
home/text.asm
View File

@ -40,18 +40,18 @@ ClearScreen::
call ByteFill call ByteFill
jr ClearTileMap jr ClearTileMap
TextBox:: Textbox::
; Draw a text box at hl with room for b lines of c characters each. ; 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 ; Places a border around the textbox, then switches the palette to the
; text black-and-white scheme. ; text black-and-white scheme.
push bc push bc
push hl push hl
call TextBoxBorder call TextboxBorder
pop hl pop hl
pop bc pop bc
jr TextBoxPalette jr TextboxPalette
TextBoxBorder:: TextboxBorder::
; Top ; Top
push hl push hl
ld a, "┌" ld a, "┌"
@ -97,7 +97,7 @@ TextBoxBorder::
jr nz, .loop jr nz, .loop
ret ret
TextBoxPalette:: TextboxPalette::
; Fill text box width c height b at hl with pal 7 ; Fill text box width c height b at hl with pal 7
ld de, wAttrMap - wTileMap ld de, wAttrMap - wTileMap
add hl, de add hl, de
@ -121,12 +121,12 @@ TextBoxPalette::
jr nz, .col jr nz, .col
ret ret
SpeechTextBox:: SpeechTextbox::
; Standard textbox. ; Standard textbox.
hlcoord TEXTBOX_X, TEXTBOX_Y hlcoord TEXTBOX_X, TEXTBOX_Y
ld b, TEXTBOX_INNERH ld b, TEXTBOX_INNERH
ld c, TEXTBOX_INNERW ld c, TEXTBOX_INNERW
jp TextBox jp Textbox
TestText:: TestText::
text "ゲームフりーク！" text "ゲームフりーク！"
@ -140,7 +140,7 @@ RadioTerminator::
text_end text_end
PrintText:: PrintText::
call SetUpTextBox call SetUpTextbox
BuenaPrintText:: BuenaPrintText::
push hl push hl
hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
@ -148,14 +148,14 @@ BuenaPrintText::
call ClearBox call ClearBox
pop hl pop hl
PrintTextBoxText:: PrintTextboxText::
bccoord TEXTBOX_INNERX, TEXTBOX_INNERY bccoord TEXTBOX_INNERX, TEXTBOX_INNERY
call PlaceHLTextAtBC call PlaceHLTextAtBC
ret ret
SetUpTextBox:: SetUpTextbox::
push hl push hl
call SpeechTextBox call SpeechTextbox
call UpdateSprites call UpdateSprites
call ApplyTilemap call ApplyTilemap
pop hl pop hl
@ -648,15 +648,15 @@ PokeFluteTerminatorCharacter::
text_end text_end
PlaceHLTextAtBC:: PlaceHLTextAtBC::
ld a, [wTextBoxFlags] ld a, [wTextboxFlags]
push af push af
set NO_TEXT_DELAY_F, a set NO_TEXT_DELAY_F, a
ld [wTextBoxFlags], a ld [wTextboxFlags], a
call DoTextUntilTerminator call DoTextUntilTerminator
pop af pop af
ld [wTextBoxFlags], a ld [wTextboxFlags], a
ret ret
DoTextUntilTerminator:: DoTextUntilTerminator::
@ -822,7 +822,7 @@ TextCommand_BOX::
push hl push hl
ld h, d ld h, d
ld l, e ld l, e
call TextBox call Textbox
pop hl pop hl
ret ret

2
home/window.asm
View File

@ -51,7 +51,7 @@ OpenText::
rst Bankswitch rst Bankswitch
call ReanchorBGMap_NoOAMUpdate ; clear bgmap call ReanchorBGMap_NoOAMUpdate ; clear bgmap
call SpeechTextBox call SpeechTextbox
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ; anchor bgmap call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ; anchor bgmap
call LoadFonts_NoOAMUpdate ; load font call LoadFonts_NoOAMUpdate ; load font
pop af pop af

Some files were not shown because too many files have changed in this diff Show More