summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcbt6 <91667135+cbt6@users.noreply.github.com>2022-02-28 23:12:57 +0800
committercbt6 <91667135+cbt6@users.noreply.github.com>2022-02-28 23:12:57 +0800
commit0aaae88d6e7a75cd4aeed4ea5bf574afe77ace27 (patch)
treee953101d29d57f4b30ef7c8b93b47de3a9dfac73 /src
parent759f373d3153afb0e9dcf5050a700aeca036a919 (diff)
Rename movement action 0x9F
Diffstat (limited to 'src')
-rw-r--r--src/data/object_events/movement_action_func_tables.h2
-rw-r--r--src/field_player_avatar.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/data/object_events/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h
index e55687c03..9abd6452a 100644
--- a/src/data/object_events/movement_action_func_tables.h
+++ b/src/data/object_events/movement_action_func_tables.h
@@ -622,7 +622,7 @@ bool8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite
[MOVEMENT_ACTION_WALK_SLOWEST_UP] = sMovementActionFuncs_x9C,
[MOVEMENT_ACTION_WALK_SLOWEST_LEFT] = sMovementActionFuncs_x9D,
[MOVEMENT_ACTION_WALK_SLOWEST_RIGHT] = sMovementActionFuncs_x9E,
- [MOVEMENT_ACTION_SHAKE_HEAD] = sMovementActionFuncs_x9F,
+ [MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE] = sMovementActionFuncs_x9F,
[MOVEMENT_ACTION_0xA0] = sMovementActionFuncs_xA0,
[MOVEMENT_ACTION_0xA1] = sMovementActionFuncs_xA1,
[MOVEMENT_ACTION_0xA2] = sMovementActionFuncs_xA2,
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index bafe7fd22..4126cc650 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -909,9 +909,9 @@ void PlayerJumpLedge(u8 direction)
PlayerSetAnimId(GetJump2MovementAction(direction), 8);
}
-void PlayerShakeHead(void)
+void PlayerShakeHeadOrWalkInPlace(void)
{
- PlayerSetAnimId(MOVEMENT_ACTION_SHAKE_HEAD, 0);
+ PlayerSetAnimId(MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE, 0);
}
void HandleEnforcedLookDirectionOnPlayerStopMoving(void)