Label all metatile behaviors and functions

1 files changed, 15 insertions, 15 deletions

diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 0d8776fd1..2ac149088 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -18,20 +18,20 @@ enum {
 void player_step(u8 a, u16 b, u16 c);
 u8 ForcedMovement_None(void);
 u8 ForcedMovement_Slip(void);
-u8 sub_8058AAC(void);
-u8 sub_8058AC4(void);
-u8 sub_8058ADC(void);
-u8 sub_8058AF4(void);
-u8 sub_8058B0C(void);
-u8 sub_8058B24(void);
-u8 sub_8058B3C(void);
-u8 sub_8058B54(void);
+u8 ForcedMovement_WalkSouth(void);
+u8 ForcedMovement_WalkNorth(void);
+u8 ForcedMovement_WalkWest(void);
+u8 ForcedMovement_WalkEast(void);
+u8 ForcedMovement_RideCurrentSouth(void);
+u8 ForcedMovement_RideCurrentNorth(void);
+u8 ForcedMovement_RideCurrentWest(void);
+u8 ForcedMovement_RideCurrentEast(void);
 u8 ForcedMovement_SlideSouth(void);
 u8 ForcedMovement_SlideNorth(void);
 u8 ForcedMovement_SlideWest(void);
 u8 ForcedMovement_SlideEast(void);
-u8 ForcedMovement_MatJump(void);
-u8 sub_8058C10(void);
+u8 ForcedMovement_SecretBaseJumpMat(void);
+u8 ForcedMovement_SecretBaseSpinMat(void);
 u8 ForcedMovement_MuddySlope(void);
 void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys);
 void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys);
@@ -50,7 +50,7 @@ u8 PlayerGetCopyableMovement(void);
 void PlayerSetAnimId(u8 a, u8 b);
 void PlayerGoSpeed1(u8 a);
 void PlayerGoSpeed2(u8 a);
-void npc_use_some_d2s(u8 a);
+void PlayerRideWaterCurrent(u8 a);
 void PlayerGoSpeed4(u8 a);
 void sub_805940C(u8 a);
 void PlayerOnBikeCollide(u8);
@@ -99,10 +99,10 @@ u8 sub_8059E84(struct Task *task, struct EventObject *b, struct EventObject *c);
 u8 sub_8059EA4(struct Task *task, struct EventObject *b, struct EventObject *c);
 u8 sub_8059F40(struct Task *task, struct EventObject *b, struct EventObject *c);
 u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject);
-u8 sub_805A0D8(struct Task *task, struct EventObject *eventObject);
-u8 sub_805A100(struct Task *task, struct EventObject *eventObject);
-u8 sub_805A178(struct Task *task, struct EventObject *eventObject);
-u8 sub_805A1B8(struct Task *task, struct EventObject *eventObject);
+u8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject);
+u8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject);
+u8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject);
+u8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject);
 void sub_805A20C(u8 a);
 void StartFishing(u8 a);
 u8 Fishing1(struct Task *task);