From 0aaae88d6e7a75cd4aeed4ea5bf574afe77ace27 Mon Sep 17 00:00:00 2001
From: cbt6 <91667135+cbt6@users.noreply.github.com>
Date: Mon, 28 Feb 2022 23:12:57 +0800
Subject: Rename movement action 0x9F

---
 src/data/object_events/movement_action_func_tables.h | 2 +-
 src/field_player_avatar.c                            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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)
-- 
cgit v1.2.3


From 7ae187a2dd49243bfa423fa402299c77b494fd4c Mon Sep 17 00:00:00 2001
From: cbt6 <91667135+cbt6@users.noreply.github.com>
Date: Mon, 28 Feb 2022 23:27:26 +0800
Subject: Add clarifying comment

---
 src/field_player_avatar.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 4126cc650..c4e2a5ed7 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -909,6 +909,8 @@ void PlayerJumpLedge(u8 direction)
     PlayerSetAnimId(GetJump2MovementAction(direction), 8);
 }
 
+// Shakes head for male player character,
+// walk in place for female player character
 void PlayerShakeHeadOrWalkInPlace(void)
 {
     PlayerSetAnimId(MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE, 0);
-- 
cgit v1.2.3