diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 20:55:05 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-19 20:55:05 -0400 |
| commit | 2c07b94e94115d89aec51cd6fd0600ce73fbb675 (patch) | |
| tree | efca127a29d73451e42898ce4fb016fd6e9e4c83 /asm/party_menu.s | |
| parent | 60f8369a898a121691c1e29ea5235407ac282f49 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge branch 'master' into berry_fix_program
Diffstat (limited to 'asm/party_menu.s')
| -rwxr-xr-x | asm/party_menu.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index cf00d63c1..bb4ad4e31 100755 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -10051,7 +10051,7 @@ task_launch_hm_phase_2: @ 81B5750 cmp r0, 0x1 bne _081B577C bl brm_get_selected_species - ldr r1, =gUnknown_02038C08 + ldr r1, =gFieldEffectSpawnParams lsls r0, 16 lsrs r0, 16 str r0, [r1] @@ -10135,7 +10135,7 @@ _081B57FE: hm_surf_run_dp02scr: @ 81B5804 push {lr} bl brm_get_pokemon_selection - ldr r1, =gUnknown_02038C08 + ldr r1, =gFieldEffectSpawnParams lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -10239,7 +10239,7 @@ sub_81B58A8: @ 81B58A8 hm2_waterfall: @ 81B58D4 push {lr} bl brm_get_pokemon_selection - ldr r1, =gUnknown_02038C08 + ldr r1, =gFieldEffectSpawnParams lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -10299,7 +10299,7 @@ _081B594E: sub_81B5958: @ 81B5958 push {lr} bl brm_get_pokemon_selection - ldr r1, =gUnknown_02038C08 + ldr r1, =gFieldEffectSpawnParams lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -10314,7 +10314,7 @@ sub_81B5958: @ 81B5958 sub_81B5974: @ 81B5974 push {lr} bl sub_809D1E8 - ldr r1, =gUnknown_02038C08 + ldr r1, =gFieldEffectSpawnParams lsls r0, 24 lsrs r0, 24 str r0, [r1, 0x4] |