diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-13 17:51:26 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-13 17:51:26 -0500 |
| commit | 4d13e3394ad44eaa5dab972e73985dd1820069ea (patch) | |
| tree | 05141d2c6307990b3013bc330e80d8e163492181 /asm/field_control_avatar.s | |
| parent | aa9a45c16fbaee2fffc94e4741e0a1f203b244bc (diff) | |
Bring all movement function names up-to-date with pokeruby
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index ff10928cb..c2b13e2bf 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -189,7 +189,7 @@ sub_809C014: @ 809C014 strh r1, [r0] ldr r0, =gSelectedEventObject strb r1, [r0] - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r6, r0, 24 mov r4, sp @@ -2452,7 +2452,7 @@ _0809D276: GetEventObjectScriptPointerForComparison: @ 809D280 push {r4,r5,lr} sub sp, 0x8 - bl player_get_direction_upper_nybble + bl GetPlayerMovementDirection adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -2481,7 +2481,7 @@ GetEventObjectScriptPointerForComparison: @ 809D280 sub_809D2BC: @ 809D2BC push {r4,lr} sub sp, 0x8 - bl player_get_direction_upper_nybble + bl GetPlayerMovementDirection mov r4, sp mov r0, sp bl player_get_pos_to_and_height |