diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 20:55:05 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 20:55:05 -0400 |
| commit | 2c07b94e94115d89aec51cd6fd0600ce73fbb675 (patch) | |
| tree | efca127a29d73451e42898ce4fb016fd6e9e4c83 /asm/map_obj_lock.s | |
| parent | 60f8369a898a121691c1e29ea5235407ac282f49 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into berry_fix_program
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 |