summaryrefslogtreecommitdiff
path: root/engine/battle/effect_commands/spikes.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-02-03 17:15:20 -0500
committerGitHub <noreply@github.com>2018-02-03 17:15:20 -0500
commitb35eb72290b964b98844afbe741bb7ede34b9ef3 (patch)
tree2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/battle/effect_commands/spikes.asm
parent7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff)
parent32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff)
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/battle/effect_commands/spikes.asm')
-rw-r--r--engine/battle/effect_commands/spikes.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/effect_commands/spikes.asm b/engine/battle/effect_commands/spikes.asm
index 3d15e4cfd..a5e22a706 100644
--- a/engine/battle/effect_commands/spikes.asm
+++ b/engine/battle/effect_commands/spikes.asm
@@ -1,11 +1,11 @@
BattleCommand_Spikes: ; 37683
; spikes
- ld hl, EnemyScreens
+ ld hl, wEnemyScreens
ld a, [hBattleTurn]
and a
jr z, .asm_3768e
- ld hl, PlayerScreens
+ ld hl, wPlayerScreens
.asm_3768e
; Fails if spikes are already down!