summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-15 04:27:59 -0700
committerYamaArashi <shadow962@live.com>2015-07-15 04:27:59 -0700
commit7b676f5851a2b6fe0001f259afde6e9918b93683 (patch)
tree11e66ae327a27f5e769aa012d5ca4e5646df4d42 /main.asm
parent994c2cbf289efa2e23eabf1af96ba62e4f066005 (diff)
commented movement stuff
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index c8907c72..1d288543 100755
--- a/main.asm
+++ b/main.asm
@@ -218,9 +218,9 @@ UpdateNonPlayerSprite:
ld a, [H_CURRENTSPRITEOFFSET]
cp b
jr nz, .unequal
- jp Func_5236
+ jp DoScriptedNPCMovement
.unequal
- jp Func_4ed1
+ jp UpdateNPCSprite
; This detects if the current sprite (whose offset is at H_CURRENTSPRITEOFFSET)
; is going to collide with another sprite by looping over the other sprites.