diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
| commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
| tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /asm/field_poison.s | |
| parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
| parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) | |
Merge origin/master into pikalaxalt/link
Diffstat (limited to 'asm/field_poison.s')
| -rw-r--r-- | asm/field_poison.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_poison.s b/asm/field_poison.s index 652026523..83262a1a5 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -203,12 +203,12 @@ _080F96C0: cmp r0, 0 beq _080F96F0 _080F96E6: - ldr r0, =gScriptResult + ldr r0, =gSpecialVar_Result strh r5, [r0] b _080F9718 .pool _080F96F0: - ldr r1, =gScriptResult + ldr r1, =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] b _080F9718 @@ -224,7 +224,7 @@ _080F96FC: b _080F9722 .pool _080F9714: - ldr r0, =gScriptResult + ldr r0, =gSpecialVar_Result strh r1, [r0] _080F9718: bl EnableBothScriptContexts |