summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/bike.h28
-rw-r--r--include/field_camera.h1
-rw-r--r--include/field_player_avatar.h1
-rw-r--r--include/metatile_behavior.h2
4 files changed, 29 insertions, 3 deletions
diff --git a/include/bike.h b/include/bike.h
index ad2bd999a..abffae435 100644
--- a/include/bike.h
+++ b/include/bike.h
@@ -1,11 +1,35 @@
#ifndef GUARD_BIKE_H
#define GUARD_BIKE_H
-void sub_80BD620(u32 unkC, u32 unk10);
+// TODO: Do the constants make sense in FRLG?
+
+// Player speeds
+enum
+{
+ SPEED_STANDING,
+ SPEED_NORMAL,
+ SPEED_FAST,
+ SPEED_FASTER,
+ SPEED_FASTEST,
+};
+
+// Acro bike states
+enum
+{
+ ACRO_STATE_NORMAL,
+ ACRO_STATE_TURNING,
+ ACRO_STATE_WHEELIE_STANDING,
+ ACRO_STATE_BUNNY_HOP,
+ ACRO_STATE_WHEELIE_MOVING,
+ ACRO_STATE_SIDE_JUMP,
+ ACRO_STATE_TURN_JUMP,
+};
+
+void sub_80BD620(u32 directionHistory, u32 abStartSelectHistory);
bool8 sub_80BD540(void);
void StartTransitionToFlipBikeState(u8 flags);
s16 GetPlayerSpeed(void);
-
+bool8 sub_80BD460(u8);
void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys);
bool32 IsRunningDisallowed(u8 metatileBehavior);
void Bike_HandleBumpySlopeJump(void);
diff --git a/include/field_camera.h b/include/field_camera.h
index 9a76e6bfc..a3275eb9d 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -20,6 +20,7 @@ struct CameraObject
extern struct CameraObject gFieldCamera;
extern u16 gTotalCameraPixelOffsetX;
extern u16 gTotalCameraPixelOffsetY;
+extern bool8 gBikeCameraAheadPanback;
// Exported ROM declarations
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 56e821fbd..2dc8aab84 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -61,5 +61,6 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys);
bool32 PlayerIsMovingOnRockStairs(u8 direction);
void sub_805BEB8(void);
void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender);
+void nullsub_24(u8 direction);
#endif //GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 899586e0f..793eeb8a1 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -96,7 +96,7 @@ bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsWater(u8 metatileBehavior);
bool8 MetatileBehavior_IsFallWarp(u8 metatileBehavior);
bool8 MetatileBehavior_ReturnFalse_13(u8 metatileBehavior);
-bool8 MetatileBehavior_IsCyclingRoadPullDownTile(u8 metatileBehavior);
+bool32 MetatileBehavior_IsCyclingRoadPullDownTile(u8 metatileBehavior);
bool8 MetatileBehavior_IsCyclingRoadPullDownTileGrass(u8 metatileBehavior);
bool8 MetatileBehavior_IsBumpySlope(u8 metatileBehavior);
bool8 MetatileBehavior_IsIsolatedVerticalRail(u8 metatileBehavior);