diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 21:00:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 21:00:24 -0400 |
| commit | 5fc2c964fb002d79a192937afc623555a411980c (patch) | |
| tree | 3217724f4142ff88e1ae10d8375183612396e0bf /asm/map_obj_lock.s | |
| parent | abe72dca47f73231e45f778e6ceafe2e3b7f4158 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into sub_81700F8
Diffstat (limited to 'asm/map_obj_lock.s')
| -rw-r--r-- | asm/map_obj_lock.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index 6530c268b..60757cdd0 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -8,7 +8,7 @@ thumb_func_start walkrun_is_standing_still walkrun_is_standing_still: @ 8098388 push {lr} - ldr r0, =gUnknown_02037590 + ldr r0, =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x1 beq _0809839C |