diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-02 15:07:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 15:07:59 -0400 |
| commit | c98fbb5ca6edf4f2bb3d2eada318082051f0849d (patch) | |
| tree | 1a15ec3e4110f619cbd345779ff09afbc5562359 /include | |
| parent | 47286d1ecb526c989d38e6e2e1c5cf80b2c5ec3f (diff) | |
| parent | 510ccbdf4cdc380594d9ee253fc209cb477d9df4 (diff) | |
Merge pull request #1538 from cbt6/move-speed
Rename some player movement speed functions
Diffstat (limited to 'include')
| -rw-r--r-- | include/bike.h | 10 | ||||
| -rwxr-xr-x | include/constants/event_object_movement.h | 8 | ||||
| -rw-r--r-- | include/event_object_movement.h | 2 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/include/bike.h b/include/bike.h index 893b0b19e..afe773d42 100644 --- a/include/bike.h +++ b/include/bike.h @@ -17,11 +17,11 @@ struct BikeHistoryInputInfo // Player speeds enum { - SPEED_STANDING, - SPEED_NORMAL, - SPEED_FAST, - SPEED_FASTER, - SPEED_FASTEST, + BIKE_SPEED_STANDING, + BIKE_SPEED_NORMAL, + BIKE_SPEED_FAST, + BIKE_SPEED_FASTER, + BIKE_SPEED_FASTEST, }; // mach bike transitions enum diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 4ffb869e4..e7238b56e 100755 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -128,10 +128,10 @@ #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C -#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D -#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E -#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F -#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_WALK_FASTER_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_FASTER_UP 0x2E +#define MOVEMENT_ACTION_WALK_FASTER_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_FASTER_RIGHT 0x30 #define MOVEMENT_ACTION_SLIDE_DOWN 0x31 #define MOVEMENT_ACTION_SLIDE_UP 0x32 #define MOVEMENT_ACTION_SLIDE_LEFT 0x33 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index a935502e6..11dac813d 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -136,7 +136,7 @@ u8 GetFaceDirectionMovementAction(u32); u8 GetWalkNormalMovementAction(u32); u8 GetWalkFastMovementAction(u32); u8 GetRideWaterCurrentMovementAction(u32); -u8 GetWalkFastestMovementAction(u32); +u8 GetWalkFasterMovementAction(u32); u8 GetPlayerRunMovementAction(u32); u8 GetJumpInPlaceMovementAction(u32); u8 GetAcroWheelieFaceDirectionMovementAction(u32); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index e9174d589..823564f22 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -11,10 +11,10 @@ void PlayerGetDestCoords(s16 *, s16 *); u8 GetPlayerFacingDirection(void); u8 GetPlayerMovementDirection(void); u8 PlayerGetCopyableMovement(void); -void PlayerGoSpeed1(u8); -void PlayerGoSpeed2(u8); +void PlayerWalkNormal(u8); +void PlayerWalkFast(u8); void PlayerRideWaterCurrent(u8); -void PlayerGoSpeed4(u8); +void PlayerWalkFaster(u8); void PlayerOnBikeCollide(u8); void PlayerFaceDirection(u8 a); void PlayerTurnInPlace(u8 a); |