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/daycare.s | |
| parent | 0310be30079c657f3a21da64683bdf9ac1d4d394 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
merge daycare with master
Diffstat (limited to 'asm/daycare.s')
| -rw-r--r-- | asm/daycare.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/daycare.s b/asm/daycare.s index 5d6b09c8e..6426381f1 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -843,12 +843,12 @@ c3_080469FC: @ 8071204 b _0807124E .pool _0807123C: - ldr r0, =gScriptResult + ldr r0, =gSpecialVar_Result strh r1, [r0] b _0807124E .pool _08071248: - ldr r1, =gScriptResult + ldr r1, =gSpecialVar_Result movs r0, 0x2 strh r0, [r1] _0807124E: @@ -877,7 +877,7 @@ _08071284: ands r0, r2 cmp r0, 0 beq _080712B4 - ldr r0, =gScriptResult + ldr r0, =gSpecialVar_Result strh r1, [r0] ldrb r0, [r4, 0x8] movs r1, 0 |