diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 13:12:43 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 13:12:43 +0200 |
| commit | 3919b7130b2a8709562b012099947923a16af02d (patch) | |
| tree | fc41f69f7213aaaed914d4ceebfa58d3beb519c6 /asm/map_obj_lock.s | |
| parent | 67a8ac72ec8629d2d737fcd976969303bcd056f5 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Fix merge conflicts
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 |