diff options
| author | yenatch <yenatch@gmail.com> | 2013-09-09 22:02:26 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-09-09 22:02:26 -0400 |
| commit | 6439706943b53ad756d481dea683fa8ee97f4981 (patch) | |
| tree | d3460b5d7e79b1afeaa88119e355e05298e184a2 /battle/effect_commands.asm | |
| parent | 91e89a29a20d075ffbdd3a2f75b507c8202b1dce (diff) | |
split spikes effect into effects/spikes.asm
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index dc6ca521c..87196653a 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -9548,34 +9548,7 @@ INCLUDE "battle/effects/protect.asm" INCLUDE "battle/effects/endure.asm" - -BattleCommand56: ; 37683 -; spikes - - ld hl, EnemyScreens - ld a, [hBattleTurn] - and a - jr z, .asm_3768e - ld hl, PlayerScreens -.asm_3768e - -; Fails if spikes are already down! - - bit SCREENS_SPIKES, [hl] - jr nz, .failed - -; Nothing else stops it from working. - - set SCREENS_SPIKES, [hl] - - call Function0x37e01 - - ld hl, SpikesText - jp StdBattleTextBox - -.failed - jp Function0x37354 -; 376a0 +INCLUDE "battle/effects/spikes.asm" BattleCommand57: ; 376a0 |