diff options
Diffstat (limited to 'engine/battle/move_effects')
-rw-r--r-- | engine/battle/move_effects/baton_pass.asm | 6 | ||||
-rw-r--r-- | engine/battle/move_effects/beat_up.asm | 3 | ||||
-rw-r--r-- | engine/battle/move_effects/bide.asm | 1 | ||||
-rw-r--r-- | engine/battle/move_effects/fury_cutter.asm | 1 | ||||
-rw-r--r-- | engine/battle/move_effects/triple_kick.asm | 1 |
5 files changed, 0 insertions, 12 deletions
diff --git a/engine/battle/move_effects/baton_pass.asm b/engine/battle/move_effects/baton_pass.asm index 5f15b3cea..bde7e18c0 100644 --- a/engine/battle/move_effects/baton_pass.asm +++ b/engine/battle/move_effects/baton_pass.asm @@ -79,7 +79,6 @@ BattleCommand_BatonPass: jr ResetBatonPassStatus - BatonPass_LinkPlayerSwitch: ld a, [wLinkMode] and a @@ -97,7 +96,6 @@ BatonPass_LinkPlayerSwitch: ld [wBattlePlayerAction], a ret - BatonPass_LinkEnemySwitch: ld a, [wLinkMode] and a @@ -123,12 +121,10 @@ BatonPass_LinkEnemySwitch: .switch jp CloseWindow - FailedBatonPass: call AnimateFailedMove jp PrintButItFailed - ResetBatonPassStatus: ; Reset status changes that aren't passed by Baton Pass. @@ -168,7 +164,6 @@ ResetBatonPassStatus: ld [wEnemyWrapCount], a ret - CheckAnyOtherAlivePartyMons: ld hl, wPartyMon1HP ld a, [wPartyCount] @@ -177,7 +172,6 @@ CheckAnyOtherAlivePartyMons: ld e, a jr CheckAnyOtherAliveMons - CheckAnyOtherAliveEnemyMons: ld hl, wOTPartyMon1HP ld a, [wOTPartyCount] diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm index 5e6cfae22..673fc46c6 100644 --- a/engine/battle/move_effects/beat_up.asm +++ b/engine/battle/move_effects/beat_up.asm @@ -193,12 +193,10 @@ BattleCommand_BeatUp: ld d, a ret - .beatup_fail ld b, buildopponentrage_command jp SkipToBattleCommand - BattleCommand_BeatUpFailText: ; beatupfailtext @@ -208,7 +206,6 @@ BattleCommand_BeatUpFailText: jp PrintButItFailed - GetBeatupMonLocation: push bc ld c, a diff --git a/engine/battle/move_effects/bide.asm b/engine/battle/move_effects/bide.asm index d7d8203b0..53abd2e07 100644 --- a/engine/battle/move_effects/bide.asm +++ b/engine/battle/move_effects/bide.asm @@ -69,7 +69,6 @@ BattleCommand_StoreEnergy: call StdBattleTextBox jp EndMoveEffect - BattleCommand_UnleashEnergy: ; unleashenergy diff --git a/engine/battle/move_effects/fury_cutter.asm b/engine/battle/move_effects/fury_cutter.asm index a3a8c44b3..ab096b447 100644 --- a/engine/battle/move_effects/fury_cutter.asm +++ b/engine/battle/move_effects/fury_cutter.asm @@ -38,7 +38,6 @@ BattleCommand_FuryCutter: ld [hl], a ret - ResetFuryCutterCount: push hl diff --git a/engine/battle/move_effects/triple_kick.asm b/engine/battle/move_effects/triple_kick.asm index 358e84b94..8c0253858 100644 --- a/engine/battle/move_effects/triple_kick.asm +++ b/engine/battle/move_effects/triple_kick.asm @@ -26,7 +26,6 @@ BattleCommand_TripleKick: ld [hl], a ret - BattleCommand_KickCounter: ; kickcounter |