diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 23:22:50 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 23:22:50 -0400 |
| commit | 67d1364c7acfd5e8e2256080e16a14cfa59a5abc (patch) | |
| tree | fcf1bcbc2990b8fdeb5d63159d15382a8bdf719a /engine/battle/move_effects | |
| parent | 91f914718a263839daef24d44eda857bfc7cca95 (diff) | |
Fix triple newlines left over from removing address comments
Diffstat (limited to 'engine/battle/move_effects')
| -rw-r--r-- | engine/battle/move_effects/attract.asm | 1 | ||||
| -rw-r--r-- | engine/battle/move_effects/baton_pass.asm | 8 | ||||
| -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/curse.asm | 3 | ||||
| -rw-r--r-- | engine/battle/move_effects/fury_cutter.asm | 1 | ||||
| -rw-r--r-- | engine/battle/move_effects/future_sight.asm | 1 | ||||
| -rw-r--r-- | engine/battle/move_effects/metronome.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/pain_split.asm | 1 | ||||
| -rw-r--r-- | engine/battle/move_effects/perish_song.asm | 1 | ||||
| -rw-r--r-- | engine/battle/move_effects/protect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/rollout.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/thief.asm | 3 | ||||
| -rw-r--r-- | engine/battle/move_effects/triple_kick.asm | 1 |
14 files changed, 0 insertions, 30 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..5f15b3cea 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,7 +44,6 @@ BattleCommand_BatonPass: call ResetBatonPassStatus ret - .Enemy: ; Wildmons don't have anything to switch to @@ -82,7 +80,6 @@ BattleCommand_BatonPass: jr ResetBatonPassStatus - BatonPass_LinkPlayerSwitch: ld a, [wLinkMode] and a @@ -101,7 +98,6 @@ BatonPass_LinkPlayerSwitch: ret - BatonPass_LinkEnemySwitch: ld a, [wLinkMode] and a @@ -128,13 +124,11 @@ BatonPass_LinkEnemySwitch: jp CloseWindow - FailedBatonPass: call AnimateFailedMove jp PrintButItFailed - ResetBatonPassStatus: ; Reset status changes that aren't passed by Baton Pass. @@ -175,7 +169,6 @@ ResetBatonPassStatus: ret - CheckAnyOtherAlivePartyMons: ld hl, wPartyMon1HP ld a, [wPartyCount] @@ -185,7 +178,6 @@ CheckAnyOtherAlivePartyMons: 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 40a375e0d..5e6cfae22 100644 --- a/engine/battle/move_effects/beat_up.asm +++ b/engine/battle/move_effects/beat_up.asm @@ -194,13 +194,11 @@ BattleCommand_BeatUp: ret - .beatup_fail ld b, buildopponentrage_command jp SkipToBattleCommand - BattleCommand_BeatUpFailText: ; beatupfailtext @@ -211,7 +209,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 b28773df9..d7d8203b0 100644 --- a/engine/battle/move_effects/bide.asm +++ b/engine/battle/move_effects/bide.asm @@ -70,7 +70,6 @@ BattleCommand_StoreEnergy: jp EndMoveEffect - BattleCommand_UnleashEnergy: ; unleashenergy 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/fury_cutter.asm b/engine/battle/move_effects/fury_cutter.asm index b34264d62..a3a8c44b3 100644 --- a/engine/battle/move_effects/fury_cutter.asm +++ b/engine/battle/move_effects/fury_cutter.asm @@ -39,7 +39,6 @@ BattleCommand_FuryCutter: ret - ResetFuryCutterCount: push hl diff --git a/engine/battle/move_effects/future_sight.asm b/engine/battle/move_effects/future_sight.asm index c1b5c0e72..8b08ce982 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 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/pain_split.asm b/engine/battle/move_effects/pain_split.asm index a4dbd3d44..a94ccff6f 100644 --- a/engine/battle/move_effects/pain_split.asm +++ b/engine/battle/move_effects/pain_split.asm @@ -89,7 +89,6 @@ BattleCommand_PainSplit: ld [wBuffer6], a ret - .ButItFailed: jp PrintDidntAffect2 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..92652109d 100644 --- a/engine/battle/move_effects/protect.asm +++ b/engine/battle/move_effects/protect.asm @@ -12,7 +12,6 @@ BattleCommand_Protect: ld hl, ProtectedItselfText jp StdBattleTextBox - ProtectChance: ld de, wPlayerProtectCount @@ -68,7 +67,6 @@ ProtectChance: and a ret - .failed xor a ld [de], a 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/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/triple_kick.asm b/engine/battle/move_effects/triple_kick.asm index 4fb939d7c..358e84b94 100644 --- a/engine/battle/move_effects/triple_kick.asm +++ b/engine/battle/move_effects/triple_kick.asm @@ -27,7 +27,6 @@ BattleCommand_TripleKick: ret - BattleCommand_KickCounter: ; kickcounter |
