diff options
Diffstat (limited to 'engine/battle/move_effects/baton_pass.asm')
| -rw-r--r-- | engine/battle/move_effects/baton_pass.asm | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/engine/battle/move_effects/baton_pass.asm b/engine/battle/move_effects/baton_pass.asm index 2937a8306..5d9f19838 100644 --- a/engine/battle/move_effects/baton_pass.asm +++ b/engine/battle/move_effects/baton_pass.asm @@ -5,7 +5,6 @@ BattleCommand_BatonPass: and a jp nz, .Enemy - ; Need something to switch to call CheckAnyOtherAlivePartyMons jp z, FailedBatonPass @@ -45,9 +44,7 @@ BattleCommand_BatonPass: call ResetBatonPassStatus ret - .Enemy: - ; Wildmons don't have anything to switch to ld a, [wBattleMode] dec a ; WILDMON @@ -81,8 +78,6 @@ BattleCommand_BatonPass: jr ResetBatonPassStatus - - BatonPass_LinkPlayerSwitch: ld a, [wLinkMode] and a @@ -100,8 +95,6 @@ BatonPass_LinkPlayerSwitch: ld [wBattlePlayerAction], a ret - - BatonPass_LinkEnemySwitch: ld a, [wLinkMode] and a @@ -127,14 +120,10 @@ BatonPass_LinkEnemySwitch: .switch jp CloseWindow - - FailedBatonPass: call AnimateFailedMove jp PrintButItFailed - - ResetBatonPassStatus: ; Reset status changes that aren't passed by Baton Pass. @@ -174,8 +163,6 @@ ResetBatonPassStatus: ld [wEnemyWrapCount], a ret - - CheckAnyOtherAlivePartyMons: ld hl, wPartyMon1HP ld a, [wPartyCount] @@ -184,8 +171,6 @@ CheckAnyOtherAlivePartyMons: ld e, a jr CheckAnyOtherAliveMons - - CheckAnyOtherAliveEnemyMons: ld hl, wOTPartyMon1HP ld a, [wOTPartyCount] @@ -230,4 +215,3 @@ CheckAnyOtherAliveMons: ld a, b and a ret - |