Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

split spikes effect into effects/spikes.asm

This commit is contained in:
yenatch 2013-09-09 22:02:26 -04:00
parent 91e89a29a2
commit 6439706943
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
battle/effect_commands.asm
View File

@ -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

28
battle/effects/spikes.asm Normal file
View File

@ -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