diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-18 21:45:52 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-18 21:45:52 +0100 |
| commit | 3de416662b5a83d96cbe010462971ed2c246d70d (patch) | |
| tree | 7070ce944c7ef2d46cde333faec6a9930d1399c2 /asm/fldeff_cut.s | |
| parent | f8b40754c70679bb3ec4c0611613a0658f679225 (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) | |
wild encounter, fix merge conflicts
Diffstat (limited to 'asm/fldeff_cut.s')
| -rwxr-xr-x | asm/fldeff_cut.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 5e2a99d18..71137b705 100755 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -32,7 +32,7 @@ _080D3754: ldr r0, =gUnknown_0203AB40 adds r1, r0, 0x2 bl PlayerGetDestCoords - bl brm_get_pokemon_selection + bl GetCursorSelectionMonId lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -384,7 +384,7 @@ hm2_ruin_valley: @ 80D3A50 push {lr} movs r0, 0x1 bl FieldEffectStart - bl brm_get_pokemon_selection + bl GetCursorSelectionMonId ldr r1, =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 @@ -420,7 +420,7 @@ sub_80D3A6C: @ 80D3A6C thumb_func_start sub_80D3A9C sub_80D3A9C: @ 80D3A9C push {lr} - bl brm_get_pokemon_selection + bl GetCursorSelectionMonId ldr r1, =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 |