diff options
| -rw-r--r-- | battle/effect_commands.asm | 29 | ||||
| -rw-r--r-- | battle/effects/spikes.asm | 28 |
2 files changed, 29 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 diff --git a/battle/effects/spikes.asm b/battle/effects/spikes.asm new file mode 100644 index 000000000..1b93f9fa1 --- /dev/null +++ b/battle/effects/spikes.asm @@ -0,0 +1,28 @@ +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 + |