summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-03-29 17:29:52 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-03-29 17:29:52 -0400
commit8c23bd7c96d1d7555a03a9288b924edcdebad7f6 (patch)
tree69b7eebb6446fd863e50143b1bae22370e291b19 /include
parent19812c9d18a64e57ebc2ef5425176b89249b2fef (diff)
Document bike.c
Diffstat (limited to 'include')
-rw-r--r--include/bike.h4
-rw-r--r--include/global.fieldmap.h1
-rw-r--r--include/overworld.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/include/bike.h b/include/bike.h
index abffae435..e4f94becb 100644
--- a/include/bike.h
+++ b/include/bike.h
@@ -25,8 +25,8 @@ enum
ACRO_STATE_TURN_JUMP,
};
-void sub_80BD620(u32 directionHistory, u32 abStartSelectHistory);
-bool8 sub_80BD540(void);
+void InitPlayerAvatarBikeState(u32 directionHistory, u32 abStartSelectHistory);
+bool8 MetatileAtPlayerPositionForbidsBiking(void);
void StartTransitionToFlipBikeState(u8 flags);
s16 GetPlayerSpeed(void);
bool8 sub_80BD460(u8);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index cd553a55a..5fa15b95a 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -333,6 +333,7 @@ enum
COLLISION_ISOLATED_HORIZONTAL_RAIL,
COLLISION_VERTICAL_RAIL,
COLLISION_HORIZONTAL_RAIL,
+ COLLISION_COUNT
};
// player running states
diff --git a/include/overworld.h b/include/overworld.h
index 5f3728dec..87b6bc309 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -81,7 +81,7 @@ void SetWarpDestinationToEscapeWarp(void);
void SetWarpDestinationToLastHealLocation(void);
u8 IsMapTypeOutdoors(u8 mapType);
void Overworld_ClearSavedMusic(void);
-bool32 sub_8056124(u16 song);
+bool32 Overworld_MusicCanOverrideMapMusic(u16 song);
void player_avatar_init_params_reset(void);