From 3e78e5b2b604568b13a37e4603dbd798373b9805 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 8 Apr 2019 14:15:10 +0200 Subject: [PATCH] TextBox -> Textbox Homogenizing names. --- constants/wram_constants.asm | 4 +- data/default_options.asm | 4 +- docs/bugs_and_glitches.md | 6 +- docs/menus.md | 2 +- engine/battle/core.asm | 162 +++++++++---------- engine/battle/effect_commands.asm | 170 ++++++++++---------- engine/battle/move_effects/attract.asm | 2 +- engine/battle/move_effects/beat_up.asm | 6 +- engine/battle/move_effects/belly_drum.asm | 2 +- engine/battle/move_effects/bide.asm | 4 +- engine/battle/move_effects/conversion.asm | 2 +- engine/battle/move_effects/conversion2.asm | 2 +- engine/battle/move_effects/curse.asm | 4 +- engine/battle/move_effects/destiny_bond.asm | 2 +- engine/battle/move_effects/disable.asm | 2 +- engine/battle/move_effects/encore.asm | 2 +- engine/battle/move_effects/endure.asm | 2 +- engine/battle/move_effects/focus_energy.asm | 2 +- engine/battle/move_effects/foresight.asm | 2 +- engine/battle/move_effects/future_sight.asm | 2 +- engine/battle/move_effects/heal_bell.asm | 2 +- engine/battle/move_effects/leech_seed.asm | 4 +- engine/battle/move_effects/lock_on.asm | 2 +- engine/battle/move_effects/magnitude.asm | 2 +- engine/battle/move_effects/mimic.asm | 2 +- engine/battle/move_effects/mirror_move.asm | 2 +- engine/battle/move_effects/mist.asm | 2 +- engine/battle/move_effects/nightmare.asm | 2 +- engine/battle/move_effects/pain_split.asm | 2 +- engine/battle/move_effects/pay_day.asm | 2 +- engine/battle/move_effects/perish_song.asm | 2 +- engine/battle/move_effects/present.asm | 4 +- engine/battle/move_effects/protect.asm | 2 +- engine/battle/move_effects/psych_up.asm | 2 +- engine/battle/move_effects/rain_dance.asm | 2 +- engine/battle/move_effects/rapid_spin.asm | 6 +- engine/battle/move_effects/safeguard.asm | 2 +- engine/battle/move_effects/sandstorm.asm | 2 +- engine/battle/move_effects/sketch.asm | 2 +- engine/battle/move_effects/spikes.asm | 2 +- engine/battle/move_effects/spite.asm | 2 +- engine/battle/move_effects/substitute.asm | 4 +- engine/battle/move_effects/sunny_day.asm | 2 +- engine/battle/move_effects/teleport.asm | 2 +- engine/battle/move_effects/thief.asm | 2 +- engine/battle/move_effects/transform.asm | 2 +- engine/battle/trainer_huds.asm | 2 +- engine/battle/used_move_text.asm | 2 +- engine/battle_anims/bg_effects.asm | 8 +- engine/events/battle_tower/battle_tower.asm | 2 +- engine/events/bug_contest/display_stats.asm | 4 +- engine/events/elevator.asm | 2 +- engine/events/halloffame.asm | 8 +- engine/events/mom.asm | 2 +- engine/events/overworld.asm | 16 +- engine/events/pokecenter_pc.asm | 16 +- engine/events/print_unown.asm | 6 +- engine/events/prof_oaks_pc.asm | 2 +- engine/games/card_flip.asm | 8 +- engine/games/slot_machine.asm | 2 +- engine/gfx/load_font.asm | 6 +- engine/items/item_effects.asm | 10 +- engine/items/mart.asm | 32 ++-- engine/items/pack.asm | 4 +- engine/items/tmhm.asm | 2 +- engine/items/update_item_description.asm | 2 +- engine/link/place_waiting_text.asm | 2 +- engine/menus/main_menu.asm | 4 +- engine/menus/menu_2.asm | 14 +- engine/menus/options_menu.asm | 6 +- engine/menus/save.asm | 8 +- engine/menus/start_menu.asm | 2 +- engine/movie/trade_animation.asm | 4 +- engine/overworld/decorations.asm | 24 +-- engine/overworld/scripting.asm | 2 +- engine/phone/phone.asm | 4 +- engine/pokegear/pokegear.asm | 14 +- engine/pokegear/radio.asm | 2 +- engine/pokemon/bills_pc.asm | 24 +-- engine/pokemon/bills_pc_top.asm | 12 +- engine/pokemon/evolve.asm | 2 +- engine/pokemon/learn.asm | 2 +- engine/pokemon/mail.asm | 8 +- engine/pokemon/mon_menu.asm | 46 +++--- engine/pokemon/party_menu.asm | 2 +- engine/pokemon/stats_screen.asm | 10 +- engine/printer/print_party.asm | 4 +- engine/printer/printer.asm | 2 +- engine/rtc/restart_clock.asm | 2 +- engine/rtc/timeset.asm | 8 +- gfx/font.asm | 2 +- home/battle.asm | 10 +- home/map.asm | 6 +- home/menu.asm | 14 +- home/menu_window.asm | 2 +- home/mobile.asm | 4 +- home/print_text.asm | 8 +- home/scrolling_menu.asm | 2 +- home/text.asm | 30 ++-- home/window.asm | 2 +- macros/scripts/battle_anims.asm | 4 +- mobile/mobile_12.asm | 2 +- mobile/mobile_12_2.asm | 4 +- mobile/mobile_22.asm | 12 +- mobile/mobile_22_2.asm | 4 +- mobile/mobile_40.asm | 18 +-- mobile/mobile_41.asm | 6 +- mobile/mobile_42.asm | 6 +- mobile/mobile_45.asm | 2 +- mobile/mobile_46.asm | 8 +- mobile/mobile_5e.asm | 2 +- mobile/mobile_5f.asm | 4 +- mobile/mobile_menu.asm | 8 +- mobile/print_opp_message.asm | 2 +- wram.asm | 4 +- 115 files changed, 478 insertions(+), 478 deletions(-) diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index ab705bc12..08cb2092b 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -37,7 +37,7 @@ TEXT_DELAY_FAST EQU %001 ; 1 TEXT_DELAY_MED EQU %011 ; 3 TEXT_DELAY_SLOW EQU %101 ; 5 -; wTextBoxFrame:: ; cfce +; wTextboxFrame:: ; cfce const_def const FRAME_1 ; 0 const FRAME_2 ; 1 @@ -49,7 +49,7 @@ TEXT_DELAY_SLOW EQU %101 ; 5 const FRAME_8 ; 7 NUM_FRAMES EQU const_value -; wTextBoxFlags:: ; cfcf +; wTextboxFlags:: ; cfcf const_def const FAST_TEXT_DELAY_F ; 0 const NO_TEXT_DELAY_F ; 1 diff --git a/data/default_options.asm b/data/default_options.asm index 333f7ef02..c09b18060 100644 --- a/data/default_options.asm +++ b/data/default_options.asm @@ -3,9 +3,9 @@ DefaultOptions: db TEXT_DELAY_MED ; wSaveFileExists: no db FALSE -; wTextBoxFrame: frame 1 +; wTextboxFrame: frame 1 db FRAME_1 -; wTextBoxFlags: use text speed +; wTextboxFlags: use text speed db 1 << FAST_TEXT_DELAY_F ; wGBPrinter: normal brightness db GBPRINTER_NORMAL diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 8d6ce988d..ab5bc208b 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -306,7 +306,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co ... ld hl, HurtItselfText - call StdBattleTextBox + call StdBattleTextbox call HitSelfInConfusion - call BattleCommand_DamageCalc @@ -319,7 +319,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co ```diff HitConfusion: ld hl, HurtItselfText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wCriticalHit], a @@ -412,7 +412,7 @@ Add this to the end of each file: .force_struggle ld hl, BattleText_MonHasNoMovesLeft - call StdBattleTextBox + call StdBattleTextbox ld c, 60 call DelayFrames xor a diff --git a/docs/menus.md b/docs/menus.md index b5a6e1e36..35bb14d3a 100644 --- a/docs/menus.md +++ b/docs/menus.md @@ -12,7 +12,7 @@ ## `ScrollingMenu` -This is the only menu that does scrolling. It doesn't draw any `TextBox` around the menu. +This is the only menu that does scrolling. It doesn't draw any `Textbox` around the menu. Structure: diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4e9d13f15..38abbb51f 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -90,7 +90,7 @@ DoBattle: call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap call SetPlayerTurn call SpikesDamage @@ -140,7 +140,7 @@ WildFled_EnemyFled_LinkBattleCanceled: ld hl, BattleText_LinkErrorBattleCanceled .print_text - call StdBattleTextBox + call StdBattleTextbox .skip_text call StopDangerSound @@ -405,7 +405,7 @@ HandleBerserkGene: ld [hl], a call GetItemName ld hl, BattleText_UsersStringBuffer1Activated - call StdBattleTextBox + call StdBattleTextbox callfar BattleCommand_StatUpMessage pop af bit SUBSTATUS_CONFUSED, a @@ -416,7 +416,7 @@ HandleBerserkGene: call Call_PlayBattleAnim_OnlyIfVisible call SwitchTurnCore ld hl, BecameConfusedText - jp StdBattleTextBox + jp StdBattleTextbox EnemyTriesToFlee: ld a, [wLinkMode] @@ -725,7 +725,7 @@ HandleEncore: res SUBSTATUS_ENCORED, [hl] call SetEnemyTurn ld hl, BattleText_TargetsEncoreEnded - jp StdBattleTextBox + jp StdBattleTextbox .do_enemy ld hl, wEnemySubStatus5 @@ -749,7 +749,7 @@ HandleEncore: res SUBSTATUS_ENCORED, [hl] call SetPlayerTurn ld hl, BattleText_TargetsEncoreEnded - jp StdBattleTextBox + jp StdBattleTextbox TryEnemyFlee: ld a, [wBattleMode] @@ -1019,7 +1019,7 @@ ResidualDamage: .got_anim push de - call StdBattleTextBox + call StdBattleTextbox pop de xor a @@ -1077,7 +1077,7 @@ ResidualDamage: ldh [hBGMapMode], a call RestoreHP ld hl, LeechSeedSapsText - call StdBattleTextBox + call StdBattleTextbox .not_seeded call HasUserFainted @@ -1094,7 +1094,7 @@ ResidualDamage: call GetQuarterMaxHP call SubtractHPFromUser ld hl, HasANightmareText - call StdBattleTextBox + call StdBattleTextbox .not_nightmare call HasUserFainted @@ -1112,7 +1112,7 @@ ResidualDamage: call GetQuarterMaxHP call SubtractHPFromUser ld hl, HurtByCurseText - call StdBattleTextBox + call StdBattleTextbox .not_cursed ld hl, wBattleMonHP @@ -1164,7 +1164,7 @@ HandlePerishSong: ld [wDeciramBuffer], a push af ld hl, PerishCountText - call StdBattleTextBox + call StdBattleTextbox pop af ret nz ld a, BATTLE_VARS_SUBSTATUS1 @@ -1263,7 +1263,7 @@ HandleWrap: ld hl, BattleText_UserWasReleasedFromStringBuffer1 .print_text - jp StdBattleTextBox + jp StdBattleTextbox SwitchTurnCore: ldh a, [hBattleTurn] @@ -1318,7 +1318,7 @@ HandleLeftovers: call SwitchTurnCore call RestoreHP ld hl, BattleText_TargetRecoveredWithItem - jp StdBattleTextBox + jp StdBattleTextbox HandleMysteryberry: ldh a, [hSerialConnectionStatus] @@ -1456,7 +1456,7 @@ HandleMysteryberry: call ItemRecoveryAnim call SwitchTurnCore ld hl, BattleText_UserRecoveredPPUsing - jp StdBattleTextBox + jp StdBattleTextbox HandleFutureSight: ldh a, [hSerialConnectionStatus] @@ -1489,7 +1489,7 @@ HandleFutureSight: ret nz ld hl, BattleText_TargetWasHitByFutureSight - call StdBattleTextBox + call StdBattleTextbox ld a, BATTLE_VARS_MOVE call GetBattleVarAddr @@ -1546,7 +1546,7 @@ HandleDefrost: call UpdateBattleHuds call SetEnemyTurn ld hl, DefrostedOpponentText - jp StdBattleTextBox + jp StdBattleTextbox .do_enemy_turn ld a, [wEnemyMonStatus] @@ -1573,7 +1573,7 @@ HandleDefrost: call UpdateBattleHuds call SetPlayerTurn ld hl, DefrostedOpponentText - jp StdBattleTextBox + jp StdBattleTextbox HandleSafeguard: ldh a, [hSerialConnectionStatus] @@ -1610,7 +1610,7 @@ HandleSafeguard: .print ldh [hBattleTurn], a ld hl, BattleText_SafeguardFaded - jp StdBattleTextBox + jp StdBattleTextbox HandleScreens: ldh a, [hSerialConnectionStatus] @@ -1662,7 +1662,7 @@ HandleScreens: push hl push de ld hl, BattleText_MonsLightScreenFell - call StdBattleTextBox + call StdBattleTextbox pop de pop hl ret @@ -1675,7 +1675,7 @@ HandleScreens: ret nz res SCREENS_REFLECT, [hl] ld hl, BattleText_MonsReflectFaded - jp StdBattleTextBox + jp StdBattleTextbox HandleWeather: ld a, [wBattleWeather] @@ -1746,7 +1746,7 @@ HandleWeather: call SubtractHPFromUser ld hl, SandstormHitsText - jp StdBattleTextBox + jp StdBattleTextbox .ended ld hl, .WeatherEndedMessages @@ -1765,7 +1765,7 @@ HandleWeather: ld a, [hli] ld h, [hl] ld l, a - jp StdBattleTextBox + jp StdBattleTextbox .WeatherMessages: ; entries correspond to WEATHER_* constants @@ -1932,7 +1932,7 @@ CheckUserHasEnoughHP: sbc [hl] ret -RestoreHP +RestoreHP: ld hl, wEnemyMonMaxHP ldh a, [hBattleTurn] and a @@ -2141,7 +2141,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ld a, [wBattleMode] dec a call z, PlayVictoryMusic - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap ld a, [wBattleResult] and BATTLERESULT_BITMASK @@ -2254,7 +2254,7 @@ FaintYourPokemon: lb bc, 5, 11 call ClearBox ld hl, BattleText_MonFainted - jp StdBattleTextBox + jp StdBattleTextbox FaintEnemyPokemon: call WaitSFX @@ -2267,7 +2267,7 @@ FaintEnemyPokemon: lb bc, 4, 10 call ClearBox ld hl, BattleText_EnemyMonFainted - jp StdBattleTextBox + jp StdBattleTextbox CheckEnemyTrainerDefeated: ld a, [wOTPartyCount] @@ -2351,7 +2351,7 @@ WinTrainerBattle: call z, PlayVictoryMusic callfar Battle_GetTrainerName ld hl, BattleText_EnemyWasDefeated - call StdBattleTextBox + call StdBattleTextbox call IsMobileBattle jr z, .mobile @@ -2391,7 +2391,7 @@ WinTrainerBattle: call BattleWinSlideInEnemyTrainerFrontpic ld c, 40 call DelayFrames - call EmptyBattleTextBox + call EmptyBattleTextbox ld c, BATTLETOWERTEXT_LOSS_TEXT farcall BattleTowerText call WaitPressAorB_BlinkCursor @@ -2456,11 +2456,11 @@ WinTrainerBattle: ld a, [hli] ld h, [hl] ld l, a - jp StdBattleTextBox + jp StdBattleTextbox .KeepItAll: ld hl, GotMoneyForWinningText - jp StdBattleTextBox + jp StdBattleTextbox .AddMoneyToMom: push bc @@ -2681,7 +2681,7 @@ UpdateFaintedPlayerMon: ret ; ?????????? AskUseNextPokemon: - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap ; We don't need to be here if we're in a Trainer battle, ; as that decision is made for us. @@ -2691,7 +2691,7 @@ AskUseNextPokemon: ret nz ld hl, BattleText_UseNextMon - call StdBattleTextBox + call StdBattleTextbox .loop lb bc, 1, 7 call PlaceYesNoBox @@ -2709,7 +2709,7 @@ AskUseNextPokemon: jp TryToRunAwayFromBattle ForcePlayerMonChoice: - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadStandardMenuHeader call SetUpBattlePartyMenu_NoLoop call ForcePickPartyMonInBattle @@ -2762,7 +2762,7 @@ ForcePlayerMonChoice: call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap call SetPlayerTurn call SpikesDamage @@ -2783,7 +2783,7 @@ PlayerPartyMonEntrance: call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap call SetPlayerTurn jp SpikesDamage @@ -2856,7 +2856,7 @@ SwitchMonAlreadyOut: jr nz, .notout ld hl, BattleText_MonIsAlreadyOut - call StdBattleTextBox + call StdBattleTextbox scf ret @@ -2938,7 +2938,7 @@ LostBattle: ld c, 40 call DelayFrames - call EmptyBattleTextBox + call EmptyBattleTextbox ld c, BATTLETOWERTEXT_WIN_TEXT farcall BattleTowerText call WaitPressAorB_BlinkCursor @@ -2974,7 +2974,7 @@ LostBattle: jr z, .mobile .text - call StdBattleTextBox + call StdBattleTextbox .end scf @@ -3192,7 +3192,7 @@ CheckWhetherSwitchmonIsPredetermined: ret ResetEnemyBattleVars: -; and draw empty TextBox +; and draw empty Textbox xor a ld [wLastPlayerCounterMove], a ld [wLastEnemyCounterMove], a @@ -3205,7 +3205,7 @@ ResetEnemyBattleVars: hlcoord 18, 0 ld a, 8 call SlideBattlePicOut - call EmptyBattleTextBox + call EmptyBattleTextbox jp LoadStandardMenuHeader ResetBattleParticipants: @@ -3480,7 +3480,7 @@ OfferSwitch: push af callfar Battle_GetTrainerName ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon - call StdBattleTextBox + call StdBattleTextbox lb bc, 1, 7 call PlaceYesNoBox ld a, [wMenuCursorY] @@ -3529,7 +3529,7 @@ ClearEnemyMonBox: Function_BattleTextEnemySentOut: callfar Battle_GetTrainerName ld hl, BattleText_EnemySentOut - call StdBattleTextBox + call StdBattleTextbox jp WaitBGMap Function_SetEnemyMonAndSendOutAnimation: @@ -3657,7 +3657,7 @@ CheckIfCurPartyMonIsFitToFight: ld hl, BattleText_TheresNoWillToBattle .print_textbox - call StdBattleTextBox + call StdBattleTextbox .finish_fail xor a @@ -3710,7 +3710,7 @@ TryToRunAwayFromBattle: call SetPlayerTurn call GetItemName ld hl, BattleText_UserFledUsingAStringBuffer1 - call StdBattleTextBox + call StdBattleTextbox jp .can_escape .no_flee_item @@ -3788,7 +3788,7 @@ TryToRunAwayFromBattle: ld hl, BattleText_TheresNoEscapeFromTrainerBattle .print_inescapable_text - call StdBattleTextBox + call StdBattleTextbox ld a, TRUE ld [wFailedToFlee], a call LoadTileMapToTempTileMap @@ -3831,7 +3831,7 @@ TryToRunAwayFromBattle: pop de call WaitSFX ld hl, BattleText_GotAwaySafely - call StdBattleTextBox + call StdBattleTextbox call WaitSFX call LoadTileMapToTempTileMap scf @@ -3843,7 +3843,7 @@ TryToRunAwayFromBattle: bit 4, [hl] jr nz, .skip_link_error ld hl, BattleText_LinkErrorBattleCanceled - call StdBattleTextBox + call StdBattleTextbox .skip_link_error call WaitSFX @@ -4000,7 +4000,7 @@ SwitchPlayerMon: call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap ld hl, wEnemyMonHP ld a, [hli] @@ -4124,7 +4124,7 @@ SpikesDamage: push bc ld hl, BattleText_UserHurtBySpikes ; "hurt by SPIKES!" - call StdBattleTextBox + call StdBattleTextbox call GetEighthMaxHP call SubtractHPFromTarget @@ -4208,7 +4208,7 @@ PursuitSwitch: ld hl, BattleText_EnemyMonFainted .done_fainted - call StdBattleTextBox + call StdBattleTextbox scf ret @@ -4342,13 +4342,13 @@ UseOpponentItem: call GetItemName callfar ConsumeHeldItem ld hl, RecoveredUsingText - jp StdBattleTextBox + jp StdBattleTextbox ItemRecoveryAnim: push hl push de push bc - call EmptyBattleTextBox + call EmptyBattleTextbox ld a, RECOVER ld [wFXAnimID], a call SwitchTurnCore @@ -4439,7 +4439,7 @@ UseConfusionHealingItem: call GetItemName call ItemRecoveryAnim ld hl, BattleText_ItemHealedConfusion - call StdBattleTextBox + call StdBattleTextbox ldh a, [hBattleTurn] and a jr nz, .do_partymon @@ -4518,7 +4518,7 @@ HandleStatBoostingHeldItems: ld [de], a call GetItemName ld hl, BattleText_UsersStringBuffer1Activated - call StdBattleTextBox + call StdBattleTextbox callfar BattleCommand_StatUpMessage ret @@ -4867,9 +4867,9 @@ BattleMenu: jr z, .ok cp BATTLETYPE_TUTORIAL jr z, .ok - call EmptyBattleTextBox + call EmptyBattleTextbox call UpdateBattleHuds - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap .ok @@ -4929,7 +4929,7 @@ LoadBattleMenu2: bit 4, [hl] jr nz, .error ld hl, BattleText_LinkErrorBattleCanceled - call StdBattleTextBox + call StdBattleTextbox ld c, 60 call DelayFrames .error @@ -4989,7 +4989,7 @@ BattleMenu_Pack: .ItemsCantBeUsed: ld hl, BattleText_ItemsCantBeUsedHere - call StdBattleTextBox + call StdBattleTextbox jp BattleMenu .UseItem: @@ -5139,7 +5139,7 @@ TryPlayerSwitch: cp d jr nz, .check_trapped ld hl, BattleText_MonIsAlreadyOut - call StdBattleTextBox + call StdBattleTextbox jp BattleMenuPKMN_Loop .check_trapped @@ -5152,7 +5152,7 @@ TryPlayerSwitch: .trapped ld hl, BattleText_MonCantBeRecalled - call StdBattleTextBox + call StdBattleTextbox jp BattleMenuPKMN_Loop .try_switch @@ -5253,7 +5253,7 @@ BattleMonEntrance: call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap call SetPlayerTurn call SpikesDamage @@ -5277,7 +5277,7 @@ PassedBattleMonEntrance: ld [wApplyStatLevelMultipliersToEnemy], a call ApplyStatLevelMultiplierOnAllStats call SendOutPlayerMon - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap call SetPlayerTurn jp SpikesDamage @@ -5347,7 +5347,7 @@ MoveSelectionScreen: ld b, 4 ld c, 14 .got_dims - call TextBox + call Textbox hlcoord 6, 17 - NUM_MOVES ld a, [wMoveSelectionMenuType] @@ -5507,7 +5507,7 @@ MoveSelectionScreen: ld hl, BattleText_TheresNoPPLeftForThisMove .place_textbox_start_over - call StdBattleTextBox + call StdBattleTextbox call Call_LoadTempTileMapToTileMap jp MoveSelectionScreen @@ -5626,7 +5626,7 @@ MoveInfoBox: hlcoord 0, 8 ld b, 3 ld c, 9 - call TextBox + call Textbox call MobileTextBorder ld a, [wPlayerDisableCount] @@ -5757,7 +5757,7 @@ CheckPlayerHasUsableMoves: .force_struggle ld hl, BattleText_MonHasNoMovesLeft - call StdBattleTextBox + call StdBattleTextbox ld c, 60 call DelayFrames xor a @@ -5770,7 +5770,7 @@ ParseEnemyAction: ld a, [wLinkMode] and a jr z, .not_linked - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap ld a, [wBattlePlayerAction] and a ; BATTLEPLAYERACTION_USEMOVE? @@ -6864,9 +6864,9 @@ Unreferenced_LoadHPExpBarGFX: lb bc, BANK(ExpBarGFX), 8 jp Get2bpp -EmptyBattleTextBox: +EmptyBattleTextbox: ld hl, .empty - jp BattleTextBox + jp BattleTextbox .empty: text_end @@ -7107,7 +7107,7 @@ GiveExperiencePoints: ld hl, wPartyMonNicknames call GetNick ld hl, Text_MonGainedExpPoint - call BattleTextBox + call BattleTextbox ld a, [wStringBuffer2 + 1] ldh [hQuotient + 3], a ld a, [wStringBuffer2] @@ -7267,7 +7267,7 @@ GiveExperiencePoints: callfar ApplyStatusEffectOnPlayerStats callfar BadgeStatBoosts callfar UpdatePlayerHUD - call EmptyBattleTextBox + call EmptyBattleTextbox call LoadTileMapToTempTileMap ld a, $1 ldh [hBGMapMode], a @@ -7283,7 +7283,7 @@ GiveExperiencePoints: call PlaySFX call WaitSFX ld hl, BattleText_StringBuffer1GrewToLevel - call StdBattleTextBox + call StdBattleTextbox call LoadTileMapToTempTileMap .skip_exp_bar_animation @@ -7293,7 +7293,7 @@ GiveExperiencePoints: hlcoord 9, 0 ld b, 10 ld c, 9 - call TextBox + call Textbox hlcoord 11, 1 ld bc, 4 predef PrintTempMonStats @@ -7526,7 +7526,7 @@ AnimateExpBar: farcall AnimateEndOfExpBar call WaitSFX ld hl, BattleText_StringBuffer1GrewToLevel - call StdBattleTextBox + call StdBattleTextbox pop de inc e ld b, $0 @@ -7666,7 +7666,7 @@ SendOutMonText: ld hl, JumpText_YourFoesWeakGetmMon .skip_to_textbox - jp BattleTextBox + jp BattleTextbox JumpText_GoMon: text_far Text_GoMon @@ -7696,7 +7696,7 @@ TextJump_BattleMonNick01: WithdrawMonText: ld hl, .WithdrawMonText - jp BattleTextBox + jp BattleTextbox .WithdrawMonText: text_far Text_BattleMonNickComma @@ -7799,7 +7799,7 @@ Unreferenced_HandleSafariAngerEatingStatus: push hl call Call_LoadTempTileMapToTileMap pop hl - jp StdBattleTextBox + jp StdBattleTextbox FillInExpBar: push hl @@ -8056,7 +8056,7 @@ BattleIntro: set rLCDC_WINDOW_TILEMAP, [hl] ; select 9C00-9FFF xor a ldh [hBGMapMode], a - call EmptyBattleTextBox + call EmptyBattleTextbox hlcoord 9, 7 lb bc, 5, 11 call ClearBox @@ -8336,7 +8336,7 @@ CheckPayDay: ld de, wMoney + 2 call AddBattleMoneyToAccount ld hl, BattleText_PlayerPickedUpPayDayMoney - call StdBattleTextBox + call StdBattleTextbox ld a, [wInBattleTowerBattle] bit 0, a ret z @@ -8901,7 +8901,7 @@ InitBattleDisplay: hlcoord 0, 12 ld b, 4 ld c, 18 - call TextBox + call Textbox farcall MobileTextBorder hlcoord 1, 5 lb bc, 3, 7 @@ -9126,7 +9126,7 @@ BattleStartMessage: push hl farcall BattleStart_TrainerHuds pop hl - call StdBattleTextBox + call StdBattleTextbox call IsMobileBattle2 ret nz diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 370818b09..eefb1debe 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -141,7 +141,7 @@ CheckPlayerTurn: res SUBSTATUS_RECHARGE, [hl] ld hl, MustRechargeText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -165,7 +165,7 @@ CheckPlayerTurn: .woke_up ld hl, WokeUpText - call StdBattleTextBox + call StdBattleTextbox call CantMove call UpdateBattleMonInParty ld hl, UpdatePlayerHUD @@ -178,7 +178,7 @@ CheckPlayerTurn: .fast_asleep ld hl, FastAsleepText - call StdBattleTextBox + call StdBattleTextbox ; Snore and Sleep Talk bypass sleep. ld a, [wCurPlayerMove] @@ -204,7 +204,7 @@ CheckPlayerTurn: jr z, .not_frozen ld hl, FrozenSolidText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -217,7 +217,7 @@ CheckPlayerTurn: res SUBSTATUS_FLINCHED, [hl] ld hl, FlinchedText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -237,7 +237,7 @@ CheckPlayerTurn: ld [hl], a ld [wDisabledMove], a ld hl, DisabledNoMoreText - call StdBattleTextBox + call StdBattleTextbox .not_disabled @@ -251,12 +251,12 @@ CheckPlayerTurn: ld hl, wPlayerSubStatus3 res SUBSTATUS_CONFUSED, [hl] ld hl, ConfusedNoMoreText - call StdBattleTextBox + call StdBattleTextbox jr .not_confused .confused ld hl, IsConfusedText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wNumHits], a ld de, ANIM_CONFUSED @@ -284,7 +284,7 @@ CheckPlayerTurn: jr nc, .not_infatuated ld hl, InLoveWithText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wNumHits], a ld de, ANIM_IN_LOVE @@ -296,7 +296,7 @@ CheckPlayerTurn: jr c, .not_infatuated ld hl, InfatuationText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -328,7 +328,7 @@ CheckPlayerTurn: ret nc ld hl, FullyParalyzedText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -370,7 +370,7 @@ CheckEnemyTurn: res SUBSTATUS_RECHARGE, [hl] ld hl, MustRechargeText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -387,7 +387,7 @@ CheckEnemyTurn: jr z, .woke_up ld hl, FastAsleepText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wNumHits], a ld de, ANIM_SLP @@ -396,7 +396,7 @@ CheckEnemyTurn: .woke_up ld hl, WokeUpText - call StdBattleTextBox + call StdBattleTextbox call CantMove call UpdateEnemyMonInParty ld hl, UpdateEnemyHUD @@ -431,7 +431,7 @@ CheckEnemyTurn: jr z, .not_frozen ld hl, FrozenSolidText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -443,7 +443,7 @@ CheckEnemyTurn: res SUBSTATUS_FLINCHED, [hl] ld hl, FlinchedText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -464,7 +464,7 @@ CheckEnemyTurn: ld [wEnemyDisabledMove], a ld hl, DisabledNoMoreText - call StdBattleTextBox + call StdBattleTextbox .not_disabled @@ -479,12 +479,12 @@ CheckEnemyTurn: ld hl, wEnemySubStatus3 res SUBSTATUS_CONFUSED, [hl] ld hl, ConfusedNoMoreText - call StdBattleTextBox + call StdBattleTextbox jr .not_confused .confused ld hl, IsConfusedText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wNumHits], a @@ -503,7 +503,7 @@ CheckEnemyTurn: ld [hl], a ld hl, HurtItselfText - call StdBattleTextBox + call StdBattleTextbox call HitSelfInConfusion call BattleCommand_DamageCalc @@ -532,7 +532,7 @@ CheckEnemyTurn: jr nc, .not_infatuated ld hl, InLoveWithText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wNumHits], a ld de, ANIM_IN_LOVE @@ -544,7 +544,7 @@ CheckEnemyTurn: jr c, .not_infatuated ld hl, InfatuationText - call StdBattleTextBox + call StdBattleTextbox call CantMove jp EndTurn @@ -577,7 +577,7 @@ CheckEnemyTurn: ret nc ld hl, FullyParalyzedText - call StdBattleTextBox + call StdBattleTextbox call CantMove ; fallthrough @@ -599,11 +599,11 @@ MoveDisabled: call GetMoveName ld hl, DisabledMoveText - jp StdBattleTextBox + jp StdBattleTextbox HitConfusion: ld hl, HurtItselfText - call StdBattleTextBox + call StdBattleTextbox xor a ld [wCriticalHit], a @@ -768,7 +768,7 @@ BattleCommand_CheckObedience: jr nc, .DoNothing ld hl, WontObeyText - call StdBattleTextBox + call StdBattleTextbox call HitConfusion jp .EndDisobedience @@ -804,7 +804,7 @@ BattleCommand_CheckObedience: ld hl, IgnoredOrdersText .Print: - call StdBattleTextBox + call StdBattleTextbox jp .EndDisobedience .UseInstead: @@ -934,7 +934,7 @@ IgnoreSleepOnly: ; 'ignored orders…sleeping!' ld hl, IgnoredSleepingText - call StdBattleTextBox + call StdBattleTextbox call EndMoveEffect @@ -1077,7 +1077,7 @@ BattleCommand_DoTurn: ; 'but no pp is left for the move' ld hl, NoPPLeftText .print - call StdBattleTextBox + call StdBattleTextbox ld b, 1 ret @@ -1662,7 +1662,7 @@ BattleCommand_CheckHit: ; 'protecting itself!' ld hl, ProtectingItselfText - call StdBattleTextBox + call StdBattleTextbox ld c, 40 call DelayFrames @@ -2181,7 +2181,7 @@ BattleCommand_ApplyDamage: dec a jr nz, .focus_band_text ld hl, EnduredText - jp StdBattleTextBox + jp StdBattleTextbox .focus_band_text call GetOpponentItem @@ -2189,7 +2189,7 @@ BattleCommand_ApplyDamage: ld [wNamedObjectIndexBuffer], a call GetItemName ld hl, HungOnText - jp StdBattleTextBox + jp StdBattleTextbox .update_damage_taken ld a, BATTLE_VARS_SUBSTATUS4_OPP @@ -2270,7 +2270,7 @@ endr ld [hl], a .do_at_least_1_damage ld hl, CrashedText - call StdBattleTextBox + call StdBattleTextbox ld a, $1 ld [wKickCounter], a call LoadMoveAnim @@ -2288,7 +2288,7 @@ FailText_CheckOpponentProtect: ld h, d ld l, e .not_protected - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_BideFailText: ld a, [wAttackMissed] @@ -2318,7 +2318,7 @@ BattleCommand_CriticalText: ld a, [hli] ld h, [hl] ld l, a - call StdBattleTextBox + call StdBattleTextbox xor a ld [wCriticalHit], a @@ -2365,7 +2365,7 @@ BattleCommand_SuperEffectiveText: jr nc, .print ld hl, NotVeryEffectiveText .print - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_CheckFaint: ; checkfaint @@ -2391,7 +2391,7 @@ BattleCommand_CheckFaint: jr z, .no_dbond ld hl, TookDownWithItText - call StdBattleTextBox + call StdBattleTextbox ldh a, [hBattleTurn] and a @@ -2484,7 +2484,7 @@ BattleCommand_BuildOpponentRage: call BattleCommand_SwitchTurn ld hl, RageBuildingText - call StdBattleTextBox + call StdBattleTextbox jp BattleCommand_SwitchTurn BattleCommand_RageDamage: @@ -3522,7 +3522,7 @@ DoPlayerDamage: DoSubstituteDamage: ld hl, SubTookDamageText - call StdBattleTextBox + call StdBattleTextbox ld de, wEnemySubstituteHP ldh a, [hBattleTurn] @@ -3548,7 +3548,7 @@ DoSubstituteDamage: res SUBSTATUS_SUBSTITUTE, [hl] ld hl, SubFadedText - call StdBattleTextBox + call StdBattleTextbox call BattleCommand_SwitchTurn call BattleCommand_LowerSubNoAnim @@ -3651,7 +3651,7 @@ BattleCommand_SleepTarget: call RefreshBattleHuds ld hl, FellAsleepText - call StdBattleTextBox + call StdBattleTextbox farcall UseHeldStatusHealingItem @@ -3662,7 +3662,7 @@ BattleCommand_SleepTarget: push hl call AnimateFailedMove pop hl - jp StdBattleTextBox + jp StdBattleTextbox .CheckAIRandomFail: ; Enemy turn @@ -3722,7 +3722,7 @@ BattleCommand_PoisonTarget: call RefreshBattleHuds ld hl, WasPoisonedText - call StdBattleTextBox + call StdBattleTextbox farcall UseHeldStatusHealingItem ret @@ -3793,7 +3793,7 @@ BattleCommand_Poison: call .apply_poison ld hl, WasPoisonedText - call StdBattleTextBox + call StdBattleTextbox jr .finished .toxic @@ -3803,7 +3803,7 @@ BattleCommand_Poison: call .apply_poison ld hl, BadlyPoisonedText - call StdBattleTextBox + call StdBattleTextbox .finished farcall UseHeldStatusHealingItem @@ -3813,7 +3813,7 @@ BattleCommand_Poison: push hl call AnimateFailedMove pop hl - jp StdBattleTextBox + jp StdBattleTextbox .apply_poison call AnimateCurrentMove @@ -3859,13 +3859,13 @@ BattleCommand_DrainTarget: ; draintarget call SapHealth ld hl, SuckedHealthText - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_EatDream: ; eatdream call SapHealth ld hl, DreamEatenText - jp StdBattleTextBox + jp StdBattleTextbox SapHealth: ; Divide damage by 2, store it in hDividend @@ -3996,7 +3996,7 @@ BattleCommand_BurnTarget: call RefreshBattleHuds ld hl, WasBurnedText - call StdBattleTextBox + call StdBattleTextbox farcall UseHeldStatusHealingItem ret @@ -4024,7 +4024,7 @@ Defrost: call UpdateOpponentInParty ld hl, DefrostedOpponentText - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_FreezeTarget: ; freezetarget @@ -4063,7 +4063,7 @@ BattleCommand_FreezeTarget: call RefreshBattleHuds ld hl, WasFrozenText - call StdBattleTextBox + call StdBattleTextbox farcall UseHeldStatusHealingItem ret nz @@ -4543,7 +4543,7 @@ BattleCommand_StatUpMessage: inc b call GetStatName ld hl, .stat - jp BattleTextBox + jp BattleTextbox .stat text_far UnknownText_0x1c0cc6 @@ -4573,7 +4573,7 @@ BattleCommand_StatDownMessage: inc b call GetStatName ld hl, .stat - jp BattleTextBox + jp BattleTextbox .stat text_far UnknownText_0x1c0ceb @@ -4652,7 +4652,7 @@ BattleCommand_StatUpFailText: inc b call GetStatName ld hl, WontRiseAnymoreText - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_StatDownFailText: ; statdownfailtext @@ -4666,14 +4666,14 @@ BattleCommand_StatDownFailText: jp z, TryPrintButItFailed dec a ld hl, ProtectedByMistText - jp z, StdBattleTextBox + jp z, StdBattleTextbox ld a, [wLoweredStat] and $f ld b, a inc b call GetStatName ld hl, WontDropAnymoreText - jp StdBattleTextBox + jp StdBattleTextbox GetStatName: ld hl, StatNames @@ -5129,7 +5129,7 @@ BattleCommand_ForceSwitch: callfar ForceEnemySwitch ld hl, DraggedOutText - call StdBattleTextBox + call StdBattleTextbox ld hl, SpikesDamage jp CallBattleCore @@ -5226,7 +5226,7 @@ BattleCommand_ForceSwitch: call CallBattleCore ld hl, DraggedOutText - call StdBattleTextBox + call StdBattleTextbox ld hl, SpikesDamage jp CallBattleCore @@ -5252,7 +5252,7 @@ BattleCommand_ForceSwitch: jr z, .do_text ld hl, BlownAwayText .do_text - jp StdBattleTextBox + jp StdBattleTextbox CheckPlayerHasMonToSwitchTo: ld a, [wPartyCount] @@ -5393,7 +5393,7 @@ BattleCommand_EndLoop: call GetBattleVar cp EFFECT_BEAT_UP jr z, .beat_up_2 - call StdBattleTextBox + call StdBattleTextbox .beat_up_2 pop bc @@ -5582,7 +5582,7 @@ BattleCommand_Charge: ld hl, IgnoredOrders2Text ld a, [wAlreadyDisobeyed] and a - call nz, StdBattleTextBox + call nz, StdBattleTextbox call BattleCommand_LowerSub xor a @@ -5631,7 +5631,7 @@ BattleCommand_Charge: call ResetDamage ld hl, .UsedText - call BattleTextBox + call BattleTextbox ld a, BATTLE_VARS_MOVE_EFFECT call GetBattleVar @@ -5752,7 +5752,7 @@ BattleCommand_TrapTarget: ld a, [hli] ld h, [hl] ld l, a - jp StdBattleTextBox + jp StdBattleTextbox .Traps: dbw BIND, UsedBindText ; 'used BIND on' @@ -5827,7 +5827,7 @@ BattleCommand_Recoil: predef AnimateHPBar call RefreshBattleHuds ld hl, RecoilText - jp StdBattleTextBox + jp StdBattleTextbox BattleCommand_ConfuseTarget: ; confusetarget @@ -5861,7 +5861,7 @@ BattleCommand_Confuse: call GetItemName call AnimateFailedMove ld hl, ProtectedByText - jp StdBattleTextBox + jp StdBattleTextbox .no_item_protection ld a, BATTLE_VARS_SUBSTATUS3_OPP @@ -5870,7 +5870,7 @@ BattleCommand_Confuse: jr z, .not_already_confused call AnimateFailedMove ld hl, AlreadyConfusedText - jp StdBattleTextBox + jp StdBattleTextbox .not_already_confused call CheckSubstituteOpp @@ -5909,7 +5909,7 @@ BattleCommand_FinishConfusingTarget: call PlayOpponentBattleAnim ld hl, BecameConfusedText - call StdBattleTextBox + call StdBattleTextbox call GetOpponentItem ld a, b @@ -5951,7 +5951,7 @@ BattleCommand_Paralyze: call GetItemName call AnimateFailedMove ld hl, ProtectedByText - jp StdBattleTextBox + jp StdBattleTextbox .no_item_protection ldh a, [hBattleTurn] @@ -6003,7 +6003,7 @@ BattleCommand_Paralyze: .paralyzed call AnimateFailedMove ld hl, AlreadyParalyzedText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp PrintDidntAffect2 @@ -6131,7 +6131,7 @@ BattleCommand_ResetStats: call AnimateCurrentMove ld hl, EliminatedStatsText - jp StdBattleTextBox + jp StdBattleTextbox .Fill: ld b, wPlayerStatLevelsEnd - wPlayerStatLevels @@ -6184,7 +6184,7 @@ BattleCommand_Heal: jr z, .no_status_to_heal ld hl, RestedText .no_status_to_heal - call StdBattleTextBox + call StdBattleTextbox ldh a, [hBattleTurn] and a jr nz, .calc_enemy_stats @@ -6216,12 +6216,12 @@ BattleCommand_Heal: call UpdateUserInParty call RefreshBattleHuds ld hl, RegainedHealthText - jp StdBattleTextBox + jp StdBattleTextbox .hp_full call AnimateFailedMove ld hl, HPIsFullText - jp StdBattleTextBox + jp StdBattleTextbox INCLUDE "engine/battle/move_effects/transform.asm" @@ -6296,7 +6296,7 @@ BattleCommand_Screen: .good call AnimateCurrentMove - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove @@ -6305,12 +6305,12 @@ BattleCommand_Screen: PrintDoesntAffect: ; 'it doesn't affect' ld hl, DoesntAffectText - jp StdBattleTextBox + jp StdBattleTextbox PrintNothingHappened: ; 'but nothing happened!' ld hl, NothingHappenedText - jp StdBattleTextBox + jp StdBattleTextbox TryPrintButItFailed: ld a, [wAlreadyFailed] @@ -6322,7 +6322,7 @@ TryPrintButItFailed: PrintButItFailed: ; 'but it failed!' ld hl, ButItFailedText - jp StdBattleTextBox + jp StdBattleTextbox FailMove: call AnimateFailedMove @@ -6336,7 +6336,7 @@ FailMimic: PrintDidntAffect: ; 'it didn't affect' ld hl, DidntAffect1Text - jp StdBattleTextBox + jp StdBattleTextbox PrintDidntAffect2: call AnimateFailedMove @@ -6347,7 +6347,7 @@ PrintDidntAffect2: PrintParalyze: ; 'paralyzed! maybe it can't attack!' ld hl, ParalyzedText - jp StdBattleTextBox + jp StdBattleTextbox CheckSubstituteOpp: ld a, BATTLE_VARS_SUBSTATUS4_OPP @@ -6421,7 +6421,7 @@ BattleCommand_ArenaTrap: set SUBSTATUS_CANT_RUN, [hl] call AnimateCurrentMove ld hl, CantEscapeNowText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove @@ -6458,7 +6458,7 @@ BattleCommand_Defrost: .done call RefreshBattleHuds ld hl, WasDefrostedText - jp StdBattleTextBox + jp StdBattleTextbox INCLUDE "engine/battle/move_effects/curse.asm" @@ -6519,7 +6519,7 @@ BattleCommand_CheckSafeguard: ld [wAttackMissed], a call BattleCommand_MoveDelay ld hl, SafeguardProtectText - call StdBattleTextBox + call StdBattleTextbox jp EndMoveEffect INCLUDE "engine/battle/move_effects/magnitude.asm" @@ -6612,14 +6612,14 @@ BattleCommand_TimeBasedHealContinue: ; 'regained health!' ld hl, RegainedHealthText - jp StdBattleTextBox + jp StdBattleTextbox .Full: call AnimateFailedMove ; 'hp is full!' ld hl, HPIsFullText - jp StdBattleTextBox + jp StdBattleTextbox .Multipliers: dw GetEighthMaxHP @@ -6845,7 +6845,7 @@ BattleCommand_ClearText: ; Used in multi-hit moves. ld hl, .text - jp BattleTextBox + jp BattleTextbox .text: text_end diff --git a/engine/battle/move_effects/attract.asm b/engine/battle/move_effects/attract.asm index bb7b4fce4..5eb82d65e 100644 --- a/engine/battle/move_effects/attract.asm +++ b/engine/battle/move_effects/attract.asm @@ -17,7 +17,7 @@ BattleCommand_Attract: ; 'fell in love!' ld hl, FellInLoveText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp FailMove diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm index bd0307f40..73bbb2e42 100644 --- a/engine/battle/move_effects/beat_up.asm +++ b/engine/battle/move_effects/beat_up.asm @@ -52,7 +52,7 @@ BattleCommand_BeatUp: ld a, $1 ld [wBeatUpHitAtLeastOnce], a ld hl, BeatUpAttackText - call StdBattleTextBox + call StdBattleTextbox ld a, [wEnemyMonSpecies] ld [wCurSpecies], a @@ -159,12 +159,12 @@ BattleCommand_BeatUp: ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, BeatUpAttackText - call StdBattleTextBox + call StdBattleTextbox jp EnemyAttackDamage .finish_beatup ld hl, BeatUpAttackText - call StdBattleTextBox + call StdBattleTextbox ld a, [wBattleMonSpecies] ld [wCurSpecies], a diff --git a/engine/battle/move_effects/belly_drum.asm b/engine/battle/move_effects/belly_drum.asm index 27ef1a542..ac415f576 100644 --- a/engine/battle/move_effects/belly_drum.asm +++ b/engine/battle/move_effects/belly_drum.asm @@ -27,7 +27,7 @@ BattleCommand_BellyDrum: jr nz, .max_attack_loop ld hl, BellyDrumText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove diff --git a/engine/battle/move_effects/bide.asm b/engine/battle/move_effects/bide.asm index cfb3f3ab2..74f7c9cfa 100644 --- a/engine/battle/move_effects/bide.asm +++ b/engine/battle/move_effects/bide.asm @@ -20,7 +20,7 @@ BattleCommand_StoreEnergy: res SUBSTATUS_BIDE, [hl] ld hl, UnleashedEnergyText - call StdBattleTextBox + call StdBattleTextbox ld a, BATTLE_VARS_MOVE_POWER call GetBattleVarAddr @@ -66,7 +66,7 @@ BattleCommand_StoreEnergy: .still_storing ld hl, StoringEnergyText - call StdBattleTextBox + call StdBattleTextbox jp EndMoveEffect BattleCommand_UnleashEnergy: diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm index 4b13f29dd..eaa3d6c9c 100644 --- a/engine/battle/move_effects/conversion.asm +++ b/engine/battle/move_effects/conversion.asm @@ -93,4 +93,4 @@ BattleCommand_Conversion: farcall GetTypeName call AnimateCurrentMove ld hl, TransformedTypeText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm index d67725f9c..802b57b53 100644 --- a/engine/battle/move_effects/conversion2.asm +++ b/engine/battle/move_effects/conversion2.asm @@ -58,7 +58,7 @@ BattleCommand_Conversion2: ld [wNamedObjectIndexBuffer], a predef GetTypeName ld hl, TransformedTypeText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp FailMove diff --git a/engine/battle/move_effects/curse.asm b/engine/battle/move_effects/curse.asm index fb59d9b67..3507c6687 100644 --- a/engine/battle/move_effects/curse.asm +++ b/engine/battle/move_effects/curse.asm @@ -76,7 +76,7 @@ BattleCommand_Curse: call CallBattleCore call UpdateUserInParty ld hl, PutACurseText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove @@ -90,4 +90,4 @@ BattleCommand_Curse: call GetStatName call AnimateFailedMove ld hl, WontRiseAnymoreText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/destiny_bond.asm b/engine/battle/move_effects/destiny_bond.asm index 55809d98a..6a03b9a76 100644 --- a/engine/battle/move_effects/destiny_bond.asm +++ b/engine/battle/move_effects/destiny_bond.asm @@ -6,4 +6,4 @@ BattleCommand_DestinyBond: set SUBSTATUS_DESTINY_BOND, [hl] call AnimateCurrentMove ld hl, DestinyBondEffectText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/disable.asm b/engine/battle/move_effects/disable.asm index 7f5cfaea0..de6dbc60f 100644 --- a/engine/battle/move_effects/disable.asm +++ b/engine/battle/move_effects/disable.asm @@ -66,7 +66,7 @@ BattleCommand_Disable: ld [wNamedObjectIndexBuffer], a call GetMoveName ld hl, WasDisabledText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp FailMove diff --git a/engine/battle/move_effects/encore.asm b/engine/battle/move_effects/encore.asm index 3ac107e2b..8ca3595f3 100644 --- a/engine/battle/move_effects/encore.asm +++ b/engine/battle/move_effects/encore.asm @@ -114,7 +114,7 @@ BattleCommand_Encore: .finish_move call AnimateCurrentMove ld hl, GotAnEncoreText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp PrintDidntAffect2 diff --git a/engine/battle/move_effects/endure.asm b/engine/battle/move_effects/endure.asm index f0555a737..00ccb130c 100644 --- a/engine/battle/move_effects/endure.asm +++ b/engine/battle/move_effects/endure.asm @@ -13,4 +13,4 @@ BattleCommand_Endure: call AnimateCurrentMove ld hl, BracedItselfText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/focus_energy.asm b/engine/battle/move_effects/focus_energy.asm index ffdc7b136..c4eb1f334 100644 --- a/engine/battle/move_effects/focus_energy.asm +++ b/engine/battle/move_effects/focus_energy.asm @@ -8,7 +8,7 @@ BattleCommand_FocusEnergy: set SUBSTATUS_FOCUS_ENERGY, [hl] call AnimateCurrentMove ld hl, GettingPumpedText - jp StdBattleTextBox + jp StdBattleTextbox .already_pumped call AnimateFailedMove diff --git a/engine/battle/move_effects/foresight.asm b/engine/battle/move_effects/foresight.asm index 4235e0878..ff25b04eb 100644 --- a/engine/battle/move_effects/foresight.asm +++ b/engine/battle/move_effects/foresight.asm @@ -16,7 +16,7 @@ BattleCommand_Foresight: set SUBSTATUS_IDENTIFIED, [hl] call AnimateCurrentMove ld hl, IdentifiedText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp FailMove diff --git a/engine/battle/move_effects/future_sight.asm b/engine/battle/move_effects/future_sight.asm index 0cb0b43ba..129a9e08f 100644 --- a/engine/battle/move_effects/future_sight.asm +++ b/engine/battle/move_effects/future_sight.asm @@ -54,7 +54,7 @@ BattleCommand_FutureSight: call BattleCommand_LowerSub call BattleCommand_MoveDelay ld hl, ForesawAttackText - call StdBattleTextBox + call StdBattleTextbox call BattleCommand_RaiseSub ld de, wPlayerFutureSightDamage ldh a, [hBattleTurn] diff --git a/engine/battle/move_effects/heal_bell.asm b/engine/battle/move_effects/heal_bell.asm index a9923429e..62309f1db 100644 --- a/engine/battle/move_effects/heal_bell.asm +++ b/engine/battle/move_effects/heal_bell.asm @@ -26,7 +26,7 @@ BattleCommand_HealBell: call AnimateCurrentMove ld hl, BellChimedText - call StdBattleTextBox + call StdBattleTextbox ldh a, [hBattleTurn] and a diff --git a/engine/battle/move_effects/leech_seed.asm b/engine/battle/move_effects/leech_seed.asm index 7cb14c27c..bb17ee00c 100644 --- a/engine/battle/move_effects/leech_seed.asm +++ b/engine/battle/move_effects/leech_seed.asm @@ -28,7 +28,7 @@ BattleCommand_LeechSeed: set SUBSTATUS_LEECH_SEED, [hl] call AnimateCurrentMove ld hl, WasSeededText - jp StdBattleTextBox + jp StdBattleTextbox .grass call AnimateFailedMove @@ -37,4 +37,4 @@ BattleCommand_LeechSeed: .evaded call AnimateFailedMove ld hl, EvadedText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/lock_on.asm b/engine/battle/move_effects/lock_on.asm index 7dc4a013d..1de3e14ba 100644 --- a/engine/battle/move_effects/lock_on.asm +++ b/engine/battle/move_effects/lock_on.asm @@ -14,7 +14,7 @@ BattleCommand_LockOn: call AnimateCurrentMove ld hl, TookAimText - jp StdBattleTextBox + jp StdBattleTextbox .fail call AnimateFailedMove diff --git a/engine/battle/move_effects/magnitude.asm b/engine/battle/move_effects/magnitude.asm index eaa0c2a3a..f8961b668 100644 --- a/engine/battle/move_effects/magnitude.asm +++ b/engine/battle/move_effects/magnitude.asm @@ -21,7 +21,7 @@ BattleCommand_GetMagnitude: ld [wDeciramBuffer], a call BattleCommand_MoveDelay ld hl, MagnitudeText - call StdBattleTextBox + call StdBattleTextbox pop de pop bc ret diff --git a/engine/battle/move_effects/mimic.asm b/engine/battle/move_effects/mimic.asm index 30b531572..e4b99377f 100644 --- a/engine/battle/move_effects/mimic.asm +++ b/engine/battle/move_effects/mimic.asm @@ -44,7 +44,7 @@ BattleCommand_Mimic: call GetMoveName call AnimateCurrentMove ld hl, LearnedMoveText - jp StdBattleTextBox + jp StdBattleTextbox .fail jp FailMimic diff --git a/engine/battle/move_effects/mirror_move.asm b/engine/battle/move_effects/mirror_move.asm index 89879c825..98e8aacc9 100644 --- a/engine/battle/move_effects/mirror_move.asm +++ b/engine/battle/move_effects/mirror_move.asm @@ -18,7 +18,7 @@ BattleCommand_MirrorMove: call AnimateFailedMove ld hl, MirrorMoveFailedText - call StdBattleTextBox + call StdBattleTextbox jp EndMoveEffect .use diff --git a/engine/battle/move_effects/mist.asm b/engine/battle/move_effects/mist.asm index 199a30045..26fafdd2d 100644 --- a/engine/battle/move_effects/mist.asm +++ b/engine/battle/move_effects/mist.asm @@ -8,7 +8,7 @@ BattleCommand_Mist: set SUBSTATUS_MIST, [hl] call AnimateCurrentMove ld hl, MistText - jp StdBattleTextBox + jp StdBattleTextbox .already_mist call AnimateFailedMove diff --git a/engine/battle/move_effects/nightmare.asm b/engine/battle/move_effects/nightmare.asm index dd85c722d..9354b15bb 100644 --- a/engine/battle/move_effects/nightmare.asm +++ b/engine/battle/move_effects/nightmare.asm @@ -30,7 +30,7 @@ BattleCommand_Nightmare: set SUBSTATUS_NIGHTMARE, [hl] call AnimateCurrentMove ld hl, StartedNightmareText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove diff --git a/engine/battle/move_effects/pain_split.asm b/engine/battle/move_effects/pain_split.asm index 4e4380b23..3c521975d 100644 --- a/engine/battle/move_effects/pain_split.asm +++ b/engine/battle/move_effects/pain_split.asm @@ -32,7 +32,7 @@ BattleCommand_PainSplit: farcall _UpdateBattleHUDs ld hl, SharedPainText - jp StdBattleTextBox + jp StdBattleTextbox .PlayerShareHP: ld a, [hld] diff --git a/engine/battle/move_effects/pay_day.asm b/engine/battle/move_effects/pay_day.asm index 9f59dbb08..5f857aea5 100644 --- a/engine/battle/move_effects/pay_day.asm +++ b/engine/battle/move_effects/pay_day.asm @@ -23,4 +23,4 @@ BattleCommand_PayDay: inc [hl] .done ld hl, CoinsScatteredText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/perish_song.asm b/engine/battle/move_effects/perish_song.asm index 4df52cc1c..1758b65a0 100644 --- a/engine/battle/move_effects/perish_song.asm +++ b/engine/battle/move_effects/perish_song.asm @@ -31,7 +31,7 @@ BattleCommand_PerishSong: .done call AnimateCurrentMove ld hl, StartPerishText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm index bfc334cc7..188c4e889 100644 --- a/engine/battle/move_effects/present.asm +++ b/engine/battle/move_effects/present.asm @@ -70,7 +70,7 @@ BattleCommand_Present: call CallBattleCore call BattleCommand_SwitchTurn ld hl, RegainedHealthText - call StdBattleTextBox + call StdBattleTextbox call BattleCommand_SwitchTurn call UpdateOpponentInParty jr .do_animation @@ -81,7 +81,7 @@ BattleCommand_Present: jr nc, .do_animation call AnimateFailedMove ld hl, RefusedGiftText - call StdBattleTextBox + call StdBattleTextbox .do_animation jp EndMoveEffect diff --git a/engine/battle/move_effects/protect.asm b/engine/battle/move_effects/protect.asm index 1e540923d..e66bce443 100644 --- a/engine/battle/move_effects/protect.asm +++ b/engine/battle/move_effects/protect.asm @@ -10,7 +10,7 @@ BattleCommand_Protect: call AnimateCurrentMove ld hl, ProtectedItselfText - jp StdBattleTextBox + jp StdBattleTextbox ProtectChance: ld de, wPlayerProtectCount diff --git a/engine/battle/move_effects/psych_up.asm b/engine/battle/move_effects/psych_up.asm index c32316ccd..1bf9f3e6f 100644 --- a/engine/battle/move_effects/psych_up.asm +++ b/engine/battle/move_effects/psych_up.asm @@ -46,4 +46,4 @@ BattleCommand_PsychUp: .merge call AnimateCurrentMove ld hl, CopiedStatsText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/rain_dance.asm b/engine/battle/move_effects/rain_dance.asm index e9ef5d123..c22fb9fdb 100644 --- a/engine/battle/move_effects/rain_dance.asm +++ b/engine/battle/move_effects/rain_dance.asm @@ -6,4 +6,4 @@ BattleCommand_StartRain: ld [wWeatherCount], a call AnimateCurrentMove ld hl, DownpourText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/rapid_spin.asm b/engine/battle/move_effects/rapid_spin.asm index 6e40726db..eb396a35d 100644 --- a/engine/battle/move_effects/rapid_spin.asm +++ b/engine/battle/move_effects/rapid_spin.asm @@ -7,7 +7,7 @@ BattleCommand_ClearHazards: jr z, .not_leeched res SUBSTATUS_LEECH_SEED, [hl] ld hl, ShedLeechSeedText - call StdBattleTextBox + call StdBattleTextbox .not_leeched ld hl, wPlayerScreens @@ -23,7 +23,7 @@ BattleCommand_ClearHazards: res SCREENS_SPIKES, [hl] ld hl, BlewSpikesText push de - call StdBattleTextBox + call StdBattleTextbox pop de .no_spikes @@ -33,4 +33,4 @@ BattleCommand_ClearHazards: xor a ld [de], a ld hl, ReleasedByText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/safeguard.asm b/engine/battle/move_effects/safeguard.asm index cb5a4857e..e64e80921 100644 --- a/engine/battle/move_effects/safeguard.asm +++ b/engine/battle/move_effects/safeguard.asm @@ -16,7 +16,7 @@ BattleCommand_Safeguard: ld [de], a call AnimateCurrentMove ld hl, CoveredByVeilText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove diff --git a/engine/battle/move_effects/sandstorm.asm b/engine/battle/move_effects/sandstorm.asm index 77d6e24b5..c88529fb1 100644 --- a/engine/battle/move_effects/sandstorm.asm +++ b/engine/battle/move_effects/sandstorm.asm @@ -11,7 +11,7 @@ BattleCommand_StartSandstorm: ld [wWeatherCount], a call AnimateCurrentMove ld hl, SandstormBrewedText - jp StdBattleTextBox + jp StdBattleTextbox .failed call AnimateFailedMove diff --git a/engine/battle/move_effects/sketch.asm b/engine/battle/move_effects/sketch.asm index 2d9705106..654fb3f54 100644 --- a/engine/battle/move_effects/sketch.asm +++ b/engine/battle/move_effects/sketch.asm @@ -110,7 +110,7 @@ BattleCommand_Sketch: call AnimateCurrentMove ld hl, SketchedText - jp StdBattleTextBox + jp StdBattleTextbox .fail call AnimateFailedMove diff --git a/engine/battle/move_effects/spikes.asm b/engine/battle/move_effects/spikes.asm index c22787d6d..96163a680 100644 --- a/engine/battle/move_effects/spikes.asm +++ b/engine/battle/move_effects/spikes.asm @@ -20,7 +20,7 @@ BattleCommand_Spikes: call AnimateCurrentMove ld hl, SpikesText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp FailMove diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm index 031cdb71f..06627268b 100644 --- a/engine/battle/move_effects/spite.asm +++ b/engine/battle/move_effects/spite.asm @@ -80,7 +80,7 @@ BattleCommand_Spite: ld a, d ld [wDeciramBuffer], a ld hl, SpiteEffectText - jp StdBattleTextBox + jp StdBattleTextbox .failed jp PrintDidntAffect2 diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm index bafd4c460..d2342c0d6 100644 --- a/engine/battle/move_effects/substitute.asm +++ b/engine/battle/move_effects/substitute.asm @@ -71,7 +71,7 @@ BattleCommand_Substitute: call BattleCommand_RaiseSubNoAnim .finish ld hl, MadeSubstituteText - call StdBattleTextBox + call StdBattleTextbox jp RefreshBattleHuds .already_has_sub @@ -85,4 +85,4 @@ BattleCommand_Substitute: call nz, BattleCommand_RaiseSub ld hl, TooWeakSubText .jp_stdbattletextbox - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/sunny_day.asm b/engine/battle/move_effects/sunny_day.asm index f5825930f..0edc38e45 100644 --- a/engine/battle/move_effects/sunny_day.asm +++ b/engine/battle/move_effects/sunny_day.asm @@ -6,4 +6,4 @@ BattleCommand_StartSun: ld [wWeatherCount], a call AnimateCurrentMove ld hl, SunGotBrightText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm index 55eb6675f..1a6aeed41 100644 --- a/engine/battle/move_effects/teleport.asm +++ b/engine/battle/move_effects/teleport.asm @@ -86,4 +86,4 @@ BattleCommand_Teleport: call SetBattleDraw ld hl, FledFromBattleText - jp StdBattleTextBox + jp StdBattleTextbox diff --git a/engine/battle/move_effects/thief.asm b/engine/battle/move_effects/thief.asm index 47270d6c2..e588c5ff7 100644 --- a/engine/battle/move_effects/thief.asm +++ b/engine/battle/move_effects/thief.asm @@ -93,7 +93,7 @@ BattleCommand_Thief: .stole call GetItemName ld hl, StoleText - jp StdBattleTextBox + jp StdBattleTextbox .playeritem ld a, 1 diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm index 509a8d03f..fe94c4f2c 100644 --- a/engine/battle/move_effects/transform.asm +++ b/engine/battle/move_effects/transform.asm @@ -135,7 +135,7 @@ BattleCommand_Transform: ld a, SUBSTITUTE call nz, LoadAnim ld hl, TransformedText - jp StdBattleTextBox + jp StdBattleTextbox BattleSideCopy: ; Copy bc bytes from hl to de if it's the player's turn. diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index 2f0e93b6e..bc55c7423 100644 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -237,7 +237,7 @@ _ShowLinkBattleParticipants: hlcoord 2, 3 ld b, 9 ld c, 14 - call TextBox + call Textbox hlcoord 4, 5 ld de, wPlayerName call PlaceString diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 88522ee32..9fb05ae06 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -1,7 +1,7 @@ DisplayUsedMoveText: ; battle command 03 ld hl, UsedMoveText - call BattleTextBox + call BattleTextbox jp WaitBGMap UsedMoveText: diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 00eb9a4ce..41d87275a 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -1417,7 +1417,7 @@ BattleBGEffect_Tackle: ldh [hLYOverrideEnd], a ld hl, BG_EFFECT_STRUCT_03 add hl, bc - ld [hl], $0 + ld [hl], 0 call BGEffect_CheckBattleTurn jr nz, .player_side ld a, 2 @@ -1451,10 +1451,10 @@ BattleBGEffect_25: ldh [hLYOverrideEnd], a ld hl, BG_EFFECT_STRUCT_03 add hl, bc - ld [hl], $0 + ld [hl], 0 call BGEffect_CheckBattleTurn jr nz, .player_side - ld a, 2 + ld a, 2 jr .okay .player_side @@ -1473,7 +1473,7 @@ Tackle_BGEffect25_2d_one: ld a, [hl] cp -8 jr z, .reached_limit - cp 8 + cp 8 jr nz, .finish .reached_limit call BattleBGEffects_IncrementJumptable diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index dcfe6ae22..bfcbbba5c 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -599,7 +599,7 @@ Unreferenced_Function1704ca: ret Function1704e1: - call SpeechTextBox + call SpeechTextbox call FadeToMenu call InitBattleTowerChallengeRAM call .JumptableLoop diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 0e9ba5fd0..6969bc893 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -12,12 +12,12 @@ DisplayCaughtContestMonStats: hlcoord 0, 0 ld b, 4 ld c, 13 - call TextBox + call Textbox hlcoord 0, 6 ld b, 4 ld c, 13 - call TextBox + call Textbox hlcoord 2, 0 ld de, .Stock diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 71b25bef7..37de3f1b6 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -150,7 +150,7 @@ Elevator_GetCurrentFloorText: hlcoord 0, 0 ld b, 4 ld c, 8 - call TextBox + call Textbox hlcoord 1, 2 ld de, Elevator_CurrentFloorText call PlaceString diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 00b910166..a4350c2f7 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -456,10 +456,10 @@ DisplayHOFMon: call ByteFill hlcoord 0, 0 lb bc, 3, SCREEN_WIDTH - 2 - call TextBox + call Textbox hlcoord 0, 12 lb bc, 4, SCREEN_WIDTH - 2 - call TextBox + call Textbox ld a, [wTempMonSpecies] ld [wCurPartySpecies], a ld [wDeciramBuffer], a @@ -567,10 +567,10 @@ HOF_AnimatePlayerPic: ldh [hBGMapMode], a hlcoord 0, 2 lb bc, 8, 9 - call TextBox + call Textbox hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox hlcoord 2, 4 ld de, wPlayerName call PlaceString diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 94d869dca..cffa17a78 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -432,7 +432,7 @@ Mom_ContinueMenuSetup: ldh [hBGMapMode], a hlcoord 0, 0 lb bc, 6, 18 - call TextBox + call Textbox hlcoord 1, 2 ld de, Mom_SavedString call PlaceString diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 788b0eb92..e74bdf0aa 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -53,7 +53,7 @@ CheckBadge: call CheckEngineFlag ret nc ld hl, .BadgeRequiredText - call MenuTextBoxBackup ; push text to queue + call MenuTextboxBackup ; push text to queue scf ret @@ -109,7 +109,7 @@ CheckPartyMove: FieldMoveFailed: ld hl, .CantUseHere - call MenuTextBoxBackup + call MenuTextboxBackup ret .CantUseHere: @@ -157,7 +157,7 @@ CutFunction: .FailCut: ld hl, Text_NothingToCut - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret @@ -394,13 +394,13 @@ SurfFunction: .FailSurf: ld hl, CantSurfText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret .AlreadySurfing: ld hl, AlreadySurfingText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret @@ -830,7 +830,7 @@ dig_incave cp $2 jr nz, .failescaperope ld hl, .Text_CantUseHere - call MenuTextBox + call MenuTextbox call WaitPressAorB_BlinkCursor call CloseWindow @@ -933,7 +933,7 @@ TeleportFunction: .FailTeleport: ld hl, .Text_CantUseHere - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret @@ -987,7 +987,7 @@ StrengthFunction: .Unreferenced_AlreadyUsing: ld hl, .JumpText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, $80 ret diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 767495592..b899f9323 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -298,7 +298,7 @@ PC_DisplayTextWaitMenu: push af set NO_TEXT_SCROLL, a ld [wOptions], a - call MenuTextBox + call MenuTextbox pop af ld [wOptions], a ret @@ -336,7 +336,7 @@ PlayerWithdrawItemMenu: .askquantity ld hl, .HowManyText - call MenuTextBox + call MenuTextbox farcall SelectQuantityToToss call ExitMenu call ExitMenu @@ -358,7 +358,7 @@ PlayerWithdrawItemMenu: call TossItem predef PartyMonItemName ld hl, .WithdrewText - call MenuTextBox + call MenuTextbox xor a ldh [hBGMapMode], a call ExitMenu @@ -366,7 +366,7 @@ PlayerWithdrawItemMenu: .PackFull: ld hl, .NoRoomText - call MenuTextBoxBackup + call MenuTextboxBackup ret .done @@ -438,7 +438,7 @@ PlayerDepositItemMenu: farcall HasNoItems ret nc ld hl, .NoItemsInBag - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -496,7 +496,7 @@ PlayerDepositItemMenu: .AskQuantity: ld hl, .HowManyText - call MenuTextBox + call MenuTextbox farcall SelectQuantityToToss push af call ExitMenu @@ -562,7 +562,7 @@ PCItemsJoypad: hlcoord 0, 0 ld b, 10 ld c, 18 - call TextBox + call Textbox ld a, [wPCItemsCursor] ld [wMenuCursorBuffer], a ld a, [wPCItemsScrollPosition] @@ -634,7 +634,7 @@ PCItemsJoypad: dba UpdateItemDescription PC_DisplayText: - call MenuTextBox + call MenuTextbox call ExitMenu ret diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 9319ecb3e..176a8725c 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -29,15 +29,15 @@ _UnownPrinter: hlcoord 0, 0 lb bc, 3, 18 - call TextBox + call Textbox hlcoord 0, 5 lb bc, 7, 7 - call TextBox + call Textbox hlcoord 0, 14 lb bc, 2, 18 - call TextBox + call Textbox hlcoord 1, 2 ld de, AlphRuinsStampString diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index 07c14ea01..7954963e6 100644 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -1,6 +1,6 @@ ProfOaksPC: ld hl, OakPCText1 - call MenuTextBox + call MenuTextbox call YesNoBox jr c, .shutdown call ProfOaksPCBoot ; player chose "yes"? diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index 59c8b9ceb..17fd2d493 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -494,9 +494,9 @@ CardFlip_UpdateCoinBalanceDisplay: hlcoord 0, 12 ld b, 4 ld c, SCREEN_WIDTH - 2 - call TextBox + call Textbox pop hl - call PrintTextBoxText + call PrintTextboxText call CardFlip_PrintCoinBalance ret @@ -504,7 +504,7 @@ CardFlip_PrintCoinBalance: hlcoord 9, 15 ld b, 1 ld c, 9 - call TextBox + call Textbox hlcoord 10, 16 ld de, .CoinStr call PlaceString @@ -530,7 +530,7 @@ CardFlip_InitTilemap: call CardFlip_CopyToBox hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox ret CardFlip_FillGreenBox: diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 4a8ee9370..202aca20b 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -1789,7 +1789,7 @@ Slots_AskPlayAgain: .you_have_coins ld hl, .Text_PlayAgain call PrintText - call LoadMenuTextBox + call LoadMenuTextbox lb bc, 14, 12 call PlaceYesNoBox ld a, [wMenuCursorY] diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm index 66ff8cb21..db24dced1 100644 --- a/engine/gfx/load_font.asm +++ b/engine/gfx/load_font.asm @@ -75,7 +75,7 @@ _LoadFontsBattleExtra:: jr LoadFrame LoadFrame: - ld a, [wTextBoxFrame] + ld a, [wTextboxFrame] maskbits NUM_FRAMES ld bc, 6 * LEN_1BPP_TILE ld hl, Frames @@ -86,8 +86,8 @@ LoadFrame: lb bc, BANK(Frames), 6 ; "┌" to "┘" call Get1bpp_2 ld hl, vTiles2 tile " " ; $7f - ld de, TextBoxSpaceGFX - lb bc, BANK(TextBoxSpaceGFX), 1 + ld de, TextboxSpaceGFX + lb bc, BANK(TextboxSpaceGFX), 1 call Get1bpp_2 ret diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index fe5ec5663..35c20db70 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1357,7 +1357,7 @@ RareCandyEffect: hlcoord 9, 0 ld b, 10 ld c, 9 - call TextBox + call Textbox hlcoord 11, 1 ld bc, 4 @@ -1632,7 +1632,7 @@ BitterBerryEffect: call UseItemText ld hl, ConfusedNoMoreText - call StdBattleTextBox + call StdBattleTextbox ld a, 0 @@ -2056,7 +2056,7 @@ Softboiled_MilkDrinkFunction: .cant_use push bc ld hl, .Text_CantBeUsed - call MenuTextBoxBackup + call MenuTextboxBackup pop bc jr .loop @@ -2266,7 +2266,7 @@ PokeFluteEffect: BlueCardEffect: ld hl, .bluecardtext - jp MenuTextBoxWaitButton + jp MenuTextboxWaitButton .bluecardtext text_far UnknownText_0x1c5c5e @@ -2274,7 +2274,7 @@ BlueCardEffect: CoinCaseEffect: ld hl, .coincasetext - jp MenuTextBoxWaitButton + jp MenuTextboxWaitButton .coincasetext text_far UnknownText_0x1c5c7b diff --git a/engine/items/mart.asm b/engine/items/mart.asm index ef06c4d11..6341e9e6e 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -35,10 +35,10 @@ HerbShop: call FarReadMart call LoadStandardMenuHeader ld hl, Text_HerbShop_Intro - call MartTextBox + call MartTextbox call BuyMenu ld hl, Text_HerbShop_ComeAgain - call MartTextBox + call MartTextbox ret BargainShop: @@ -48,7 +48,7 @@ BargainShop: call ReadMart call LoadStandardMenuHeader ld hl, Text_BargainShop_Intro - call MartTextBox + call MartTextbox call BuyMenu ld hl, wBargainShopFlags ld a, [hli] @@ -59,17 +59,17 @@ BargainShop: .skip_set ld hl, Text_BargainShop_ComeAgain - call MartTextBox + call MartTextbox ret Pharmacist: call FarReadMart call LoadStandardMenuHeader ld hl, Text_Pharmacist_Intro - call MartTextBox + call MartTextbox call BuyMenu ld hl, Text_Pharmacist_ComeAgain - call MartTextBox + call MartTextbox ret RooftopSale: @@ -86,10 +86,10 @@ RooftopSale: call ReadMart call LoadStandardMenuHeader ld hl, Text_Mart_HowMayIHelpYou - call MartTextBox + call MartTextbox call BuyMenu ld hl, Text_Mart_ComeAgain - call MartTextBox + call MartTextbox ret INCLUDE "data/items/rooftop_sale.asm" @@ -203,7 +203,7 @@ StandardMart: .Quit: call ExitMenu ld hl, Text_Mart_ComeAgain - call MartTextBox + call MartTextbox ld a, STANDARDMART_EXIT ret @@ -440,7 +440,7 @@ BuyMenuLoop: ld [wMenuScrollPositionBackup], a ld a, [wMenuCursorY] ld [wMenuCursorBufferBackup], a - call SpeechTextBox + call SpeechTextbox ld a, [wMenuJoypad] cp B_BUTTON jr z, .set_carry @@ -475,7 +475,7 @@ BuyMenuLoop: call JoyWaitAorB .cancel - call SpeechTextBox + call SpeechTextbox and a ret @@ -747,7 +747,7 @@ SellMenu: .Unreferenced_NothingToSell: ld hl, .NothingToSellText - call MenuTextBoxBackup + call MenuTextboxBackup and a ret @@ -796,7 +796,7 @@ SellMenu: lb bc, 3, 18 call ClearBox ld hl, Text_Mart_ICanPayThisMuch - call PrintTextBoxText + call PrintTextboxText call YesNoBox jr c, .declined ld de, wMoney @@ -810,7 +810,7 @@ SellMenu: lb bc, 3, 18 call ClearBox ld hl, Text_Mart_SoldForAmount - call PrintTextBoxText + call PrintTextboxText call PlayTransactionSound farcall PlaceMoneyBottomLeft call JoyWaitAorB @@ -890,8 +890,8 @@ PlayTransactionSound: call PlaySFX ret -MartTextBox: - call MenuTextBox +MartTextbox: + call MenuTextbox call JoyWaitAorB call ExitMenu ret diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 97f04f604..268a013bc 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -484,7 +484,7 @@ TossMenu: jr c, .finish call Pack_GetItemName ld hl, Text_ConfirmThrowAway - call MenuTextBox + call MenuTextbox call YesNoBox push af call ExitMenu @@ -1358,7 +1358,7 @@ Pack_InitGFX: ; Place the textbox for displaying the item description hlcoord 0, SCREEN_HEIGHT - 4 - 2 lb bc, 4, SCREEN_WIDTH - 2 - call TextBox + call Textbox call EnableLCD call DrawPackGFX ret diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 98222e4b6..d82b5829e 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -247,7 +247,7 @@ TMHM_ShowTMMoveDescription: hlcoord 0, 12 ld b, 4 ld c, SCREEN_WIDTH - 2 - call TextBox + call Textbox ld a, [wCurItem] cp NUM_TMS + NUM_HMS + 1 jr nc, TMHM_JoypadLoop diff --git a/engine/items/update_item_description.asm b/engine/items/update_item_description.asm index d4bc731a1..da56732a2 100644 --- a/engine/items/update_item_description.asm +++ b/engine/items/update_item_description.asm @@ -4,7 +4,7 @@ UpdateItemDescription: hlcoord 0, 12 ld b, 4 ld c, SCREEN_WIDTH - 2 - call TextBox + call Textbox ld a, [wMenuSelection] cp -1 ret z diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index 147683042..dc1fe215c 100644 --- a/engine/link/place_waiting_text.asm +++ b/engine/link/place_waiting_text.asm @@ -7,7 +7,7 @@ PlaceWaitingText:: and a jr z, .notinbattle - call TextBox + call Textbox jr .proceed .notinbattle diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 1de34f40f..281000352 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -237,11 +237,11 @@ MainMenu_PrintCurrentTimeAndDay: hlcoord 0, 14 ld b, 2 ld c, 18 - call TextBox + call Textbox ret .TimeFail: - call SpeechTextBox + call SpeechTextbox ret .PlaceTime: diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 94732d60b..0a398d259 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -30,19 +30,19 @@ PlaceMenuItemQuantity: PlaceMoneyTopRight: ld hl, MenuHeader_0x24b15 call CopyMenuHeader - jr PlaceMoneyTextBox + jr PlaceMoneyTextbox PlaceMoneyBottomLeft: ld hl, MenuHeader_0x24b1d call CopyMenuHeader - jr PlaceMoneyTextBox + jr PlaceMoneyTextbox PlaceMoneyAtTopLeftOfTextbox: ld hl, MenuHeader_0x24b15 lb de, 0, 11 call OffsetMenuHeader -PlaceMoneyTextBox: +PlaceMoneyTextbox: call MenuBox call MenuBoxCoord2Tile ld de, SCREEN_WIDTH + 1 @@ -69,7 +69,7 @@ DisplayCoinCaseBalance: hlcoord 11, 0 ld b, 1 ld c, 7 - call TextBox + call Textbox hlcoord 12, 0 ld de, CoinString call PlaceString @@ -86,7 +86,7 @@ DisplayMoneyAndCoinBalance: hlcoord 5, 0 ld b, 3 ld c, 13 - call TextBox + call Textbox hlcoord 6, 1 ld de, MoneyString call PlaceString @@ -119,7 +119,7 @@ Unreferenced_Function24b8f: hlcoord 0, 0 ld b, 3 ld c, 7 - call TextBox + call Textbox hlcoord 1, 1 ld de, wSafariTimeRemaining lb bc, 2, 3 @@ -147,7 +147,7 @@ StartMenu_DrawBugContestStatusBox: hlcoord 0, 0 ld b, 5 ld c, 17 - call TextBox + call Textbox ret StartMenu_PrintBugContestStatus: diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm index d13868279..a776a05c1 100644 --- a/engine/menus/options_menu.asm +++ b/engine/menus/options_menu.asm @@ -7,7 +7,7 @@ _OptionsMenu: hlcoord 0, 0 ld b, 16 ld c, 18 - call TextBox + call Textbox hlcoord 2, 2 ld de, StringOptions call PlaceString @@ -448,7 +448,7 @@ Options_MenuAccount: .On: db "ON @" Options_Frame: - ld hl, wTextBoxFrame + ld hl, wTextboxFrame ldh a, [hJoyPressed] bit D_LEFT_F, a jr nz, .LeftPressed @@ -470,7 +470,7 @@ Options_Frame: maskbits NUM_FRAMES ld [hl], a UpdateFrame: - ld a, [wTextBoxFrame] + ld a, [wTextboxFrame] hlcoord 16, 15 ; where on the screen the number is drawn add "1" ld [hl], a diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 34b38a25b..e7dcb026a 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -1,7 +1,7 @@ SaveMenu: call LoadStandardMenuHeader farcall DisplaySaveInfoOnSave - call SpeechTextBox + call SpeechTextbox call UpdateSprites farcall SaveMenu_CopyTilemapAtOnce ld hl, Text_WouldYouLikeToSaveTheGame @@ -39,7 +39,7 @@ SaveAfterLinkTrade: ChangeBoxSaveGame: push de ld hl, Text_SaveOnBoxSwitch - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu jr c, .refused @@ -116,7 +116,7 @@ MoveMonWOMail_InsertMon_SaveGame: StartMoveMonWOMail_SaveGame: ld hl, Text_SaveOnMoveMonWOMail - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu jr c, .refused @@ -198,7 +198,7 @@ AskOverwriteSaveFile: SaveTheGame_yesorno: ld b, BANK(Text_WouldYouLikeToSaveTheGame) call MapTextbox - call LoadMenuTextBox + call LoadMenuTextbox lb bc, 0, 7 call PlaceYesNoBox ld a, [wMenuCursorY] diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index 49144f0b6..ab7b98ea2 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -379,7 +379,7 @@ endr hlcoord 0, 13 ld b, 3 ld c, 8 - jp TextBoxPalette + jp TextboxPalette .IsMenuAccountOn: ld a, [wOptions2] diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 21eb1fec9..b12c74b62 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -931,7 +931,7 @@ TrademonStats_MonTemplate: hlcoord 3, 0 ld b, $6 ld c, $d - call TextBox + call Textbox hlcoord 4, 0 ld de, .OTMonData call PlaceString @@ -951,7 +951,7 @@ TrademonStats_Egg: hlcoord 3, 0 ld b, 6 ld c, 13 - call TextBox + call Textbox hlcoord 4, 2 ld de, .EggData call PlaceString diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index 74abf56ee..2fbf888bc 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -379,7 +379,7 @@ PopulateDecoCategoryMenu: .empty ld hl, .Text_nothing_to_choose - call MenuTextBoxBackup + call MenuTextboxBackup ret .Text_nothing_to_choose: @@ -675,7 +675,7 @@ DecoAction_SetItUp: ld hl, wStringBuffer3 call GetDecorationName ld hl, DecoText_PutAwayAndSetUp - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret @@ -684,13 +684,13 @@ DecoAction_SetItUp: ld hl, wStringBuffer3 call GetDecorationName ld hl, DecoText_SetUpTheDeco - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret .alreadythere ld hl, DecoText_AlreadySetUp - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -711,13 +711,13 @@ DecoAction_TryPutItAway: ld hl, wStringBuffer3 call GetDecorationName ld hl, DecoText_PutAwayTheDeco - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret .nothingthere ld hl, DecoText_NothingToPutAway - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret @@ -772,7 +772,7 @@ DecoAction_SetItUp_Ornament: ld [wSelectedDecoration], a call .getwhichside ld hl, DecoText_PutAwayAndSetUp - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret @@ -784,13 +784,13 @@ DecoAction_SetItUp_Ornament: ld hl, wStringBuffer3 call GetDecorationName ld hl, DecoText_SetUpTheDeco - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret .failed ld hl, DecoText_AlreadySetUp - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -820,13 +820,13 @@ DecoAction_PutItAway_Ornament: xor a ld [wSelectedDecoration], a ld hl, DecoText_PutAwayTheDeco - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret .nothingthere ld hl, DecoText_NothingToPutAway - call MenuTextBoxBackup + call MenuTextboxBackup xor a ret @@ -836,7 +836,7 @@ DecoText_WhichSide: text_end DecoAction_AskWhichSide: - call MenuTextBox + call MenuTextbox ld hl, MenuHeader_0x26eab call GetMenu2 call ExitMenu diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index c622dc9db..4f6c6568e 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -498,7 +498,7 @@ Script_battletowertext: ; script command 0xa4 ; parameters: bttext_id - call SetUpTextBox + call SetUpTextbox call GetScriptByte ld c, a farcall BattleTowerText diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 9582b5921..8a2b022dc 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -555,7 +555,7 @@ UnknownText_0x90336: text_end HangUp_BoopOff: - call SpeechTextBox + call SpeechTextbox ret Phone_StartRinging: @@ -593,7 +593,7 @@ Phone_CallerTextbox: hlcoord 0, 0 ld b, 2 ld c, SCREEN_WIDTH - 2 - call TextBox + call Textbox ret Function90380: diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 8281dd468..13b561d4b 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -313,7 +313,7 @@ InitPokegearTilemap: call PlaceString hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox call Pokegear_UpdateClock ret @@ -351,7 +351,7 @@ InitPokegearTilemap: call Pokegear_LoadTilemapRLE hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox ret .Phone: @@ -359,7 +359,7 @@ InitPokegearTilemap: call Pokegear_LoadTilemapRLE hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox call .PlacePhoneBars call PokegearPhone_UpdateDisplayList ret @@ -1138,7 +1138,7 @@ PokegearPhoneContactSubmenu: ld b, a ld c, 8 push de - call TextBox + call Textbox pop de pop hl inc hl @@ -1213,7 +1213,7 @@ PokegearPhoneContactSubmenu: .Delete: ld hl, PokegearText_DeleteStoredNumber - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu jr c, .CancelDelete @@ -1758,7 +1758,7 @@ NoRadioName: call ClearBox hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox ret OaksPKMNTalkName: db "OAK's Talk@" @@ -1988,7 +1988,7 @@ PlayRadio: push de hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox hlcoord 1, 14 ld [hl], "“" pop de diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index 64a566630..2e1dccf67 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -142,7 +142,7 @@ PrintRadioLine: call PlaceHLTextAtBC jr .skip .print - call PrintTextBoxText + call PrintTextboxText .skip ld a, RADIO_SCROLL ld [wCurRadioLine], a diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 8127c8ff5..d7138646e 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -963,7 +963,7 @@ BillsPC_PlaceString: push de hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox pop de hlcoord 1, 16 call PlaceString @@ -980,7 +980,7 @@ BillsPC_MoveMonWOMail_BoxNameAndArrows: BillsPC_BoxName: hlcoord 8, 0 lb bc, 1, 10 - call TextBox + call Textbox ld a, [wBillsPC_LoadedBox] and a @@ -1219,7 +1219,7 @@ BillsPC_LoadMonStats: BillsPC_RefreshTextboxes: hlcoord 8, 2 lb bc, 10, 10 - call TextBox + call Textbox hlcoord 8, 2 ld [hl], "└" @@ -1790,7 +1790,7 @@ DepositPokemon: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox call WaitBGMap hlcoord 1, 16 ld de, PCString_Stored @@ -1845,7 +1845,7 @@ TryWithdrawPokemon: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox call WaitBGMap hlcoord 1, 16 ld de, PCString_Got @@ -1881,7 +1881,7 @@ ReleasePKMN_ByePKMN: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox call WaitBGMap ld a, [wCurPartySpecies] @@ -1902,7 +1902,7 @@ ReleasePKMN_ByePKMN: call DelayFrames hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox hlcoord 1, 16 ld de, PCString_Bye call PlaceString @@ -1925,7 +1925,7 @@ MovePKMNWitoutMail_InsertMon: push af hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox hlcoord 1, 16 ld de, .Saving_LeaveOn call PlaceString @@ -2241,7 +2241,7 @@ _ChangeBox: ld [wMenuScrollPosition], a hlcoord 0, 4 lb bc, 8, 9 - call TextBox + call Textbox call ScrollingMenu ld a, [wMenuJoypad] cp B_BUTTON @@ -2306,7 +2306,7 @@ GetBoxName: BillsPC_PrintBoxCountAndCapacity: hlcoord 11, 7 lb bc, 5, 7 - call TextBox + call Textbox ld a, [wMenuSelection] cp -1 ret z @@ -2394,7 +2394,7 @@ BillsPC_PrintBoxName: hlcoord 0, 0 ld b, 2 ld c, 18 - call TextBox + call Textbox hlcoord 1, 2 ld de, .Current call PlaceString @@ -2522,7 +2522,7 @@ BillsPC_PlaceChangeBoxString: push de hlcoord 0, 14 lb bc, 2, 18 - call TextBox + call Textbox pop de hlcoord 1, 16 call PlaceString diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index a213bc79a..700c59d35 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -10,7 +10,7 @@ _BillsPC: and a ret nz ld hl, .Text_GottaHavePokemon - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -153,13 +153,13 @@ Unreferenced_Functione512: .no_mon ld hl, .Text_NoMon - call MenuTextBoxBackup + call MenuTextboxBackup scf ret .only_one_mon ld hl, .Text_ItsYourLastMon - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -220,7 +220,7 @@ Unreferenced_Functione56d: .asm_e576 ld hl, UnknownText_0xe57e - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -246,10 +246,10 @@ ClearPCItemScreen: call ByteFill hlcoord 0, 0 lb bc, 10, 18 - call TextBox + call Textbox hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox call WaitBGMap2 call SetPalettes ; load regular palettes? ret diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 9b6dd4cb5..0ee10eac8 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -241,7 +241,7 @@ EvolveAfterBattle_MasterLoop: push hl ld hl, Text_EvolvedIntoPKMN - call PrintTextBoxText + call PrintTextboxText farcall StubbedTrainerRankings_MonsEvolved ld de, MUSIC_NONE diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 55e673ecc..d73dd7094 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -139,7 +139,7 @@ ForgetMove: hlcoord 5, 2 ld b, NUM_MOVES * 2 ld c, MOVE_NAME_LENGTH - call TextBox + call Textbox hlcoord 5 + 2, 2 + 2 ld a, SCREEN_WIDTH * 2 ld [wBuffer1], a diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index 91026d2a2..04c9a98e2 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -307,7 +307,7 @@ _PlayerMailBoxMenu: .nomail ld hl, .EmptyMailboxText - jp MenuTextBoxBackup + jp MenuTextboxBackup .EmptyMailboxText: text_far _EmptyMailboxText @@ -429,7 +429,7 @@ MailboxPC: .PutInPack: ld hl, .MessageLostText - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu ret c @@ -442,7 +442,7 @@ MailboxPC: call ReceiveItem jr c, .put_in_bag ld hl, .PackFullText - jp MenuTextBoxBackup + jp MenuTextboxBackup .put_in_bag ld a, [wMenuSelection] @@ -450,7 +450,7 @@ MailboxPC: ld b, a call DeleteMailFromPC ld hl, .PutAwayText - jp MenuTextBoxBackup + jp MenuTextboxBackup .PutAwayText: text_far ClearedMailPutAwayText diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 0d71412b6..19fecff19 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -30,7 +30,7 @@ TossItemFromPC: and a jr nz, .key_item ld hl, .TossHowMany - call MenuTextBox + call MenuTextbox farcall SelectQuantityToToss push af call CloseWindow @@ -38,7 +38,7 @@ TossItemFromPC: pop af jr c, .quit ld hl, .ConfirmToss - call MenuTextBox + call MenuTextbox call YesNoBox push af call ExitMenu @@ -49,7 +49,7 @@ TossItemFromPC: call TossItem call PartyMonItemName ld hl, .TossedThisMany - call MenuTextBox + call MenuTextbox call ExitMenu and a ret @@ -78,7 +78,7 @@ TossItemFromPC: .CantToss: ld hl, .TooImportantToToss - call MenuTextBoxBackup + call MenuTextboxBackup ret .TooImportantToToss: @@ -88,7 +88,7 @@ TossItemFromPC: CantUseItem: ld hl, CantUseItemText - call MenuTextBoxWaitButton + call MenuTextboxWaitButton ret CantUseItemText: @@ -265,14 +265,14 @@ GiveTakePartyMonItem: .next ld hl, CantBeHeldText - call MenuTextBoxBackup + call MenuTextboxBackup jr .loop .quit ret TryGiveItemToPartymon: - call SpeechTextBox + call SpeechTextbox call PartyMonItemName call GetPartyItemLocation ld a, [hl] @@ -290,13 +290,13 @@ TryGiveItemToPartymon: .give_item_to_mon call GiveItemToPokemon ld hl, MadeHoldText - call MenuTextBoxBackup + call MenuTextboxBackup call GivePartyItem ret .please_remove_mail ld hl, PleaseRemoveMailText - call MenuTextBoxBackup + call MenuTextboxBackup ret .already_holding_item @@ -317,7 +317,7 @@ TryGiveItemToPartymon: jr nc, .bag_full ld hl, TookAndMadeHoldText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, [wNamedObjectIndexBuffer] ld [wCurItem], a call GivePartyItem @@ -328,7 +328,7 @@ TryGiveItemToPartymon: ld [wCurItem], a call ReceiveItemFromPokemon ld hl, ItemStorageIsFullText - call MenuTextBoxBackup + call MenuTextboxBackup .abort ret @@ -346,7 +346,7 @@ GivePartyItem: ret TakePartyItem: - call SpeechTextBox + call SpeechTextbox call GetPartyItemLocation ld a, [hl] and a @@ -363,17 +363,17 @@ TakePartyItem: ld [hl], NO_ITEM call GetItemName ld hl, TookFromText - call MenuTextBoxBackup + call MenuTextboxBackup jr .asm_12c9a .asm_12c8c ld hl, IsntHoldingAnythingText - call MenuTextBoxBackup + call MenuTextboxBackup jr .asm_12c9a .asm_12c94 ld hl, ItemStorageIsFullText - call MenuTextBoxBackup + call MenuTextboxBackup .asm_12c9a ret @@ -442,7 +442,7 @@ GiveItemToPokemon: jp TossItem StartMenuYesNo: - call MenuTextBox + call MenuTextbox call YesNoBox jp ExitMenu @@ -514,12 +514,12 @@ MonMailAction: farcall SendMailToPC jr c, .MailboxFull ld hl, .sentmailtopctext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .MailboxFull: ld hl, .mailboxfulltext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .RemoveMailToBag: @@ -535,12 +535,12 @@ MonMailAction: ld [hl], $0 call GetCurNick ld hl, .tookmailfrommontext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .BagIsFull: ld hl, .bagfulltext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .done @@ -1118,11 +1118,11 @@ SetUpMoveScreenBG: hlcoord 0, 1 ld b, 9 ld c, 18 - call TextBox + call Textbox hlcoord 0, 11 ld b, 5 ld c, 18 - call TextBox + call Textbox hlcoord 2, 0 lb bc, 2, 3 call ClearBox @@ -1169,7 +1169,7 @@ SetUpMoveList: hlcoord 0, 11 ld b, 5 ld c, 18 - jp TextBox + jp Textbox PrepareToPlaceMoveData: ld hl, wPartyMon1Moves diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 617039db8..43e7af7cb 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -712,7 +712,7 @@ PartyMenuSelect: PrintPartyMenuText: hlcoord 0, 14 lb bc, 2, 18 - call TextBox + call Textbox ld a, [wPartyCount] and a jr nz, .haspokemon diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 84af2bf49..1d8d7da77 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -843,7 +843,7 @@ StatsScreen_PlaceFrontpic: ld a, [wCurPartySpecies] call IsAPokemon ret c - call StatsScreen_LoadTextBoxSpaceGFX + call StatsScreen_LoadTextboxSpaceGFX ld de, vTiles2 tile $00 predef GetAnimatedFrontpic hlcoord 0, 0 @@ -919,7 +919,7 @@ StatsScreen_GetAnimationParam: xor a ret -StatsScreen_LoadTextBoxSpaceGFX: +StatsScreen_LoadTextboxSpaceGFX: nop push hl push de @@ -930,8 +930,8 @@ StatsScreen_LoadTextBoxSpaceGFX: push af ld a, $1 ldh [rVBK], a - ld de, TextBoxSpaceGFX - lb bc, BANK(TextBoxSpaceGFX), 1 + ld de, TextboxSpaceGFX + lb bc, BANK(TextboxSpaceGFX), 1 ld hl, vTiles2 tile " " call Get2bpp pop af @@ -1042,7 +1042,7 @@ StatsScreen_AnimateEgg: push de ld a, $1 ld [wBoxAlignment], a - call StatsScreen_LoadTextBoxSpaceGFX + call StatsScreen_LoadTextboxSpaceGFX ld de, vTiles2 tile $00 predef GetAnimatedFrontpic pop de diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index caeb1eecd..16310d8f6 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -159,7 +159,7 @@ PrintPartyMonPage1: hlcoord 0, 7 ld b, 9 ld c, 18 - call TextBox + call Textbox hlcoord 8, 2 ld a, [wTempMonLevel] call PrintLevel_Force3Digits @@ -242,7 +242,7 @@ PrintPartyMonPage2: hlcoord 0, 0 ld b, 15 ld c, 18 - call TextBox + call Textbox ld bc, SCREEN_WIDTH decoord 0, 0 hlcoord 0, 1 diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 27fff95b8..8c659c27e 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -554,7 +554,7 @@ PlacePrinterStatusString: ldh [hBGMapMode], a hlcoord 0, 5 lb bc, 10, 18 - call TextBox + call Textbox pop af ld e, a ld d, 0 diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index f3d8ebdae..16f25cddd 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -189,7 +189,7 @@ RestartClock: hlcoord 0, 5 ld b, 5 ld c, 18 - call TextBox + call Textbox decoord 1, 8 ld a, [wBuffer4] ld b, a diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 3898249c7..94557ed63 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -56,7 +56,7 @@ InitClock: hlcoord 3, 7 ld b, 2 ld c, 15 - call TextBox + call Textbox hlcoord 11, 7 ld [hl], $1 hlcoord 11, 10 @@ -86,7 +86,7 @@ InitClock: call PrintText hlcoord 11, 7 lb bc, 2, 7 - call TextBox + call Textbox hlcoord 15, 7 ld [hl], $1 hlcoord 15, 10 @@ -408,14 +408,14 @@ SetDayOfWeek: .loop hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox call LoadStandardMenuHeader ld hl, .WhatDayIsItText call PrintText hlcoord 9, 3 ld b, 2 ld c, 9 - call TextBox + call Textbox hlcoord 14, 3 ld [hl], TIMESET_UP_ARROW hlcoord 14, 6 diff --git a/gfx/font.asm b/gfx/font.asm index 2361c2ae6..e83fc4d17 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -44,7 +44,7 @@ INCBIN "gfx/font/phone_icon.2bpp" UnusedBoldFontGFX: ; unused bold letters + unown chars INCBIN "gfx/font/unused_bold_font.1bpp" -TextBoxSpaceGFX: +TextboxSpaceGFX: INCBIN "gfx/frames/space.1bpp" FontsExtra_SolidBlackGFX: diff --git a/home/battle.asm b/home/battle.asm index 37c2e7b1c..7f2e8bfdd 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -155,18 +155,18 @@ MobileTextBorder:: ld [hl], $5f ; bottom ret -BattleTextBox:: +BattleTextbox:: ; Open a textbox and print text at hl. push hl - call SpeechTextBox + call SpeechTextbox call MobileTextBorder call UpdateSprites call ApplyTilemap pop hl - call PrintTextBoxText + call PrintTextboxText ret -StdBattleTextBox:: +StdBattleTextbox:: ; Open a textbox and print battle text at 20:hl. ldh a, [hROMBank] @@ -175,7 +175,7 @@ StdBattleTextBox:: ld a, BANK(BattleText) rst Bankswitch - call BattleTextBox + call BattleTextbox pop af rst Bankswitch diff --git a/home/map.asm b/home/map.asm index 391500eb2..b85599de8 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1025,13 +1025,13 @@ MapTextbox:: rst Bankswitch push hl - call SpeechTextBox + call SpeechTextbox call SafeUpdateSprites ld a, 1 ldh [hOAMUpdate], a call ApplyTilemap pop hl - call PrintTextBoxText + call PrintTextboxText xor a ldh [hOAMUpdate], a @@ -1932,7 +1932,7 @@ ReturnToMapWithSpeechTextbox:: call ReloadTilesetAndPalettes hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox ld hl, wVramState set 0, [hl] call UpdateSprites diff --git a/home/menu.asm b/home/menu.asm index 5060a915a..4debb11ad 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -17,16 +17,16 @@ StoreTo_wMenuCursorBuffer:: ld [wMenuCursorBuffer], a ret -MenuTextBox:: +MenuTextbox:: push hl - call LoadMenuTextBox + call LoadMenuTextbox pop hl jp PrintText ; unused ret -LoadMenuTextBox:: +LoadMenuTextbox:: ld hl, .MenuHeader call LoadMenuHeader ret @@ -37,8 +37,8 @@ LoadMenuTextBox:: dw vTiles0 db 0 ; default option -MenuTextBoxBackup:: - call MenuTextBox +MenuTextboxBackup:: + call MenuTextbox call CloseWindow ret @@ -498,8 +498,8 @@ PlayClickSFX:: pop de ret -MenuTextBoxWaitButton:: - call MenuTextBox +MenuTextboxWaitButton:: + call MenuTextbox call WaitButton call ExitMenu ret diff --git a/home/menu_window.asm b/home/menu_window.asm index 7c511097d..b72677702 100644 --- a/home/menu_window.asm +++ b/home/menu_window.asm @@ -144,7 +144,7 @@ MenuBox:: call GetMenuBoxDims dec b dec c - jp TextBox + jp Textbox GetMenuTextStartCoord:: ld a, [wMenuBorderTopCoord] diff --git a/home/mobile.asm b/home/mobile.asm index e87cdcab4..727518b84 100644 --- a/home/mobile.asm +++ b/home/mobile.asm @@ -159,7 +159,7 @@ Unreferenced_Function3efd:: ld c, 18 call .fill_attr pop hl - call PrintTextBoxText + call PrintTextboxText ret .fill_attr @@ -174,7 +174,7 @@ Unreferenced_Function3efd:: call Function3f35 pop bc pop hl - call TextBoxBorder + call TextboxBorder ret Function3f20:: diff --git a/home/print_text.asm b/home/print_text.asm index 98f50c7c1..b7f76ce64 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -6,15 +6,15 @@ PrintLetterDelay:: ; mid: 3 frames ; slow: 5 frames -; wTextBoxFlags[!0] and A or B override text speed with a one-frame delay. -; wOptions[4] and wTextBoxFlags[!1] disable the delay. +; wTextboxFlags[!0] and A or B override text speed with a one-frame delay. +; wOptions[4] and wTextboxFlags[!1] disable the delay. ld a, [wOptions] bit NO_TEXT_SCROLL, a ret nz ; non-scrolling text? - ld a, [wTextBoxFlags] + ld a, [wTextboxFlags] bit NO_TEXT_DELAY_F, a ret z @@ -31,7 +31,7 @@ PrintLetterDelay:: ld [hl], a ; force fast scroll? - ld a, [wTextBoxFlags] + ld a, [wTextboxFlags] bit FAST_TEXT_DELAY_F, a jr z, .fast diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index 076b43156..cde0e0212 100644 --- a/home/scrolling_menu.asm +++ b/home/scrolling_menu.asm @@ -38,7 +38,7 @@ InitScrollingMenu:: push de call Coord2Tile pop bc - jp TextBox + jp Textbox JoyTextDelay_ForcehJoyDown:: call DelayFrame diff --git a/home/text.asm b/home/text.asm index 6f6ac95de..af6f9a8f4 100644 --- a/home/text.asm +++ b/home/text.asm @@ -40,18 +40,18 @@ ClearScreen:: call ByteFill jr ClearTileMap -TextBox:: +Textbox:: ; Draw a text box at hl with room for b lines of c characters each. ; Places a border around the textbox, then switches the palette to the ; text black-and-white scheme. push bc push hl - call TextBoxBorder + call TextboxBorder pop hl pop bc - jr TextBoxPalette + jr TextboxPalette -TextBoxBorder:: +TextboxBorder:: ; Top push hl ld a, "┌" @@ -97,7 +97,7 @@ TextBoxBorder:: jr nz, .loop ret -TextBoxPalette:: +TextboxPalette:: ; Fill text box width c height b at hl with pal 7 ld de, wAttrMap - wTileMap add hl, de @@ -121,12 +121,12 @@ TextBoxPalette:: jr nz, .col ret -SpeechTextBox:: +SpeechTextbox:: ; Standard textbox. hlcoord TEXTBOX_X, TEXTBOX_Y ld b, TEXTBOX_INNERH ld c, TEXTBOX_INNERW - jp TextBox + jp Textbox TestText:: text "ゲームフりーク！" @@ -140,7 +140,7 @@ RadioTerminator:: text_end PrintText:: - call SetUpTextBox + call SetUpTextbox BuenaPrintText:: push hl hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY @@ -148,14 +148,14 @@ BuenaPrintText:: call ClearBox pop hl -PrintTextBoxText:: +PrintTextboxText:: bccoord TEXTBOX_INNERX, TEXTBOX_INNERY call PlaceHLTextAtBC ret -SetUpTextBox:: +SetUpTextbox:: push hl - call SpeechTextBox + call SpeechTextbox call UpdateSprites call ApplyTilemap pop hl @@ -648,15 +648,15 @@ PokeFluteTerminatorCharacter:: text_end PlaceHLTextAtBC:: - ld a, [wTextBoxFlags] + ld a, [wTextboxFlags] push af set NO_TEXT_DELAY_F, a - ld [wTextBoxFlags], a + ld [wTextboxFlags], a call DoTextUntilTerminator pop af - ld [wTextBoxFlags], a + ld [wTextboxFlags], a ret DoTextUntilTerminator:: @@ -822,7 +822,7 @@ TextCommand_BOX:: push hl ld h, d ld l, e - call TextBox + call Textbox pop hl ret diff --git a/home/window.asm b/home/window.asm index 16564af47..be249e845 100644 --- a/home/window.asm +++ b/home/window.asm @@ -51,7 +51,7 @@ OpenText:: rst Bankswitch call ReanchorBGMap_NoOAMUpdate ; clear bgmap - call SpeechTextBox + call SpeechTextbox call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ; anchor bgmap call LoadFonts_NoOAMUpdate ; load font pop af diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index 417e9ac28..adb48e4a4 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -209,8 +209,8 @@ ENDM anim_bgeffect: MACRO db anim_bgeffect_command db \1 ; effect - db \2 ; unknown - db \3 ; unknown + db \2 ; jumptable index + db \3 ; battle turn db \4 ; unknown ENDM diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index c3e0aa6ab..2f9041d1f 100644 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -107,7 +107,7 @@ InitMobileProfile: hlcoord 0, 14 ld b, $2 ld c, $12 - call TextBox + call Textbox hlcoord 1, 16 ld de, MobileString_PersonalInfo call PlaceString diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index cd5a7b233..7c3adbbcb 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -671,7 +671,7 @@ Function4ac58: hlcoord 11, 13 ld b, $3 ld c, $7 - call TextBox + call Textbox hlcoord 13, 14 ld de, String_4ada7 call PlaceString @@ -681,7 +681,7 @@ Function4ac58: hlcoord 11, 9 ld b, $7 ld c, $7 - call TextBox + call Textbox call Function4ad68 .asm_4ac96 diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 6f17e09de..3920e44c9 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -1542,7 +1542,7 @@ Function89a2e: hlcoord 11, 12 ld b, $2 ld c, $6 - call TextBox + call Textbox hlcoord 13, 13 ld de, String_89a4e call PlaceString @@ -2737,7 +2737,7 @@ Function8a1b0: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox hlcoord 1, 14 ld a, [wMenuCursorY] ld de, Strings_8a1cc @@ -3057,7 +3057,7 @@ Function8a453: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox hlcoord 1, 14 ld de, String_8a476 ld a, [wMenuSelection] @@ -4035,7 +4035,7 @@ Function8aba9: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox hlcoord 1, 14 ld de, String_8ac3b call PlaceString @@ -4188,7 +4188,7 @@ Function8ad0b: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox ld de, String_8ad89 hlcoord 1, 14 call PlaceString @@ -4199,7 +4199,7 @@ Function8ad0b: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox ld de, String_8ad9c hlcoord 1, 14 call PlaceString diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 4b28f791f..6a740e696 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -284,7 +284,7 @@ Function8b4a4: push bc push de call Function8b4d8 - call TextBox + call Textbox pop de pop bc call Function8b4cc @@ -940,7 +940,7 @@ Function8b8c8: hlcoord 0, 14 ld b, $2 ld c, $12 - call TextBox + call Textbox ld a, [wd033] ld b, 0 ld c, a diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index d018168ab..c342388dd 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1396,7 +1396,7 @@ Function100902: hlcoord 3, 10 ld b, $01 ld c, $0b - call TextBox + call Textbox ld a, [wcd6d] ld c, a ld a, $0a @@ -1860,7 +1860,7 @@ MobileMoveSelectionScreen: ld hl, BattleText_TheresNoPPLeftForThisMove .print_text - call StdBattleTextBox + call StdBattleTextbox call Call_LoadTempTileMapToTileMap jp .GetMoveSelection @@ -1868,7 +1868,7 @@ Function100c74: hlcoord 0, 8 ld b, 8 ld c, 8 - call TextBox + call Textbox ld hl, wBattleMonMoves ld de, wListMoves_MoveIndicesBuffer ld bc, NUM_MOVES @@ -3788,7 +3788,7 @@ _StartMobileBattle: ld [wdc5f], a ld [wdc60], a farcall BlankScreen - call SpeechTextBox + call SpeechTextbox farcall Function100846 ld c, 120 call DelayFrames @@ -4741,14 +4741,14 @@ Function102142: call Function10218d call Function102180 ld hl, UnknownText_0x1021d1 - call MenuTextBox + call MenuTextbox ld de, SFX_LEVEL_UP call PlaySFX call JoyWaitAorB call ExitMenu call Function10219f ld hl, UnknownText_0x1021d6 - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu jr c, .asm_10217c @@ -4814,7 +4814,7 @@ UnknownText_0x1021db: text_end Function1021e0: - call MenuTextBox + call MenuTextbox call JoyWaitAorB call ExitMenu ret @@ -6472,7 +6472,7 @@ Function102e07: ld a, [wBattleMode] and a jr z, .link_battle - call TextBox + call Textbox jr .okay .link_battle @@ -6573,7 +6573,7 @@ Function102ea8: ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, UnknownText_0x102ee2 - call PrintTextBoxText + call PrintTextboxText ret UnknownText_0x102ee2: diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index da5e95347..66acfb5ac 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -1029,7 +1029,7 @@ Function106464:: ret Function10649b: - ld a, [wTextBoxFrame] + ld a, [wTextboxFrame] maskbits NUM_FRAMES ld bc, 6 * LEN_1BPP_TILE ld hl, Frames @@ -1041,9 +1041,9 @@ Function10649b: ld b, BANK(Frames) call Function1064c3 ld hl, vTiles2 tile " " ; $7f - ld de, TextBoxSpaceGFX + ld de, TextboxSpaceGFX ld c, 1 - ld b, BANK(TextBoxSpaceGFX) + ld b, BANK(TextboxSpaceGFX) call Function1064c3 ret diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 4cb54ce05..ef69e51e3 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1255,7 +1255,7 @@ MobileTradeAnim_DisplayEggData: hlcoord 5, 0 ld b, 6 ld c, 9 - call TextBox + call Textbox hlcoord 6, 2 ld de, .EggTemplate call PlaceString @@ -1276,7 +1276,7 @@ Function108a33: hlcoord 5, 0 ld b, 6 ld c, 9 - call TextBox + call Textbox hlcoord 7, 4 ld de, .OddEgg call PlaceString @@ -1294,7 +1294,7 @@ MobileTradeAnim_LoadMonTemplate: hlcoord 4, 0 ld b, 6 ld c, 10 - call TextBox + call Textbox hlcoord 5, 0 ld de, .MonTemplate call PlaceString diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 8067f5f30..dc0e4966b 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -7015,7 +7015,7 @@ Function1178e8: jp MobilePassword_IncrementJumptable Function117942: - call SpeechTextBox + call SpeechTextbox hlcoord 1, 14 ld de, SavedPasswordString call PlaceString diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index b919a9f52..75ed452b9 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1744,7 +1744,7 @@ Function118eb0: Function118ec6: call Function118440 - call SpeechTextBox + call SpeechTextbox ld hl, $d80e ld de, $c320 ld bc, $0026 @@ -5253,7 +5253,7 @@ BattleTowerRoomMenu_WriteMessage: Function11a90f: ld a, $1 ldh [rSVBK], a - call SpeechTextBox + call SpeechTextbox ld a, $50 ld hl, $c320 ld bc, $008c @@ -5503,7 +5503,7 @@ Text_ThisBattleRoomPleaseWait: done Function11ac3e: - call SpeechTextBox + call SpeechTextbox call FadeToMenu callfar ClearSpriteAnims2 call Function11ac51 @@ -7316,7 +7316,7 @@ Function11b7e5: farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a - call SpeechTextBox + call SpeechTextbox call FadeToMenu farcall MobileTradeAnimation_ReceiveGetmonFromGTS farcall Function17d1f1 diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index 748a71d55..589d9d444 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -816,7 +816,7 @@ Function17ac46: ld a, [$d088] bit 4, a jr nz, .bit_4_set - call TextBox + call Textbox ret .bit_4_set diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 48ba99276..9d8a8b831 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -289,7 +289,7 @@ Function17d0f3: farcall GetCaughtGender ld a, c ld [wOTTrademonCaughtData], a - call SpeechTextBox + call SpeechTextbox call FadeToMenu farcall Function10804d farcall Function17d1f1 @@ -520,7 +520,7 @@ Function17d2ce: .asm_17d2e2 call Function17d314 ret c - call SpeechTextBox + call SpeechTextbox call FadeToMenu ldh a, [rSVBK] push af diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 3b971ee83..ea54ff85c 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -23,7 +23,7 @@ Function49f16: hlcoord 0, 12 ld b, 4 ld c, SCREEN_HEIGHT - call TextBox + call Textbox xor a ld de, String_0x49fe9 hlcoord 1, 14 @@ -258,7 +258,7 @@ Function4a149: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox ld a, [wMenuCursorY] dec a ld hl, Strings_4a23d @@ -418,7 +418,7 @@ Function4a28a: hlcoord 14, 7 ld b, 3 ld c, 4 - call TextBox + call Textbox farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ld hl, DeletePassword_YesNo_MenuHeader call LoadMenuHeader @@ -667,7 +667,7 @@ Function4a4c4: hlcoord 0, 12 ld b, $4 ld c, $12 - call TextBox + call Textbox xor a ld hl, Strings_4a5f6 ld d, h diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm index fc9d7d9c7..77cbbbdfc 100644 --- a/mobile/print_opp_message.asm +++ b/mobile/print_opp_message.asm @@ -1,7 +1,7 @@ Mobile_PrintOpponentBattleMessage: ld a, c push af - call SpeechTextBox + call SpeechTextbox call MobileTextBorder pop af dec a diff --git a/wram.asm b/wram.asm index ddd360d73..39e202cfb 100644 --- a/wram.asm +++ b/wram.asm @@ -1569,10 +1569,10 @@ wOptions:: ; cfcc ; bit 7: battle scene off/on db wSaveFileExists:: db -wTextBoxFrame:: ; cfce +wTextboxFrame:: ; cfce ; bits 0-2: textbox frame 0-7 db -wTextBoxFlags:: +wTextboxFlags:: ; bit 0: 1-frame text delay ; bit 4: no text delay db