diff options
Diffstat (limited to 'engine/battle/move_effects')
50 files changed, 0 insertions, 87 deletions
diff --git a/engine/battle/move_effects/attract.asm b/engine/battle/move_effects/attract.asm index 45417936f..bb7b4fce4 100644 --- a/engine/battle/move_effects/attract.asm +++ b/engine/battle/move_effects/attract.asm @@ -22,7 +22,6 @@ BattleCommand_Attract: .failed jp FailMove - CheckOppositeGender: ld a, MON_SPECIES call BattlePartyAttr 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 - diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm index 40a375e0d..673fc46c6 100644 --- a/engine/battle/move_effects/beat_up.asm +++ b/engine/battle/move_effects/beat_up.asm @@ -193,14 +193,10 @@ BattleCommand_BeatUp: ld d, a ret - - .beatup_fail ld b, buildopponentrage_command jp SkipToBattleCommand - - BattleCommand_BeatUpFailText: ; beatupfailtext @@ -210,8 +206,6 @@ BattleCommand_BeatUpFailText: jp PrintButItFailed - - GetBeatupMonLocation: push bc ld c, a diff --git a/engine/battle/move_effects/belly_drum.asm b/engine/battle/move_effects/belly_drum.asm index aec3a1d68..27ef1a542 100644 --- a/engine/battle/move_effects/belly_drum.asm +++ b/engine/battle/move_effects/belly_drum.asm @@ -32,4 +32,3 @@ BattleCommand_BellyDrum: .failed call AnimateFailedMove jp PrintButItFailed - diff --git a/engine/battle/move_effects/bide.asm b/engine/battle/move_effects/bide.asm index b28773df9..871e0e7a8 100644 --- a/engine/battle/move_effects/bide.asm +++ b/engine/battle/move_effects/bide.asm @@ -69,8 +69,6 @@ BattleCommand_StoreEnergy: call StdBattleTextBox jp EndMoveEffect - - BattleCommand_UnleashEnergy: ; unleashenergy @@ -100,4 +98,3 @@ BattleCommand_UnleashEnergy: ld [wKickCounter], a call AnimateCurrentMove jp EndMoveEffect - diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm index bc2c746df..f9307056c 100644 --- a/engine/battle/move_effects/conversion.asm +++ b/engine/battle/move_effects/conversion.asm @@ -94,4 +94,3 @@ BattleCommand_Conversion: call AnimateCurrentMove ld hl, TransformedTypeText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm index b1d0e6282..14a7e257a 100644 --- a/engine/battle/move_effects/conversion2.asm +++ b/engine/battle/move_effects/conversion2.asm @@ -62,4 +62,3 @@ BattleCommand_Conversion2: .failed jp FailMove - diff --git a/engine/battle/move_effects/counter.asm b/engine/battle/move_effects/counter.asm index 9d10d1865..f92e1b3ac 100644 --- a/engine/battle/move_effects/counter.asm +++ b/engine/battle/move_effects/counter.asm @@ -56,4 +56,3 @@ BattleCommand_Counter: xor a ld [wAttackMissed], a ret - diff --git a/engine/battle/move_effects/curse.asm b/engine/battle/move_effects/curse.asm index e0fc0144c..4861e9a37 100644 --- a/engine/battle/move_effects/curse.asm +++ b/engine/battle/move_effects/curse.asm @@ -21,7 +21,6 @@ BattleCommand_Curse: cp GHOST jr z, .ghost - ; If no stats can be increased, don't. ; Attack @@ -54,7 +53,6 @@ BattleCommand_Curse: call BattleCommand_DefenseUp jp BattleCommand_StatUpMessage - .ghost ; Cut HP in half and put a curse on the opponent. @@ -84,7 +82,6 @@ BattleCommand_Curse: call AnimateFailedMove jp PrintButItFailed - .cantraise ; Can't raise either stat. diff --git a/engine/battle/move_effects/destiny_bond.asm b/engine/battle/move_effects/destiny_bond.asm index 427c8b08a..55809d98a 100644 --- a/engine/battle/move_effects/destiny_bond.asm +++ b/engine/battle/move_effects/destiny_bond.asm @@ -7,4 +7,3 @@ BattleCommand_DestinyBond: call AnimateCurrentMove ld hl, DestinyBondEffectText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/disable.asm b/engine/battle/move_effects/disable.asm index b1055b200..44017e30d 100644 --- a/engine/battle/move_effects/disable.asm +++ b/engine/battle/move_effects/disable.asm @@ -70,4 +70,3 @@ BattleCommand_Disable: .failed jp FailMove - diff --git a/engine/battle/move_effects/encore.asm b/engine/battle/move_effects/encore.asm index e65925f52..f436fd970 100644 --- a/engine/battle/move_effects/encore.asm +++ b/engine/battle/move_effects/encore.asm @@ -118,4 +118,3 @@ BattleCommand_Encore: .failed jp PrintDidntAffect2 - diff --git a/engine/battle/move_effects/false_swipe.asm b/engine/battle/move_effects/false_swipe.asm index c61aa534a..4f4eb329c 100644 --- a/engine/battle/move_effects/false_swipe.asm +++ b/engine/battle/move_effects/false_swipe.asm @@ -46,4 +46,3 @@ BattleCommand_FalseSwipe: .done and a ret - diff --git a/engine/battle/move_effects/focus_energy.asm b/engine/battle/move_effects/focus_energy.asm index 8fa6b19ff..ffdc7b136 100644 --- a/engine/battle/move_effects/focus_energy.asm +++ b/engine/battle/move_effects/focus_energy.asm @@ -13,4 +13,3 @@ BattleCommand_FocusEnergy: .already_pumped call AnimateFailedMove jp PrintButItFailed - diff --git a/engine/battle/move_effects/frustration.asm b/engine/battle/move_effects/frustration.asm index 5e45636be..3d395b510 100644 --- a/engine/battle/move_effects/frustration.asm +++ b/engine/battle/move_effects/frustration.asm @@ -25,4 +25,3 @@ BattleCommand_FrustrationPower: ld d, a pop bc ret - diff --git a/engine/battle/move_effects/fury_cutter.asm b/engine/battle/move_effects/fury_cutter.asm index b34264d62..6aa6b7838 100644 --- a/engine/battle/move_effects/fury_cutter.asm +++ b/engine/battle/move_effects/fury_cutter.asm @@ -38,10 +38,7 @@ BattleCommand_FuryCutter: ld [hl], a ret - - ResetFuryCutterCount: - push hl ld hl, wPlayerFuryCutterCount @@ -56,4 +53,3 @@ ResetFuryCutterCount: pop hl ret - diff --git a/engine/battle/move_effects/future_sight.asm b/engine/battle/move_effects/future_sight.asm index c1b5c0e72..c28841b35 100644 --- a/engine/battle/move_effects/future_sight.asm +++ b/engine/battle/move_effects/future_sight.asm @@ -25,7 +25,6 @@ BattleCommand_CheckFutureSight: ld b, futuresight_command jp SkipToBattleCommand - BattleCommand_FutureSight: ; futuresight @@ -80,4 +79,3 @@ BattleCommand_FutureSight: call AnimateFailedMove call PrintButItFailed jp EndMoveEffect - diff --git a/engine/battle/move_effects/heal_bell.asm b/engine/battle/move_effects/heal_bell.asm index 060ac3423..2570a53ba 100644 --- a/engine/battle/move_effects/heal_bell.asm +++ b/engine/battle/move_effects/heal_bell.asm @@ -32,4 +32,3 @@ BattleCommand_HealBell: and a jp z, CalcPlayerStats jp CalcEnemyStats - diff --git a/engine/battle/move_effects/hidden_power.asm b/engine/battle/move_effects/hidden_power.asm index 19d7e0b32..3b40a6c31 100644 --- a/engine/battle/move_effects/hidden_power.asm +++ b/engine/battle/move_effects/hidden_power.asm @@ -6,4 +6,3 @@ BattleCommand_HiddenPower: ret nz farcall HiddenPowerDamage ret - diff --git a/engine/battle/move_effects/leech_seed.asm b/engine/battle/move_effects/leech_seed.asm index 44019a6ad..5602e7f62 100644 --- a/engine/battle/move_effects/leech_seed.asm +++ b/engine/battle/move_effects/leech_seed.asm @@ -38,4 +38,3 @@ BattleCommand_LeechSeed: call AnimateFailedMove ld hl, EvadedText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/lock_on.asm b/engine/battle/move_effects/lock_on.asm index 7b6503575..7dc4a013d 100644 --- a/engine/battle/move_effects/lock_on.asm +++ b/engine/battle/move_effects/lock_on.asm @@ -19,4 +19,3 @@ BattleCommand_LockOn: .fail call AnimateFailedMove jp PrintDidntAffect - diff --git a/engine/battle/move_effects/metronome.asm b/engine/battle/move_effects/metronome.asm index b5632d005..b8a6b586f 100644 --- a/engine/battle/move_effects/metronome.asm +++ b/engine/battle/move_effects/metronome.asm @@ -34,12 +34,10 @@ BattleCommand_Metronome: call CheckUserMove jr z, .GetMove - ld a, BATTLE_VARS_MOVE call GetBattleVarAddr ld [hl], b call UpdateMoveData jp ResetTurn - INCLUDE "data/battle/metronome_exception_moves.asm" diff --git a/engine/battle/move_effects/mimic.asm b/engine/battle/move_effects/mimic.asm index 2f91d6a1d..b1c6608fa 100644 --- a/engine/battle/move_effects/mimic.asm +++ b/engine/battle/move_effects/mimic.asm @@ -48,4 +48,3 @@ BattleCommand_Mimic: .fail jp FailMimic - diff --git a/engine/battle/move_effects/mirror_coat.asm b/engine/battle/move_effects/mirror_coat.asm index f8b8ca114..8743c389d 100644 --- a/engine/battle/move_effects/mirror_coat.asm +++ b/engine/battle/move_effects/mirror_coat.asm @@ -57,4 +57,3 @@ BattleCommand_MirrorCoat: xor a ld [wAttackMissed], a ret - diff --git a/engine/battle/move_effects/mist.asm b/engine/battle/move_effects/mist.asm index 52e4e59f4..199a30045 100644 --- a/engine/battle/move_effects/mist.asm +++ b/engine/battle/move_effects/mist.asm @@ -13,4 +13,3 @@ BattleCommand_Mist: .already_mist call AnimateFailedMove jp PrintButItFailed - diff --git a/engine/battle/move_effects/pain_split.asm b/engine/battle/move_effects/pain_split.asm index a4dbd3d44..4e4380b23 100644 --- a/engine/battle/move_effects/pain_split.asm +++ b/engine/battle/move_effects/pain_split.asm @@ -89,7 +89,5 @@ BattleCommand_PainSplit: ld [wBuffer6], a ret - .ButItFailed: jp PrintDidntAffect2 - diff --git a/engine/battle/move_effects/pay_day.asm b/engine/battle/move_effects/pay_day.asm index 53705d434..ba1dce884 100644 --- a/engine/battle/move_effects/pay_day.asm +++ b/engine/battle/move_effects/pay_day.asm @@ -24,4 +24,3 @@ BattleCommand_PayDay: .done ld hl, CoinsScatteredText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/perish_song.asm b/engine/battle/move_effects/perish_song.asm index 221ecfb46..4df52cc1c 100644 --- a/engine/battle/move_effects/perish_song.asm +++ b/engine/battle/move_effects/perish_song.asm @@ -1,7 +1,6 @@ BattleCommand_PerishSong: ; perishsong - ld hl, wPlayerSubStatus1 ld de, wEnemySubStatus1 bit SUBSTATUS_PERISH, [hl] diff --git a/engine/battle/move_effects/protect.asm b/engine/battle/move_effects/protect.asm index 768e51cbb..9025d2f4b 100644 --- a/engine/battle/move_effects/protect.asm +++ b/engine/battle/move_effects/protect.asm @@ -12,9 +12,7 @@ BattleCommand_Protect: ld hl, ProtectedItselfText jp StdBattleTextBox - ProtectChance: - ld de, wPlayerProtectCount ld a, [hBattleTurn] and a @@ -68,7 +66,6 @@ ProtectChance: and a ret - .failed xor a ld [de], a diff --git a/engine/battle/move_effects/psych_up.asm b/engine/battle/move_effects/psych_up.asm index 743e93c86..02fdef5d2 100644 --- a/engine/battle/move_effects/psych_up.asm +++ b/engine/battle/move_effects/psych_up.asm @@ -47,4 +47,3 @@ BattleCommand_PsychUp: call AnimateCurrentMove ld hl, CopiedStatsText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/pursuit.asm b/engine/battle/move_effects/pursuit.asm index 640957516..18c358144 100644 --- a/engine/battle/move_effects/pursuit.asm +++ b/engine/battle/move_effects/pursuit.asm @@ -22,4 +22,3 @@ BattleCommand_Pursuit: ld [hli], a ld [hl], a ret - diff --git a/engine/battle/move_effects/rage.asm b/engine/battle/move_effects/rage.asm index 1f40cc1fb..df206a6bf 100644 --- a/engine/battle/move_effects/rage.asm +++ b/engine/battle/move_effects/rage.asm @@ -4,4 +4,3 @@ BattleCommand_Rage: call GetBattleVarAddr set SUBSTATUS_RAGE, [hl] ret - diff --git a/engine/battle/move_effects/rain_dance.asm b/engine/battle/move_effects/rain_dance.asm index fa8881c3c..e9ef5d123 100644 --- a/engine/battle/move_effects/rain_dance.asm +++ b/engine/battle/move_effects/rain_dance.asm @@ -7,4 +7,3 @@ BattleCommand_StartRain: call AnimateCurrentMove ld hl, DownpourText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/rapid_spin.asm b/engine/battle/move_effects/rapid_spin.asm index 089be7667..0dc8b7de2 100644 --- a/engine/battle/move_effects/rapid_spin.asm +++ b/engine/battle/move_effects/rapid_spin.asm @@ -34,4 +34,3 @@ BattleCommand_ClearHazards: ld [de], a ld hl, ReleasedByText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/return.asm b/engine/battle/move_effects/return.asm index ee83843b3..d3071d23a 100644 --- a/engine/battle/move_effects/return.asm +++ b/engine/battle/move_effects/return.asm @@ -23,4 +23,3 @@ BattleCommand_HappinessPower: ld d, a pop bc ret - diff --git a/engine/battle/move_effects/rollout.asm b/engine/battle/move_effects/rollout.asm index da890f48f..de4bfcaa6 100644 --- a/engine/battle/move_effects/rollout.asm +++ b/engine/battle/move_effects/rollout.asm @@ -1,6 +1,5 @@ MAX_ROLLOUT_COUNT EQU 5 - BattleCommand_CheckCurl: ; checkcurl @@ -23,7 +22,6 @@ BattleCommand_CheckCurl: ld [de], a ret - BattleCommand_RolloutPower: ; rolloutpower diff --git a/engine/battle/move_effects/safeguard.asm b/engine/battle/move_effects/safeguard.asm index e4e2e0951..a926bdccc 100644 --- a/engine/battle/move_effects/safeguard.asm +++ b/engine/battle/move_effects/safeguard.asm @@ -21,4 +21,3 @@ BattleCommand_Safeguard: .failed call AnimateFailedMove jp PrintButItFailed - diff --git a/engine/battle/move_effects/selfdestruct.asm b/engine/battle/move_effects/selfdestruct.asm index 3c7b05ef9..d6eeac484 100644 --- a/engine/battle/move_effects/selfdestruct.asm +++ b/engine/battle/move_effects/selfdestruct.asm @@ -27,4 +27,3 @@ BattleCommand_Selfdestruct: farcall DrawEnemyHUD call WaitBGMap jp RefreshBattleHuds - diff --git a/engine/battle/move_effects/sketch.asm b/engine/battle/move_effects/sketch.asm index 1f2e67dd4..4c15dbe02 100644 --- a/engine/battle/move_effects/sketch.asm +++ b/engine/battle/move_effects/sketch.asm @@ -115,4 +115,3 @@ BattleCommand_Sketch: .fail call AnimateFailedMove jp PrintDidntAffect - diff --git a/engine/battle/move_effects/sleep_talk.asm b/engine/battle/move_effects/sleep_talk.asm index ce7a27ed5..ae2d252b7 100644 --- a/engine/battle/move_effects/sleep_talk.asm +++ b/engine/battle/move_effects/sleep_talk.asm @@ -141,4 +141,3 @@ BattleCommand_SleepTalk: ret z cp EFFECT_BIDE ret - diff --git a/engine/battle/move_effects/snore.asm b/engine/battle/move_effects/snore.asm index 4544b7fbd..e2432c59f 100644 --- a/engine/battle/move_effects/snore.asm +++ b/engine/battle/move_effects/snore.asm @@ -9,4 +9,3 @@ BattleCommand_Snore: ld [wAttackMissed], a call FailMove jp EndMoveEffect - diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm index 7c9499074..8aba187a4 100644 --- a/engine/battle/move_effects/spite.asm +++ b/engine/battle/move_effects/spite.asm @@ -84,4 +84,3 @@ BattleCommand_Spite: .failed jp PrintDidntAffect2 - diff --git a/engine/battle/move_effects/splash.asm b/engine/battle/move_effects/splash.asm index ed9eeb4ca..493ea8ca6 100644 --- a/engine/battle/move_effects/splash.asm +++ b/engine/battle/move_effects/splash.asm @@ -2,4 +2,3 @@ BattleCommand_Splash: call AnimateCurrentMove farcall StubbedTrainerRankings_Splash jp PrintNothingHappened - diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm index f439afd78..8f14bc315 100644 --- a/engine/battle/move_effects/substitute.asm +++ b/engine/battle/move_effects/substitute.asm @@ -86,4 +86,3 @@ BattleCommand_Substitute: ld hl, TooWeakSubText .jp_stdbattletextbox jp StdBattleTextBox - diff --git a/engine/battle/move_effects/sunny_day.asm b/engine/battle/move_effects/sunny_day.asm index ad2298401..f5825930f 100644 --- a/engine/battle/move_effects/sunny_day.asm +++ b/engine/battle/move_effects/sunny_day.asm @@ -7,4 +7,3 @@ BattleCommand_StartSun: call AnimateCurrentMove ld hl, SunGotBrightText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm index b9c7f9fb2..1c67ef112 100644 --- a/engine/battle/move_effects/teleport.asm +++ b/engine/battle/move_effects/teleport.asm @@ -87,4 +87,3 @@ BattleCommand_Teleport: ld hl, FledFromBattleText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/thief.asm b/engine/battle/move_effects/thief.asm index d9d2f47fd..64de1a4fe 100644 --- a/engine/battle/move_effects/thief.asm +++ b/engine/battle/move_effects/thief.asm @@ -50,7 +50,6 @@ BattleCommand_Thief: ld [de], a jr .stole - .enemy ; The enemy can't already have an item. @@ -91,13 +90,11 @@ BattleCommand_Thief: ld [hl], a ld [de], a - .stole call GetItemName ld hl, StoleText jp StdBattleTextBox - .playeritem ld a, 1 call BattlePartyAttr diff --git a/engine/battle/move_effects/thunder.asm b/engine/battle/move_effects/thunder.asm index 1a87176bd..b2a643787 100644 --- a/engine/battle/move_effects/thunder.asm +++ b/engine/battle/move_effects/thunder.asm @@ -16,4 +16,3 @@ BattleCommand_ThunderAccuracy: ; Redundant with CheckHit guranteeing hit ld [hl], 100 percent ret - diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm index fe85658e6..ef8071290 100644 --- a/engine/battle/move_effects/transform.asm +++ b/engine/battle/move_effects/transform.asm @@ -137,4 +137,3 @@ BattleCommand_Transform: call nz, LoadAnim ld hl, TransformedText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/triple_kick.asm b/engine/battle/move_effects/triple_kick.asm index 4fb939d7c..e41044c9d 100644 --- a/engine/battle/move_effects/triple_kick.asm +++ b/engine/battle/move_effects/triple_kick.asm @@ -26,12 +26,9 @@ BattleCommand_TripleKick: ld [hl], a ret - - BattleCommand_KickCounter: ; kickcounter ld hl, wKickCounter inc [hl] ret - |