summaryrefslogtreecommitdiff
path: root/engine/npc_movement.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-12-23 17:14:09 -0500
committeryenatch <yenatch@gmail.com>2017-12-23 17:14:09 -0500
commitc51968f0de6b8420c141dde27339e82a42837c5b (patch)
tree782f2b25f21adacb48fd516694b8a82864fe0b99 /engine/npc_movement.asm
parentc883ab4d34ecb4890010e808d6b6d533f5d8ad56 (diff)
parent878092004956418bfd77bfdb9fc9dd7f640f80d2 (diff)
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'engine/npc_movement.asm')
-rwxr-xr-xengine/npc_movement.asm3
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm
index 9a18cdcb1..e102cc554 100755
--- a/engine/npc_movement.asm
+++ b/engine/npc_movement.asm
@@ -7,7 +7,8 @@ Function6ec1: ; 6ec1
ld hl, OBJECT_FLAGS1
add hl, bc
- bit 4, [hl] ; lost
+ bit 4, [hl] ; lost, uncomment next line to fix
+; jr nz, .resume
push hl
push bc
call Function6f2c