diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-25 10:56:55 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-25 10:56:55 -0500 |
| commit | a875d665b812b4aaa5cde21b5127262e04106755 (patch) | |
| tree | 4e597cbce3178a5434d62beaf2f812ad57b8b7ef /asm/field_screen.s | |
| parent | 293dfc4823d6c984adc221b40be4e3705a3fa65b (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'asm/field_screen.s')
| -rw-r--r-- | asm/field_screen.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_screen.s b/asm/field_screen.s index 4ab8a5a53..497346f8a 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -10424,7 +10424,7 @@ sub_80B0534: @ 80B0534 lsls r1, 3 ldr r0, =gTasks + 0x8 adds r1, r0 - ldr r0, =gScriptResult + ldr r0, =gSpecialVar_Result ldrh r0, [r0] cmp r0, 0 bne _080B0568 |