2 files changed, 465 insertions, 461 deletions

diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp
index 34a0673b..d0763ef7 100644
--- a/src/animation/AnimManager.cpp
+++ b/src/animation/AnimManager.cpp
@@ -20,212 +20,212 @@ CAnimBlendAssocGroup *CAnimManager::ms_aAnimAssocGroups;
 CLinkList<CAnimBlendHierarchy*> CAnimManager::ms_animCache;
 
 AnimAssocDesc aStdAnimDescs[] = {
-	{ ANIM_WALK,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_WALK },
-	{ ANIM_RUN,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_WALK },
-	{ ANIM_SPRINT,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_WALK },
-	{ ANIM_IDLE_STANCE,  ASSOC_REPEAT },
-	{ ANIM_WALK_START,  ASSOC_HAS_TRANSLATION },
-	{ ANIM_RUN_STOP,  ASSOC_DELETEFADEDOUT | ASSOC_HAS_TRANSLATION },
-	{ ANIM_RUN_STOP_R,  ASSOC_DELETEFADEDOUT | ASSOC_HAS_TRANSLATION },
-	{ ANIM_IDLE_CAM,  ASSOC_REPEAT | ASSOC_PARTIAL },
-	{ ANIM_IDLE_HBHB,  ASSOC_REPEAT | ASSOC_PARTIAL },
-	{ ANIM_IDLE_TIRED,  ASSOC_REPEAT },
-	{ ANIM_IDLE_ARMED,  ASSOC_REPEAT | ASSOC_PARTIAL },
-	{ ANIM_IDLE_CHAT,  ASSOC_REPEAT | ASSOC_PARTIAL },
-	{ ANIM_IDLE_TAXI,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_KO_SHOT_FRONT1,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
-	{ ANIM_KO_SHOT_FRONT2,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
-	{ ANIM_KO_SHOT_FRONT3,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
-	{ ANIM_KO_SHOT_FRONT4,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
-	{ ANIM_KO_SHOT_FACE,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_KO_SHOT_STOM,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
-	{ ANIM_KO_SHOT_ARML,  ASSOC_PARTIAL | ASSOC_FRONTAL },
-	{ ANIM_KO_SHOT_ARMR,  ASSOC_PARTIAL | ASSOC_FRONTAL },
-	{ ANIM_KO_SHOT_LEGL,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_KO_SHOT_LEGR,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_KD_LEFT,  ASSOC_PARTIAL },
-	{ ANIM_KD_RIGHT,  ASSOC_PARTIAL },
-	{ ANIM_KO_SKID_FRONT,  ASSOC_PARTIAL },
-	{ ANIM_KO_SPIN_R,  ASSOC_PARTIAL },
-	{ ANIM_KO_SKID_BACK,  ASSOC_PARTIAL | ASSOC_FRONTAL },
-	{ ANIM_KO_SPIN_L,  ASSOC_PARTIAL },
-	{ ANIM_SHOT_FRONT_PARTIAL,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
-	{ ANIM_SHOT_LEFT_PARTIAL,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
-	{ ANIM_SHOT_BACK_PARTIAL,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
-	{ ANIM_SHOT_RIGHT_PARTIAL,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
-	{ ANIM_HIT_FRONT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_HIT_LEFT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_HIT_BACK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_HIT_RIGHT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FLOOR_HIT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_HIT_WALL,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_FLOOR_HIT_F,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_FRONTAL },
-	{ ANIM_HIT_BEHIND,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FIGHT_IDLE,  ASSOC_REPEAT },
-	{ ANIM_FIGHT2_IDLE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FIGHT_SH_F,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_FIGHT_PPUNCH,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_NOWALK },
-	{ ANIM_L_HOOK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_R_HOOK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_UPPERCUT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_HEADBUTT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_FRONTKICK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_ROUNDHOUSE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_HIT_L_HOOK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_HIT_R_HOOK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_HIT_UPPERCUT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_HIT_HEADBUTT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_HIT_FRONTKICK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_HIT_RHOUSE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_BOMBER,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_PUNCH_R,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FIGHT_PPUNCH2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_KICK_FLOOR,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_THROWU,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FIGHT_SH_BACK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_CAR_JACKED_RHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_CAR_LJACKED_RHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_CAR_JACKED_LHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_CAR_LJACKED_LHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_CAR_QJACK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_QJACKED,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_CAR_ALIGN_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_ALIGNHI_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_OPEN_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_DOORLOCKED_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_PULLOUT_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_PULLOUT_LOW_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_GETIN_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_GETIN_LOW_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_CLOSEDOOR_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_CLOSEDOOR_LOW_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_ROLLDOOR,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_ROLLDOOR_LOW,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_JUMPIN_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_GETOUT_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_GETOUT_LOW_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_CLOSE_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_ALIGN_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_ALIGNHI_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_OPEN_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_DOORLOCKED_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_PULLOUT_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_PULLOUT_LOW_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_GETIN_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_GETIN_LOW_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_CLOSEDOOR_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_CLOSEDOOR_LOW_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_SHUFFLE_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_LSHUFFLE_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_SIT,  ASSOC_DELETEFADEDOUT },
-	{ ANIM_CAR_LSIT,  ASSOC_DELETEFADEDOUT },
-	{ ANIM_CAR_SITP,  ASSOC_DELETEFADEDOUT },
-	{ ANIM_CAR_SITPLO,  ASSOC_DELETEFADEDOUT },
-	{ ANIM_DRIVE_L,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_DRIVE_R,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_DRIVE_LOW_L,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_DRIVE_LOW_R,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_DRIVEBY_L,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_DRIVEBY_R,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_DRIVEBY_LOW_L,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_DRIVEBY_LOW_R,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_CAR_LB,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_DRIVE_BOAT,  ASSOC_DELETEFADEDOUT | ASSOC_DRIVING },
-	{ ANIM_DRIVE_BOAT_L,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_DRIVE_BOAT_R,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_BOAT_LB,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_BIKE_PICKUP_R,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_BIKE_PICKUP_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_BIKE_PULLUP_R,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_BIKE_PULLUP_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_BIKE_ELBOW_R,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_BIKE_ELBOW_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_BIKE_FALL_OFF,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_BIKE_FALL_R,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_CAR_GETOUT_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_GETOUT_LOW_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_CLOSE_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_HOOKERTALK,  ASSOC_REPEAT | ASSOC_PARTIAL },
-	{ ANIM_TRAIN_GETIN,  ASSOC_DELETEFADEDOUT },
-	{ ANIM_TRAIN_GETOUT,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE },
-	{ ANIM_CAR_CRAWLOUT_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_CRAWLOUT_RHS2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_ROLLOUT_LHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_FRONTAL },
-	{ ANIM_CAR_ROLLOUT_RHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_FRONTAL },
-	{ ANIM_GETUP1,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_GETUP2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_GETUP3,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_GETUP_FRONT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_JUMP_LAUNCH,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_JUMP_GLIDE,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_JUMP_LAND,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_FALL_FALL,  ASSOC_DELETEFADEDOUT },
-	{ ANIM_FALL_GLIDE,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_FALL_LAND,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_FALL_COLLAPSE,  ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_FALL_BACK,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_FALL_FRONT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_FRONTAL },
-	{ ANIM_EV_STEP,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_EV_DIVE,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
-	{ ANIM_COMMANDO_ROLL,  ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
-	{ ANIM_XPRESS_SCRATCH,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_ROAD_CROSS,  ASSOC_REPEAT | ASSOC_PARTIAL },
-	{ ANIM_TURN_180,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_ARREST_GUN,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_DROWN,  ASSOC_PARTIAL },
-	{ ANIM_DUCK_DOWN,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_DUCK_LOW,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_CROUCH,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_RBLOCK_CSHOOT,  ASSOC_RUNNING },
-	{ ANIM_HANDSUP,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_HANDSCOWER,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_FUCKU,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
-	{ ANIM_PHONE_IN,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_PHONE_OUT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_PHONE_TALK,  ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_SEAT_DOWN,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_SEAT_UP,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_SEAT_IDLE,  ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_SEAT_DOWN2,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_ATM,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_ABSEIL,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_WALK,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_WALK },
+	{ ANIM_STD_RUN,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_WALK },
+	{ ANIM_STD_RUNFAST,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_WALK },
+	{ ANIM_STD_IDLE,  ASSOC_REPEAT },
+	{ ANIM_STD_STARTWALK,  ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_RUNSTOP1,  ASSOC_DELETEFADEDOUT | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_RUNSTOP2,  ASSOC_DELETEFADEDOUT | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_IDLE_CAM,  ASSOC_REPEAT | ASSOC_PARTIAL },
+	{ ANIM_STD_IDLE_HBHB,  ASSOC_REPEAT | ASSOC_PARTIAL },
+	{ ANIM_STD_IDLE_TIRED,  ASSOC_REPEAT },
+	{ ANIM_STD_IDLE_BIGGUN,  ASSOC_REPEAT | ASSOC_PARTIAL },
+	{ ANIM_STD_CHAT,  ASSOC_REPEAT | ASSOC_PARTIAL },
+	{ ANIM_STD_HAILTAXI,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_KO_FRONT,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_STD_KO_LEFT,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_STD_KO_BACK,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_STD_KO_RIGHT,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_STD_KO_SHOT_FACE,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_KO_SHOT_STOMACH,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_STD_KO_SHOT_ARM_L,  ASSOC_PARTIAL | ASSOC_FRONTAL },
+	{ ANIM_STD_KO_SHOT_ARM_R,  ASSOC_PARTIAL | ASSOC_FRONTAL },
+	{ ANIM_STD_KO_SHOT_LEG_L,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_KO_SHOT_LEG_R,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_SPINFORWARD_LEFT,  ASSOC_PARTIAL },
+	{ ANIM_STD_SPINFORWARD_RIGHT,  ASSOC_PARTIAL },
+	{ ANIM_STD_HIGHIMPACT_FRONT,  ASSOC_PARTIAL },
+	{ ANIM_STD_HIGHIMPACT_LEFT,  ASSOC_PARTIAL },
+	{ ANIM_STD_HIGHIMPACT_BACK,  ASSOC_PARTIAL | ASSOC_FRONTAL },
+	{ ANIM_STD_HIGHIMPACT_RIGHT,  ASSOC_PARTIAL },
+	{ ANIM_STD_HITBYGUN_FRONT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_STD_HITBYGUN_LEFT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_STD_HITBYGUN_BACK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_STD_HITBYGUN_RIGHT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_STD_HIT_FRONT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_HIT_LEFT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_HIT_BACK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_HIT_RIGHT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_HIT_FLOOR,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_HIT_WALL,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_HIT_FLOOR_FRONT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_FRONTAL },
+	{ ANIM_STD_HIT_BEHIND,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_FIGHT_IDLE,  ASSOC_REPEAT },
+	{ ANIM_STD_FIGHT_2IDLE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_FIGHT_SHUFFLE_F,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_PARTIAL_PUNCH,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_FIGHT_ATTACK_A1,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_ATTACK_A2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_ATTACK_A3,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_ATTACK_B1,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_ATTACK_B2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_ATTACK_B3,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_HIT_A1,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_HIT_A2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_HIT_A3,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_HIT_B1,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_HIT_B2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FIGHT_HIT_B3,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_DETONATE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_PUNCH,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_PARTIALPUNCH,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_KICKGROUND,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_THROW_UNDER,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_FIGHT_SHUFFLE_B,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_JACKEDCAR_RHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_JACKEDCAR_LO_RHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_JACKEDCAR_LHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_JACKEDCAR_LO_LHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_QUICKJACK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_QUICKJACKED,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_ALIGN_DOOR_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_ALIGNHI_DOOR_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_OPEN_DOOR_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CARDOOR_LOCKED_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_PULL_OUT_PED_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_PULL_OUT_PED_LO_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_GET_IN_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_GET_IN_LO_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_CLOSE_DOOR_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_CLOSE_DOOR_LO_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_CLOSE_DOOR_ROLLING_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_CLOSE_DOOR_ROLLING_LO_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_JUMP_IN_LO_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_GETOUT_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_GETOUT_LO_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_CLOSE_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_ALIGN_DOOR_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_ALIGNHI_DOOR_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_OPEN_DOOR_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CARDOOR_LOCKED_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_PULL_OUT_PED_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_PULL_OUT_PED_LO_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_GET_IN_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_GET_IN_LO_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_CLOSE_DOOR_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_CLOSE_DOOR_LO_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_SHUFFLE_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_SHUFFLE_LO_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_SIT,  ASSOC_DELETEFADEDOUT },
+	{ ANIM_STD_CAR_SIT_LO,  ASSOC_DELETEFADEDOUT },
+	{ ANIM_STD_CAR_SIT_P,  ASSOC_DELETEFADEDOUT },
+	{ ANIM_STD_CAR_SIT_P_LO,  ASSOC_DELETEFADEDOUT },
+	{ ANIM_STD_CAR_DRIVE_LEFT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_CAR_DRIVE_RIGHT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_CAR_DRIVE_LEFT_LO,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_CAR_DRIVE_RIGHT_LO,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_CAR_DRIVEBY_LEFT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_CAR_DRIVEBY_RIGHT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_CAR_DRIVEBY_LEFT_LO,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_CAR_DRIVEBY_RIGHT_LO,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_CAR_LOOKBEHIND,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_BOAT_DRIVE,  ASSOC_DELETEFADEDOUT | ASSOC_DRIVING },
+	{ ANIM_STD_BOAT_DRIVE_LEFT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_BOAT_DRIVE_RIGHT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_BOAT_LOOKBEHIND,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_STD_BIKE_PICKUP_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_BIKE_PICKUP_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_BIKE_PULLUP_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_BIKE_PULLUP_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_BIKE_ELBOW_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_BIKE_ELBOW_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_BIKE_FALLOFF,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_BIKE_FALLBACK,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_GETOUT_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_GETOUT_LO_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_CLOSE_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CAR_HOOKERTALK,  ASSOC_REPEAT | ASSOC_PARTIAL },
+	{ ANIM_STD_TRAIN_GETIN,  ASSOC_DELETEFADEDOUT },
+	{ ANIM_STD_TRAIN_GETOUT,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE },
+	{ ANIM_STD_CRAWLOUT_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_CRAWLOUT_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_ROLLOUT_LHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_STD_ROLLOUT_RHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_STD_GET_UP,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_GET_UP_LEFT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_GET_UP_RIGHT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_GET_UP_FRONT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_JUMP_LAUNCH,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_JUMP_GLIDE,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_JUMP_LAND,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_FALL,  ASSOC_DELETEFADEDOUT },
+	{ ANIM_STD_FALL_GLIDE,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_FALL_LAND,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_FALL_COLLAPSE,  ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_FALL_ONBACK,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_FALL_ONFRONT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_FRONTAL },
+	{ ANIM_STD_EVADE_STEP,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_EVADE_DIVE,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_STD_COMMANDO_ROLL,  ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_STD_XPRESS_SCRATCH,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_STD_ROADCROSS,  ASSOC_REPEAT | ASSOC_PARTIAL },
+	{ ANIM_STD_TURN180,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_ARREST,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_DROWN,  ASSOC_PARTIAL },
+	{ ANIM_STD_DUCK_DOWN,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_DUCK_LOW,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_DUCK_WEAPON,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_RBLOCK_SHOOT,  ASSOC_RUNNING },
+	{ ANIM_STD_HANDSUP,  ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_HANDSCOWER,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_STD_PARTIAL_FUCKU,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_STD_PHONE_IN,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_PHONE_OUT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_PHONE_TALK,  ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_STD_SEAT_DOWN,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_SEAT_UP,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_SEAT_IDLE,  ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_SEAT_RVRS,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_ATM,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_ABSEIL,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
 };
 AnimAssocDesc aVanAnimDescs[] = {
-	{ ANIM_VAN_OPEN_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_GETIN_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_CLOSE_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_GETOUT_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_OPEN,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_GETIN,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_CLOSE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_GETOUT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_VAN_OPEN_DOOR_REAR_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_VAN_GET_IN_REAR_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_VAN_CLOSE_DOOR_REAR_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_VAN_GET_OUT_REAR_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_VAN_OPEN_DOOR_REAR_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_VAN_GET_IN_REAR_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_VAN_CLOSE_DOOR_REAR_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_VAN_GET_OUT_REAR_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 };
 AnimAssocDesc aCoachAnimDescs[] = {
-	{ ANIM_COACH_OPEN_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_COACH_OPEN_R,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_COACH_IN_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_COACH_IN_R,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_COACH_OUT_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_COACH_OPEN_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_COACH_OPEN_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_COACH_GET_IN_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_COACH_GET_IN_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STD_COACH_GET_OUT_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 };
 AnimAssocDesc aBikeAnimDescs[] = {
 	{ ANIM_BIKE_RIDE,  ASSOC_DELETEFADEDOUT },
-	{ ANIM_BIKE_STILL,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_READY,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
 	{ ANIM_BIKE_LEFT,  ASSOC_PARTIAL | ASSOC_DRIVING },
 	{ ANIM_BIKE_RIGHT,  ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_BIKE_BACK,  ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_BIKE_FWD,  ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_BIKE_PUSHES,  ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_BIKE_JUMPON_R,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_BIKE_JUMPON_L,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_LEANB,  ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_LEANF,  ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_WALKBACK,  ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_JUMPON_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_JUMPON_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_BIKE_KICK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_BIKE_HIT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_BIKE_GETOFF_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_BIKE_GETOFF_LHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_GETOFF_RHS,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_BIKE_GETOFF_BACK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_BIKE_DRIVEBY_RHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
 	{ ANIM_BIKE_DRIVEBY_LHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_BIKE_DRIVEBY_FT,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
-	{ ANIM_BIKE_PASSENGER,  ASSOC_DELETEFADEDOUT | ASSOC_DRIVING },
+	{ ANIM_BIKE_DRIVEBY_RHS,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_DRIVEBY_FORWARD,  ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_RIDE_P,  ASSOC_DELETEFADEDOUT | ASSOC_DRIVING },
 };
 AnimAssocDesc aMeleeAnimDescs[] = {
 	{ ANIM_MELEE_ATTACK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
@@ -242,25 +242,25 @@ AnimAssocDesc aSwingAnimDescs[] = {
 	{ ANIM_MELEE_ATTACK_FINISH,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 };
 AnimAssocDesc aWeaponAnimDescs[] = {
-	{ ANIM_WEAPON_FIRE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_CROUCHFIRE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_RELOAD,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_CROUCHRELOAD,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_ATTACK_1,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_ATTACK_2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_ATTACK_EXTRA1,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_ATTACK_EXTRA2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 };
 AnimAssocDesc aMedicAnimDescs[] = {
-	{ ANIM_CPR,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_MEDIC_CPR,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 };
 AnimAssocDesc aSunbatheAnimDescs[] = {
-	{ ANIM_SUNBATHE,  ASSOC_REPEAT | ASSOC_PARTIAL },
+	{ ANIM_SUNBATHE_IDLE,  ASSOC_REPEAT | ASSOC_PARTIAL },
 	{ ANIM_SUNBATHE_DOWN,  ASSOC_HAS_X_TRANSLATION | ASSOC_HAS_TRANSLATION | ASSOC_PARTIAL },
 	{ ANIM_SUNBATHE_UP,  ASSOC_HAS_X_TRANSLATION | ASSOC_HAS_TRANSLATION | ASSOC_PARTIAL },
 	{ ANIM_SUNBATHE_ESCAPE,  ASSOC_HAS_X_TRANSLATION | ASSOC_HAS_TRANSLATION | ASSOC_PARTIAL },
 };
 AnimAssocDesc aPlayerIdleAnimDescs[] = {
-	{ ANIM_IDLE_STRETCH,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_IDLE_TIME,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_IDLE_SHOULDER,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_IDLE_STRETCH_LEG,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_PLAYER_IDLE1,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_PLAYER_IDLE2,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_PLAYER_IDLE3,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_PLAYER_IDLE4,  ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 };
 AnimAssocDesc aRiotAnimDescs[] = {
 	{ ANIM_RIOT_ANGRY,  ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
@@ -269,7 +269,7 @@ AnimAssocDesc aRiotAnimDescs[] = {
 	{ ANIM_RIOT_PUNCHES,  ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_RIOT_SHOUT,  ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_RIOT_CHALLENGE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_RIOT_FUKU,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_RIOT_FUCKYOU,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 };
 AnimAssocDesc aStripAnimDescs[] = {
 	{ ANIM_STRIP_A,  ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
@@ -281,25 +281,25 @@ AnimAssocDesc aStripAnimDescs[] = {
 	{ ANIM_STRIP_G,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 };
 AnimAssocDesc aStdAnimDescsSide[] = {
-	{ ANIM_WALK,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_WALK },
-	{ ANIM_RUN,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_WALK },
-	{ ANIM_SPRINT,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_WALK },
-	{ ANIM_IDLE_STANCE,  ASSOC_REPEAT },
-	{ ANIM_WALK_START,  ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION },
+	{ ANIM_STD_WALK,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_WALK },
+	{ ANIM_STD_RUN,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_WALK },
+	{ ANIM_STD_RUNFAST,  ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_WALK },
+	{ ANIM_STD_IDLE,  ASSOC_REPEAT },
+	{ ANIM_STD_STARTWALK,  ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION },
 };
 AnimAssocDesc aMPNoteAnimDescs[] = {
-	{ ANIM_MPNOTE,  ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_MPNOTE_LOOP,  ASSOC_REPEAT | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_MULTIPLAYER_CUTSCENE_MPNOTE,  ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_MULTIPLAYER_CUTSCENE_MPNOTE_LOOP,  ASSOC_REPEAT | ASSOC_PARTIAL | ASSOC_IDLE },
 };
 AnimAssocDesc aCSMiscAnimDescs[] = {
-	{ ANIM_IDLE_LOOK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_IDLE_NO,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_IDLE_YES,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_IDLE_CHAT2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_IDLE_COUGH,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_IDLE_GIGGLE_FEMALE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_IDLE_TOUGH_CHAT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_IDLE_CELL_TALK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_CS_MISC_IDLE_LOOK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_CS_MISC_IDLE_NO,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_CS_MISC_IDLE_YES,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_CS_MISC_IDLE_CHAT2,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_CS_MISC_IDLE_COUGH,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_CS_MISC_IDLE_GIGGLE_FEMALE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_CS_MISC_IDLE_TOUGH_CHAT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_CS_MISC_IDLE_CELL_TALK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
 };
 AnimAssocDesc aDONH2AnimDescs[] = {
 	{ ANIM_DONH2_CAMERA,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
@@ -320,7 +320,7 @@ AnimAssocDesc aJDT5AnimDescs[] = {
 };
 AnimAssocDesc aJDT6AnimDescs[] = {
 	{ ANIM_JDT6_PICKUP,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_JDT6_DOORKNOCK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_JDT6_KNOCK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
 };
 AnimAssocDesc aMAR1AnimDescs[] = {
 	{ ANIM_MAR1_SKIRT,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
@@ -334,7 +334,7 @@ AnimAssocDesc aMAR2AnimDescs[] = {
 AnimAssocDesc aMAR3AnimDescs[] = {
 	{ ANIM_MAR3_HOOCHY,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
 	{ ANIM_MAR3_NOTE_IDLE,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_MAR3_NOTE_PICK,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_MAR3_NOTE_PICKUP,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
 };
 AnimAssocDesc aSAL1AnimDescs[] = {
 	{ ANIM_SAL1_BIREFCASE_DOWN,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
@@ -349,8 +349,8 @@ AnimAssocDesc aSAL3AnimDescs[] = {
 	{ ANIM_SAL3_SIT_DOWN,  ASSOC_PARTIAL | ASSOC_IDLE },
 };
 AnimAssocDesc aSAL4AnimDescs[] = {
-	{ ANIM_SAL4_DUSTDOWN,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
-	{ ANIM_SAL4_GIRLRUN,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_SAL4_DUST_DOWN,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
+	{ ANIM_SAL4_GIRL_RUN,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
 };
 AnimAssocDesc aSAL6AnimDescs[] = {
 	{ ANIM_SAL6_ANGRY_SEATED,  ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
diff --git a/src/animation/AnimationId.h b/src/animation/AnimationId.h
index 7e3234ab..5a8f7289 100644
--- a/src/animation/AnimationId.h
+++ b/src/animation/AnimationId.h
@@ -2,250 +2,256 @@
 
 enum AnimationId
 {
-	ANIM_WALK,
-	ANIM_RUN,
-	ANIM_SPRINT,
-	ANIM_IDLE_STANCE,
-	ANIM_WALK_START,
-	ANIM_RUN_STOP,
-	ANIM_RUN_STOP_R,
-	ANIM_IDLE_CAM,
-	ANIM_IDLE_HBHB,
-	ANIM_IDLE_TIRED,
-	ANIM_IDLE_ARMED,
-	ANIM_IDLE_CHAT,
-	ANIM_IDLE_TAXI,
-	ANIM_KO_SHOT_FRONT1,
-	ANIM_KO_SHOT_FRONT2,
-	ANIM_KO_SHOT_FRONT3,
-	ANIM_KO_SHOT_FRONT4,
-	ANIM_KO_SHOT_FACE,
-	ANIM_KO_SHOT_STOM,
-	ANIM_KO_SHOT_ARML,
-	ANIM_KO_SHOT_ARMR,
-	ANIM_KO_SHOT_LEGL,
-	ANIM_KO_SHOT_LEGR,
-	ANIM_KD_LEFT,
-	ANIM_KD_RIGHT,
-	ANIM_KO_SKID_FRONT,
-	ANIM_KO_SPIN_R, // named left in VC
-	ANIM_KO_SKID_BACK,
-	ANIM_KO_SPIN_L, // named right in VC
-	ANIM_SHOT_FRONT_PARTIAL,
-	ANIM_SHOT_LEFT_PARTIAL,
-	ANIM_SHOT_BACK_PARTIAL,
-	ANIM_SHOT_RIGHT_PARTIAL,
-	ANIM_HIT_FRONT,
-	ANIM_HIT_LEFT,
-	ANIM_HIT_BACK,
-	ANIM_HIT_RIGHT,
-	ANIM_FLOOR_HIT,
-	ANIM_HIT_WALL,
-	ANIM_FLOOR_HIT_F,
-	ANIM_HIT_BEHIND,
-	ANIM_FIGHT_IDLE,
-	ANIM_FIGHT2_IDLE,
-	ANIM_FIGHT_SH_F,
-	ANIM_FIGHT_PPUNCH,
-	ANIM_L_HOOK,
-	ANIM_R_HOOK,
-	ANIM_UPPERCUT,
-	ANIM_HEADBUTT,
-	ANIM_FRONTKICK,
-	ANIM_ROUNDHOUSE,
-	ANIM_HIT_L_HOOK,
-	ANIM_HIT_R_HOOK,
-	ANIM_HIT_UPPERCUT,
-	ANIM_HIT_HEADBUTT,
-	ANIM_HIT_FRONTKICK,
-	ANIM_HIT_RHOUSE,
-	ANIM_BOMBER,
-	ANIM_PUNCH_R,
-	ANIM_FIGHT_PPUNCH2,
-	ANIM_KICK_FLOOR,
-
-	ANIM_WEAPON_THROWU,
-	ANIM_FIGHT_SH_BACK,
-
-	ANIM_CAR_JACKED_RHS,
-	ANIM_CAR_LJACKED_RHS,
-	ANIM_CAR_JACKED_LHS,
-	ANIM_CAR_LJACKED_LHS,
-	ANIM_CAR_QJACK,
-	ANIM_CAR_QJACKED,
-	ANIM_CAR_ALIGN_LHS,
-	ANIM_CAR_ALIGNHI_LHS,
-	ANIM_CAR_OPEN_LHS,
-	ANIM_CAR_DOORLOCKED_LHS,
-	ANIM_CAR_PULLOUT_LHS,
-	ANIM_CAR_PULLOUT_LOW_LHS,
-	ANIM_CAR_GETIN_LHS,
-	ANIM_CAR_GETIN_LOW_LHS,
-	ANIM_CAR_CLOSEDOOR_LHS,
-	ANIM_CAR_CLOSEDOOR_LOW_LHS,
-	ANIM_CAR_ROLLDOOR,
-	ANIM_CAR_ROLLDOOR_LOW,
-	ANIM_CAR_JUMPIN_LHS,
-	ANIM_CAR_GETOUT_LHS,
-	ANIM_CAR_GETOUT_LOW_LHS,
-	ANIM_CAR_CLOSE_LHS,
-	ANIM_CAR_ALIGN_RHS,
-	ANIM_CAR_ALIGNHI_RHS,
-	ANIM_CAR_OPEN_RHS,
-	ANIM_CAR_DOORLOCKED_RHS,
-	ANIM_CAR_PULLOUT_RHS,
-	ANIM_CAR_PULLOUT_LOW_RHS,
-	ANIM_CAR_GETIN_RHS,
-	ANIM_CAR_GETIN_LOW_RHS,
-	ANIM_CAR_CLOSEDOOR_RHS,
-	ANIM_CAR_CLOSEDOOR_LOW_RHS,
-	ANIM_CAR_SHUFFLE_RHS,
-	ANIM_CAR_LSHUFFLE_RHS,
-	ANIM_CAR_SIT,
-	ANIM_CAR_LSIT,
-	ANIM_CAR_SITP,
-	ANIM_CAR_SITPLO,
-	ANIM_DRIVE_L,
-	ANIM_DRIVE_R,
-	ANIM_DRIVE_LOW_L,
-	ANIM_DRIVE_LOW_R,
-	ANIM_DRIVEBY_L,
-	ANIM_DRIVEBY_R,
-	ANIM_DRIVEBY_LOW_L,
-	ANIM_DRIVEBY_LOW_R,
-	ANIM_CAR_LB,
-	ANIM_DRIVE_BOAT,
-	ANIM_DRIVE_BOAT_L,
-	ANIM_DRIVE_BOAT_R,
-	ANIM_BOAT_LB,
-
-	ANIM_BIKE_PICKUP_R,
-	ANIM_BIKE_PICKUP_L,
-	ANIM_BIKE_PULLUP_R,
-	ANIM_BIKE_PULLUP_L,
-	ANIM_BIKE_ELBOW_R,
-	ANIM_BIKE_ELBOW_L,
-	ANIM_BIKE_FALL_OFF,
-	ANIM_BIKE_FALL_R,
-
-	ANIM_CAR_GETOUT_RHS,
-	ANIM_CAR_GETOUT_LOW_RHS,
-	ANIM_CAR_CLOSE_RHS,
-	ANIM_CAR_HOOKERTALK,
-
-	ANIM_TRAIN_GETIN,
-	ANIM_TRAIN_GETOUT,
-
-	ANIM_CAR_CRAWLOUT_RHS,
-	ANIM_CAR_CRAWLOUT_RHS2,
-	ANIM_CAR_ROLLOUT_LHS,
-	ANIM_CAR_ROLLOUT_RHS,
-
-	ANIM_GETUP1,
-	ANIM_GETUP2,
-	ANIM_GETUP3,
-	ANIM_GETUP_FRONT,
-	ANIM_JUMP_LAUNCH,
-	ANIM_JUMP_GLIDE,
-	ANIM_JUMP_LAND,
-	ANIM_FALL_FALL,
-	ANIM_FALL_GLIDE,
-	ANIM_FALL_LAND,
-	ANIM_FALL_COLLAPSE,
-	ANIM_FALL_BACK,
-	ANIM_FALL_FRONT,
-
-	ANIM_EV_STEP,
-	ANIM_EV_DIVE,
-	ANIM_COMMANDO_ROLL,
-	ANIM_XPRESS_SCRATCH,
-	ANIM_ROAD_CROSS,
-	ANIM_TURN_180,
-	ANIM_ARREST_GUN,
-	ANIM_DROWN,
-	ANIM_DUCK_DOWN,
-	ANIM_DUCK_LOW,
-
-	ANIM_WEAPON_CROUCH,
-
-	ANIM_RBLOCK_CSHOOT,
-	ANIM_HANDSUP,
-	ANIM_HANDSCOWER,
-	ANIM_FUCKU,
-	ANIM_PHONE_IN,
-	ANIM_PHONE_OUT,
-	ANIM_PHONE_TALK,
-
-	ANIM_SEAT_DOWN,
-	ANIM_SEAT_UP,
-	ANIM_SEAT_IDLE,
-	ANIM_SEAT_DOWN2,
-	ANIM_ATM,
-	ANIM_ABSEIL,
-
-	NUM_STD_ANIMS,
-
-	ANIM_VAN_OPEN_L,
-	ANIM_VAN_GETIN_L,
-	ANIM_VAN_CLOSE_L,
-	ANIM_VAN_GETOUT_L,
-	ANIM_VAN_OPEN,
-	ANIM_VAN_GETIN,
-	ANIM_VAN_CLOSE,
-	ANIM_VAN_GETOUT,
-
-	ANIM_COACH_OPEN_L,
-	ANIM_COACH_OPEN_R,
-	ANIM_COACH_IN_L,
-	ANIM_COACH_IN_R,
-	ANIM_COACH_OUT_L,
+	ANIM_STD_WALK,
+	ANIM_STD_RUN,
+	ANIM_STD_RUNFAST,
+	ANIM_STD_IDLE,
+	ANIM_STD_STARTWALK,
+	ANIM_STD_RUNSTOP1,
+	ANIM_STD_RUNSTOP2,
+	ANIM_STD_IDLE_CAM,
+	ANIM_STD_IDLE_HBHB,
+	ANIM_STD_IDLE_TIRED,
+	ANIM_STD_IDLE_BIGGUN,
+	ANIM_STD_CHAT,
+	ANIM_STD_HAILTAXI,
+	ANIM_STD_KO_FRONT,
+	ANIM_STD_KO_LEFT,
+	ANIM_STD_KO_BACK,
+	ANIM_STD_KO_RIGHT,
+	ANIM_STD_KO_SHOT_FACE,
+	ANIM_STD_KO_SHOT_STOMACH,
+	ANIM_STD_KO_SHOT_ARM_L,
+	ANIM_STD_KO_SHOT_ARM_R,
+	ANIM_STD_KO_SHOT_LEG_L,
+	ANIM_STD_KO_SHOT_LEG_R,
+	ANIM_STD_SPINFORWARD_LEFT,
+	ANIM_STD_SPINFORWARD_RIGHT,
+	ANIM_STD_HIGHIMPACT_FRONT,
+	ANIM_STD_HIGHIMPACT_LEFT,
+	ANIM_STD_HIGHIMPACT_BACK,
+	ANIM_STD_HIGHIMPACT_RIGHT,
+	ANIM_STD_HITBYGUN_FRONT,
+	ANIM_STD_HITBYGUN_LEFT,
+	ANIM_STD_HITBYGUN_BACK,
+	ANIM_STD_HITBYGUN_RIGHT,
+	ANIM_STD_HIT_FRONT,
+	ANIM_STD_HIT_LEFT,
+	ANIM_STD_HIT_BACK,
+	ANIM_STD_HIT_RIGHT,
+	ANIM_STD_HIT_FLOOR,
+	ANIM_STD_HIT_WALL,
+	ANIM_STD_HIT_FLOOR_FRONT,
+	ANIM_STD_HIT_BEHIND,
+	ANIM_STD_FIGHT_IDLE,
+	ANIM_STD_FIGHT_2IDLE,
+	ANIM_STD_FIGHT_SHUFFLE_F,
+	ANIM_STD_PARTIAL_PUNCH,
+	ANIM_FIGHT_ATTACK_A1,
+	ANIM_FIGHT_ATTACK_A2,
+	ANIM_FIGHT_ATTACK_A3,
+	ANIM_FIGHT_ATTACK_B1,
+	ANIM_FIGHT_ATTACK_B2,
+	ANIM_FIGHT_ATTACK_B3,
+	ANIM_FIGHT_HIT_A1,
+	ANIM_FIGHT_HIT_A2,
+	ANIM_FIGHT_HIT_A3,
+	ANIM_FIGHT_HIT_B1,
+	ANIM_FIGHT_HIT_B2,
+	ANIM_FIGHT_HIT_B3,
+	ANIM_STD_DETONATE,
+	ANIM_STD_PUNCH,
+	ANIM_STD_PARTIALPUNCH,
+	ANIM_STD_KICKGROUND,
+
+	ANIM_STD_THROW_UNDER,
+	ANIM_STD_FIGHT_SHUFFLE_B,
+
+	ANIM_STD_JACKEDCAR_RHS,
+	ANIM_STD_JACKEDCAR_LO_RHS,
+	ANIM_STD_JACKEDCAR_LHS,
+	ANIM_STD_JACKEDCAR_LO_LHS,
+	ANIM_STD_QUICKJACK,
+	ANIM_STD_QUICKJACKED,
+	ANIM_STD_CAR_ALIGN_DOOR_LHS,
+	ANIM_STD_CAR_ALIGNHI_DOOR_LHS,
+	ANIM_STD_CAR_OPEN_DOOR_LHS,
+	ANIM_STD_CARDOOR_LOCKED_LHS,
+	ANIM_STD_CAR_PULL_OUT_PED_LHS,
+	ANIM_STD_CAR_PULL_OUT_PED_LO_LHS,
+	ANIM_STD_CAR_GET_IN_LHS,
+	ANIM_STD_CAR_GET_IN_LO_LHS,
+	ANIM_STD_CAR_CLOSE_DOOR_LHS,
+	ANIM_STD_CAR_CLOSE_DOOR_LO_LHS,
+	ANIM_STD_CAR_CLOSE_DOOR_ROLLING_LHS,
+	ANIM_STD_CAR_CLOSE_DOOR_ROLLING_LO_LHS,
+	ANIM_STD_CAR_JUMP_IN_LO_LHS,
+	ANIM_STD_GETOUT_LHS,
+	ANIM_STD_GETOUT_LO_LHS,
+	ANIM_STD_CAR_CLOSE_LHS,
+	ANIM_STD_CAR_ALIGN_DOOR_RHS,
+	ANIM_STD_CAR_ALIGNHI_DOOR_RHS,
+	ANIM_STD_CAR_OPEN_DOOR_RHS,
+	ANIM_STD_CARDOOR_LOCKED_RHS,
+	ANIM_STD_CAR_PULL_OUT_PED_RHS,
+	ANIM_STD_CAR_PULL_OUT_PED_LO_RHS,
+	ANIM_STD_CAR_GET_IN_RHS,
+	ANIM_STD_CAR_GET_IN_LO_RHS,
+	ANIM_STD_CAR_CLOSE_DOOR_RHS,
+	ANIM_STD_CAR_CLOSE_DOOR_LO_RHS,
+	ANIM_STD_CAR_SHUFFLE_RHS,
+	ANIM_STD_CAR_SHUFFLE_LO_RHS,
+	ANIM_STD_CAR_SIT,
+	ANIM_STD_CAR_SIT_LO,
+	ANIM_STD_CAR_SIT_P,
+	ANIM_STD_CAR_SIT_P_LO,
+	ANIM_STD_CAR_DRIVE_LEFT,
+	ANIM_STD_CAR_DRIVE_RIGHT,
+	ANIM_STD_CAR_DRIVE_LEFT_LO,
+	ANIM_STD_CAR_DRIVE_RIGHT_LO,
+	ANIM_STD_CAR_DRIVEBY_LEFT,
+	ANIM_STD_CAR_DRIVEBY_RIGHT,
+	ANIM_STD_CAR_DRIVEBY_LEFT_LO,
+	ANIM_STD_CAR_DRIVEBY_RIGHT_LO,
+	ANIM_STD_CAR_LOOKBEHIND,
+	ANIM_STD_BOAT_DRIVE,
+	ANIM_STD_BOAT_DRIVE_LEFT,
+	ANIM_STD_BOAT_DRIVE_RIGHT,
+	ANIM_STD_BOAT_LOOKBEHIND,
+
+	ANIM_STD_BIKE_PICKUP_LHS,
+	ANIM_STD_BIKE_PICKUP_RHS,
+	ANIM_STD_BIKE_PULLUP_LHS,
+	ANIM_STD_BIKE_PULLUP_RHS,
+	ANIM_STD_BIKE_ELBOW_LHS,
+	ANIM_STD_BIKE_ELBOW_RHS,
+	ANIM_STD_BIKE_FALLOFF,
+	ANIM_STD_BIKE_FALLBACK,
+
+	ANIM_STD_GETOUT_RHS,
+	ANIM_STD_GETOUT_LO_RHS,
+	ANIM_STD_CAR_CLOSE_RHS,
+	ANIM_STD_CAR_HOOKERTALK,
+
+	ANIM_STD_TRAIN_GETIN,
+	ANIM_STD_TRAIN_GETOUT,
+
+	ANIM_STD_CRAWLOUT_LHS,
+	ANIM_STD_CRAWLOUT_RHS,
+	ANIM_STD_ROLLOUT_LHS,
+	ANIM_STD_ROLLOUT_RHS,
+
+	ANIM_STD_GET_UP,
+	ANIM_STD_GET_UP_LEFT,
+	ANIM_STD_GET_UP_RIGHT,
+	ANIM_STD_GET_UP_FRONT,
+	ANIM_STD_JUMP_LAUNCH,
+	ANIM_STD_JUMP_GLIDE,
+	ANIM_STD_JUMP_LAND,
+	ANIM_STD_FALL,
+	ANIM_STD_FALL_GLIDE,
+	ANIM_STD_FALL_LAND,
+	ANIM_STD_FALL_COLLAPSE,
+	ANIM_STD_FALL_ONBACK,
+	ANIM_STD_FALL_ONFRONT,
+
+	ANIM_STD_EVADE_STEP,
+	ANIM_STD_EVADE_DIVE,
+	ANIM_STD_COMMANDO_ROLL,
+	ANIM_STD_XPRESS_SCRATCH,
+	ANIM_STD_ROADCROSS,
+	ANIM_STD_TURN180,
+	ANIM_STD_ARREST,
+	ANIM_STD_DROWN,
+	ANIM_STD_DUCK_DOWN,
+	ANIM_STD_DUCK_LOW,
+
+	ANIM_STD_DUCK_WEAPON,
+
+	ANIM_STD_RBLOCK_SHOOT,
+	ANIM_STD_HANDSUP,
+	ANIM_STD_HANDSCOWER,
+	ANIM_STD_PARTIAL_FUCKU,
+	ANIM_STD_PHONE_IN,
+	ANIM_STD_PHONE_OUT,
+	ANIM_STD_PHONE_TALK,
+
+	ANIM_STD_SEAT_DOWN,
+	ANIM_STD_SEAT_UP,
+	ANIM_STD_SEAT_IDLE,
+	ANIM_STD_SEAT_RVRS,
+	ANIM_STD_ATM,
+	ANIM_STD_ABSEIL,
+
+	ANIM_STD_NUM,
+
+	ANIM_STD_VAN_OPEN_DOOR_REAR_LHS,
+	ANIM_STD_VAN_GET_IN_REAR_LHS,
+	ANIM_STD_VAN_CLOSE_DOOR_REAR_LHS,
+	ANIM_STD_VAN_GET_OUT_REAR_LHS,
+	ANIM_STD_VAN_OPEN_DOOR_REAR_RHS,
+	ANIM_STD_VAN_GET_IN_REAR_RHS,
+	ANIM_STD_VAN_CLOSE_DOOR_REAR_RHS,
+	ANIM_STD_VAN_GET_OUT_REAR_RHS,
+
+	ANIM_STD_COACH_OPEN_LHS,
+	ANIM_STD_COACH_OPEN_RHS,
+	ANIM_STD_COACH_GET_IN_LHS,
+	ANIM_STD_COACH_GET_IN_RHS,
+	ANIM_STD_COACH_GET_OUT_LHS,
 
 	ANIM_BIKE_RIDE,
-	ANIM_BIKE_STILL,
+	ANIM_BIKE_READY,
 	ANIM_BIKE_LEFT,
 	ANIM_BIKE_RIGHT,
-	ANIM_BIKE_BACK,
-	ANIM_BIKE_FWD,
-	ANIM_BIKE_PUSHES,
-	ANIM_BIKE_JUMPON_R,
-	ANIM_BIKE_JUMPON_L,
+	ANIM_BIKE_LEANB,
+	ANIM_BIKE_LEANF,
+	ANIM_BIKE_WALKBACK,
+	ANIM_BIKE_JUMPON_LHS,
+	ANIM_BIKE_JUMPON_RHS,
 	ANIM_BIKE_KICK,
 	ANIM_BIKE_HIT,
-	ANIM_BIKE_GETOFF_RHS,
 	ANIM_BIKE_GETOFF_LHS,
+	ANIM_BIKE_GETOFF_RHS,
 	ANIM_BIKE_GETOFF_BACK,
-	ANIM_BIKE_DRIVEBY_RHS,
 	ANIM_BIKE_DRIVEBY_LHS,
-	ANIM_BIKE_DRIVEBY_FT,
-	ANIM_BIKE_PASSENGER,
+	ANIM_BIKE_DRIVEBY_RHS,
+	ANIM_BIKE_DRIVEBY_FORWARD,
+	ANIM_BIKE_RIDE_P,
+
+	ANIM_ATTACK_1,
+	ANIM_ATTACK_2,
+	ANIM_ATTACK_EXTRA1,
+	ANIM_ATTACK_EXTRA2,
+	ANIM_ATTACK_3,
 
-	ANIM_WEAPON_FIRE,
+	// our synonyms... because originals are hard to understand
+	ANIM_WEAPON_FIRE = ANIM_ATTACK_1,
 	ANIM_WEAPON_CROUCHFIRE,
+	ANIM_WEAPON_FIRE_2ND = ANIM_WEAPON_CROUCHFIRE,
 	ANIM_WEAPON_RELOAD,
 	ANIM_WEAPON_CROUCHRELOAD,
-	ANIM_WEAPON_SPECIAL,
-	ANIM_MELEE_ATTACK = ANIM_WEAPON_FIRE,
+	ANIM_WEAPON_FIRE_3RD,
+	ANIM_THROWABLE_THROW = ANIM_ATTACK_1,
+	ANIM_THROWABLE_THROWU,
+	ANIM_THROWABLE_START_THROW,
+	ANIM_MELEE_ATTACK = ANIM_ATTACK_1,
 	ANIM_MELEE_ATTACK_2ND,
 	ANIM_MELEE_ATTACK_START,
 	ANIM_MELEE_IDLE_FIGHTMODE,
 	ANIM_MELEE_ATTACK_FINISH,
-	ANIM_THROWABLE_THROW = ANIM_WEAPON_FIRE,
-	ANIM_THROWABLE_THROWU,
-	ANIM_THROWABLE_START_THROW,
-	ANIM_WEAPON_FIRE_2ND = ANIM_WEAPON_CROUCHFIRE,
-	ANIM_WEAPON_FIRE_3RD = ANIM_WEAPON_SPECIAL,
 
-	ANIM_SUNBATHE,
+	ANIM_SUNBATHE_IDLE,
 	ANIM_SUNBATHE_DOWN,
 	ANIM_SUNBATHE_UP,
 	ANIM_SUNBATHE_ESCAPE,
 
-	ANIM_CPR,
+	ANIM_MEDIC_CPR,
 
-	ANIM_IDLE_STRETCH,
-	ANIM_IDLE_TIME,
-	ANIM_IDLE_SHOULDER,
-	ANIM_IDLE_STRETCH_LEG,
+	ANIM_PLAYER_IDLE1,
+	ANIM_PLAYER_IDLE2,
+	ANIM_PLAYER_IDLE3,
+	ANIM_PLAYER_IDLE4,
 
 	ANIM_RIOT_ANGRY,
 	ANIM_RIOT_ANGRY_B,
@@ -253,7 +259,7 @@ enum AnimationId
 	ANIM_RIOT_PUNCHES,
 	ANIM_RIOT_SHOUT,
 	ANIM_RIOT_CHALLENGE,
-	ANIM_RIOT_FUKU,
+	ANIM_RIOT_FUCKYOU,
 
 	ANIM_STRIP_A,
 	ANIM_STRIP_B,
@@ -264,17 +270,17 @@ enum AnimationId
 	ANIM_STRIP_G,
 
 
-	ANIM_MPNOTE,
-	ANIM_MPNOTE_LOOP,
+	ANIM_MULTIPLAYER_CUTSCENE_MPNOTE,
+	ANIM_MULTIPLAYER_CUTSCENE_MPNOTE_LOOP,
 
-	ANIM_IDLE_LOOK,
-	ANIM_IDLE_NO,
-	ANIM_IDLE_YES,
-	ANIM_IDLE_CHAT2,
-	ANIM_IDLE_COUGH,
-	ANIM_IDLE_GIGGLE_FEMALE,
-	ANIM_IDLE_TOUGH_CHAT,
-	ANIM_IDLE_CELL_TALK,
+	ANIM_CS_MISC_IDLE_LOOK,
+	ANIM_CS_MISC_IDLE_NO,
+	ANIM_CS_MISC_IDLE_YES,
+	ANIM_CS_MISC_IDLE_CHAT2,
+	ANIM_CS_MISC_IDLE_COUGH,
+	ANIM_CS_MISC_IDLE_GIGGLE_FEMALE,
+	ANIM_CS_MISC_IDLE_TOUGH_CHAT,
+	ANIM_CS_MISC_IDLE_CELL_TALK,
 
 	ANIM_DONH2_CAMERA,
 	ANIM_DONH3_HAPPY,
@@ -285,7 +291,7 @@ enum AnimationId
 	ANIM_JDT5_CALM_DOWN,
 	ANIM_JDT5_POINT,
 	ANIM_JDT6_PICKUP,
-	ANIM_JDT6_DOORKNOCK,
+	ANIM_JDT6_KNOCK,
 
 	ANIM_MAR1_SKIRT,
 	ANIM_MAR2_CELL_ANSWER,
@@ -294,7 +300,7 @@ enum AnimationId
 	ANIM_MAR2_FOOT_TAP,
 	ANIM_MAR3_HOOCHY,
 	ANIM_MAR3_NOTE_IDLE,
-	ANIM_MAR3_NOTE_PICK,
+	ANIM_MAR3_NOTE_PICKUP,
 
 	ANIM_SAL1_BIREFCASE_DOWN,
 	ANIM_SAL2_IDLE_SEATED,
@@ -302,8 +308,8 @@ enum AnimationId
 	ANIM_SAL3_SEATED_TALK,
 	ANIM_SAL3_SEATED_IDLE,
 	ANIM_SAL3_SIT_DOWN,
-	ANIM_SAL4_DUSTDOWN,
-	ANIM_SAL4_GIRLRUN,
+	ANIM_SAL4_DUST_DOWN,
+	ANIM_SAL4_GIRL_RUN,
 	ANIM_SAL6_ANGRY_SEATED,
 	ANIM_SAL6_IDLE_SEATED,
 	ANIM_SAL7_LOOKOUT,
@@ -322,7 +328,5 @@ enum AnimationId
 
 	ANIM_MAC2_PLEAD,
 
-	ANIM_VIC7_PROD_WITH_FOOT,
-
-	NUM_ANIMS
+	ANIM_VIC7_PROD_WITH_FOOT
 };
\ No newline at end of file