summaryrefslogtreecommitdiff
path: root/asm/script_movement.s
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-02-11 20:12:40 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-02-11 20:12:40 -0500
commit590c4b500b9dd37d372a935865aa4df0ab0bf43c (patch)
tree5572d76c91e106e74e1401076f130fb902f6b67b /asm/script_movement.s
parentbc063b45d05716d1eab283f6d474bcdc601cafde (diff)
parent14a76793e596d612efd273169c4172922c270f13 (diff)
Merge branch 'master' into record_mixing
Diffstat (limited to 'asm/script_movement.s')
-rw-r--r--[-rwxr-xr-x]asm/script_movement.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/script_movement.s b/asm/script_movement.s
index 5f06fd179..8c6a6257c 100755..100644
--- a/asm/script_movement.s
+++ b/asm/script_movement.s
@@ -553,7 +553,7 @@ _080D36DC:
adds r1, r6, 0
bl sub_80D355C
adds r0, r4, 0
- bl sub_8097404
+ bl FreezeMapObject
b _080D370E
.pool
_080D36F8: