Core/Movement

* Updated movement flags
* Cleaned up MovementStatusElements enum
* Updated and enabled MSG_MOVE_START_FORWARD

1 files changed, 949 insertions, 911 deletions

diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h
index 84b6d79cbd5..87439bbedbc 100644
--- a/src/server/game/Movement/MovementStructures.h
+++ b/src/server/game/Movement/MovementStructures.h
@@ -21,10 +21,35 @@
 
 enum MovementStatusElements
 {
-    MSEFlags,
-    MSEFlags2,
-    MSETimestamp,
-    MSEHavePitch,
+    MSEHasGuidByte0,
+    MSEHasGuidByte1,
+    MSEHasGuidByte2,
+    MSEHasGuidByte3,
+    MSEHasGuidByte4,
+    MSEHasGuidByte5,
+    MSEHasGuidByte6,
+    MSEHasGuidByte7,
+    MSEHasMovementFlags,
+    MSEHasMovementFlags2,
+    MSEHasTimestamp,
+    MSEHasOrientation,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasPitch,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasSplineElev,
+    MSEHasSpline,
+
     MSEGuidByte0,
     MSEGuidByte1,
     MSEGuidByte2,
@@ -33,11 +58,13 @@ enum MovementStatusElements
     MSEGuidByte5,
     MSEGuidByte6,
     MSEGuidByte7,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHaveTransportData,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
+    MSEMovementFlags,
+    MSEMovementFlags2,
+    MSETimestamp,
+    MSEPositionX,
+    MSEPositionY,
+    MSEPositionZ,
+    MSEOrientation,
     MSETransportGuidByte0,
     MSETransportGuidByte1,
     MSETransportGuidByte2,
@@ -46,1326 +73,1337 @@ enum MovementStatusElements
     MSETransportGuidByte5,
     MSETransportGuidByte6,
     MSETransportGuidByte7,
-    MSEHaveSpline,
-    MSEHaveSplineElev,
-    MSEPositionX,
-    MSEPositionY,
-    MSEPositionZ,
-    MSEPositionO,
-    MSEGuidByte0_2,
-    MSEGuidByte1_2,
-    MSEGuidByte2_2,
-    MSEGuidByte3_2,
-    MSEGuidByte4_2,
-    MSEGuidByte5_2,
-    MSEGuidByte6_2,
-    MSEGuidByte7_2,
-    MSEPitch,
-    MSEFallTime,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte4_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte6_2,
-    MSETransportGuidByte7_2,
-    MSESplineElev,
-    MSEFallHorizontalSpeed,
-    MSEFallVerticalSpeed,
-    MSEFallCosAngle,
-    MSEFallSinAngle,
-    MSETransportSeat,
-    MSETransportPositionO,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
+    MSETransportOrientation,
+    MSETransportSeat,
     MSETransportTime,
     MSETransportTime2,
     MSETransportTime3,
+    MSEPitch,
+    MSEFallTime,
+    MSEFallVerticalSpeed,
+    MSEFallCosAngle,
+    MSEFallSinAngle,
+    MSEFallHorizontalSpeed,
+    MSESplineElev,
+
+    // Special
+    MSEZeroBit, // writes bit value 1 or skips read bit
+    MSEOneBit,  // writes bit value 0 or skips read bit
+    MSEEnd,     // marks end of parsing
     MSE_COUNT
 };
+
 //4.2.2
 MovementStatusElements PlayerMoveSequence[] = {
-    MSEHaveSplineElev,
-    MSEHaveTransportData,
-    MSEGuidByte5,
-    MSETransportGuidByte2,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte0,
-    MSETransportHaveTime2,
-    MSETransportGuidByte7,
-    MSETransportHaveTime3,
-    MSETransportGuidByte6,
-    MSETransportGuidByte5,
-    MSEGuidByte7,
-    MSEGuidByte3,
-    MSEGuidByte1,
+    MSEHasSplineElev,
+    MSEHasTransportData,
+    MSEHasGuidByte5,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportTime2,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime3,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte5,
+    MSEHasGuidByte7,
+    MSEHasGuidByte3,
+    MSEHasGuidByte1,
+    MSEHasGuidByte4,
+    MSEHasGuidByte0,
+    MSEMovementFlags,
+    MSEHasPitch,
+    MSEHasGuidByte2,
+    MSEMovementFlags2,
+    MSEHasGuidByte6,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasSpline,
     MSEGuidByte4,
     MSEGuidByte0,
-    MSEFlags,
-    MSEHavePitch,
-    MSEGuidByte2,
-    MSEFlags2,
+    MSEOrientation,
     MSEGuidByte6,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHaveSpline,
-    MSEGuidByte4_2,
-    MSEGuidByte0_2,
-    MSEPositionO,
-    MSEGuidByte6_2,
-    MSEGuidByte7_2,
+    MSEGuidByte7,
     MSESplineElev,
-    MSETransportGuidByte4_2,
-    MSETransportGuidByte2_2,
-    MSETransportPositionO,
+    MSETransportGuidByte4,
+    MSETransportGuidByte2,
+    MSETransportOrientation,
     MSETransportTime,
     MSETransportSeat,
-    MSETransportGuidByte3_2,
+    MSETransportGuidByte3,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
-    MSETransportGuidByte1_2,
+    MSETransportGuidByte1,
     MSETransportTime2,
     MSETransportTime3,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte6_2,
-    MSETransportGuidByte7_2,
-    MSEGuidByte2_2,
+    MSETransportGuidByte5,
+    MSETransportGuidByte0,
+    MSETransportGuidByte6,
+    MSETransportGuidByte7,
+    MSEGuidByte2,
     MSETimestamp,
-    MSEGuidByte1_2,
+    MSEGuidByte1,
     MSEPitch,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEGuidByte5_2,
-    MSEGuidByte3_2,
+    MSEGuidByte5,
+    MSEGuidByte3,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
     MSEFallVerticalSpeed,
     MSEFallTime,
 };
+
 //4.2.2
 MovementStatusElements MovementFallLandSequence[] = {
-    MSEGuidByte4,
-    MSEGuidByte6,
-    MSEGuidByte3,
-    MSEHaveSpline,
-    MSEGuidByte2,
-    MSEFlags,
-    MSEGuidByte7,
-    MSEGuidByte1,
-    MSEFlags2,
-    MSEGuidByte5,
-    MSEGuidByte0,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHavePitch,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHaveSplineElev,
-    MSEPositionO,
+    MSEHasGuidByte4,
+    MSEHasGuidByte6,
+    MSEHasGuidByte3,
+    MSEHasSpline,
+    MSEHasGuidByte2,
+    MSEMovementFlags,
+    MSEHasGuidByte7,
+    MSEHasGuidByte1,
+    MSEMovementFlags2,
+    MSEHasGuidByte5,
+    MSEHasGuidByte0,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasPitch,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasSplineElev,
+    MSEOrientation,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
     MSETimestamp,
-    MSEGuidByte7_2,
-    MSEGuidByte2_2,
+    MSEGuidByte7,
+    MSEGuidByte2,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte0_2,
+    MSEGuidByte0,
     MSEPitch,
-    MSEGuidByte4_2,
-    MSEGuidByte6_2,
-    MSEGuidByte5_2,
-    MSEGuidByte3_2,
+    MSEGuidByte4,
+    MSEGuidByte6,
+    MSEGuidByte5,
+    MSEGuidByte3,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
     MSESplineElev,
-    MSEGuidByte1_2,
+    MSEGuidByte1,
 };
+
 //4.2.2
 MovementStatusElements MovementHeartBeatSequence[] = {
-    MSEFlags,
-    MSEHaveSpline,
-    MSEGuidByte0,
-    MSEGuidByte6,
-    MSEGuidByte1,
-    MSEGuidByte7,
-    MSEGuidByte2,
-    MSEGuidByte4,
-    MSEGuidByte3,
-    MSEFlags2,
-    MSEGuidByte5,
-    MSEHaveSplineElev,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHavePitch,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
+    MSEMovementFlags,
+    MSEHasSpline,
+    MSEHasGuidByte0,
+    MSEHasGuidByte6,
+    MSEHasGuidByte1,
+    MSEHasGuidByte7,
+    MSEHasGuidByte2,
+    MSEHasGuidByte4,
+    MSEHasGuidByte3,
+    MSEMovementFlags2,
+    MSEHasGuidByte5,
+    MSEHasSplineElev,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasPitch,
+    MSEHasFallData,
+    MSEHasFallDirection,
     MSETimestamp,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEPositionO,
-    MSEGuidByte7_2,
-    MSEGuidByte5_2,
+    MSEOrientation,
+    MSEGuidByte7,
+    MSEGuidByte5,
     MSESplineElev,
-    MSEGuidByte1_2,
-    MSEGuidByte6_2,
-    MSEGuidByte4_2,
-    MSEGuidByte3_2,
+    MSEGuidByte1,
+    MSEGuidByte6,
+    MSEGuidByte4,
+    MSEGuidByte3,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
     MSEPitch,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte2_2,
-    MSEGuidByte0_2,
+    MSEGuidByte2,
+    MSEGuidByte0,
 };
+
 //4.2.2
 MovementStatusElements MovementJumpSequence[] = {
-    MSEHaveSpline,
-    MSEGuidByte0,
-    MSEGuidByte1,
-    MSEGuidByte4,
-    MSEFlags,
-    MSEGuidByte2,
-    MSEGuidByte5,
-    MSEGuidByte3,
-    MSEFlags2,
-    MSEGuidByte7,
-    MSEGuidByte6,
-    MSEHaveSplineElev,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHavePitch,
-    MSEPositionO,
+    MSEHasSpline,
+    MSEHasGuidByte0,
+    MSEHasGuidByte1,
+    MSEHasGuidByte4,
+    MSEMovementFlags,
+    MSEHasGuidByte2,
+    MSEHasGuidByte5,
+    MSEHasGuidByte3,
+    MSEMovementFlags2,
+    MSEHasGuidByte7,
+    MSEHasGuidByte6,
+    MSEHasSplineElev,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasPitch,
+    MSEOrientation,
     MSETimestamp,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
     MSESplineElev,
-    MSEGuidByte0_2,
-    MSEGuidByte5_2,
-    MSEGuidByte3_2,
+    MSEGuidByte0,
+    MSEGuidByte5,
+    MSEGuidByte3,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte4_2,
-    MSEGuidByte1_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
+    MSEGuidByte4,
+    MSEGuidByte1,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte2_2,
-    MSEGuidByte6_2,
-    MSEGuidByte7_2,
+    MSEGuidByte2,
+    MSEGuidByte6,
+    MSEGuidByte7,
     MSEPitch,
 };
+
 //4.2.2
 MovementStatusElements MovementSetFacingSequence[] = {
-    MSEFlags,
-    MSEGuidByte4,
-    MSEGuidByte2,
-    MSEHaveSpline,
-    MSEGuidByte3,
-    MSEGuidByte5,
-    MSEFlags2,
-    MSEGuidByte0,
-    MSEGuidByte7,
-    MSEGuidByte6,
-    MSEGuidByte1,
-    MSEHaveSplineElev,
-    MSEHavePitch,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEPositionO,
+    MSEMovementFlags,
+    MSEHasGuidByte4,
+    MSEHasGuidByte2,
+    MSEHasSpline,
+    MSEHasGuidByte3,
+    MSEHasGuidByte5,
+    MSEMovementFlags2,
+    MSEHasGuidByte0,
+    MSEHasGuidByte7,
+    MSEHasGuidByte6,
+    MSEHasGuidByte1,
+    MSEHasSplineElev,
+    MSEHasPitch,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEOrientation,
     MSETimestamp,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEGuidByte7_2,
-    MSEGuidByte5_2,
+    MSEGuidByte7,
+    MSEGuidByte5,
     MSESplineElev,
-    MSEGuidByte4_2,
-    MSEGuidByte1_2,
-    MSEGuidByte2_2,
+    MSEGuidByte4,
+    MSEGuidByte1,
+    MSEGuidByte2,
     MSEPitch,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte6_2,
-    MSEGuidByte0_2,
+    MSEGuidByte6,
+    MSEGuidByte0,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte3_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
+    MSEGuidByte3,
 };
+
 //4.2.2
 MovementStatusElements MovementSetPitchSequence[] = {
-    MSEGuidByte1,
-    MSEGuidByte6,
-    MSEGuidByte7,
-    MSEGuidByte3,
-    MSEFlags,
-    MSEGuidByte5,
-    MSEGuidByte2,
-    MSEGuidByte0,
-    MSEHaveSpline,
-    MSEGuidByte4,
-    MSEFlags2,
-    MSEHaveSplineElev,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHavePitch,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
+    MSEHasGuidByte1,
+    MSEHasGuidByte6,
+    MSEHasGuidByte7,
+    MSEHasGuidByte3,
+    MSEMovementFlags,
+    MSEHasGuidByte5,
+    MSEHasGuidByte2,
+    MSEHasGuidByte0,
+    MSEHasSpline,
+    MSEHasGuidByte4,
+    MSEMovementFlags2,
+    MSEHasSplineElev,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasPitch,
+    MSEHasFallData,
+    MSEHasFallDirection,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
     MSETimestamp,
-    MSEPositionO,
-    MSEGuidByte1_2,
-    MSEGuidByte4_2,
+    MSEOrientation,
+    MSEGuidByte1,
+    MSEGuidByte4,
     MSESplineElev,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
     MSEPitch,
-    MSEGuidByte5_2,
+    MSEGuidByte5,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte0_2,
-    MSEGuidByte3_2,
-    MSEGuidByte6_2,
-    MSEGuidByte7_2,
-    MSEGuidByte2_2,
+    MSEGuidByte0,
+    MSEGuidByte3,
+    MSEGuidByte6,
+    MSEGuidByte7,
+    MSEGuidByte2,
 };
+
 //4.2.2
 MovementStatusElements MovementStartBackwardSequence[] = {
-    MSEGuidByte5,
-    MSEFlags2,
-    MSEGuidByte2,
-    MSEGuidByte7,
-    MSEHaveSpline,
-    MSEFlags,
-    MSEGuidByte1,
-    MSEGuidByte3,
-    MSEGuidByte4,
-    MSEGuidByte6,
-    MSEGuidByte0,
-    MSEHaveSplineElev,
-    MSEHavePitch,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEPositionO,
+    MSEHasGuidByte5,
+    MSEMovementFlags2,
+    MSEHasGuidByte2,
+    MSEHasGuidByte7,
+    MSEHasSpline,
+    MSEMovementFlags,
+    MSEHasGuidByte1,
+    MSEHasGuidByte3,
+    MSEHasGuidByte4,
+    MSEHasGuidByte6,
+    MSEHasGuidByte0,
+    MSEHasSplineElev,
+    MSEHasPitch,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEOrientation,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
     MSETimestamp,
-    MSEGuidByte3_2,
-    MSEGuidByte0_2,
-    MSEGuidByte1_2,
+    MSEGuidByte3,
+    MSEGuidByte0,
+    MSEGuidByte1,
     MSESplineElev,
-    MSEGuidByte4_2,
+    MSEGuidByte4,
     MSEPitch,
-    MSEGuidByte7_2,
-    MSEGuidByte2_2,
-    MSEGuidByte6_2,
+    MSEGuidByte7,
+    MSEGuidByte2,
+    MSEGuidByte6,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte5_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
+    MSEGuidByte5,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
 };
-//4.2.2
-MovementStatusElements MovementStartForwardSequence[] = {
-    MSEFlags,
+
+//4.3.3
+MovementStatusElements MovementStartForwardSequence[] =
+{
+    MSEPositionY,
+    MSEPositionZ,
+    MSEPositionX,
+    MSEHasGuidByte5,
+    MSEHasGuidByte2,
+    MSEHasGuidByte0,
+    MSEZeroBit,
+    MSEHasMovementFlags,
+    MSEHasGuidByte7,
+    MSEHasGuidByte3,
+    MSEHasGuidByte1,
+    MSEHasOrientation,
+    MSEHasGuidByte6,
+    MSEHasSpline,
+    MSEHasSplineElev,
+    MSEHasGuidByte4,
+    MSEHasTransportData,
+    MSEHasTimestamp,
+    MSEHasPitch,
+    MSEHasMovementFlags2,
+    MSEHasFallData,
+    MSEMovementFlags,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportTime3,
+    MSEHasTransportTime2,
+    MSEHasFallDirection,
+    MSEMovementFlags2,
+    MSEGuidByte2,
+    MSEGuidByte4,
+    MSEGuidByte6,
     MSEGuidByte1,
     MSEGuidByte7,
-    MSEFlags2,
-    MSEGuidByte6,
+    MSEGuidByte3,
     MSEGuidByte5,
-    MSEHaveSpline,
     MSEGuidByte0,
-    MSEGuidByte3,
-    MSEGuidByte4,
-    MSEGuidByte2,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHaveSplineElev,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHavePitch,
-    MSEPositionX,
-    MSEPositionY,
-    MSEPositionZ,
-    MSETimestamp,
-    MSEPositionO,
-    MSEGuidByte2_2,
-    MSEGuidByte3_2,
-    MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSESplineElev,
-    MSEGuidByte6_2,
-    MSEGuidByte0_2,
-    MSEGuidByte1_2,
-    MSEGuidByte7_2,
-    MSETransportSeat,
-    MSETransportPositionO,
-    MSETransportPositionX,
+    MSEFallTime,
+    MSETransportGuidByte3,
     MSETransportPositionY,
     MSETransportPositionZ,
+    MSETransportGuidByte1,
+    MSETransportGuidByte4,
+    MSETransportGuidByte7,
+    MSETransportOrientation,
+    MSETransportGuidByte2,
+    MSETransportPositionX,
+    MSETransportGuidByte5,
+    MSETransportTime3,
     MSETransportTime,
+    MSETransportGuidByte6,
+    MSETransportGuidByte0,
+    MSETransportSeat,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
-    MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte5_2,
-    MSEGuidByte4_2,
+    MSESplineElev,
     MSEPitch,
+    MSEOrientation,
+    MSETimestamp,
+
+    MSEEnd,
 };
+
 //4.2.2
 MovementStatusElements MovementStartStrafeLeftSequence[] = {
-    MSEGuidByte5,
-    MSEFlags,
-    MSEHaveSpline,
-    MSEGuidByte6,
-    MSEGuidByte1,
-    MSEGuidByte2,
-    MSEFlags2,
-    MSEGuidByte7,
-    MSEGuidByte0,
-    MSEGuidByte3,
-    MSEGuidByte4,
-    MSEHavePitch,
-    MSEHaveSplineElev,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
+    MSEHasGuidByte5,
+    MSEMovementFlags,
+    MSEHasSpline,
+    MSEHasGuidByte6,
+    MSEHasGuidByte1,
+    MSEHasGuidByte2,
+    MSEMovementFlags2,
+    MSEHasGuidByte7,
+    MSEHasGuidByte0,
+    MSEHasGuidByte3,
+    MSEHasGuidByte4,
+    MSEHasPitch,
+    MSEHasSplineElev,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEPositionO,
+    MSEOrientation,
     MSETimestamp,
     MSEPitch,
     MSESplineElev,
-    MSEGuidByte7_2,
-    MSEGuidByte5_2,
+    MSEGuidByte7,
+    MSEGuidByte5,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte4_2,
-    MSEGuidByte3_2,
-    MSEGuidByte2_2,
-    MSEGuidByte6_2,
-    MSEGuidByte0_2,
-    MSEGuidByte1_2,
+    MSEGuidByte4,
+    MSEGuidByte3,
+    MSEGuidByte2,
+    MSEGuidByte6,
+    MSEGuidByte0,
+    MSEGuidByte1,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
 };
+
 //4.2.2
 MovementStatusElements MovementStartStrafeRightSequence[] = {
-    MSEGuidByte3,
-    MSEGuidByte2,
-    MSEGuidByte4,
-    MSEGuidByte5,
-    MSEGuidByte0,
-    MSEGuidByte6,
-    MSEHaveSpline,
-    MSEFlags2,
-    MSEGuidByte1,
-    MSEFlags,
-    MSEGuidByte7,
-    MSEHaveSplineElev,
-    MSEHavePitch,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEPositionO,
+    MSEHasGuidByte3,
+    MSEHasGuidByte2,
+    MSEHasGuidByte4,
+    MSEHasGuidByte5,
+    MSEHasGuidByte0,
+    MSEHasGuidByte6,
+    MSEHasSpline,
+    MSEMovementFlags2,
+    MSEHasGuidByte1,
+    MSEMovementFlags,
+    MSEHasGuidByte7,
+    MSEHasSplineElev,
+    MSEHasPitch,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEOrientation,
     MSETimestamp,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEGuidByte4_2,
-    MSEGuidByte1_2,
-    MSEGuidByte2_2,
+    MSEGuidByte4,
+    MSEGuidByte1,
+    MSEGuidByte2,
     MSESplineElev,
-    MSEGuidByte0_2,
+    MSEGuidByte0,
     MSEPitch,
-    MSEGuidByte6_2,
-    MSEGuidByte3_2,
-    MSEGuidByte7_2,
-    MSEGuidByte5_2,
+    MSEGuidByte6,
+    MSEGuidByte3,
+    MSEGuidByte7,
+    MSEGuidByte5,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
 };
+
 //4.2.2
 MovementStatusElements MovementStartTurnLeftSequence[] = {
-    MSEGuidByte5,
-    MSEGuidByte4,
-    MSEGuidByte6,
-    MSEGuidByte0,
-    MSEGuidByte1,
-    MSEGuidByte7,
-    MSEGuidByte2,
-    MSEGuidByte3,
-    MSEFlags,
-    MSEFlags2,
-    MSEHaveSpline,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHaveSplineElev,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHavePitch,
+    MSEHasGuidByte5,
+    MSEHasGuidByte4,
+    MSEHasGuidByte6,
+    MSEHasGuidByte0,
+    MSEHasGuidByte1,
+    MSEHasGuidByte7,
+    MSEHasGuidByte2,
+    MSEHasGuidByte3,
+    MSEMovementFlags,
+    MSEMovementFlags2,
+    MSEHasSpline,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasSplineElev,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasPitch,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
     MSETimestamp,
-    MSEPositionO,
+    MSEOrientation,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte4_2,
-    MSEGuidByte0_2,
-    MSEGuidByte7_2,
-    MSEGuidByte1_2,
-    MSEGuidByte6_2,
-    MSEGuidByte5_2,
-    MSEGuidByte3_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
+    MSEGuidByte4,
+    MSEGuidByte0,
+    MSEGuidByte7,
+    MSEGuidByte1,
+    MSEGuidByte6,
+    MSEGuidByte5,
+    MSEGuidByte3,
     MSESplineElev,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte2_2,
+    MSEGuidByte2,
     MSEPitch,
 };
+
 //4.2.2
 MovementStatusElements MovementStartTurnRightSequence[] = {
-    MSEGuidByte4,
-    MSEGuidByte1,
-    MSEGuidByte6,
-    MSEGuidByte0,
-    MSEFlags,
-    MSEGuidByte5,
-    MSEFlags2,
-    MSEHaveSpline,
-    MSEGuidByte2,
-    MSEGuidByte3,
-    MSEGuidByte7,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHavePitch,
-    MSEHaveSplineElev,
+    MSEHasGuidByte4,
+    MSEHasGuidByte1,
+    MSEHasGuidByte6,
+    MSEHasGuidByte0,
+    MSEMovementFlags,
+    MSEHasGuidByte5,
+    MSEMovementFlags2,
+    MSEHasSpline,
+    MSEHasGuidByte2,
+    MSEHasGuidByte3,
+    MSEHasGuidByte7,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasPitch,
+    MSEHasSplineElev,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEPositionO,
+    MSEOrientation,
     MSETimestamp,
-    MSEGuidByte6_2,
+    MSEGuidByte6,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte2_2,
-    MSEGuidByte4_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
+    MSEGuidByte2,
+    MSEGuidByte4,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
     MSEPitch,
-    MSEGuidByte7_2,
-    MSEGuidByte3_2,
-    MSEGuidByte1_2,
-    MSEGuidByte0_2,
+    MSEGuidByte7,
+    MSEGuidByte3,
+    MSEGuidByte1,
+    MSEGuidByte0,
     MSESplineElev,
-    MSEGuidByte5_2,
+    MSEGuidByte5,
 };
+
 //4.2.2
 MovementStatusElements MovementStopSequence[] = {
-    MSEGuidByte2,
-    MSEGuidByte0,
-    MSEHaveSpline,
-    MSEFlags,
-    MSEGuidByte4,
-    MSEGuidByte6,
-    MSEGuidByte3,
-    MSEGuidByte5,
-    MSEGuidByte7,
-    MSEFlags2,
-    MSEGuidByte1,
-    MSEHavePitch,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHaveSplineElev,
-    MSEPositionO,
+    MSEHasGuidByte2,
+    MSEHasGuidByte0,
+    MSEHasSpline,
+    MSEMovementFlags,
+    MSEHasGuidByte4,
+    MSEHasGuidByte6,
+    MSEHasGuidByte3,
+    MSEHasGuidByte5,
+    MSEHasGuidByte7,
+    MSEMovementFlags2,
+    MSEHasGuidByte1,
+    MSEHasPitch,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasSplineElev,
+    MSEOrientation,
     MSETimestamp,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEGuidByte2_2,
-    MSEGuidByte3_2,
+    MSEGuidByte2,
+    MSEGuidByte3,
     MSEPitch,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte5_2,
-    MSEGuidByte7_2,
+    MSEGuidByte5,
+    MSEGuidByte7,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte1_2,
-    MSEGuidByte0_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
+    MSEGuidByte1,
+    MSEGuidByte0,
     MSESplineElev,
-    MSEGuidByte6_2,
-    MSEGuidByte4_2,
+    MSEGuidByte6,
+    MSEGuidByte4,
 };
+
 //4.2.2
 MovementStatusElements MovementStopStrafeSequence[] = {
-    MSEGuidByte4,
-    MSEFlags2,
-    MSEGuidByte3,
-    MSEGuidByte1,
-    MSEFlags,
-    MSEGuidByte5,
-    MSEHaveSpline,
-    MSEGuidByte2,
-    MSEGuidByte6,
-    MSEGuidByte0,
-    MSEGuidByte7,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHavePitch,
-    MSEHaveSplineElev,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEPositionO,
+    MSEHasGuidByte4,
+    MSEMovementFlags2,
+    MSEHasGuidByte3,
+    MSEHasGuidByte1,
+    MSEMovementFlags,
+    MSEHasGuidByte5,
+    MSEHasSpline,
+    MSEHasGuidByte2,
+    MSEHasGuidByte6,
+    MSEHasGuidByte0,
+    MSEHasGuidByte7,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasPitch,
+    MSEHasSplineElev,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEOrientation,
     MSETimestamp,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEGuidByte1_2,
-    MSEGuidByte2_2,
-    MSEGuidByte6_2,
-    MSEGuidByte5_2,
-    MSEGuidByte7_2,
-    MSEGuidByte0_2,
+    MSEGuidByte1,
+    MSEGuidByte2,
+    MSEGuidByte6,
+    MSEGuidByte5,
+    MSEGuidByte7,
+    MSEGuidByte0,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte3_2,
+    MSEGuidByte3,
     MSEPitch,
     MSESplineElev,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte4_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
+    MSEGuidByte4,
 };
+
 //4.2.2
 MovementStatusElements MovementStopTurnSequence[] = {
-    MSEGuidByte6,
-    MSEFlags,
-    MSEGuidByte2,
-    MSEGuidByte3,
-    MSEFlags2,
-    MSEGuidByte5,
-    MSEGuidByte7,
-    MSEGuidByte0,
-    MSEGuidByte4,
-    MSEGuidByte1,
-    MSEHaveSpline,
-    MSEHavePitch,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHaveSplineElev,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
+    MSEHasGuidByte6,
+    MSEMovementFlags,
+    MSEHasGuidByte2,
+    MSEHasGuidByte3,
+    MSEMovementFlags2,
+    MSEHasGuidByte5,
+    MSEHasGuidByte7,
+    MSEHasGuidByte0,
+    MSEHasGuidByte4,
+    MSEHasGuidByte1,
+    MSEHasSpline,
+    MSEHasPitch,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasSplineElev,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
     MSETimestamp,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEPositionO,
-    MSEGuidByte4_2,
-    MSEGuidByte5_2,
-    MSEGuidByte7_2,
-    MSEGuidByte1_2,
+    MSEOrientation,
+    MSEGuidByte4,
+    MSEGuidByte5,
+    MSEGuidByte7,
+    MSEGuidByte1,
     MSEPitch,
-    MSEGuidByte3_2,
-    MSEGuidByte6_2,
+    MSEGuidByte3,
+    MSEGuidByte6,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
     MSESplineElev,
-    MSEGuidByte0_2,
-    MSEGuidByte2_2,
+    MSEGuidByte0,
+    MSEGuidByte2,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
 };
+
 //4.2.2
 MovementStatusElements MovementStartAscendSequence[] = {
-    MSEGuidByte3,
-    MSEGuidByte1,
-    MSEGuidByte5,
-    MSEFlags,
-    MSEGuidByte4,
-    MSEGuidByte6,
-    MSEGuidByte0,
-    MSEGuidByte7,
-    MSEFlags2,
-    MSEGuidByte2,
-    MSEHaveSpline,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHavePitch,
-    MSEHaveSplineElev,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
+    MSEHasGuidByte3,
+    MSEHasGuidByte1,
+    MSEHasGuidByte5,
+    MSEMovementFlags,
+    MSEHasGuidByte4,
+    MSEHasGuidByte6,
+    MSEHasGuidByte0,
+    MSEHasGuidByte7,
+    MSEMovementFlags2,
+    MSEHasGuidByte2,
+    MSEHasSpline,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasPitch,
+    MSEHasSplineElev,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
     MSETimestamp,
-    MSEPositionO,
-    MSEGuidByte3_2,
+    MSEOrientation,
+    MSEGuidByte3,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
     MSEPitch,
-    MSEGuidByte0_2,
-    MSEGuidByte5_2,
+    MSEGuidByte0,
+    MSEGuidByte5,
     MSESplineElev,
-    MSEGuidByte1_2,
+    MSEGuidByte1,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte4_2,
-    MSEGuidByte7_2,
-    MSEGuidByte2_2,
-    MSEGuidByte6_2,
-};
-//4.2.2
-MovementStatusElements MovementStartDescendSequence[] = {
-    MSEGuidByte6,
-    MSEGuidByte1,
-    MSEGuidByte0,
-    MSEGuidByte3,
-    MSEFlags,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
     MSEGuidByte4,
     MSEGuidByte7,
-    MSEHaveSpline,
-    MSEGuidByte5,
-    MSEFlags2,
     MSEGuidByte2,
-    MSEHaveSplineElev,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHavePitch,
+    MSEGuidByte6,
+};
+
+//4.2.2
+MovementStatusElements MovementStartDescendSequence[] = {
+    MSEHasGuidByte6,
+    MSEHasGuidByte1,
+    MSEHasGuidByte0,
+    MSEHasGuidByte3,
+    MSEMovementFlags,
+    MSEHasGuidByte4,
+    MSEHasGuidByte7,
+    MSEHasSpline,
+    MSEHasGuidByte5,
+    MSEMovementFlags2,
+    MSEHasGuidByte2,
+    MSEHasSplineElev,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasPitch,
     MSETimestamp,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEPositionO,
+    MSEOrientation,
     MSESplineElev,
-    MSEGuidByte7_2,
-    MSEGuidByte4_2,
-    MSEGuidByte2_2,
-    MSEGuidByte5_2,
+    MSEGuidByte7,
+    MSEGuidByte4,
+    MSEGuidByte2,
+    MSEGuidByte5,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte6_2,
+    MSEGuidByte6,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte0_2,
-    MSEGuidByte3_2,
-    MSEGuidByte1_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
+    MSEGuidByte0,
+    MSEGuidByte3,
+    MSEGuidByte1,
     MSEPitch,
 };
+
 //4.2.2
 MovementStatusElements MovementStartSwimSequence[] = {
-    MSEGuidByte2,
-    MSEHaveSpline,
-    MSEGuidByte1,
-    MSEFlags,
-    MSEGuidByte3,
-    MSEGuidByte5,
-    MSEGuidByte0,
-    MSEGuidByte6,
-    MSEGuidByte7,
-    MSEFlags2,
-    MSEGuidByte4,
-    MSEHavePitch,
-    MSEHaveSplineElev,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
+    MSEHasGuidByte2,
+    MSEHasSpline,
+    MSEHasGuidByte1,
+    MSEMovementFlags,
+    MSEHasGuidByte3,
+    MSEHasGuidByte5,
+    MSEHasGuidByte0,
+    MSEHasGuidByte6,
+    MSEHasGuidByte7,
+    MSEMovementFlags2,
+    MSEHasGuidByte4,
+    MSEHasPitch,
+    MSEHasSplineElev,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEPositionO,
+    MSEOrientation,
     MSETimestamp,
     MSEPitch,
     MSESplineElev,
-    MSEGuidByte2_2,
-    MSEGuidByte0_2,
-    MSEGuidByte5_2,
-    MSEGuidByte4_2,
-    MSEGuidByte7_2,
-    MSEGuidByte1_2,
+    MSEGuidByte2,
+    MSEGuidByte0,
+    MSEGuidByte5,
+    MSEGuidByte4,
+    MSEGuidByte7,
+    MSEGuidByte1,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
-    MSEGuidByte3_2,
+    MSEGuidByte3,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
-    MSEGuidByte6_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
+    MSEGuidByte6,
 };
+
 //4.2.2
 MovementStatusElements MovementStopAscendSequence[] = {
-    MSEGuidByte0,
-    MSEGuidByte3,
-    MSEFlags2,
-    MSEGuidByte1,
-    MSEGuidByte5,
-    MSEHaveSpline,
-    MSEGuidByte4,
-    MSEGuidByte2,
-    MSEFlags,
-    MSEGuidByte7,
-    MSEGuidByte6,
-    MSEHaveFallData,
-    MSEHaveFallDirection,
-    MSEHaveTransportData,
-    MSETransportGuidByte0,
-    MSETransportGuidByte6,
-    MSETransportGuidByte2,
-    MSETransportGuidByte5,
-    MSETransportGuidByte4,
-    MSETransportGuidByte1,
-    MSETransportGuidByte3,
-    MSETransportGuidByte7,
-    MSETransportHaveTime2,
-    MSETransportHaveTime3,
-    MSEHavePitch,
-    MSEHaveSplineElev,
+    MSEHasGuidByte0,
+    MSEHasGuidByte3,
+    MSEMovementFlags2,
+    MSEHasGuidByte1,
+    MSEHasGuidByte5,
+    MSEHasSpline,
+    MSEHasGuidByte4,
+    MSEHasGuidByte2,
+    MSEMovementFlags,
+    MSEHasGuidByte7,
+    MSEHasGuidByte6,
+    MSEHasFallData,
+    MSEHasFallDirection,
+    MSEHasTransportData,
+    MSEHasTransportGuidByte0,
+    MSEHasTransportGuidByte6,
+    MSEHasTransportGuidByte2,
+    MSEHasTransportGuidByte5,
+    MSEHasTransportGuidByte4,
+    MSEHasTransportGuidByte1,
+    MSEHasTransportGuidByte3,
+    MSEHasTransportGuidByte7,
+    MSEHasTransportTime2,
+    MSEHasTransportTime3,
+    MSEHasPitch,
+    MSEHasSplineElev,
     MSETimestamp,
-    MSEPositionO,
+    MSEOrientation,
     MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEGuidByte0_2,
-    MSEGuidByte1_2,
-    MSEGuidByte2_2,
-    MSEGuidByte7_2,
+    MSEGuidByte0,
+    MSEGuidByte1,
+    MSEGuidByte2,
+    MSEGuidByte7,
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
     MSETransportSeat,
-    MSETransportPositionO,
+    MSETransportOrientation,
     MSETransportPositionX,
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportTime,
     MSETransportTime2,
-    MSETransportGuidByte3_2,
-    MSETransportGuidByte6_2,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
     MSETransportTime3,
-    MSETransportGuidByte7_2,
-    MSETransportGuidByte5_2,
-    MSETransportGuidByte2_2,
-    MSETransportGuidByte1_2,
-    MSETransportGuidByte0_2,
-    MSETransportGuidByte4_2,
+    MSETransportGuidByte7,
+    MSETransportGuidByte5,
+    MSETransportGuidByte2,
+    MSETransportGuidByte1,
+    MSETransportGuidByte0,
+    MSETransportGuidByte4,
     MSEPitch,
-    MSEGuidByte5_2,
-    MSEGuidByte4_2,
-    MSEGuidByte3_2,
+    MSEGuidByte5,
+    MSEGuidByte4,
+    MSEGuidByte3,
     MSESplineElev,
-    MSEGuidByte6_2,
+    MSEGuidByte6,
 };
 
 MovementStatusElements* GetMovementStatusElementsSequence(Opcodes opcode)
 {
-    switch(opcode)
+    switch (opcode)
     {
-        case SMSG_PLAYER_MOVE:
-            return PlayerMoveSequence;
-        case MSG_MOVE_FALL_LAND:
-            return MovementFallLandSequence;
+        //case SMSG_PLAYER_MOVE:
+        //    return PlayerMoveSequence;
+        //case MSG_MOVE_FALL_LAND:
+        //    return MovementFallLandSequence;
         //case MSG_MOVE_HEARTBEAT:
         //    return MovementHeartBeatSequence;
-        case MSG_MOVE_JUMP:
-            return MovementJumpSequence;
+        //case MSG_MOVE_JUMP:
+        //    return MovementJumpSequence;
         //case MSG_MOVE_SET_FACING:
         //    return MovementSetFacingSequence;
         //case MSG_MOVE_SET_PITCH:
         //    return MovementSetPitchSequence;
-        case MSG_MOVE_START_BACKWARD:
-            return MovementStartBackwardSequence;
+        //case MSG_MOVE_START_BACKWARD:
+        //    return MovementStartBackwardSequence;
         case MSG_MOVE_START_FORWARD:
             return MovementStartForwardSequence;
-        case MSG_MOVE_START_STRAFE_LEFT:
-            return MovementStartStrafeLeftSequence;
-        case MSG_MOVE_START_STRAFE_RIGHT:
-            return MovementStartStrafeRightSequence;
-        case MSG_MOVE_START_TURN_LEFT:
-            return MovementStartTurnLeftSequence;
-        case MSG_MOVE_START_TURN_RIGHT:
-            return MovementStartTurnRightSequence;
-        case MSG_MOVE_STOP:
-            return MovementStopSequence;
-        case MSG_MOVE_STOP_STRAFE:
-            return MovementStopStrafeSequence;
-        case MSG_MOVE_STOP_TURN:
-            return MovementStopTurnSequence;
-        case MSG_MOVE_START_ASCEND:
-            return MovementStartAscendSequence;
-        case MSG_MOVE_START_DESCEND:
-            return MovementStartDescendSequence;
-        case MSG_MOVE_START_SWIM:
-            return MovementStartSwimSequence;
-        case MSG_MOVE_STOP_ASCEND:
-            return MovementStopAscendSequence;
+        //case MSG_MOVE_START_STRAFE_LEFT:
+        //    return MovementStartStrafeLeftSequence;
+        //case MSG_MOVE_START_STRAFE_RIGHT:
+        //    return MovementStartStrafeRightSequence;
+        //case MSG_MOVE_START_TURN_LEFT:
+        //    return MovementStartTurnLeftSequence;
+        //case MSG_MOVE_START_TURN_RIGHT:
+        //    return MovementStartTurnRightSequence;
+        //case MSG_MOVE_STOP:
+        //    return MovementStopSequence;
+        //case MSG_MOVE_STOP_STRAFE:
+        //    return MovementStopStrafeSequence;
+        //case MSG_MOVE_STOP_TURN:
+        //    return MovementStopTurnSequence;
+        //case MSG_MOVE_START_ASCEND:
+        //    return MovementStartAscendSequence;
+        //case MSG_MOVE_START_DESCEND:
+        //    return MovementStartDescendSequence;
+        //case MSG_MOVE_START_SWIM:
+        //    return MovementStartSwimSequence;
+        //case MSG_MOVE_STOP_ASCEND:
+        //    return MovementStopAscendSequence;
         default:
             break;
     }
+
     return NULL;
 }