diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-02-28 10:41:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 10:41:16 -0500 |
| commit | 7cc59fbb1102f8f5520a20718c9181e9436223b4 (patch) | |
| tree | 2d9d893f7c0624944bba4dc26d76e17f38e4ee4f | |
| parent | 759f373d3153afb0e9dcf5050a700aeca036a919 (diff) | |
| parent | 7ae187a2dd49243bfa423fa402299c77b494fd4c (diff) | |
Merge pull request #490 from cbt6/movement-action-0x9f
Rename movement action 0x9F
| -rw-r--r-- | asm/macros/movement.inc | 2 | ||||
| -rw-r--r-- | include/constants/event_object_movement.h | 2 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 2 | ||||
| -rw-r--r-- | src/data/object_events/movement_action_func_tables.h | 2 | ||||
| -rw-r--r-- | src/field_player_avatar.c | 6 |
5 files changed, 8 insertions, 6 deletions
diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index b6c151730..7cbd1ffc4 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -124,7 +124,7 @@ create_movement walk_slowest_up create_movement walk_slowest_left create_movement walk_slowest_right - create_movement shake_head + create_movement shake_head_or_walk_in_place enum_start 0xa6 create_movement jump_special_with_effect_down diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 87625860b..a9b390b6f 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -247,7 +247,7 @@ #define MOVEMENT_ACTION_WALK_SLOWEST_UP 0x9C #define MOVEMENT_ACTION_WALK_SLOWEST_LEFT 0x9D #define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT 0x9E -#define MOVEMENT_ACTION_SHAKE_HEAD 0x9F +#define MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE 0x9F #define MOVEMENT_ACTION_0xA0 0xA0 #define MOVEMENT_ACTION_0xA1 0xA1 #define MOVEMENT_ACTION_0xA2 0xA2 diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 7e051f0dd..a970385db 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -56,7 +56,7 @@ void PlayerFaceDirection(u8 direction); void PlayerFaceDirectionFast(u8 direction); void PlayerTurnInPlace(u8 direction); void PlayerJumpLedge(u8 direction); -void PlayerShakeHead(void); +void PlayerShakeHeadOrWalkInPlace(void); void player_step(u8 direction, u16 newKeys, u16 heldKeys); bool32 PlayerIsMovingOnRockStairs(u8 direction); void UpdatePlayerAvatarTransitionState(void); 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..c4e2a5ed7 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -909,9 +909,11 @@ void PlayerJumpLedge(u8 direction) PlayerSetAnimId(GetJump2MovementAction(direction), 8); } -void PlayerShakeHead(void) +// Shakes head for male player character, +// walk in place for female player character +void PlayerShakeHeadOrWalkInPlace(void) { - PlayerSetAnimId(MOVEMENT_ACTION_SHAKE_HEAD, 0); + PlayerSetAnimId(MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE, 0); } void HandleEnforcedLookDirectionOnPlayerStopMoving(void) |