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/field_tasks.s | |
| parent | 67a8ac72ec8629d2d737fcd976969303bcd056f5 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Fix merge conflicts
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 |