through CheckMovementInputNotOnBike

2 files changed, 167 insertions, 195 deletions

diff --git a/data/event_object_movement.s b/data/event_object_movement.s
index 259099795..6aad8341a 100644
--- a/data/event_object_movement.s
+++ b/data/event_object_movement.s
@@ -1,3 +1,4 @@
+#include "constants/event_object_movement.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 	.section .rodata
@@ -769,7 +770,7 @@ sMovementTypeCallbacks:: @ 839FBC8
 	.4byte MovementType_FaceDirection
 	.4byte MovementType_FaceDirection
 	.4byte MovementType_FaceDirection
-	.4byte sub_805B3B8
+	.4byte MovementType_Player
 	.4byte NULL
 	.4byte MovementType_FaceDownAndUp
 	.4byte MovementType_FaceLeftAndRight
@@ -7888,235 +7889,235 @@ sDirectionToVectors:: @ 83A64C8
 
 @ gFaceDirectionMovementActions
 gFaceDirectionMovementActions:: @ 83A64EC
-	.byte 0x0 @ DIR_NONE
-	.byte 0x0 @ DIR_SOUTH
-	.byte 0x1 @ DIR_NORTH
-	.byte 0x2 @ DIR_WEST
-	.byte 0x3 @ DIR_EAST
+	.byte MOVEMENT_ACTION_FACE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_FACE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_FACE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_FACE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_FACE_RIGHT @ DIR_EAST
 
 gWalkSlowMovementActions:: @ 83A64F1
-	.byte 0x4 @ DIR_NONE
-	.byte 0x4 @ DIR_SOUTH
-	.byte 0x5 @ DIR_NORTH
-	.byte 0x6 @ DIR_WEST
-	.byte 0x7 @ DIR_EAST
+	.byte MOVEMENT_ACTION_FACE_DOWN_FAST @ DIR_NONE
+	.byte MOVEMENT_ACTION_FACE_DOWN_FAST @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_FACE_UP_FAST @ DIR_NORTH
+	.byte MOVEMENT_ACTION_FACE_LEFT_FAST @ DIR_WEST
+	.byte MOVEMENT_ACTION_FACE_RIGHT_FAST @ DIR_EAST
 
 gUnknown_83A64F6:: @ 83A64F6
-	.byte 0x9B @ DIR_NONE
-	.byte 0x9B @ DIR_SOUTH
-	.byte 0x9C @ DIR_NORTH
-	.byte 0x9D @ DIR_WEST
-	.byte 0x9E @ DIR_EAST
+	.byte MOVEMENT_ACTION_0x9B @ DIR_NONE
+	.byte MOVEMENT_ACTION_0x9B @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_0x9C @ DIR_NORTH
+	.byte MOVEMENT_ACTION_0x9D @ DIR_WEST
+	.byte MOVEMENT_ACTION_0x9E @ DIR_EAST
 
 gUnknown_83A64FB:: @ 83A64FB
-	.byte 0x8 @ DIR_NONE
-	.byte 0x8 @ DIR_SOUTH
-	.byte 0x9 @ DIR_NORTH
-	.byte 0xA @ DIR_WEST
-	.byte 0xB @ DIR_EAST
+	.byte MOVEMENT_ACTION_WALK_SLOWEST_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_WALK_SLOWEST_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_WALK_SLOWEST_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_WALK_SLOWEST_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_WALK_SLOWEST_RIGHT @ DIR_EAST
 
 gUnknown_83A6500:: @ 83A6500
-	.byte 0xC @ DIR_NONE
-	.byte 0xC @ DIR_SOUTH
-	.byte 0xD @ DIR_NORTH
-	.byte 0xE @ DIR_WEST
-	.byte 0xF @ DIR_EAST
+	.byte MOVEMENT_ACTION_WALK_SLOW_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_WALK_SLOW_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_WALK_SLOW_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_WALK_SLOW_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_WALK_SLOW_RIGHT @ DIR_EAST
 
 gUnknown_83A6505:: @ 83A6505
-	.byte 0x10 @ DIR_NONE
-	.byte 0x10 @ DIR_SOUTH
-	.byte 0x11 @ DIR_NORTH
-	.byte 0x12 @ DIR_WEST
-	.byte 0x13 @ DIR_EAST
+	.byte MOVEMENT_ACTION_WALK_NORMAL_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_WALK_NORMAL_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_WALK_NORMAL_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_WALK_NORMAL_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_WALK_NORMAL_RIGHT @ DIR_EAST
 
 gUnknown_83A650A:: @ 83A650A
-	.byte 0x1D @ DIR_NONE
-	.byte 0x1D @ DIR_SOUTH
-	.byte 0x1E @ DIR_NORTH
-	.byte 0x1F @ DIR_WEST
-	.byte 0x20 @ DIR_EAST
+	.byte MOVEMENT_ACTION_WALK_FAST_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_WALK_FAST_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_WALK_FAST_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_WALK_FAST_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_WALK_FAST_RIGHT @ DIR_EAST
 
 gUnknown_83A650F:: @ 83A650F
-	.byte 0xA0 @ DIR_NONE
-	.byte 0xA0 @ DIR_SOUTH
-	.byte 0xA1 @ DIR_NORTH
-	.byte 0xA2 @ DIR_WEST
-	.byte 0xA3 @ DIR_EAST
+	.byte MOVEMENT_ACTION_0xA0 @ DIR_NONE
+	.byte MOVEMENT_ACTION_0xA0 @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_0xA1 @ DIR_NORTH
+	.byte MOVEMENT_ACTION_0xA2 @ DIR_WEST
+	.byte MOVEMENT_ACTION_0xA3 @ DIR_EAST
 
 gUnknown_83A6514:: @ 83A6514
-	.byte 0x31 @ DIR_NONE
-	.byte 0x31 @ DIR_SOUTH
-	.byte 0x32 @ DIR_NORTH
-	.byte 0x33 @ DIR_WEST
-	.byte 0x34 @ DIR_EAST
+	.byte MOVEMENT_ACTION_FACE_DOWN_SLOW @ DIR_NONE
+	.byte MOVEMENT_ACTION_FACE_DOWN_SLOW @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_FACE_UP_SLOW @ DIR_NORTH
+	.byte MOVEMENT_ACTION_FACE_LEFT_SLOW @ DIR_WEST
+	.byte MOVEMENT_ACTION_FACE_RIGHT_SLOW @ DIR_EAST
 
 gUnknown_83A6519:: @ 83A6519
-	.byte 0x35 @ DIR_NONE
-	.byte 0x35 @ DIR_SOUTH
-	.byte 0x36 @ DIR_NORTH
-	.byte 0x37 @ DIR_WEST
-	.byte 0x38 @ DIR_EAST
+	.byte MOVEMENT_ACTION_WALK_FASTEST_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_WALK_FASTEST_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_WALK_FASTEST_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_WALK_FASTEST_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_WALK_FASTEST_RIGHT @ DIR_EAST
 
 gUnknown_83A651E:: @ 83A651E
-	.byte 0x39 @ DIR_NONE
-	.byte 0x39 @ DIR_SOUTH
-	.byte 0x3A @ DIR_NORTH
-	.byte 0x3B @ DIR_WEST
-	.byte 0x3C @ DIR_EAST
+	.byte MOVEMENT_ACTION_SLIDE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_SLIDE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_SLIDE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_SLIDE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_SLIDE_RIGHT @ DIR_EAST
 
 gUnknown_83A6523:: @ 83A6523
-	.byte 0x3D @ DIR_NONE
-	.byte 0x3D @ DIR_SOUTH
-	.byte 0x3E @ DIR_NORTH
-	.byte 0x3F @ DIR_WEST
-	.byte 0x40 @ DIR_EAST
+	.byte MOVEMENT_ACTION_PLAYER_RUN_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_PLAYER_RUN_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_PLAYER_RUN_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_PLAYER_RUN_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_PLAYER_RUN_RIGHT @ DIR_EAST
 
 gUnknown_83A6528:: @ 83A6528
-	.byte 0x41 @ DIR_NONE
-	.byte 0x41 @ DIR_SOUTH
-	.byte 0x42 @ DIR_NORTH
-	.byte 0x43 @ DIR_WEST
-	.byte 0x44 @ DIR_EAST
+	.byte MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW @ DIR_NONE
+	.byte MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW @ DIR_NORTH
+	.byte MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW @ DIR_WEST
+	.byte MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW @ DIR_EAST
 
 gUnknown_83A652D:: @ 83A652D
-	.byte 0x94 @ DIR_NONE
-	.byte 0x94 @ DIR_SOUTH
-	.byte 0x95 @ DIR_NORTH
-	.byte 0x96 @ DIR_WEST
-	.byte 0x97 @ DIR_EAST
+	.byte MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT @ DIR_EAST
 
 gUnknown_83A6532:: @ 83A6532
-	.byte 0x14 @ DIR_NONE
-	.byte 0x14 @ DIR_SOUTH
-	.byte 0x15 @ DIR_NORTH
-	.byte 0x16 @ DIR_WEST
-	.byte 0x17 @ DIR_EAST
+	.byte MOVEMENT_ACTION_JUMP_2_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_JUMP_2_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_JUMP_2_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_JUMP_2_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_JUMP_2_RIGHT @ DIR_EAST
 
 gUnknown_83A6537:: @ 83A6537
-	.byte 0x52 @ DIR_NONE
-	.byte 0x52 @ DIR_SOUTH
-	.byte 0x53 @ DIR_NORTH
-	.byte 0x54 @ DIR_WEST
-	.byte 0x55 @ DIR_EAST
+	.byte MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_JUMP_IN_PLACE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT @ DIR_EAST
 
 gUnknown_83A653C:: @ 83A653C
-	.byte 0x57 @ DIR_NONE
-	.byte 0x57 @ DIR_SOUTH
-	.byte 0x56 @ DIR_NORTH
-	.byte 0x59 @ DIR_WEST
-	.byte 0x58 @ DIR_EAST
+	.byte MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT @ DIR_EAST
 
 gUnknown_83A6541:: @ 83A6541
-	.byte 0x4E @ DIR_NONE
-	.byte 0x4E @ DIR_SOUTH
-	.byte 0x4F @ DIR_NORTH
-	.byte 0x50 @ DIR_WEST
-	.byte 0x51 @ DIR_EAST
+	.byte MOVEMENT_ACTION_JUMP_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_JUMP_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_JUMP_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_JUMP_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_JUMP_RIGHT @ DIR_EAST
 
 gUnknown_83A6546:: @ 83A6546
-	.byte 0x46 @ DIR_NONE
-	.byte 0x46 @ DIR_SOUTH
-	.byte 0x47 @ DIR_NORTH
-	.byte 0x48 @ DIR_WEST
-	.byte 0x49 @ DIR_EAST
+	.byte MOVEMENT_ACTION_JUMP_SPECIAL_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_JUMP_SPECIAL_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_JUMP_SPECIAL_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_JUMP_SPECIAL_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT @ DIR_EAST
 
 gUnknown_83A654B:: @ 83A654B
-	.byte 0xA6 @ DIR_NONE
-	.byte 0xA6 @ DIR_SOUTH
-	.byte 0xA7 @ DIR_NORTH
-	.byte 0xA8 @ DIR_WEST
-	.byte 0xA9 @ DIR_EAST
+	.byte MOVEMENT_ACTION_0xA6 @ DIR_NONE
+	.byte MOVEMENT_ACTION_0xA6 @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_0xA7 @ DIR_NORTH
+	.byte MOVEMENT_ACTION_0xA8 @ DIR_WEST
+	.byte MOVEMENT_ACTION_0xA9 @ DIR_EAST
 
 gUnknown_83A6550:: @ 83A6550
-	.byte 0x21 @ DIR_NONE
-	.byte 0x21 @ DIR_SOUTH
-	.byte 0x22 @ DIR_NORTH
-	.byte 0x23 @ DIR_WEST
-	.byte 0x24 @ DIR_EAST
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT @ DIR_EAST
 
 gUnknown_83A6555:: @ 83A6555
-	.byte 0x25 @ DIR_NONE
-	.byte 0x25 @ DIR_SOUTH
-	.byte 0x26 @ DIR_NORTH
-	.byte 0x27 @ DIR_WEST
-	.byte 0x28 @ DIR_EAST
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT @ DIR_EAST
 
 gUnknown_83A655A:: @ 83A655A
-	.byte 0x29 @ DIR_NONE
-	.byte 0x29 @ DIR_SOUTH
-	.byte 0x2A @ DIR_NORTH
-	.byte 0x2B @ DIR_WEST
-	.byte 0x2C @ DIR_EAST
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT @ DIR_EAST
 
 gUnknown_83A655F:: @ 83A655F
-	.byte 0x2D @ DIR_NONE
-	.byte 0x2D @ DIR_SOUTH
-	.byte 0x2E @ DIR_NORTH
-	.byte 0x2F @ DIR_WEST
-	.byte 0x30 @ DIR_EAST
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT @ DIR_EAST
 
 gUnknown_83A6564:: @ 83A6564
-	.byte 0x70 @ DIR_NONE
-	.byte 0x70 @ DIR_SOUTH
-	.byte 0x71 @ DIR_NORTH
-	.byte 0x72 @ DIR_WEST
-	.byte 0x73 @ DIR_EAST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT @ DIR_EAST
 
 gUnknown_83A6569:: @ 83A6569
-	.byte 0x74 @ DIR_NONE
-	.byte 0x74 @ DIR_SOUTH
-	.byte 0x75 @ DIR_NORTH
-	.byte 0x76 @ DIR_WEST
-	.byte 0x77 @ DIR_EAST
+	.byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT @ DIR_EAST
 
 gUnknown_83A656E:: @ 83A656E
-	.byte 0x78 @ DIR_NONE
-	.byte 0x78 @ DIR_SOUTH
-	.byte 0x79 @ DIR_NORTH
-	.byte 0x7A @ DIR_WEST
-	.byte 0x7B @ DIR_EAST
+	.byte MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT @ DIR_EAST
 
 gUnknown_83A6573:: @ 83A6573
-	.byte 0x7C @ DIR_NONE
-	.byte 0x7C @ DIR_SOUTH
-	.byte 0x7D @ DIR_NORTH
-	.byte 0x7E @ DIR_WEST
-	.byte 0x7F @ DIR_EAST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT @ DIR_EAST
 
 gUnknown_83A6578:: @ 83A6578
-	.byte 0x80 @ DIR_NONE
-	.byte 0x80 @ DIR_SOUTH
-	.byte 0x81 @ DIR_NORTH
-	.byte 0x82 @ DIR_WEST
-	.byte 0x83 @ DIR_EAST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT @ DIR_EAST
 
 gUnknown_83A657D:: @ 83A657D
-	.byte 0x84 @ DIR_NONE
-	.byte 0x84 @ DIR_SOUTH
-	.byte 0x85 @ DIR_NORTH
-	.byte 0x86 @ DIR_WEST
-	.byte 0x87 @ DIR_EAST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT @ DIR_EAST
 
 gUnknown_83A6582:: @ 83A6582
-	.byte 0x88 @ DIR_NONE
-	.byte 0x88 @ DIR_SOUTH
-	.byte 0x89 @ DIR_NORTH
-	.byte 0x8A @ DIR_WEST
-	.byte 0x8B @ DIR_EAST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT @ DIR_EAST
 
 gUnknown_83A6587:: @ 83A6587
-	.byte 0x8C @ DIR_NONE
-	.byte 0x8C @ DIR_SOUTH
-	.byte 0x8D @ DIR_NORTH
-	.byte 0x8E @ DIR_WEST
-	.byte 0x8F @ DIR_EAST
+	.byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT @ DIR_EAST
 
 gUnknown_83A658C:: @ 83A658C
-	.byte 0x90 @ DIR_NONE
-	.byte 0x90 @ DIR_SOUTH
-	.byte 0x91 @ DIR_NORTH
-	.byte 0x92 @ DIR_WEST
-	.byte 0x93 @ DIR_EAST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN @ DIR_NONE
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN @ DIR_SOUTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP @ DIR_NORTH
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT @ DIR_WEST
+	.byte MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT @ DIR_EAST
 
 @ gOppositeDirections ?
 gOppositeDirections:: @ 83A6591
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
index be4036928..bfa367941 100644
--- a/data/field_player_avatar.s
+++ b/data/field_player_avatar.s
@@ -3,35 +3,6 @@
 	.include "constants/constants.inc"
 	.section .rodata
 	.align 2
-gUnknown_835B764:: @ 835B764
-	.4byte MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip
-	.4byte MetatileBehavior_IsIce_2, ForcedMovement_Slip
-	.4byte MetatileBehavior_IsWalkSouth, sub_805B750
-	.4byte MetatileBehavior_IsWalkNorth, sub_805B768
-	.4byte MetatileBehavior_IsWalkWest, sub_805B780
-	.4byte MetatileBehavior_IsWalkEast, sub_805B798
-	.4byte MetatileBehavior_IsSouthwardCurrent, sub_805B82C
-	.4byte MetatileBehavior_IsNorthwardCurrent, sub_805B844
-	.4byte MetatileBehavior_IsWestwardCurrent, sub_805B85C
-	.4byte MetatileBehavior_IsEastwardCurrent, sub_805B874
-	.4byte MetatileBehavior_UnusedIsSpinRight, sub_805B7B0
-	.4byte MetatileBehavior_UnusedIsSpinLeft, sub_805B7CC
-	.4byte MetatileBehavior_UnusedIsSpinUp, sub_805B7E8
-	.4byte MetatileBehavior_UnusedIsSpinDown, sub_805B804
-	.4byte MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth
-	.4byte MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth
-	.4byte MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest
-	.4byte MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast
-	.4byte MetatileBehavior_IsWaterfall, sub_805B82C
-	.4byte MetatileBehavior_UnusedReturnFalse_7, sub_805B924
-	.4byte MetatileBehavior_UnusedReturnFalse_8, sub_805B930
-	.4byte NULL, ForcedMovement_None
-
-gUnknown_835B814:: @ 835B814
-	.4byte PlayerNotOnBikeNotMoving
-	.4byte sub_805B9C4
-	.4byte sub_805B9D4
-
 gUnknown_835B820:: @ 835B820
 	.byte 0x04, 0x04, 0x05, 0x06, 0x07