diff options
Diffstat (limited to 'engine/battle/effect_commands.asm')
| -rw-r--r-- | engine/battle/effect_commands.asm | 154 |
1 files changed, 0 insertions, 154 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index e19cce189..35e94ee2d 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -7,7 +7,6 @@ DoPlayerTurn: jr DoTurn - DoEnemyTurn: call SetEnemyTurn @@ -109,7 +108,6 @@ DoMove: .DoMoveEffectCommand: jp hl - CheckTurn: BattleCommand_CheckTurn: ; checkturn @@ -336,7 +334,6 @@ CheckPlayerTurn: call CantMove jp EndTurn - CantMove: ld a, BATTLE_VARS_SUBSTATUS1 call GetBattleVarAddr @@ -363,15 +360,11 @@ CantMove: res SUBSTATUS_FLYING, [hl] jp AppearUserRaiseSub - - OpponentCantMove: call BattleCommand_SwitchTurn call CantMove jp BattleCommand_SwitchTurn - - CheckEnemyTurn: ld hl, wEnemySubStatus4 @@ -595,7 +588,6 @@ EndTurn: ld [wTurnEnded], a jp ResetDamage - MoveDisabled: ; Make sure any charged moves fail @@ -611,7 +603,6 @@ MoveDisabled: ld hl, DisabledMoveText jp StdBattleTextBox - HitConfusion: ld hl, HurtItselfText @@ -642,7 +633,6 @@ HitConfusion: call DoPlayerDamage jp BattleCommand_RaiseSub - BattleCommand_CheckObedience: ; checkobedience @@ -928,7 +918,6 @@ BattleCommand_CheckObedience: jp EndMoveEffect - IgnoreSleepOnly: ld a, BATTLE_VARS_MOVE_ANIM @@ -957,13 +946,11 @@ IgnoreSleepOnly: scf ret - BattleCommand_UsedMoveText: ; usedmovetext farcall DisplayUsedMoveText ret - CheckUserIsCharging: ld a, [hBattleTurn] @@ -975,7 +962,6 @@ CheckUserIsCharging: and a ret - BattleCommand_DoTurn: call CheckUserIsCharging ret nz @@ -1142,7 +1128,6 @@ CheckMimicUsed: and a ret - BattleCommand_Critical: ; critical @@ -1421,7 +1406,6 @@ BattleCommand_Stab: ld [wTypeModifier], a ret - BattleCheckTypeMatchup: ld hl, wEnemyMonType1 ld a, [hBattleTurn] @@ -1501,7 +1485,6 @@ CheckTypeMatchup: pop hl ret - BattleCommand_ResetTypeMatchup: ; Reset the type matchup multiplier to 1.0, if the type matchup is not 0. ; If there is immunity in play, the move automatically misses. @@ -1521,7 +1504,6 @@ BattleCommand_ResetTypeMatchup: ld [wTypeMatchup], a ret - INCLUDE "engine/battle/ai/switch.asm" INCLUDE "data/types/type_matchups.asm" @@ -1578,7 +1560,6 @@ BattleCommand_DamageVariation: ld [hl], a ret - BattleCommand_CheckHit: ; checkhit @@ -1914,7 +1895,6 @@ BattleCommand_EffectChance: and a ret - BattleCommand_LowerSub: ; lowersub @@ -1983,14 +1963,12 @@ BattleCommand_LowerSub: ld [wSomeoneIsRampaging], a ret - BattleCommand_MoveAnim: ; moveanim call BattleCommand_LowerSub call BattleCommand_MoveAnimNoSub jp BattleCommand_RaiseSub - BattleCommand_MoveAnimNoSub: ld a, [wAttackMissed] and a @@ -2055,7 +2033,6 @@ BattleCommand_MoveAnimNoSub: ld [wNumHits], a jp PlayFXAnimID - BattleCommand_StatUpAnim: ld a, [wAttackMissed] and a @@ -2064,7 +2041,6 @@ BattleCommand_StatUpAnim: xor a jr BattleCommand_StatUpDownAnim - BattleCommand_StatDownAnim: ld a, [wAttackMissed] and a @@ -2088,7 +2064,6 @@ BattleCommand_StatUpDownAnim: ld d, 0 jp PlayFXAnimID - BattleCommand_SwitchTurn: ; switchturn @@ -2097,7 +2072,6 @@ BattleCommand_SwitchTurn: ld [hBattleTurn], a ret - BattleCommand_RaiseSub: ; raisesub @@ -2117,7 +2091,6 @@ BattleCommand_RaiseSub: ld a, SUBSTITUTE jp LoadAnim - BattleCommand_FailureText: ; failuretext ; If the move missed or failed, load the appropriate @@ -2160,7 +2133,6 @@ BattleCommand_FailureText: call AppearUserRaiseSub jp EndMoveEffect - BattleCommand_ApplyDamage: ; applydamage @@ -2253,7 +2225,6 @@ BattleCommand_ApplyDamage: ld [de], a ret - GetFailureResultText: ld hl, DoesntAffectText ld de, DoesntAffectText @@ -2322,7 +2293,6 @@ FailText_CheckOpponentProtect: .not_protected jp StdBattleTextBox - BattleCommand_BideFailText: ld a, [wAttackMissed] and a @@ -2333,7 +2303,6 @@ BattleCommand_BideFailText: jp z, PrintDoesntAffect jp PrintButItFailed - BattleCommand_CriticalText: ; criticaltext ; Prints the message for critical hits or one-hit KOs. @@ -2378,7 +2347,6 @@ BattleCommand_StartLoop: ld [hl], a ret - BattleCommand_SuperEffectiveLoopText: ; supereffectivelooptext @@ -2402,7 +2370,6 @@ BattleCommand_SuperEffectiveText: .print jp StdBattleTextBox - BattleCommand_CheckDestinyBond: ; checkdestinybond @@ -2490,7 +2457,6 @@ BattleCommand_CheckDestinyBond: .finish jp EndMoveEffect - BattleCommand_BuildOpponentRage: ; buildopponentrage @@ -2522,7 +2488,6 @@ BattleCommand_BuildOpponentRage: call StdBattleTextBox jp BattleCommand_SwitchTurn - BattleCommand_RageDamage: ; ragedamage @@ -2551,7 +2516,6 @@ BattleCommand_RageDamage: ld [wCurDamage + 1], a ret - EndMoveEffect: ld a, [wBattleScriptBufferAddress] ld l, a @@ -2563,7 +2527,6 @@ EndMoveEffect: ld [hl], a ret - DittoMetalPowder: ld a, MON_SPECIES call BattlePartyAttr @@ -2600,7 +2563,6 @@ DittoMetalPowder: rr c ret - BattleCommand_DamageStats: ; damagestats @@ -2692,7 +2654,6 @@ PlayerAttackDamage: and a ret - TruncateHL_BC: .loop ; Truncate 16-bit values hl and bc to 8-bit values b and c respectively. @@ -2738,7 +2699,6 @@ TruncateHL_BC: ld b, l ret - GetDamageStatsCritical: ; Return carry if non-critical. @@ -2789,7 +2749,6 @@ GetDamageStats: pop hl ret - ThickClubBoost: ; Return in hl the stat value at hl. @@ -2805,7 +2764,6 @@ ThickClubBoost: pop bc ret - LightBallBoost: ; Return in hl the stat value at hl. @@ -2821,7 +2779,6 @@ LightBallBoost: pop bc ret - SpeciesItemBoost: ; Return in hl the stat value at hl. @@ -2862,7 +2819,6 @@ SpeciesItemBoost: rl h ret - EnemyAttackDamage: call ResetDamage @@ -2941,7 +2897,6 @@ EnemyAttackDamage: and a ret - INCLUDE "engine/battle/move_effects/beat_up.asm" BattleCommand_ClearMissDamage: @@ -2952,7 +2907,6 @@ BattleCommand_ClearMissDamage: jp ResetDamage - HitSelfInConfusion: call ResetDamage ld a, [hBattleTurn] @@ -2989,7 +2943,6 @@ HitSelfInConfusion: ld e, a ret - BattleCommand_DamageCalc: ; damagecalc @@ -3219,7 +3172,6 @@ BattleCommand_DamageCalc: ret - INCLUDE "data/types/type_boost_items.asm" BattleCommand_ConstantDamage: @@ -3422,7 +3374,6 @@ BattleCommand_DefrostOpponent: ld [hl], a ret - INCLUDE "engine/battle/move_effects/sleep_talk.asm" INCLUDE "engine/battle/move_effects/destiny_bond.asm" @@ -3454,7 +3405,6 @@ PlayFXAnimID: callfar PlayBattleAnim ret - DoEnemyDamage: ld hl, wCurDamage ld a, [hli] @@ -3515,7 +3465,6 @@ DoEnemyDamage: .did_no_damage jp RefreshBattleHuds - DoPlayerDamage: ld hl, wCurDamage ld a, [hli] @@ -3576,7 +3525,6 @@ DoPlayerDamage: .did_no_damage jp RefreshBattleHuds - DoSubstituteDamage: ld hl, SubTookDamageText call StdBattleTextBox @@ -3634,7 +3582,6 @@ DoSubstituteDamage: .done jp ResetDamage - UpdateMoveData: ld a, BATTLE_VARS_MOVE_ANIM @@ -3652,7 +3599,6 @@ UpdateMoveData: call GetMoveName jp CopyName1 - BattleCommand_SleepTarget: ; sleeptarget @@ -3724,7 +3670,6 @@ BattleCommand_SleepTarget: pop hl jp StdBattleTextBox - .CheckAIRandomFail: ; Enemy turn ld a, [hBattleTurn] @@ -3753,7 +3698,6 @@ BattleCommand_SleepTarget: xor a ret - BattleCommand_PoisonTarget: ; poisontarget @@ -3789,7 +3733,6 @@ BattleCommand_PoisonTarget: farcall UseHeldStatusHealingItem ret - BattleCommand_Poison: ; poison @@ -3878,13 +3821,11 @@ BattleCommand_Poison: pop hl jp StdBattleTextBox - .apply_poison call AnimateCurrentMove call PoisonOpponent jp RefreshBattleHuds - .check_toxic ld a, BATTLE_VARS_SUBSTATUS5_OPP call GetBattleVarAddr @@ -3899,7 +3840,6 @@ BattleCommand_Poison: cp EFFECT_TOXIC ret - CheckIfTargetIsPoisonType: ld de, wEnemyMonType1 ld a, [hBattleTurn] @@ -3915,28 +3855,24 @@ CheckIfTargetIsPoisonType: cp POISON ret - PoisonOpponent: ld a, BATTLE_VARS_STATUS_OPP call GetBattleVarAddr set PSN, [hl] jp UpdateOpponentInParty - BattleCommand_DrainTarget: ; draintarget call SapHealth ld hl, SuckedHealthText jp StdBattleTextBox - BattleCommand_EatDream: ; eatdream call SapHealth ld hl, DreamEatenText jp StdBattleTextBox - SapHealth: ; Divide damage by 2, store it in hDividend ld hl, wCurDamage @@ -4030,7 +3966,6 @@ SapHealth: call RefreshBattleHuds jp UpdateBattleMonInParty - BattleCommand_BurnTarget: ; burntarget @@ -4072,7 +4007,6 @@ BattleCommand_BurnTarget: farcall UseHeldStatusHealingItem ret - Defrost: ld a, [hl] and 1 << FRZ @@ -4098,7 +4032,6 @@ Defrost: ld hl, DefrostedOpponentText jp StdBattleTextBox - BattleCommand_FreezeTarget: ; freezetarget @@ -4152,7 +4085,6 @@ BattleCommand_FreezeTarget: ld [hl], $1 ret - BattleCommand_ParalyzeTarget: ; paralyzetarget @@ -4189,7 +4121,6 @@ BattleCommand_ParalyzeTarget: ld hl, UseHeldStatusHealingItem jp CallBattleCore - BattleCommand_AttackUp: ; attackup ld b, ATTACK @@ -4268,7 +4199,6 @@ BattleCommand_StatUp: ret nz jp StatUpAnimation - CheckIfStatCanBeRaised: ld a, b ld [wLoweredStat], a @@ -4348,7 +4278,6 @@ CheckIfStatCanBeRaised: ld [wFailedMessage], a ret - .stats_already_max pop hl dec [hl] @@ -4361,13 +4290,11 @@ CheckIfStatCanBeRaised: ld [wAttackMissed], a ret - .stat_raise_failed ld a, $1 ld [wFailedMessage], a ret - StatUpAnimation: ld bc, wPlayerMinimized ld hl, DropPlayerSub @@ -4393,7 +4320,6 @@ StatUpAnimation: call WaitBGMap jp BattleCommand_MoveDelay - BattleCommand_AttackDown: ; attackdown ld a, ATTACK @@ -4586,7 +4512,6 @@ BattleCommand_StatDown: ld [wAttackMissed], a ret - CheckMist: ld a, BATTLE_VARS_MOVE_EFFECT call GetBattleVar @@ -4612,7 +4537,6 @@ CheckMist: bit SUBSTATUS_MIST, a ret - BattleCommand_StatUpMessage: ld a, [wFailedMessage] and a @@ -4643,7 +4567,6 @@ BattleCommand_StatUpMessage: text_jump UnknownText_0x1c0ce0 db "@" - BattleCommand_StatDownMessage: ld a, [wFailedMessage] and a @@ -4673,7 +4596,6 @@ BattleCommand_StatDownMessage: text_jump UnknownText_0x1c0d06 db "@" - TryLowerStat: ; Lower stat c from stat struct hl (buffer de). @@ -4717,7 +4639,6 @@ TryLowerStat: and a ret - BattleCommand_StatUpFailText: ; statupfailtext ld a, [wFailedMessage] @@ -4736,7 +4657,6 @@ BattleCommand_StatUpFailText: ld hl, WontRiseAnymoreText jp StdBattleTextBox - BattleCommand_StatDownFailText: ; statdownfailtext ld a, [wFailedMessage] @@ -4758,7 +4678,6 @@ BattleCommand_StatDownFailText: ld hl, WontDropAnymoreText jp StdBattleTextBox - GetStatName: ld hl, StatNames ld c, "@" @@ -4813,7 +4732,6 @@ ResetMiss: ld [wAttackMissed], a ret - LowerStat: ld [wLoweredStat], a @@ -4885,7 +4803,6 @@ LowerStat: ld [wFailedMessage], a ret - BattleCommand_TriStatusChance: ; tristatuschance @@ -4914,7 +4831,6 @@ BattleCommand_Curl: set SUBSTATUS_CURLED, [hl] ret - BattleCommand_RaiseSubNoAnim: ld hl, GetBattleMonBackpic ld a, [hBattleTurn] @@ -4927,7 +4843,6 @@ BattleCommand_RaiseSubNoAnim: call CallBattleCore jp WaitBGMap - BattleCommand_LowerSubNoAnim: ld hl, DropPlayerSub ld a, [hBattleTurn] @@ -4940,7 +4855,6 @@ BattleCommand_LowerSubNoAnim: call CallBattleCore jp WaitBGMap - CalcPlayerStats: ld hl, wPlayerAtkLevel ld de, wPlayerStats @@ -4962,7 +4876,6 @@ CalcPlayerStats: jp BattleCommand_SwitchTurn - CalcEnemyStats: ld hl, wEnemyAtkLevel ld de, wEnemyStats @@ -4981,7 +4894,6 @@ CalcEnemyStats: jp BattleCommand_SwitchTurn - CalcStats: .loop push af @@ -5051,7 +4963,6 @@ CalcStats: ret - INCLUDE "engine/battle/move_effects/bide.asm" BattleCommand_CheckRampage: @@ -5091,7 +5002,6 @@ BattleCommand_CheckRampage: ld b, rampage_command jp SkipToBattleCommand - BattleCommand_Rampage: ; rampage @@ -5119,7 +5029,6 @@ BattleCommand_Rampage: ld [wSomeoneIsRampaging], a ret - INCLUDE "engine/battle/move_effects/teleport.asm" SetBattleDraw: @@ -5129,7 +5038,6 @@ SetBattleDraw: ld [wBattleResult], a ret - BattleCommand_ForceSwitch: ; forceswitch @@ -5349,7 +5257,6 @@ BattleCommand_ForceSwitch: .do_text jp StdBattleTextBox - CheckPlayerHasMonToSwitchTo: ld a, [wPartyCount] ld d, a @@ -5379,7 +5286,6 @@ CheckPlayerHasMonToSwitchTo: and a ret - BattleCommand_EndLoop: ; endloop @@ -5514,7 +5420,6 @@ BattleCommand_EndLoop: ld [wBattleScriptBufferAddress], a ret - BattleCommand_FakeOut: ld a, [wAttackMissed] and a @@ -5536,7 +5441,6 @@ BattleCommand_FakeOut: ld [wAttackMissed], a ret - BattleCommand_FlinchTarget: call CheckSubstituteOpp ret nz @@ -5561,7 +5465,6 @@ FlinchTarget: set SUBSTATUS_FLINCHED, [hl] jp EndRechargeOpp - CheckOpponentWentFirst: ; Returns a=0, z if user went first ; Returns a=1, nz if opponent went first @@ -5573,7 +5476,6 @@ CheckOpponentWentFirst: pop bc ret - BattleCommand_HeldFlinch: ; kingsrock @@ -5602,7 +5504,6 @@ BattleCommand_HeldFlinch: set SUBSTATUS_FLINCHED, [hl] ret - BattleCommand_OHKO: ; ohko @@ -5649,7 +5550,6 @@ BattleCommand_OHKO: ld [wAttackMissed], a ret - BattleCommand_CheckCharge: ; checkcharge @@ -5663,7 +5563,6 @@ BattleCommand_CheckCharge: ld b, charge_command jp SkipToBattleCommand - BattleCommand_Charge: ; charge @@ -5809,7 +5708,6 @@ BattleCommand3c: ; unused ret - BattleCommand_TrapTarget: ; traptarget @@ -5934,7 +5832,6 @@ BattleCommand_Recoil: ld hl, RecoilText jp StdBattleTextBox - BattleCommand_ConfuseTarget: ; confusetarget @@ -6038,7 +5935,6 @@ BattleCommand_Confuse_CheckSnore_Swagger_ConfuseHit: ret z jp PrintDidntAffect2 - BattleCommand_Paralyze: ; paralyze @@ -6119,7 +6015,6 @@ BattleCommand_Paralyze: call AnimateFailedMove jp PrintDoesntAffect - CheckMoveTypeMatchesTarget: ; Compare move type to opponent type. ; Return z if matching the opponent type, @@ -6155,7 +6050,6 @@ CheckMoveTypeMatchesTarget: pop hl ret - INCLUDE "engine/battle/move_effects/substitute.asm" BattleCommand_RechargeNextTurn: @@ -6165,7 +6059,6 @@ BattleCommand_RechargeNextTurn: set SUBSTATUS_RECHARGE, [hl] ret - EndRechargeOpp: push hl ld a, BATTLE_VARS_SUBSTATUS4_OPP @@ -6174,7 +6067,6 @@ EndRechargeOpp: pop hl ret - INCLUDE "engine/battle/move_effects/rage.asm" BattleCommand_DoubleFlyingDamage: @@ -6185,7 +6077,6 @@ BattleCommand_DoubleFlyingDamage: ret z jr DoubleDamage - BattleCommand_DoubleUndergroundDamage: ; doubleundergrounddamage ld a, BATTLE_VARS_SUBSTATUS3_OPP @@ -6208,7 +6099,6 @@ DoubleDamage: .quit ret - INCLUDE "engine/battle/move_effects/mimic.asm" INCLUDE "engine/battle/move_effects/leech_seed.asm" @@ -6254,7 +6144,6 @@ BattleCommand_ResetStats: jr nz, .next ret - BattleCommand_Heal: ; heal @@ -6337,7 +6226,6 @@ BattleCommand_Heal: ld hl, HPIsFullText jp StdBattleTextBox - INCLUDE "engine/battle/move_effects/transform.asm" BattleSideCopy: @@ -6355,12 +6243,10 @@ BattleSideCopy: .copy jp CopyBytes - BattleEffect_ButItFailed: call AnimateFailedMove jp PrintButItFailed - ClearLastMove: ld a, BATTLE_VARS_LAST_COUNTER_MOVE call GetBattleVarAddr @@ -6373,7 +6259,6 @@ ClearLastMove: ld [hl], a ret - ResetActorDisable: ld a, [hBattleTurn] and a @@ -6390,7 +6275,6 @@ ResetActorDisable: ld [wDisabledMove], a ret - BattleCommand_Screen: ; screen @@ -6436,19 +6320,16 @@ BattleCommand_Screen: call AnimateFailedMove jp PrintButItFailed - PrintDoesntAffect: ; 'it doesn't affect' ld hl, DoesntAffectText jp StdBattleTextBox - PrintNothingHappened: ; 'but nothing happened!' ld hl, NothingHappenedText jp StdBattleTextBox - TryPrintButItFailed: ld a, [wAlreadyFailed] and a @@ -6461,7 +6342,6 @@ PrintButItFailed: ld hl, ButItFailedText jp StdBattleTextBox - FailMove: call AnimateFailedMove ; fallthrough @@ -6471,33 +6351,28 @@ FailMimic: ld de, ItFailedText ; 'it failed!' jp FailText_CheckOpponentProtect - PrintDidntAffect: ; 'it didn't affect' ld hl, DidntAffect1Text jp StdBattleTextBox - PrintDidntAffect2: call AnimateFailedMove ld hl, DidntAffect1Text ; 'it didn't affect' ld de, DidntAffect2Text ; 'it didn't affect' jp FailText_CheckOpponentProtect - PrintParalyze: ; 'paralyzed! maybe it can't attack!' ld hl, ParalyzedText jp StdBattleTextBox - CheckSubstituteOpp: ld a, BATTLE_VARS_SUBSTATUS4_OPP call GetBattleVar bit SUBSTATUS_SUBSTITUTE, a ret - INCLUDE "engine/battle/move_effects/selfdestruct.asm" INCLUDE "engine/battle/move_effects/mirror_move.asm" @@ -6528,7 +6403,6 @@ CheckUserMove: and a ret - ResetTurn: ld hl, wPlayerCharging ld a, [hBattleTurn] @@ -6543,7 +6417,6 @@ ResetTurn: call DoMove jp EndMoveEffect - INCLUDE "engine/battle/move_effects/thief.asm" BattleCommand_ArenaTrap: @@ -6572,7 +6445,6 @@ BattleCommand_ArenaTrap: call AnimateFailedMove jp PrintButItFailed - INCLUDE "engine/battle/move_effects/nightmare.asm" BattleCommand_Defrost: @@ -6606,7 +6478,6 @@ BattleCommand_Defrost: ld hl, WasDefrostedText jp StdBattleTextBox - INCLUDE "engine/battle/move_effects/curse.asm" INCLUDE "engine/battle/move_effects/protect.asm" @@ -6627,7 +6498,6 @@ BattleCommand5d: ; unused ret - INCLUDE "engine/battle/move_effects/fury_cutter.asm" INCLUDE "engine/battle/move_effects/attract.asm" @@ -6653,7 +6523,6 @@ SafeCheckSafeguard: pop hl ret - BattleCommand_CheckSafeguard: ; checksafeguard ld hl, wEnemyScreens @@ -6671,7 +6540,6 @@ BattleCommand_CheckSafeguard: call StdBattleTextBox jp EndMoveEffect - INCLUDE "engine/battle/move_effects/magnitude.asm" INCLUDE "engine/battle/move_effects/baton_pass.asm" @@ -6811,7 +6679,6 @@ BattleCommand_DoubleMinimizeDamage: ld [hl], a ret - BattleCommand_SkipSunCharge: ; mimicsuncharge ld a, [wBattleWeather] @@ -6820,7 +6687,6 @@ BattleCommand_SkipSunCharge: ld b, charge_command jp SkipToBattleCommand - INCLUDE "engine/battle/move_effects/future_sight.asm" INCLUDE "engine/battle/move_effects/thunder.asm" @@ -6832,7 +6698,6 @@ CheckHiddenOpponent: and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND ret - GetUserItem: ; Return the effect of the user's item in bc, and its id at hl. ld hl, wBattleMonItem @@ -6844,7 +6709,6 @@ GetUserItem: ld b, [hl] jp GetItemHeldEffect - GetOpponentItem: ; Return the effect of the opponent's item in bc, and its id at hl. ld hl, wEnemyMonItem @@ -6856,7 +6720,6 @@ GetOpponentItem: ld b, [hl] jp GetItemHeldEffect - GetItemHeldEffect: ; Return the effect of item b in bc. ld a, b @@ -6877,7 +6740,6 @@ GetItemHeldEffect: pop hl ret - AnimateCurrentMoveEitherSide: push hl push de @@ -6894,7 +6756,6 @@ AnimateCurrentMoveEitherSide: pop hl ret - AnimateCurrentMove: push hl push de @@ -6911,7 +6772,6 @@ AnimateCurrentMove: pop hl ret - PlayDamageAnim: xor a ld [wFXAnimID + 1], a @@ -6934,7 +6794,6 @@ PlayDamageAnim: jp PlayUserBattleAnim - LoadMoveAnim: xor a ld [wNumHits], a @@ -6962,7 +6821,6 @@ PlayUserBattleAnim: pop hl ret - PlayOpponentBattleAnim: ld a, e ld [wFXAnimID], a @@ -6984,26 +6842,22 @@ PlayOpponentBattleAnim: pop hl ret - CallBattleCore: ld a, BANK("Battle Core") rst FarCall ret - AnimateFailedMove: call BattleCommand_LowerSub call BattleCommand_MoveDelay jp BattleCommand_RaiseSub - BattleCommand_MoveDelay: ; movedelay ; Wait 40 frames. ld c, 40 jp DelayFrames - BattleCommand_ClearText: ; cleartext @@ -7031,7 +6885,6 @@ SkipToBattleCommand: ld [wBattleScriptBufferAddress], a ret - GetMoveAttr: ; Assuming hl = Moves + x, return attribute x of move a. push bc @@ -7041,7 +6894,6 @@ GetMoveAttr: pop bc ret - GetMoveData: ; Copy move struct a to de. ld hl, Moves @@ -7050,27 +6902,22 @@ GetMoveData: ld a, BANK(Moves) jp FarCopyBytes - GetMoveByte: ld a, BANK(Moves) jp GetFarByte - DisappearUser: farcall _DisappearUser ret - AppearUserLowerSub: farcall _AppearUserLowerSub ret - AppearUserRaiseSub: farcall _AppearUserRaiseSub ret - _CheckBattleScene: ; Checks the options. Returns carry if battle animations are disabled. push hl @@ -7081,4 +6928,3 @@ _CheckBattleScene: pop de pop hl ret - |