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_strength.s | |
| parent | 3b3423d1a751134ff7941b41bad72e0e75314647 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into lilycove_lady
Diffstat (limited to 'asm/fldeff_strength.s')
| -rw-r--r-- | asm/fldeff_strength.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index 3dc64467e..98764625e 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -40,7 +40,7 @@ _08145DF2: sub_8145E0C: @ 8145E0C push {lr} bl brm_get_pokemon_selection - ldr r1, =gUnknown_02038C08 + ldr r1, =gFieldEffectSpawnParams lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -66,7 +66,7 @@ sub_8145E2C: @ 8145E2C lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] - ldr r0, =gUnknown_02038C08 + ldr r0, =gFieldEffectSpawnParams ldr r1, [r0] movs r0, 0x64 muls r0, r1 |