summaryrefslogtreecommitdiff
path: root/engine/player_movement.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2016-03-01 22:31:21 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2016-03-01 22:31:21 -0500
commit599e6e8d16571235f2054aa38f39e66181da3796 (patch)
tree9d3670e3329a17f076ea95fc721fd7501354a984 /engine/player_movement.asm
parente044b8ec08fee4a5d4f9cd942551ff94f2577b76 (diff)
Battle animation annotations
Diffstat (limited to 'engine/player_movement.asm')
-rwxr-xr-xengine/player_movement.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/player_movement.asm b/engine/player_movement.asm
index 80c5e6edc..6ab121f61 100755
--- a/engine/player_movement.asm
+++ b/engine/player_movement.asm
@@ -121,12 +121,12 @@ DoPlayerMovement:: ; 80000
ld a, [PlayerStandingTile]
ld c, a
call CheckWhirlpoolTile
- jr c, .asm_800c4
+ jr c, .not_whirlpool
ld a, 3
scf
ret
-.asm_800c4
+.not_whirlpool
and $f0
cp $30 ; moving water
jr z, .water