diff options
Diffstat (limited to 'battle')
-rw-r--r-- | battle/ai/scoring.asm | 2 | ||||
-rw-r--r-- | battle/anim_commands.asm | 2 | ||||
-rw-r--r-- | battle/anim_gfx.asm | 1 | ||||
-rw-r--r-- | battle/anim_objects.asm | 1 | ||||
-rw-r--r-- | battle/anims.asm | 1 | ||||
-rw-r--r-- | battle/bg_effects.asm | 2 | ||||
-rw-r--r-- | battle/core.asm | 1 | ||||
-rw-r--r-- | battle/effect_commands.asm | 1 | ||||
-rw-r--r-- | battle/effects/curse.asm | 1 | ||||
-rw-r--r-- | battle/effects/endure.asm | 1 | ||||
-rw-r--r-- | battle/effects/foresight.asm | 1 | ||||
-rw-r--r-- | battle/effects/metronome.asm | 1 | ||||
-rw-r--r-- | battle/effects/mirror_move.asm | 1 | ||||
-rw-r--r-- | battle/effects/nightmare.asm | 1 | ||||
-rw-r--r-- | battle/effects/perish_song.asm | 1 | ||||
-rw-r--r-- | battle/effects/protect.asm | 1 | ||||
-rw-r--r-- | battle/effects/rollout.asm | 1 | ||||
-rw-r--r-- | battle/effects/sandstorm.asm | 1 | ||||
-rw-r--r-- | battle/effects/spikes.asm | 1 | ||||
-rw-r--r-- | battle/effects/thief.asm | 1 | ||||
-rw-r--r-- | battle/hidden_power.asm | 1 | ||||
-rw-r--r-- | battle/magikarp_length.asm | 1 | ||||
-rw-r--r-- | battle/move_names.asm | 1 | ||||
-rw-r--r-- | battle/moves/move_effects.asm | 4 | ||||
-rw-r--r-- | battle/moves/move_effects_pointers.asm | 1 | ||||
-rw-r--r-- | battle/moves/moves.asm | 1 |
26 files changed, 0 insertions, 32 deletions
diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 4d25c837f..425d6911b 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -3597,5 +3597,3 @@ AI_50_50: ; 39527 cp $80 ; 1/2 ret ; 3952d - - diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 54a269dfe..f5b895d0f 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -1506,5 +1506,3 @@ Functioncc96e: ; cc96e .asm_cc9a0 ret ; cc9a1 - - diff --git a/battle/anim_gfx.asm b/battle/anim_gfx.asm index f95365188..c84dda83f 100644 --- a/battle/anim_gfx.asm +++ b/battle/anim_gfx.asm @@ -39,4 +39,3 @@ AnimObj37GFX: INCBIN "gfx/fx/037.2bpp.lz" AnimObj38GFX: INCBIN "gfx/fx/038.2bpp.lz" AnimObj39GFX: INCBIN "gfx/fx/039.2bpp.lz" ; 8640e - diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm index 776e09812..4f32bd932 100644 --- a/battle/anim_objects.asm +++ b/battle/anim_objects.asm @@ -6451,4 +6451,3 @@ ENDM object_gfx NULL, 1 object_gfx NULL, 1 ; cfd9e - diff --git a/battle/anims.asm b/battle/anims.asm index 9fcde859e..0f3ba748b 100644 --- a/battle/anims.asm +++ b/battle/anims.asm @@ -5307,4 +5307,3 @@ BattleAnim_WaterGun_branch_cbcd2: ; cbcd2 anim_wait 1 anim_ret ; cbcdd - diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index 80462f984..8dfe30db6 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -2932,5 +2932,3 @@ Functionc9066: ; c9066 (32:5066) ld a, e ret ; c906f (32:506f) - - diff --git a/battle/core.asm b/battle/core.asm index 472687a13..c522bbd85 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -9525,4 +9525,3 @@ BattleStartMessage: ; 3fc8b ret ; 3fd26 - diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 96331f9eb..7c1fa738a 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -10683,4 +10683,3 @@ Function37ed5: ; 37ed5 pop hl ret ; 37ee2 - diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index f117c5108..65376a4aa 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -95,4 +95,3 @@ BattleCommand54: ; 37588 ld hl, WontRiseAnymoreText jp StdBattleTextBox ; 37618 - diff --git a/battle/effects/endure.asm b/battle/effects/endure.asm index 9d99c8236..026fde417 100644 --- a/battle/effects/endure.asm +++ b/battle/effects/endure.asm @@ -15,4 +15,3 @@ BattleCommand5a: ; 3766f ld hl, BracedItselfText jp StdBattleTextBox ; 37683 - diff --git a/battle/effects/foresight.asm b/battle/effects/foresight.asm index 84c10670b..775fbd78d 100644 --- a/battle/effects/foresight.asm +++ b/battle/effects/foresight.asm @@ -21,4 +21,3 @@ BattleCommand57: ; 376a0 .failed jp Function37354 ; 376c2 - diff --git a/battle/effects/metronome.asm b/battle/effects/metronome.asm index 213892945..6815377d0 100644 --- a/battle/effects/metronome.asm +++ b/battle/effects/metronome.asm @@ -59,4 +59,3 @@ MetronomeExcepts: ; 37454 db THIEF db -1 ; 37462 - diff --git a/battle/effects/mirror_move.asm b/battle/effects/mirror_move.asm index 2a32e7e81..32a1998bb 100644 --- a/battle/effects/mirror_move.asm +++ b/battle/effects/mirror_move.asm @@ -50,4 +50,3 @@ BattleCommand1b: ; 373c9 call BattleCommandaa jp ResetTurn ; 37418 - diff --git a/battle/effects/nightmare.asm b/battle/effects/nightmare.asm index 01f17ff71..da39affc1 100644 --- a/battle/effects/nightmare.asm +++ b/battle/effects/nightmare.asm @@ -36,4 +36,3 @@ BattleCommand52: ; 37536 call AnimateFailedMove jp PrintButItFailed ; 37563 - diff --git a/battle/effects/perish_song.asm b/battle/effects/perish_song.asm index 423d299fa..95391f3bd 100644 --- a/battle/effects/perish_song.asm +++ b/battle/effects/perish_song.asm @@ -38,4 +38,3 @@ BattleCommand58: ; 376c2 call AnimateFailedMove jp PrintButItFailed ; 376f8 - diff --git a/battle/effects/protect.asm b/battle/effects/protect.asm index be9284135..eaf011ffe 100644 --- a/battle/effects/protect.asm +++ b/battle/effects/protect.asm @@ -78,4 +78,3 @@ ProtectChance: ; 3762c scf ret ; 3766f - diff --git a/battle/effects/rollout.asm b/battle/effects/rollout.asm index f709c7988..3826734b4 100644 --- a/battle/effects/rollout.asm +++ b/battle/effects/rollout.asm @@ -96,4 +96,3 @@ BattleCommand5c: ; 37734 .asm_37790 ret ; 37791 - diff --git a/battle/effects/sandstorm.asm b/battle/effects/sandstorm.asm index b4f782721..a33db7f8c 100644 --- a/battle/effects/sandstorm.asm +++ b/battle/effects/sandstorm.asm @@ -17,4 +17,3 @@ BattleCommand59: ; 376f8 call AnimateFailedMove jp PrintButItFailed ; 37718 - diff --git a/battle/effects/spikes.asm b/battle/effects/spikes.asm index 2d9357941..68894b1c1 100644 --- a/battle/effects/spikes.asm +++ b/battle/effects/spikes.asm @@ -25,4 +25,3 @@ BattleCommand56: ; 37683 .failed jp Function37354 ; 376a0 - diff --git a/battle/effects/thief.asm b/battle/effects/thief.asm index 83b954eaf..dbbe0396b 100644 --- a/battle/effects/thief.asm +++ b/battle/effects/thief.asm @@ -114,4 +114,3 @@ BattleCommand50: ; 37492 ld hl, EnemyMonItem ret ; 37517 - diff --git a/battle/hidden_power.asm b/battle/hidden_power.asm index 4d1ad9dc3..58e4599dd 100644 --- a/battle/hidden_power.asm +++ b/battle/hidden_power.asm @@ -109,4 +109,3 @@ HiddenPowerDamage: ; fbced ld d, a ret ; fbd54 - diff --git a/battle/magikarp_length.asm b/battle/magikarp_length.asm index 991e78b27..160912c53 100644 --- a/battle/magikarp_length.asm +++ b/battle/magikarp_length.asm @@ -212,4 +212,3 @@ CalcMagikarpLength: ; fbbfc dwb 65410, 2 dwb 65510, 1 ; not used ; fbcd2 - diff --git a/battle/move_names.asm b/battle/move_names.asm index a0f03627c..e4470a998 100644 --- a/battle/move_names.asm +++ b/battle/move_names.asm @@ -249,4 +249,3 @@ db "ROCK SMASH@" db "WHIRLPOOL@" db "BEAT UP@" - diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm index 1e3bd4586..29fd27983 100644 --- a/battle/moves/move_effects.asm +++ b/battle/moves/move_effects.asm @@ -2237,7 +2237,3 @@ DefenseCurl: statmessageuser statupfailtext endmove - - - - diff --git a/battle/moves/move_effects_pointers.asm b/battle/moves/move_effects_pointers.asm index 4f955444a..3f364f521 100644 --- a/battle/moves/move_effects_pointers.asm +++ b/battle/moves/move_effects_pointers.asm @@ -155,4 +155,3 @@ dw BeatUp dw Fly dw DefenseCurl - diff --git a/battle/moves/moves.asm b/battle/moves/moves.asm index 3877e9960..ac9f49300 100644 --- a/battle/moves/moves.asm +++ b/battle/moves/moves.asm @@ -262,4 +262,3 @@ ENDM move ROCK_SMASH, EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50 move WHIRLPOOL, EFFECT_BIND, 15, WATER, 70, 15, 0 move BEAT_UP, EFFECT_BEAT_UP, 10, DARK, 100, 10, 0 - |