From 8e82c291fddf460198ae2fb5bcc3e4e7d67898bc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 30 Mar 2021 15:45:42 -0400 Subject: Document bike.c and fix weird goto --- include/bike.h | 24 +++++++++++++++++++----- include/constants/metatile_behaviors.h | 2 +- include/field_player_avatar.h | 2 +- include/metatile_behavior.h | 4 ++-- 4 files changed, 23 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/bike.h b/include/bike.h index e4f94becb..9526b6e83 100644 --- a/include/bike.h +++ b/include/bike.h @@ -13,6 +13,20 @@ enum SPEED_FASTEST, }; +enum { + BIKE_TRANS_FACE_DIRECTION, + BIKE_TRANS_TURNING, + BIKE_TRANS_MOVE, + BIKE_TRANS_DOWNHILL, + BIKE_TRANS_UPHILL +}; + +enum { + BIKE_STATE_NORMAL, + BIKE_STATE_TURNING, + BIKE_STATE_SLOPE +}; + // Acro bike states enum { @@ -25,15 +39,15 @@ enum ACRO_STATE_TURN_JUMP, }; -void InitPlayerAvatarBikeState(u32 directionHistory, u32 abStartSelectHistory); -bool8 MetatileAtPlayerPositionForbidsBiking(void); -void StartTransitionToFlipBikeState(u8 flags); +void BikeClearState(u32 directionHistory, u32 abStartSelectHistory); +bool8 IsBikingDisallowedByPlayer(void); +void GoOnOffBike(u8 flags); s16 GetPlayerSpeed(void); -bool8 sub_80BD460(u8); +bool8 RS_IsRunningDisallowed(u8 r0); void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys); bool32 IsRunningDisallowed(u8 metatileBehavior); void Bike_HandleBumpySlopeJump(void); void Bike_UpdateBikeCounterSpeed(u8 counter); -bool8 player_should_look_direction_be_enforced_upon_movement(void); +bool8 IsPlayerNotUsingAcroBikeOnBumpySlope(void); #endif //GUARD_BIKE_H diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index 77cd6de1b..c953ae20b 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -6,7 +6,7 @@ #define MB_01 0x01 #define MB_TALL_GRASS 0x02 #define MB_CAVE 0x08 -#define MB_0A 0x0A +#define MB_RUNNING_DISALLOWED 0x0A #define MB_0B 0x0B #define MB_0C 0x0C #define MB_POND_WATER 0x10 diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index a254cff83..6e9917154 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -61,7 +61,7 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys); bool32 PlayerIsMovingOnRockStairs(u8 direction); void UpdatePlayerAvatarTransitionState(void); void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender); -void nullsub_24(u8 direction); +void PlayerUseAcroBikeOnBumpySlope(u8 direction); u8 GetRSAvatarGraphicsIdByGender(u8 gender); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index 9d29c31e9..aedc8b5b0 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -77,7 +77,7 @@ bool8 MetatileBehavior_IsSouthBlocked(u8 metatileBehavior); bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior); bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_9(u8 metatileBehavior); +bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior); @@ -104,7 +104,7 @@ bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 metatileBehavior); bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior); bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior); bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior); -bool8 MetatileBehavior_IsMB0A(u8 metatileBehavior); +bool8 MetatileBehavior_IsRunningDisallowed(u8 metatileBehavior); bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior); bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior); bool8 MetatileBehavior_IsPokeMartShelf(u8 metatileBehavior); -- cgit v1.2.3 From d9234adb0065719535ba345648159691f85135ea Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 30 Mar 2021 16:07:18 -0400 Subject: Fix typos --- include/bike.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/bike.h b/include/bike.h index 9526b6e83..d6021f5e4 100644 --- a/include/bike.h +++ b/include/bike.h @@ -41,7 +41,7 @@ enum void BikeClearState(u32 directionHistory, u32 abStartSelectHistory); bool8 IsBikingDisallowedByPlayer(void); -void GoOnOffBike(u8 flags); +void GetOnOffBike(u8 flags); s16 GetPlayerSpeed(void); bool8 RS_IsRunningDisallowed(u8 r0); void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys); -- cgit v1.2.3