diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
commit | 1e79d53d2f913c65295b2547549d2c4ed849122b (patch) | |
tree | de6e74a23a65f5d7ebc7e4a7305742b08b6e71c0 /asm/field_screen.s | |
parent | 0310be30079c657f3a21da64683bdf9ac1d4d394 (diff) | |
parent | 055a419830c0725a629f971b0299c89082c192fd (diff) |
merge daycare with master
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 |