diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/event_object_movement.h | 62 | ||||
| -rw-r--r-- | include/event_object_movement.h | 22 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 2 |
3 files changed, 41 insertions, 45 deletions
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 62c5a2ef2..87625860b 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -82,7 +82,7 @@ #define MOVEMENT_TYPE_VS_SEEKER_4D 0x4D #define MOVEMENT_TYPE_VS_SEEKER_4E 0x4E #define MOVEMENT_TYPE_VS_SEEKER_4F 0x4F -#define MOVEMENT_TYPE_WANDER_AROUND_SLOWEST 0x50 +#define MOVEMENT_TYPE_WANDER_AROUND_SLOWER 0x50 #define MOVEMENT_TYPES_COUNT 0x51 #define MOVEMENT_ACTION_FACE_DOWN 0x0 @@ -93,10 +93,10 @@ #define MOVEMENT_ACTION_FACE_UP_FAST 0x5 #define MOVEMENT_ACTION_FACE_LEFT_FAST 0x6 #define MOVEMENT_ACTION_FACE_RIGHT_FAST 0x7 -#define MOVEMENT_ACTION_WALK_SLOWEST_DOWN 0x8 -#define MOVEMENT_ACTION_WALK_SLOWEST_UP 0x9 -#define MOVEMENT_ACTION_WALK_SLOWEST_LEFT 0xA -#define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT 0xB +#define MOVEMENT_ACTION_WALK_SLOWER_DOWN 0x8 +#define MOVEMENT_ACTION_WALK_SLOWER_UP 0x9 +#define MOVEMENT_ACTION_WALK_SLOWER_LEFT 0xA +#define MOVEMENT_ACTION_WALK_SLOWER_RIGHT 0xB #define MOVEMENT_ACTION_WALK_SLOW_DOWN 0xC #define MOVEMENT_ACTION_WALK_SLOW_UP 0xD #define MOVEMENT_ACTION_WALK_SLOW_LEFT 0xE @@ -134,10 +134,10 @@ #define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x2E #define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x2F #define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x30 -#define MOVEMENT_ACTION_FACE_DOWN_SLOW 0x31 -#define MOVEMENT_ACTION_FACE_UP_SLOW 0x32 -#define MOVEMENT_ACTION_FACE_LEFT_SLOW 0x33 -#define MOVEMENT_ACTION_FACE_RIGHT_SLOW 0x34 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x31 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x32 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x33 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x34 #define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x35 #define MOVEMENT_ACTION_WALK_FASTEST_UP 0x36 #define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x37 @@ -235,33 +235,29 @@ #define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x91 #define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x92 #define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x93 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x94 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x95 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x96 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x97 - -// 98-A3 are unknown -#define MOVEMENT_ACTION_0x98 0x98 -#define MOVEMENT_ACTION_0x99 0x99 -#define MOVEMENT_ACTION_0x9A 0x9A -#define MOVEMENT_ACTION_0x9B 0x9B -#define MOVEMENT_ACTION_0x9C 0x9C -#define MOVEMENT_ACTION_0x9D 0x9D -#define MOVEMENT_ACTION_0x9E 0x9E -#define MOVEMENT_ACTION_0x9F 0x9F -#define MOVEMENT_ACTION_0xA0 0xA0 -#define MOVEMENT_ACTION_0xA1 0xA1 -#define MOVEMENT_ACTION_0xA2 0xA2 -#define MOVEMENT_ACTION_0xA3 0xA3 +#define MOVEMENT_ACTION_SPIN_DOWN 0x94 +#define MOVEMENT_ACTION_SPIN_UP 0x95 +#define MOVEMENT_ACTION_SPIN_LEFT 0x96 +#define MOVEMENT_ACTION_SPIN_RIGHT 0x97 +#define MOVEMENT_ACTION_0x98 0x98 +#define MOVEMENT_ACTION_0x99 0x99 +#define MOVEMENT_ACTION_0x9A 0x9A +#define MOVEMENT_ACTION_WALK_SLOWEST_DOWN 0x9B +#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_0xA0 0xA0 +#define MOVEMENT_ACTION_0xA1 0xA1 +#define MOVEMENT_ACTION_0xA2 0xA2 +#define MOVEMENT_ACTION_0xA3 0xA3 #define MOVEMENT_ACTION_FLY_UP 0xA4 #define MOVEMENT_ACTION_FLY_DOWN 0xA5 - -// Duplicates of JUMP_SPECIAL? -#define MOVEMENT_ACTION_0xA6 0xA6 -#define MOVEMENT_ACTION_0xA7 0xA7 -#define MOVEMENT_ACTION_0xA8 0xA8 -#define MOVEMENT_ACTION_0xA9 0xA9 +#define MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_DOWN 0xA6 +#define MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_UP 0xA7 +#define MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_LEFT 0xA8 +#define MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_RIGHT 0xA9 #define MOVEMENT_ACTION_STEP_END 0xFE diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 852af21df..46529bdfe 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -124,7 +124,7 @@ u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent); u8 GetWalkNormalMovementAction(u32); u8 GetWalkFastMovementAction(u32); u8 GetWalkFastestMovementAction(u32); -u8 GetWalkSlowestMovementAction(u32 direction); +u8 GetWalkSlowerMovementAction(u32 direction); u8 GetTrainerFacingDirectionMovementType(u8 direction); u8 GetFaceDirectionMovementAction(u32); u8 GetFaceDirectionFastMovementAction(u32); @@ -134,7 +134,7 @@ u8 GetSlideMovementAction(u32); u8 GetJumpInPlaceMovementAction(u32); u8 GetJumpMovementAction(u32); u8 GetJump2MovementAction(u32); -bool8 NpcTakeStep(struct Sprite *sprite); +bool8 UpdateWalkSlowerAnim(struct Sprite *sprite); void SetJumpSpriteData(struct Sprite *, u8, u8, u8); u8 DoJumpSpriteMovement(struct Sprite *); u8 DoJumpSpecialSpriteMovement(struct Sprite *); @@ -171,16 +171,16 @@ void UpdateObjectEventsForCameraUpdate(s16 x, s16 y); void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *); void SetMovementDelay(struct Sprite *, s16); bool8 WaitForMovementDelay(struct Sprite *); -void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -bool8 obj_npc_ministep(struct Sprite *sprite); -void SetSpriteDataForNormalStep(struct Sprite *, u8); -void SetSpriteDataForNormalStep2(struct Sprite *, u8); +void SetSpriteDataForNormalStep(struct Sprite *, u8, u8); +bool8 NpcTakeStep(struct Sprite *sprite); +void SetWalkSlowerSpriteData(struct Sprite *, u8); +void SetWalkSlowestSpriteData(struct Sprite *, u8); +bool8 UpdateWalkSlowestAnim(struct Sprite *sprite); +void SetWalkSlowSpriteData(struct Sprite *, u8); bool8 UpdateWalkSlowAnim(struct Sprite *sprite); -void SetSpriteDataForNormalStep3(struct Sprite *, u8); -bool8 sub_8068C18(struct Sprite *sprite); void DoShadowFieldEffect(struct ObjectEvent *); -void SetSpriteDataForNormalStep4(struct Sprite *, u8); -bool8 sub_8068CB4(struct Sprite *sprite); +void SetRunSlowSpriteData(struct Sprite *, u8); +bool8 UpdateRunSlowAnim(struct Sprite *sprite); void SetAndStartSpriteAnim(struct Sprite *, u8, u8); bool8 SpriteAnimEnded(struct Sprite *); u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent); @@ -212,7 +212,7 @@ u8 GetJumpInPlaceTurnAroundMovementAction(u32 direction); u8 GetAcroWheelieInPlaceDirectionMovementAction(u32 direction); u8 GetAcroPopWheelieMoveDirectionMovementAction(u32 direction); u8 GetAcroWheelieMoveDirectionMovementAction(u32 direction); -u8 sub_80641EC(u32 direction); +u8 GetJumpSpecialWithEffectMovementAction(u32 direction); u8 GetFishingBiteDirectionAnimNum(u8 direction); void TrySpawnObjectEvents(s16 cameraX, s16 cameraY); void ResetObjectEvents(void); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index c7d2d6012..7e051f0dd 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 sub_805C260(void); +void PlayerShakeHead(void); void player_step(u8 direction, u16 newKeys, u16 heldKeys); bool32 PlayerIsMovingOnRockStairs(u8 direction); void UpdatePlayerAvatarTransitionState(void); |