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/field_tasks.s | |
| parent | abe72dca47f73231e45f778e6ceafe2e3b7f4158 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into sub_81700F8
Diffstat (limited to 'asm/field_tasks.s')
| -rw-r--r-- | asm/field_tasks.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 0abd11da4..26761b8d1 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -1858,7 +1858,7 @@ _0809E6F8: cmp r6, 0xD ble _0809E6F8 _0809E708: - ldr r2, =gUnknown_02037334 + ldr r2, =gCamera ldrb r1, [r2] movs r0, 0x1 ands r0, r1 |