diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 20:12:40 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 20:12:40 -0500 |
| commit | 590c4b500b9dd37d372a935865aa4df0ab0bf43c (patch) | |
| tree | 5572d76c91e106e74e1401076f130fb902f6b67b /asm/fldeff_strength.s | |
| parent | bc063b45d05716d1eab283f6d474bcdc601cafde (diff) | |
| parent | 14a76793e596d612efd273169c4172922c270f13 (diff) | |
Merge branch 'master' into record_mixing
Diffstat (limited to 'asm/fldeff_strength.s')
| -rw-r--r-- | asm/fldeff_strength.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index 947517ed5..fdadd2aac 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -17,13 +17,13 @@ hm_prepare_rocksmash: @ 8145DC4 movs r0, 0 b _08145DF2 _08145DD8: - ldr r4, =gScriptResult - bl brm_get_pokemon_selection + ldr r4, =gSpecialVar_Result + bl GetCursorSelectionMonId lsls r0, 24 lsrs r0, 24 strh r0, [r4] ldr r1, =gUnknown_03005DB0 - ldr r0, =hm_add_c3_launch_phase_2 + ldr r0, =FieldCallback_Teleport str r0, [r1] ldr r1, =gUnknown_0203CEEC ldr r0, =sub_8145E0C @@ -39,12 +39,12 @@ _08145DF2: thumb_func_start sub_8145E0C sub_8145E0C: @ 8145E0C push {lr} - bl brm_get_pokemon_selection + bl GetCursorSelectionMonId ldr r1, =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r0, =gUnknown_082908FD + ldr r0, =FieryPath_EventScript_2908FD bl ScriptContext1_SetupScript pop {r0} bx r0 |