diff options
Diffstat (limited to 'engine/battle')
44 files changed, 217 insertions, 217 deletions
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: |