diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/bike.h | 2 | ||||
-rw-r--r-- | include/event_object_movement.h | 11 | ||||
-rw-r--r-- | include/field_player_avatar.h | 5 | ||||
-rw-r--r-- | include/global.fieldmap.h | 27 |
4 files changed, 35 insertions, 10 deletions
diff --git a/include/bike.h b/include/bike.h index 154ffeeee..bdc61ecfe 100644 --- a/include/bike.h +++ b/include/bike.h @@ -8,5 +8,7 @@ s16 GetPlayerSpeed(void); void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys); bool32 IsRunningDisallowed(u8 metatileBehavior); +void Bike_HandleBumpySlopeJump(void); +void Bike_UpdateBikeCounterSpeed(u8 counter); #endif //GUARD_BIKE_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 8b2944578..12d3305e7 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -206,5 +206,16 @@ u8 sub_8064008(u32 direction); u8 GetPlayerRunMovementAction(u32 direction); u8 GetPlayerRunSlowMovementAction(u32 direction); u8 GetWalkSlowMovementAction(u32 direction); +u8 sub_80640E4(u32 direction); +u8 GetAcroWheelieFaceDirectionMovementAction(u32 direction); +u8 GetAcroPopWheelieFaceDirectionMovementAction(u32 direction); +u8 GetAcroEndWheelieFaceDirectionMovementAction(u32 direction); +u8 GetAcroWheelieHopFaceDirectionMovementAction(u32 direction); +u8 GetAcroWheelieHopDirectionMovementAction(u32 direction); +u8 GetAcroWheelieJumpDirectionMovementAction(u32 direction); +u8 GetJumpInPlaceTurnAroundMovementAction(u32 direction); +u8 GetAcroWheelieInPlaceDirectionMovementAction(u32 direction); +u8 GetAcroPopWheelieMoveDirectionMovementAction(u32 direction); +u8 GetAcroWheelieMoveDirectionMovementAction(u32 direction); #endif // GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 76271b5cf..7440bd0bd 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -36,8 +36,9 @@ bool32 sub_805DAD0(void); bool32 sub_805DC24(void); bool8 PartyHasMonWithSurf(void); bool8 IsPlayerSurfingNorth(void); -void player_get_pos_including_state_based_drift(s16 *x, s16 *y); +u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y); void sub_805CBE8(void); -u8 sub_805C7C8(u8 state, u8 gender); +u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender); +u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index f5660a8a4..38391bf27 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -278,14 +278,25 @@ struct ObjectEventGraphicsInfo /*0x20*/ const union AffineAnimCmd *const *affineAnims; }; -#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0) -#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1) -#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) -#define PLAYER_AVATAR_FLAG_SURFING (1 << 3) -#define PLAYER_AVATAR_FLAG_4 (1 << 4) -#define PLAYER_AVATAR_FLAG_FORCED_MVMT_DISABLED (1 << 5) -#define PLAYER_AVATAR_FLAG_MVMT_IS_FORCED (1 << 6) -#define PLAYER_AVATAR_FLAG_DASH (1 << 7) +enum { + PLAYER_AVATAR_STATE_NORMAL, + PLAYER_AVATAR_STATE_MACH_BIKE, + PLAYER_AVATAR_STATE_ACRO_BIKE, + PLAYER_AVATAR_STATE_SURFING, + PLAYER_AVATAR_STATE_UNDERWATER, + PLAYER_AVATAR_STATE_FIELD_MOVE, + PLAYER_AVATAR_STATE_FISHING, + PLAYER_AVATAR_STATE_WATERING, +}; + +#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << PLAYER_AVATAR_STATE_NORMAL) +#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << PLAYER_AVATAR_STATE_MACH_BIKE) +#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << PLAYER_AVATAR_STATE_ACRO_BIKE) +#define PLAYER_AVATAR_FLAG_SURFING (1 << PLAYER_AVATAR_STATE_SURFING) +#define PLAYER_AVATAR_FLAG_4 (1 << PLAYER_AVATAR_STATE_UNDERWATER) +#define PLAYER_AVATAR_FLAG_FORCED_MVMT_DISABLED (1 << PLAYER_AVATAR_STATE_FIELD_MOVE) +#define PLAYER_AVATAR_FLAG_MVMT_IS_FORCED (1 << PLAYER_AVATAR_STATE_FISHING) +#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING) enum { |