diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 21:18:34 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 21:18:34 -0400 |
commit | f43de6e5826b30335a843413c4f3043d7f6d5395 (patch) | |
tree | 880867e0d39569b5a8be546b1e2b0e2bd8021024 /asm/scrcmd.s | |
parent | 3b3423d1a751134ff7941b41bad72e0e75314647 (diff) | |
parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) |
Merge branch 'master' into lilycove_lady
Diffstat (limited to 'asm/scrcmd.s')
-rw-r--r-- | asm/scrcmd.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 0598c2310..39366d29f 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -4874,7 +4874,7 @@ s9D_set_HM_animation_data: @ 809B7F4 lsls r0, 16 lsrs r0, 16 bl VarGet - ldr r1, =gUnknown_02038C08 + ldr r1, =gFieldEffectSpawnParams lsls r4, 2 adds r4, r1 lsls r0, 16 |