diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-19 19:42:32 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-19 19:42:32 -0500 |
| commit | d273493cbb1ef8ecda5c87908d07fffc1d68cd6f (patch) | |
| tree | a08642a5b0d91c17f1ccf7bf2d69c321ddd653d4 /asm/field_tasks.s | |
| parent | fcc94f9722609ffa67c045cf8a7539690a68b080 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge remote-tracking branch 'pret/master'
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 |