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/fldeff_emotion.s | |
| parent | 3b3423d1a751134ff7941b41bad72e0e75314647 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into lilycove_lady
Diffstat (limited to 'asm/fldeff_emotion.s')
| -rw-r--r-- | asm/fldeff_emotion.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/fldeff_emotion.s b/asm/fldeff_emotion.s index f8b66da0d..37096a438 100644 --- a/asm/fldeff_emotion.s +++ b/asm/fldeff_emotion.s @@ -115,7 +115,7 @@ sub_80B46D8: @ 80B46D8 orrs r3, r4 mov r4, r12 strb r3, [r4] - ldr r4, =gUnknown_02038C08 + ldr r4, =gFieldEffectSpawnParams ldr r3, [r4] strh r3, [r0, 0x2E] ldr r3, [r4, 0x4] @@ -296,7 +296,7 @@ sub_80B4808: @ 80B4808 b _080B489E .pool _080B4870: - ldr r0, =gUnknown_02037590 + ldr r0, =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 |