diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-17 15:07:17 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-17 15:07:17 -0600 |
| commit | 52624c4fb7c145c33a2d0edc1d64b2d6e09c1336 (patch) | |
| tree | aec3073d480a2fbc3f0221397aa5e84f85755e48 /asm/fldeff_cut.s | |
| parent | f8402b3d7408e31a085dc136967f99705c764553 (diff) | |
| parent | 3883c399912a35ca4eca3cbee7cb0c46c81e8d76 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
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 |