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/fldeff_sweetscent.s | |
parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) |
Merge origin/master into pikalaxalt/link
Diffstat (limited to 'asm/fldeff_sweetscent.s')
-rw-r--r-- | asm/fldeff_sweetscent.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index ea7b2653a..9510ca4a0 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -205,7 +205,7 @@ sub_815A090: @ 815A090 lsls r2, 1 bl CpuFastSet bl sub_80AC3E4 - ldr r0, =gUnknown_08290CAE + ldr r0, =EventScript_290CAE bl ScriptContext1_SetupScript adds r0, r4, 0 bl DestroyTask |