diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 20:54:49 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 20:54:49 -0400 |
| commit | d4d8f876e55f5dd1df792e0124d9fb488976151a (patch) | |
| tree | 94664c7d3241b52aee3f08496f8f234eb3b3dc82 /asm/map_obj_lock.s | |
| parent | bff89725ec31f87c296ec45f107f81dfe3cd54d6 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into battle_dome_cards
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 |