diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 62c715d40..94b54c0bd 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -154,7 +154,7 @@ CheckPlayerTurn: ; 'must recharge!' ld hl, MustRechargeText - call FarBattleTextBox + call StdBattleTextBox call CantMove jp Function0x34385 @@ -179,7 +179,7 @@ CheckPlayerTurn: .WokeUp ; 'woke up!' ld hl, WokeUpText - call FarBattleTextBox + call StdBattleTextBox call CantMove call UpdateBattleMonInParty @@ -195,7 +195,7 @@ CheckPlayerTurn: .FastAsleep ; 'fast asleep!' ld hl, FastAsleepText - call FarBattleTextBox + call StdBattleTextBox ; Snore and Sleep Talk bypass sleep. ld a, [CurPlayerMove] @@ -221,7 +221,7 @@ CheckPlayerTurn: ; 'frozen solid!' ld hl, FrozenSolidText - call FarBattleTextBox + call StdBattleTextBox call CantMove jp Function0x34385 @@ -236,7 +236,7 @@ CheckPlayerTurn: ; 'flinched!' ld hl, FlinchedText - call FarBattleTextBox + call StdBattleTextBox call CantMove jp Function0x34385 @@ -256,7 +256,7 @@ CheckPlayerTurn: ; 'disabled no more!' ld hl, DisabledNoMoreText - call FarBattleTextBox + call StdBattleTextBox .CheckConfused @@ -272,7 +272,7 @@ CheckPlayerTurn: ; 'confused no more!' ld hl, ConfusedNoMoreText - call FarBattleTextBox + call StdBattleTextBox jr .CheckAttract @@ -280,7 +280,7 @@ CheckPlayerTurn: .Confused ; 'confused!' ld hl, IsConfusedText - call FarBattleTextBox + call StdBattleTextBox xor a ld [$cfca], a @@ -310,7 +310,7 @@ CheckPlayerTurn: ; 'in love with' ld hl, InLoveWithText - call FarBattleTextBox + call StdBattleTextBox xor a ld [$cfca], a @@ -325,7 +325,7 @@ CheckPlayerTurn: ; 'infatuation kept it from attacking!' ld hl, InfatuationText - call FarBattleTextBox + call StdBattleTextBox call CantMove jp Function0x34385 @@ -359,7 +359,7 @@ CheckPlayerTurn: ; 'fully paralyzed!' ld hl, FullyParalyzedText - call FarBattleTextBox + call StdBattleTextBox call CantMove jp Function0x34385 ; 341f0 @@ -412,7 +412,7 @@ CheckEnemyTurn: ; 3421f ; 'must recharge!' ld hl, MustRechargeText - call FarBattleTextBox + call StdBattleTextBox call CantMove jp Function0x34385 @@ -429,7 +429,7 @@ CheckEnemyTurn: ; 3421f ; 'fast asleep!' ld hl, FastAsleepText - call FarBattleTextBox + call StdBattleTextBox xor a ld [$cfca], a ld de, ANIM_SLEEP @@ -440,7 +440,7 @@ CheckEnemyTurn: ; 3421f .WokeUp ; 'woke up!' ld hl, WokeUpText - call FarBattleTextBox + call StdBattleTextBox call CantMove call UpdateEnemyMonInParty ld hl, $6036 @@ -475,7 +475,7 @@ CheckEnemyTurn: ; 3421f ; 'frozen solid!' ld hl, FrozenSolidText - call FarBattleTextBox + call StdBattleTextBox call CantMove jp Function0x34385 @@ -489,7 +489,7 @@ CheckEnemyTurn: ; 3421f ; 'flinched!' ld hl, FlinchedText - call FarBattleTextBox + call StdBattleTextBox call CantMove jp Function0x34385 @@ -511,7 +511,7 @@ CheckEnemyTurn: ; 3421f ; 'disabled no more!' ld hl, DisabledNoMoreText - call FarBattleTextBox + call StdBattleTextBox .CheckConfused @@ -528,7 +528,7 @@ CheckEnemyTurn: ; 3421f ; 'confused no more!' ld hl, ConfusedNoMoreText - call FarBattleTextBox + call StdBattleTextBox jr .CheckAttract @@ -536,7 +536,7 @@ CheckEnemyTurn: ; 3421f .Confused ; 'confused!' ld hl, IsConfusedText - call FarBattleTextBox + call StdBattleTextBox xor a ld [$cfca], a @@ -555,7 +555,7 @@ CheckEnemyTurn: ; 3421f ; 'hurt itself in its confusion!' ld hl, HurtItselfText - call FarBattleTextBox + call StdBattleTextBox call Function0x355dd @@ -589,7 +589,7 @@ CheckEnemyTurn: ; 3421f ; 'in love with' ld hl, InLoveWithText - call FarBattleTextBox + call StdBattleTextBox xor a ld [$cfca], a @@ -604,7 +604,7 @@ CheckEnemyTurn: ; 3421f ; 'infatuation kept it from attacking!' ld hl, InfatuationText - call FarBattleTextBox + call StdBattleTextBox call CantMove jp Function0x34385 @@ -639,7 +639,7 @@ CheckEnemyTurn: ; 3421f ; 'fully paralyzed!' ld hl, FullyParalyzedText - call FarBattleTextBox + call StdBattleTextBox call CantMove @@ -668,7 +668,7 @@ MoveDisabled: ; 3438d ; 'disabled!' ld hl, DisabledMoveText - jp FarBattleTextBox + jp StdBattleTextBox ; 343a5 @@ -676,7 +676,7 @@ HitConfusion: ; 343a5 ; 'hurt itself in its confusion!' ld hl, HurtItselfText - call FarBattleTextBox + call StdBattleTextBox xor a ld [CriticalHit], a @@ -854,7 +854,7 @@ BattleCommand02: ; 343db ; 'won't obey!' ld hl, WontObeyText - call FarBattleTextBox + call StdBattleTextBox call HitConfusion @@ -898,7 +898,7 @@ BattleCommand02: ; 343db ld hl, IgnoredOrdersText .Print - call FarBattleTextBox + call StdBattleTextBox jp Function0x3450c @@ -1043,7 +1043,7 @@ IgnoreSleepOnly: ; 3451f ; 'ignored orders…sleeping!' ld hl, IgnoredSleepingText - call FarBattleTextBox + call StdBattleTextBox call EndMoveEffect @@ -1192,7 +1192,7 @@ BattleCommand04: ; 34555 ; 'but no pp is left for the move' ld hl, NoPPLeftText .print - call FarBattleTextBox + call StdBattleTextBox ld b, 1 ret ; 34602 @@ -2471,7 +2471,7 @@ BattleCommand09: ; 34d32 ; 'protecting itself!' ld hl, ProtectingItselfText - call FarBattleTextBox + call StdBattleTextBox ld c, 40 call DelayFrames @@ -3014,7 +3014,7 @@ BattleCommand0e: ; 3505e dec a jr nz, .asm_350ab ; 350a3 $6 ld hl, EnduredText - jp FarBattleTextBox + jp StdBattleTextBox .asm_350ab call GetOpponentItem @@ -3023,7 +3023,7 @@ BattleCommand0e: ; 3505e call GetItemName ld hl, HungOnText - jp FarBattleTextBox + jp StdBattleTextBox .asm_50bb ld a, BATTLE_VARS_SUBSTATUS4_OPP @@ -3105,7 +3105,7 @@ Function0x350e4: ; 350e4 ld [hl], a .asm_3513e ld hl, CrashedText - call FarBattleTextBox + call StdBattleTextBox ld a, $1 ld [$c689], a call Function0x37e36 @@ -3123,7 +3123,7 @@ Function0x35157: ; 35157 ld h, d ld l, e .asm_35162 - jp FarBattleTextBox + jp StdBattleTextBox ; 35165 @@ -3157,7 +3157,7 @@ BattleCommand0f: ; 35175 ld a, [hli] ld h, [hl] ld l, a - call FarBattleTextBox + call StdBattleTextBox xor a ld [CriticalHit], a @@ -3211,7 +3211,7 @@ BattleCommand10: ; 351ad jr nc, .print ld hl, NotVeryEffectiveText ; 'not very effective' .print - jp FarBattleTextBox + jp StdBattleTextBox ; 351c0 @@ -3237,7 +3237,7 @@ BattleCommand11: ; 351c0 jr z, .asm_35231 ld hl, TookDownWithItText - call FarBattleTextBox + call StdBattleTextBox ld a, [hBattleTurn] and a @@ -3332,7 +3332,7 @@ BattleCommand12: ; 35250 call SwitchTurn ld hl, RageBuildingText - call FarBattleTextBox + call StdBattleTextBox jp SwitchTurn ; 3527b @@ -3822,7 +3822,7 @@ BattleCommanda1: ; 35461 ld a, $1 ld [$c72d], a ld hl, BeatUpAttackText - call FarBattleTextBox + call StdBattleTextBox ld a, [EnemyMonSpecies] ld [CurSpecies], a call $3856 @@ -3923,11 +3923,11 @@ BattleCommanda1: ; 35461 ld [$d265], a call $343b ld hl, BeatUpAttackText - call FarBattleTextBox + call StdBattleTextBox jp EnemyAttackDamage .asm_3557d ld hl, BeatUpAttackText - call FarBattleTextBox + call StdBattleTextBox ld a, [BattleMonSpecies] ld [CurSpecies], a call GetBaseData @@ -4626,7 +4626,7 @@ BattleCommand41: ; 35864 call Function0x37e01 ld hl, GotAnEncoreText - jp FarBattleTextBox + jp StdBattleTextBox ; 35923 @@ -4673,7 +4673,7 @@ BattleCommand42: ; 35926 rst FarCall ld hl, SharedPainText - jp FarBattleTextBox + jp StdBattleTextBox .asm_3597d ld a, [hld] @@ -4815,7 +4815,7 @@ BattleCommand44: ; 359e6 ld a, $29 call Predef ld hl, $5452 - jp FarBattleTextBox + jp StdBattleTextBox .asm_35a50 jp Function0x37354 ; 35a53 @@ -4835,7 +4835,7 @@ BattleCommand45: ; 35a53 call Function0x37e01 ld hl, TookAimText - jp FarBattleTextBox + jp StdBattleTextBox .asm_35a6e call Function0x37e77 @@ -4938,7 +4938,7 @@ BattleCommand46: ; 35a74 call Function0x37e01 ld hl, SketchedText - jp FarBattleTextBox + jp StdBattleTextBox .asm_35b10 call Function0x37e77 @@ -5131,7 +5131,7 @@ BattleCommand49: ; 35bff set 6, [hl] call Function0x37e01 ld hl, DestinyBondEffectText - jp FarBattleTextBox + jp StdBattleTextBox ; 35c0f @@ -5216,7 +5216,7 @@ BattleCommand4a: ; 35c0f ld a, d ld [$d265], a ld hl, SpiteEffectText - jp FarBattleTextBox + jp StdBattleTextBox .asm_35c91 jp PrintDidntAffect2 ; 35c94 @@ -5294,7 +5294,7 @@ BattleCommand4c: ; 35cc9 call Function0x37e01 ld hl, BellChimedText - call FarBattleTextBox + call StdBattleTextBox ld a, [hBattleTurn] and a @@ -5452,7 +5452,7 @@ Function0x35d7e: ; 35d7e Function0x35de0: ; 35de0 ld hl, SubTookDamageText - call FarBattleTextBox + call StdBattleTextBox ld de, $c6e0 ld a, [hBattleTurn] @@ -5479,7 +5479,7 @@ Function0x35de0: ; 35de0 res 4, [hl] ld hl, SubFadedText - call FarBattleTextBox + call StdBattleTextBox call SwitchTurn call BattleCommanda7 @@ -5587,7 +5587,7 @@ BattleCommand14: ; 35e5c call RefreshBattleHuds ld hl, FellAsleepText - call FarBattleTextBox + call StdBattleTextBox ld a, $f ld hl, $5de9 @@ -5600,7 +5600,7 @@ BattleCommand14: ; 35e5c push hl call Function0x37e77 pop hl - jp FarBattleTextBox + jp StdBattleTextBox ; 35ece @@ -5664,7 +5664,7 @@ BattleCommand13: ; 35eee call RefreshBattleHuds ld hl, WasPoisonedText - call FarBattleTextBox + call StdBattleTextBox ld a, $f ld hl, $5de9 @@ -5729,7 +5729,7 @@ BattleCommand2f: ; 35f2c call Function0x35fc0 ld hl, WasPoisonedText - call FarBattleTextBox + call StdBattleTextBox jr .asm_35fb1 ; 35fa2 $d .asm_35fa4 @@ -5739,7 +5739,7 @@ BattleCommand2f: ; 35f2c call Function0x35fc0 ld hl, BadlyPoisonedText - call FarBattleTextBox + call StdBattleTextBox .asm_35fb1 ld a, $f @@ -5751,7 +5751,7 @@ BattleCommand2f: ; 35f2c push hl call Function0x37e77 pop hl - jp FarBattleTextBox + jp StdBattleTextBox ; 35fc0 @@ -5807,7 +5807,7 @@ BattleCommand15: ; 35fff ; draintarget call Function0x36011 ld hl, SuckedHealthText - jp FarBattleTextBox + jp StdBattleTextBox ; 36008 @@ -5815,7 +5815,7 @@ BattleCommand16: ; 36008 ; eatdream call Function0x36011 ld hl, DreamEatenText - jp FarBattleTextBox + jp StdBattleTextBox ; 36011 @@ -5938,7 +5938,7 @@ BattleCommand17: ; 3608c call RefreshBattleHuds ld hl, WasBurnedText - call FarBattleTextBox + call StdBattleTextBox ld a, $f ld hl, $5de9 @@ -5970,7 +5970,7 @@ Defrost: ; 360dd call UpdateOpponentInParty ld hl, DefrostedOpponentText - jp FarBattleTextBox + jp StdBattleTextBox ; 36102 @@ -6011,7 +6011,7 @@ BattleCommand18: ; 36102 call RefreshBattleHuds ld hl, WasFrozenText - call FarBattleTextBox + call StdBattleTextBox ld a, $f ld hl, $5de9 @@ -6596,7 +6596,7 @@ BattleCommand8e: ; 3644c inc b call GetStatName ld hl, WontRiseAnymoreText - jp FarBattleTextBox + jp StdBattleTextBox ; 3646a @@ -6612,14 +6612,14 @@ BattleCommand8f: ; 3646a jp z, TryPrintButItFailed dec a ld hl, ProtectedByMistText - jp z, FarBattleTextBox + jp z, StdBattleTextBox ld a, [LoweredStat] and $f ld b, a inc b call GetStatName ld hl, WontDropAnymoreText - jp FarBattleTextBox + jp StdBattleTextBox ; 3648f @@ -6972,7 +6972,7 @@ BattleCommand21: ; 36671 res 0, [hl] ld hl, UnleashedEnergyText - call FarBattleTextBox + call StdBattleTextBox ld a, BATTLE_VARS_MOVE_POWER call GetBattleVarPair @@ -7018,7 +7018,7 @@ BattleCommand21: ; 36671 .asm_366dc ld hl, StoringEnergyText - call FarBattleTextBox + call StdBattleTextBox jp EndMoveEffect ; 366e5 @@ -7199,7 +7199,7 @@ BattleCommanda0: ; 36778 call Function0x36804 ld hl, FledFromBattleText - jp FarBattleTextBox + jp StdBattleTextBox ; 36804 @@ -7305,7 +7305,7 @@ BattleCommand23: ; 3680f rst FarCall ld hl, DraggedOutText - call FarBattleTextBox + call StdBattleTextBox ld hl, $5c23 jp CallBankF @@ -7402,7 +7402,7 @@ BattleCommand23: ; 3680f call CallBankF ld hl, DraggedOutText - call FarBattleTextBox + call StdBattleTextBox ld hl, $5c23 jp CallBankF @@ -7428,7 +7428,7 @@ BattleCommand23: ; 3680f jr z, .asm_36991 ld hl, BlownAwayText .asm_36991 - jp FarBattleTextBox + jp StdBattleTextBox ; 36994 @@ -7569,7 +7569,7 @@ BattleCommand24: ; 369b6 call CleanGetBattleVarPair cp EFFECT_BEAT_UP jr z, .asm_36a67 - call FarBattleTextBox + call StdBattleTextBox .asm_36a67 pop bc @@ -7767,7 +7767,7 @@ BattleCommand39: ; 36b4d ld hl, IgnoredOrders2Text ld a, [AlreadyDisobeyed] and a - call nz, FarBattleTextBox + call nz, StdBattleTextBox call BattleCommand0a xor a @@ -7941,7 +7941,7 @@ BattleCommand3b: ; 36c2d ld a, [hli] ld h, [hl] ld l, a - jp FarBattleTextBox + jp StdBattleTextBox .Traps dbw BIND, UsedBindText ; 'used BIND on' @@ -7962,7 +7962,7 @@ BattleCommand28: ; 36c7e set 1, [hl] call Function0x37e01 ld hl, MistText - jp FarBattleTextBox + jp StdBattleTextBox .asm_36c92 call Function0x37e77 jp PrintButItFailed @@ -7979,7 +7979,7 @@ BattleCommand29: ; 36c98 set 2, [hl] call Function0x37e01 ld hl, GettingPumpedText - jp FarBattleTextBox + jp StdBattleTextBox .asm_36cac call Function0x37e77 jp PrintButItFailed @@ -8048,7 +8048,7 @@ BattleCommand27: ; 36cb2 call Predef call RefreshBattleHuds ld hl, RecoilText - jp FarBattleTextBox + jp StdBattleTextBox ; 36d1d @@ -8085,7 +8085,7 @@ BattleCommand2a: ; 36d3b call GetItemName call Function0x37e77 ld hl, ProtectedByText - jp FarBattleTextBox + jp StdBattleTextBox .asm_36d53 ld a, BATTLE_VARS_SUBSTATUS3_OPP @@ -8094,7 +8094,7 @@ BattleCommand2a: ; 36d3b jr z, .asm_36d65 call Function0x37e77 ld hl, AlreadyConfusedText - jp FarBattleTextBox + jp StdBattleTextBox .asm_36d65 call CheckSubstituteOpp @@ -8137,7 +8137,7 @@ Function0x36d70: ; 36d70 call Function0x37e54 ld hl, BecameConfusedText - call FarBattleTextBox + call StdBattleTextBox call GetOpponentItem ld a, b @@ -8182,7 +8182,7 @@ BattleCommand30: ; 36dc7 call GetItemName call Function0x37e77 ld hl, ProtectedByText - jp FarBattleTextBox + jp StdBattleTextBox .asm_36def ld a, [hBattleTurn] and a @@ -8227,7 +8227,7 @@ BattleCommand30: ; 36dc7 .asm_36e49 call Function0x37e77 ld hl, AlreadyParalyzedText - jp FarBattleTextBox + jp StdBattleTextBox .asm_36e52 jp PrintDidntAffect2 .asm_36e55 @@ -8338,7 +8338,7 @@ BattleCommand31: ; 36e7c call BattleCommanda6 .asm_36eeb ld hl, MadeSubstituteText - call FarBattleTextBox + call StdBattleTextBox jp RefreshBattleHuds .asm_36ef4 call Function0x34548 @@ -8350,7 +8350,7 @@ BattleCommand31: ; 36e7c call nz, BattleCommand0c ld hl, TooWeakSubText .asm_36f08 - jp FarBattleTextBox + jp StdBattleTextBox ; 36f0b BattleCommand32: ; 36f0b @@ -8463,7 +8463,7 @@ BattleCommand33: ; 36f46 call GetMoveName call Function0x37e01 ld hl, LearnedMoveText - jp FarBattleTextBox + jp StdBattleTextBox .asm_36f9a jp Function0x37357 ; 36f9d @@ -8496,14 +8496,14 @@ BattleCommand35: ; 36f9d set 7, [hl] call Function0x37e01 ld hl, WasSeededText - jp FarBattleTextBox + jp StdBattleTextBox .asm_36fd2 call Function0x37e77 jp PrintDoesntAffect .asm_36fd8 call Function0x37e77 ld hl, EvadedText - jp FarBattleTextBox + jp StdBattleTextBox ; 36fe1 @@ -8579,7 +8579,7 @@ BattleCommand37: ; 36fed ld [$d265], a call GetMoveName ld hl, WasDisabledText - jp FarBattleTextBox + jp StdBattleTextBox .asm_37059 jp Function0x37354 ; 3705c @@ -8608,7 +8608,7 @@ BattleCommand1e: ; 3705c inc [hl] .asm_37079 ld hl, CoinsScatteredText - jp FarBattleTextBox + jp StdBattleTextBox ; 3707f @@ -8706,7 +8706,7 @@ BattleCommand1f: ; 3707f rst FarCall call Function0x37e01 ld hl, TransformedTypeText - jp FarBattleTextBox + jp StdBattleTextBox ; 3710e @@ -8733,7 +8733,7 @@ BattleCommand20: ; 3710e call Function0x37e01 ld hl, EliminatedStatsText - jp FarBattleTextBox + jp StdBattleTextBox .Fill ld b, PlayerStatLevelsEnd - PlayerStatLevels @@ -8787,7 +8787,7 @@ BattleCommand2c: ; 3713e jr z, .asm_37186 ; 37181 $3 ld hl, RestedText .asm_37186 - call FarBattleTextBox + call StdBattleTextBox ld a, [hBattleTurn] and a jr nz, .asm_37193 ; 3718c $5 @@ -8816,12 +8816,12 @@ BattleCommand2c: ; 3713e call UpdateUserInParty call RefreshBattleHuds ld hl, RegainedHealthText - jp FarBattleTextBox + jp StdBattleTextBox .asm_371c4 call Function0x37e77 ld hl, HPIsFullText - jp FarBattleTextBox + jp StdBattleTextBox ; 371cd @@ -8958,7 +8958,7 @@ BattleCommand2d: ; 371cd ld a, $a4 call nz, Function0x37e44 ld hl, TransformedText - jp FarBattleTextBox + jp StdBattleTextBox ; 372c6 @@ -9056,7 +9056,7 @@ BattleCommand2e: ; 372fc .asm_37331 call Function0x37e01 - jp FarBattleTextBox + jp StdBattleTextBox .asm_37337 call Function0x37e77 @@ -9067,14 +9067,14 @@ BattleCommand2e: ; 372fc PrintDoesntAffect: ; 3733d ; 'it doesn't affect' ld hl, DoesntAffectText - jp FarBattleTextBox + jp StdBattleTextBox ; 37343 PrintNothingHappened: ; 37343 ; 'but nothing happened!' ld hl, NothingHappenedText - jp FarBattleTextBox + jp StdBattleTextBox ; 37349 @@ -9090,7 +9090,7 @@ TryPrintButItFailed: ; 37349 PrintButItFailed: ; 3734e ; 'but it failed!' ld hl, ButItFailedText - jp FarBattleTextBox + jp StdBattleTextBox ; 37354 @@ -9109,7 +9109,7 @@ Function0x37357: ; 37357 PrintDidntAffect: ; 37360 ; 'it didn't affect' ld hl, DidntAffect1Text - jp FarBattleTextBox + jp StdBattleTextBox ; 37366 @@ -9124,7 +9124,7 @@ PrintDidntAffect2: ; 37366 PrintParalyze: ; 37372 ; 'paralyzed! maybe it can't attack!' ld hl, ParalyzedText - jp FarBattleTextBox + jp StdBattleTextBox ; 37378 @@ -9189,7 +9189,7 @@ BattleCommand1b: ; 373c9 .asm_373de call Function0x37e77 ld hl, MirrorMoveFailedText - call FarBattleTextBox + call StdBattleTextBox jp EndMoveEffect .asm_373ea ld a, b @@ -9391,7 +9391,7 @@ BattleCommand50: ; 37492 .asm_374f8 call GetItemName ld hl, StoleText - jp FarBattleTextBox + jp StdBattleTextBox .asm_37501 ld a, 1 @@ -9422,7 +9422,7 @@ BattleCommand51: ; 37517 set 7, [hl] call Function0x37e01 ld hl, CantEscapeNowText - jp FarBattleTextBox + jp StdBattleTextBox .asm_37530 call Function0x37e77 jp PrintButItFailed @@ -9447,7 +9447,7 @@ BattleCommand52: ; 37536 set 0, [hl] call Function0x37e01 ld hl, StartedNightmareText - jp FarBattleTextBox + jp StdBattleTextBox .asm_3755d call Function0x37e77 jp PrintButItFailed @@ -9475,7 +9475,7 @@ BattleCommand53: ; 37563 .asm_3757f call RefreshBattleHuds ld hl, WasDefrostedText - jp FarBattleTextBox + jp StdBattleTextBox ; 37588 @@ -9536,7 +9536,7 @@ BattleCommand54: ; 37588 call CallBankF call UpdateUserInParty ld hl, PutACurseText - jp FarBattleTextBox + jp StdBattleTextBox .asm_37604 call Function0x37e77 jp PrintButItFailed @@ -9545,7 +9545,7 @@ BattleCommand54: ; 37588 call GetStatName call Function0x37e77 ld hl, WontRiseAnymoreText - jp FarBattleTextBox + jp StdBattleTextBox ; 37618 @@ -9559,7 +9559,7 @@ BattleCommand55: ; 37618 set 2, [hl] call Function0x37e01 ld hl, ProtectedItselfText - jp FarBattleTextBox + jp StdBattleTextBox ; 3762c @@ -9631,7 +9631,7 @@ BattleCommand5a: ; 3766f set SUBSTATUS_ENDURE, [hl] call Function0x37e01 ld hl, BracedItselfText - jp FarBattleTextBox + jp StdBattleTextBox ; 37683 @@ -9651,7 +9651,7 @@ BattleCommand56: ; 37683 set 0, [hl] call Function0x37e01 ld hl, SpikesText - jp FarBattleTextBox + jp StdBattleTextBox .failed jp Function0x37354 @@ -9673,7 +9673,7 @@ BattleCommand57: ; 376a0 set SUBSTATUS_IDENTIFIED, [hl] call Function0x37e01 ld hl, IdentifiedText - jp FarBattleTextBox + jp StdBattleTextBox .asm_376bf jp Function0x37354 ; 376c2 @@ -9706,7 +9706,7 @@ BattleCommand58: ; 376c2 .asm_376e9 call Function0x37e01 ld hl, StartPerishText - jp FarBattleTextBox + jp StdBattleTextBox .asm_376f2 call Function0x37e77 jp PrintButItFailed @@ -9725,7 +9725,7 @@ BattleCommand59: ; 376f8 ld [WeatherCount], a call Function0x37e01 ld hl, SandstormBrewedText - jp FarBattleTextBox + jp StdBattleTextBox .asm_37712 call Function0x37e77 jp PrintButItFailed @@ -9911,7 +9911,7 @@ BattleCommand5f: ; 377ce ; 'fell in love!' ld hl, FellInLoveText - jp FarBattleTextBox + jp StdBattleTextBox .asm_377f2 jp Function0x37354 @@ -10071,7 +10071,7 @@ BattleCommand61: ; 37874 call CallBankF call SwitchTurn ld hl, RegainedHealthText - call FarBattleTextBox + call StdBattleTextBox call SwitchTurn call UpdateOpponentInParty jr .asm_37904 ; 378f1 $11 @@ -10081,7 +10081,7 @@ BattleCommand61: ; 37874 jr nc, .asm_37904 ; 378f9 $9 call Function0x37e77 ld hl, RefusedGiftText - call FarBattleTextBox + call StdBattleTextBox .asm_37904 jp EndMoveEffect @@ -10141,7 +10141,7 @@ BattleCommand64: ; 37939 ld [de], a call Function0x37e01 ld hl, CoveredByVeilText - jp FarBattleTextBox + jp StdBattleTextBox .asm_3795c call Function0x37e77 jp PrintButItFailed @@ -10177,7 +10177,7 @@ BattleCommand65: ; 37972 ld [AttackMissed], a call BattleCommandaa ld hl, SafeguardProtectText - call FarBattleTextBox + call StdBattleTextBox jp EndMoveEffect ; 37991 @@ -10204,7 +10204,7 @@ BattleCommand66: ; 37991 ld [$d265], a call BattleCommandaa ld hl, MagnitudeText - call FarBattleTextBox + call StdBattleTextBox pop de pop bc ret @@ -10485,7 +10485,7 @@ BattleCommand69: ; 37b39 jr z, .asm_37b4a ; 37b40 $8 res 7, [hl] ld hl, ShedLeechSeedText - call FarBattleTextBox + call StdBattleTextBox .asm_37b4a ld hl, PlayerScreens ld de, $c730 @@ -10500,7 +10500,7 @@ BattleCommand69: ; 37b39 res 0, [hl] ld hl, BlewSpikesText push de - call FarBattleTextBox + call StdBattleTextBox pop de .asm_37b69 ld a, [de] @@ -10509,7 +10509,7 @@ BattleCommand69: ; 37b39 xor a ld [de], a ld hl, ReleasedByText - jp FarBattleTextBox + jp StdBattleTextBox ; 37b74 @@ -10600,14 +10600,14 @@ BattleCommand6a6c: ; 37b7e ; 'regained health!' ld hl, RegainedHealthText - jp FarBattleTextBox + jp StdBattleTextBox .Full call Function0x37e77 ; 'hp is full!' ld hl, HPIsFullText - jp FarBattleTextBox + jp StdBattleTextBox .Multipliers dw GetEighthMaxHP @@ -10636,7 +10636,7 @@ BattleCommand6e: ; 37bf4 ld [WeatherCount], a call Function0x37e01 ld hl, DownpourText - jp FarBattleTextBox + jp StdBattleTextBox ; 37c07 @@ -10648,7 +10648,7 @@ BattleCommand6f: ; 37c07 ld [WeatherCount], a call Function0x37e01 ld hl, SunGotBrightText - jp FarBattleTextBox + jp StdBattleTextBox ; 37c1a @@ -10685,7 +10685,7 @@ BattleCommand95: ; 37c1a jr nz, .asm_37c41 ; 37c47 $f8 ld hl, BellyDrumText - jp FarBattleTextBox + jp StdBattleTextBox .asm_37c4f call Function0x37e77 jp PrintButItFailed @@ -10735,7 +10735,7 @@ BattleCommand96: ; 37c55 .asm_37c8c call Function0x37e01 ld hl, CopiedStatsText - jp FarBattleTextBox + jp StdBattleTextBox ; 37c95 @@ -10884,7 +10884,7 @@ BattleCommand9c: ; 37d34 call BattleCommand0a call BattleCommandaa ld hl, ForesawAttackText - call FarBattleTextBox + call StdBattleTextBox call BattleCommand0c ld de, $c727 ld a, [hBattleTurn] diff --git a/items/item_effects.asm b/items/item_effects.asm index b060914db..342f61926 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -1212,7 +1212,7 @@ BitterBerry: ; f16a call $7789 ld hl, $4d81 - call FarBattleTextBox + call StdBattleTextBox ld a, $0 diff --git a/main.asm b/main.asm index 0b848c4e0..077205a37 100644 --- a/main.asm +++ b/main.asm @@ -8178,24 +8178,25 @@ MobileTextBorder: ; 3ab2 BattleTextBox: ; 3ac3 +; Open a textbox and print text at hl. push hl call SpeechTextBox call MobileTextBorder - call Function1ad2 ; UpdateSprites - call Function321c ; refresh? + call Function1ad2 + call Function321c pop hl call PrintTextBoxText ret ; 3ad5 -FarBattleTextBox: ; 3ad5 -; Open a textbox and print text at 20:hl. +StdBattleTextBox: ; 3ad5 +; Open a textbox and print battle text at 20:hl. ld a, [hROMBank] push af - ld a, $20 + ld a, BANK(BattleText) rst Bankswitch call BattleTextBox @@ -36361,7 +36362,7 @@ Function3c0e5: ; 3c0e5 ld hl, $5863 .asm_3c115 - call FarBattleTextBox + call StdBattleTextBox .asm_3c118 call Function3ceec @@ -36624,7 +36625,7 @@ Function3c27c: ; 3c27c ld [hl], a call GetItemName ld hl, $4bde - call FarBattleTextBox + call StdBattleTextBox callab BattleCommand8c pop af bit 7, a @@ -36635,7 +36636,7 @@ Function3c27c: ; 3c27c call Function3ee0f call Function3c8e4 ld hl, $4d97 - jp FarBattleTextBox + jp StdBattleTextBox ; 3c300 Function3c300: ; 3c300 @@ -36945,7 +36946,7 @@ Function3c4df: ; 3c4df res 4, [hl] call SetEnemyTurn ld hl, $4c8a - jp FarBattleTextBox + jp StdBattleTextBox .asm_3c518 ld hl, EnemySubStatus5 @@ -36969,7 +36970,7 @@ Function3c4df: ; 3c4df res 4, [hl] call SetPlayerTurn ld hl, $4c8a - jp FarBattleTextBox + jp StdBattleTextBox ; 3c543 @@ -37278,7 +37279,7 @@ Function3c716: ; 3c716 .asm_3c733 push de - call FarBattleTextBox + call StdBattleTextBox pop de xor a ld [$cfca], a @@ -37332,7 +37333,7 @@ Function3c716: ; 3c716 ld [hBGMapMode], a call Function3ccef ld hl, $480e - call FarBattleTextBox + call StdBattleTextBox .asm_3c7a1 call Function3c706 @@ -37348,7 +37349,7 @@ Function3c716: ; 3c716 call GetQuarterMaxHP call Function3cc3f ld hl, $4822 - call FarBattleTextBox + call StdBattleTextBox .asm_3c7c5 call Function3c706 @@ -37364,7 +37365,7 @@ Function3c716: ; 3c716 call GetQuarterMaxHP call Function3cc3f ld hl, $4836 - call FarBattleTextBox + call StdBattleTextBox .asm_3c7e9 ld hl, BattleMonHP @@ -37415,7 +37416,7 @@ Function3c801: ; 3c801 ld [$d265], a push af ld hl, $4864 - call FarBattleTextBox + call StdBattleTextBox pop af ret nz ld a, $0 @@ -37510,7 +37511,7 @@ Function3c874: ; 3c874 ld hl, $4df5 .asm_3c8e1 - jp FarBattleTextBox + jp StdBattleTextBox ; 3c8e4 Function3c8e4: ; 3c8e4 @@ -37563,7 +37564,7 @@ Function3c8eb: ; 3c8eb call Function3c8e4 call Function3ccef ld hl, $4880 - jp FarBattleTextBox + jp StdBattleTextBox ; 3c93c Function3c93c: ; 3c93c @@ -37702,7 +37703,7 @@ Function3c93c: ; 3c93c call Function3ddc8 call Function3c8e4 ld hl, $4899 - jp FarBattleTextBox + jp StdBattleTextBox ; 3ca26 Function3ca26: ; 3ca26 @@ -37733,7 +37734,7 @@ Function3ca26: ; 3ca26 cp $1 ret nz ld hl, $48b6 - call FarBattleTextBox + call StdBattleTextBox ld a, $10 call GetBattleVarPair push af @@ -37784,7 +37785,7 @@ Function3ca8f: ; 3ca8f call UpdateBattleHuds call SetEnemyTurn ld hl, $524b - jp FarBattleTextBox + jp StdBattleTextBox .asm_3cac9 ld a, [EnemyMonStatus] @@ -37810,7 +37811,7 @@ Function3ca8f: ; 3ca8f call UpdateBattleHuds call SetPlayerTurn ld hl, $524b - jp FarBattleTextBox + jp StdBattleTextBox ; 3cafb Function3cafb: ; 3cafb @@ -37847,7 +37848,7 @@ Function3cafb: ; 3cafb .asm_3cb2e ld [hBattleTurn], a ld hl, $48d2 - jp FarBattleTextBox + jp StdBattleTextBox ; 3cb36 @@ -37904,7 +37905,7 @@ FadeLightScreen: ; 3cb80 push hl push de ld hl, BattleText_0x808e7 - call FarBattleTextBox + call StdBattleTextBox pop de pop hl ret @@ -37918,7 +37919,7 @@ FadeReflect: ; 3cb91 ret nz res SCREENS_REFLECT, [hl] ld hl, BattleText_0x80905 - jp FarBattleTextBox + jp StdBattleTextBox ; 3cb9e HandleWeather: ; 3cb9e @@ -37991,7 +37992,7 @@ HandleWeather: ; 3cb9e call Function3cc3f ld hl, BattleText_0x8084d - jp FarBattleTextBox + jp StdBattleTextBox .asm_3cc13 ld hl, .WeatherEndedMessages @@ -38010,7 +38011,7 @@ HandleWeather: ; 3cb9e ld a, [hli] ld h, [hl] ld l, a - jp FarBattleTextBox + jp StdBattleTextBox ; 3cc2d .WeatherMessages @@ -38521,7 +38522,7 @@ Function3cef1: ; 3cef1 ld bc, $050b call ClearBox ld hl, BattleText_0x80a75 - jp FarBattleTextBox + jp StdBattleTextBox ; 3cf14 Function3cf14: ; 3cf14 @@ -38535,7 +38536,7 @@ Function3cf14: ; 3cf14 ld bc, $040a call ClearBox ld hl, BattleText_0x809a8 - jp FarBattleTextBox + jp StdBattleTextBox ; 3cf35 Function3cf35: ; 3cf35 @@ -38620,7 +38621,7 @@ Function3cfa4: ; 3cfa4 call z, Function3d0ea callab Function39939 ld hl, BattleText_0x809da - call FarBattleTextBox + call StdBattleTextBox call Function3d2f1 jr z, .asm_3cff5 ld a, [InLinkBattle] @@ -38729,11 +38730,11 @@ Function3d02b: ; 3d02b ld a, [hli] ld h, [hl] ld l, a - jp FarBattleTextBox + jp StdBattleTextBox .asm_3d07b ld hl, BattleText_0x809be - jp FarBattleTextBox + jp StdBattleTextBox ; 3d081 Function3d081: ; 3d081 @@ -39013,7 +39014,7 @@ Function3d1f8: ; 3d1f8 dec a ret nz ld hl, BattleText_0x80a83 - call FarBattleTextBox + call StdBattleTextBox .asm_3d20a ld bc, $0107 call Function1dd2 @@ -39188,7 +39189,7 @@ Function3d34f: ; 3d34f cp [hl] jr nz, .asm_3d360 ld hl, BattleText_0x80c0d - call FarBattleTextBox + call StdBattleTextBox scf ret @@ -39309,7 +39310,7 @@ LostBattle: ; 3d38e jr z, .asm_3d417 .asm_3d412 - call FarBattleTextBox + call StdBattleTextBox .end scf @@ -39827,7 +39828,7 @@ Function3d74b: ; 3d74b push af callab Function39939 ld hl, BattleText_0x80aca - call FarBattleTextBox + call StdBattleTextBox ld bc, $0107 call Function1dd2 ld a, [$cfa9] @@ -39878,7 +39879,7 @@ Function3d7a0: ; 3d7a0 Function3d7b8: ; 3d7b8 callab Function39939 ld hl, BattleText_0x80af8 - call FarBattleTextBox + call StdBattleTextBox jp WaitBGMap ; 3d7c7 @@ -40009,7 +40010,7 @@ Function3d887: ; 3d887 ld hl, BattleText_0x80b0b .asm_3d8ae - call FarBattleTextBox + call StdBattleTextBox .asm_3d8b1 xor a @@ -40063,7 +40064,7 @@ Function3d8b3: ; 3d8b3 call SetPlayerTurn call GetItemName ld hl, BattleText_0x80b89 - call FarBattleTextBox + call StdBattleTextBox jp .asm_3d9a2 .asm_3d916 @@ -40140,7 +40141,7 @@ Function3d8b3: ; 3d8b3 ld hl, BattleText_0x80b49 .asm_3d995 - call FarBattleTextBox + call StdBattleTextBox ld a, $1 ld [$d266], a call Function309d @@ -40183,7 +40184,7 @@ Function3d8b3: ; 3d8b3 pop de call WaitSFX ld hl, BattleText_0x80b77 - call FarBattleTextBox + call StdBattleTextBox call WaitSFX call Function309d scf @@ -40195,7 +40196,7 @@ Function3d8b3: ; 3d8b3 bit 4, [hl] jr nz, .asm_3da05 ld hl, BattleText_0x81863 - call FarBattleTextBox + call StdBattleTextBox .asm_3da05 call WaitSFX @@ -40488,7 +40489,7 @@ Function3dc23: ; 3dc23 ret z push bc ld hl, BattleText_0x80bae - call FarBattleTextBox + call StdBattleTextBox call GetEighthMaxHP call Function3cc39 pop hl @@ -40565,7 +40566,7 @@ Function3dc5b: ; 3dc5b ld hl, BattleText_0x809a8 .asm_3dcdf - call FarBattleTextBox + call StdBattleTextBox scf ret @@ -40701,7 +40702,7 @@ Function3dd2f: ; 3dd2f ld a, $9 rst FarCall ld hl, RecoveredUsingText - jp FarBattleTextBox + jp StdBattleTextBox ; 3ddc8 @@ -40812,7 +40813,7 @@ Function3de51: ; 3de51 call GetItemName call Function3ddc8 ld hl, BattleText_0x80dab - call FarBattleTextBox + call StdBattleTextBox ld a, [hBattleTurn] and a jr nz, .asm_3de90 @@ -40892,7 +40893,7 @@ Function3deb1: ; 3deb1 ld [de], a call GetItemName ld hl, BattleText_0x80bde - call FarBattleTextBox + call StdBattleTextBox callab BattleCommand8c ret @@ -41328,7 +41329,7 @@ Function3e19b: ; 3e19b bit 4, [hl] jr nz, .asm_3e1c5 ld hl, $5863 - call FarBattleTextBox + call StdBattleTextBox ld c, $3c call DelayFrames @@ -41391,7 +41392,7 @@ Function3e1c7: ; 3e1c7 Function3e22b: ; 3e22b ld hl, BattleText_0x80bf3 - call FarBattleTextBox + call StdBattleTextBox jp Function3e139 ; 3e234 @@ -41546,7 +41547,7 @@ Function3e358: ; 3e358 cp d jr nz, .asm_3e36b ld hl, BattleText_0x80c0d - call FarBattleTextBox + call StdBattleTextBox jp $6299 .asm_3e36b @@ -41559,7 +41560,7 @@ Function3e358: ; 3e358 .asm_3e378 ld hl, BattleText_0x80c22 - call FarBattleTextBox + call StdBattleTextBox jp $6299 .asm_3e381 @@ -41919,7 +41920,7 @@ Function3e4bc: ; 3e4bc ld hl, Function3cc39 .asm_3e613 - call FarBattleTextBox + call StdBattleTextBox call Function30b4 jp Function3e4bc ; 3e61c @@ -42168,7 +42169,7 @@ Function3e786: ; 3e786 .asm_3e7b4 ld hl, BattleText_0x80c72 - call FarBattleTextBox + call StdBattleTextBox ld c, $3c call DelayFrames xor a @@ -43811,7 +43812,7 @@ Function3ee3b: ; 3ee3b call StartSFX call WaitSFX ld hl, BattleText_0x80c9c - call FarBattleTextBox + call StdBattleTextBox call Function309d .asm_3f057 @@ -44064,7 +44065,7 @@ Function3f136: ; 3f136 rst FarCall call WaitSFX ld hl, BattleText_0x80c9c - call FarBattleTextBox + call StdBattleTextBox pop de inc e ld b, $0 @@ -44353,7 +44354,7 @@ Function3f360: ; 3f360 push hl call Function30b4 pop hl - jp FarBattleTextBox + jp StdBattleTextBox ; 3f390 @@ -44912,7 +44913,7 @@ Function3f71d: ; 3f71d ld de, $d850 call Function3d0be ld hl, BattleText_0x80730 - call FarBattleTextBox + call StdBattleTextBox ld a, [$cfc0] bit 0, a ret z @@ -45752,7 +45753,7 @@ BattleStartMessage: ; 3fc8b ld hl, $4000 rst FarCall pop hl - call FarBattleTextBox + call StdBattleTextBox call Function3f830 ret nz @@ -54111,6 +54112,7 @@ INCLUDE "engine/engine_flags.asm" INCBIN "baserom.gbc", $80648, $80730-$80648 +BattleText: INCLUDE "text/battle.asm" INCBIN "baserom.gbc", $818ac, $81fe3-$818ac @@ -68010,7 +68012,7 @@ Function100bc2: ; 100bc2 ld hl, $4c39 .asm_100c6b - call FarBattleTextBox + call StdBattleTextBox call Function30b4 jp Function100bc2 ; 100c74