summaryrefslogtreecommitdiff
path: root/src/field_control_avatar.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-05-25 09:30:24 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-05-29 17:43:11 -0500
commitbc97185452e4dd38a808afeac7b6c774d4ab1163 (patch)
treecce8625b11a840a19219b5af051c6ebe83c3d95f /src/field_control_avatar.c
parent4d92810ad64d6b01701de7f4796467c402542420 (diff)
Label all movement type functions and their callbacks
Diffstat (limited to 'src/field_control_avatar.c')
-rw-r--r--src/field_control_avatar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 918ab0e21..f090cf5ca 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -197,7 +197,7 @@ int sub_8068024(struct FieldInput *input)
u8 r6;
u16 r4;
- r6 = player_get_direction_lower_nybble();
+ r6 = GetPlayerFacingDirection();
player_get_pos_to_and_height(&position);
r4 = MapGridGetMetatileBehaviorAt(position.x, position.y);
#if DEBUG
@@ -916,7 +916,7 @@ u8 *GetFieldObjectScriptPointerPlayerFacing(void)
u8 r4;
struct MapPosition position;
- r4 = player_get_direction_upper_nybble();
+ r4 = GetPlayerMovementDirection();
player_get_next_pos_and_height(&position);
return sub_8068364(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), r4);
}
@@ -925,7 +925,7 @@ int SetCableClubWarp(void)
{
struct MapPosition position;
- player_get_direction_upper_nybble(); //unnecessary
+ GetPlayerMovementDirection(); //unnecessary
player_get_pos_to_and_height(&position);
MapGridGetMetatileBehaviorAt(position.x, position.y); //unnecessary
sub_8068C30(&gMapHeader, map_warp_check_packed(&gMapHeader, &position), &position);