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/field_tasks.s | |
| parent | bff89725ec31f87c296ec45f107f81dfe3cd54d6 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into battle_dome_cards
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 |