diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-11-24 10:45:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-24 10:45:15 -0600 |
| commit | 80116a80fd98679c0449efe33c4e460947f4b8d0 (patch) | |
| tree | 312a72b8513694aab4db01941cc5d2b37b53dd4e /asm/map_obj_lock.s | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
| parent | bc6416ddd96182d5f786add8d1c1945a2f82f2b9 (diff) | |
Merge pull request #22 from PikalaxALT/quest_log
Quest log
Diffstat (limited to 'asm/map_obj_lock.s')
| -rw-r--r-- | asm/map_obj_lock.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index a5a61662d..4ff07589a 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -8,14 +8,14 @@ thumb_func_start walkrun_is_standing_still walkrun_is_standing_still: @ 8069554 push {lr} - ldr r0, _08069564 @ =gUnknown_2037078 + ldr r0, _08069564 @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x1 beq _08069568 movs r0, 0x1 b _0806956A .align 2, 0 -_08069564: .4byte gUnknown_2037078 +_08069564: .4byte gPlayerAvatar _08069568: movs r0, 0 _0806956A: |