diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-25 10:56:55 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-25 10:56:55 -0500 |
| commit | a875d665b812b4aaa5cde21b5127262e04106755 (patch) | |
| tree | 4e597cbce3178a5434d62beaf2f812ad57b8b7ef /asm/fldeff_softboiled.s | |
| parent | 293dfc4823d6c984adc221b40be4e3705a3fa65b (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'asm/fldeff_softboiled.s')
| -rwxr-xr-x | asm/fldeff_softboiled.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s index 48d968d20..c3aa4f1ed 100755 --- a/asm/fldeff_softboiled.s +++ b/asm/fldeff_softboiled.s @@ -8,7 +8,7 @@ thumb_func_start hm_prepare_dive_probably hm_prepare_dive_probably: @ 8161508 push {r4-r6,lr} - bl brm_get_pokemon_selection + bl GetCursorSelectionMonId lsls r0, 24 lsrs r0, 24 movs r6, 0x64 @@ -20,7 +20,7 @@ hm_prepare_dive_probably: @ 8161508 adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 - bl brm_get_pokemon_selection + bl GetCursorSelectionMonId lsls r0, 24 lsrs r0, 24 muls r0, r6 @@ -59,7 +59,7 @@ sub_8161560: @ 8161560 strb r1, [r0, 0xB] ldrb r1, [r0, 0x9] strb r1, [r0, 0xA] - bl brm_get_pokemon_selection + bl GetCursorSelectionMonId lsls r0, 24 lsrs r0, 24 movs r1, 0x1 |