1 files changed, 235 insertions, 235 deletions
diff --git a/src/data/object_events/object_event_anims.h b/src/data/object_events/object_event_anims.h
index a66d634b0..a5fb41462 100755
--- a/src/data/object_events/object_event_anims.h
+++ b/src/data/object_events/object_event_anims.h
@@ -796,99 +796,100 @@ static const union AnimCmd sAnim_HoOhStayStill[] =
 };
 
 static const union AnimCmd *const sAnimTable_Inanimate[] = {
-    sAnim_StayStill,
+    [ANIM_STAY_STILL] = sAnim_StayStill,
 };
 
 static const union AnimCmd *const sAnimTable_QuintyPlump[] = {
-    sAnim_QuintyPlumpFaceSouth,
-    sAnim_QuintyPlumpFaceNorth,
-    sAnim_QuintyPlumpFaceWest,
-    sAnim_QuintyPlumpFaceEast,
-    sAnim_QuintyPlumpGoSouth,
-    sAnim_QuintyPlumpGoNorth,
-    sAnim_QuintyPlumpGoWest,
-    sAnim_QuintyPlumpGoEast,
-    sAnim_QuintyPlumpGoFastSouth,
-    sAnim_QuintyPlumpGoFastNorth,
-    sAnim_QuintyPlumpGoFastWest,
-    sAnim_QuintyPlumpGoFastEast,
-    sAnim_QuintyPlumpGoFasterSouth,
-    sAnim_QuintyPlumpGoFasterNorth,
-    sAnim_QuintyPlumpGoFasterWest,
-    sAnim_QuintyPlumpGoFasterEast,
-    sAnim_QuintyPlumpGoFastestSouth,
-    sAnim_QuintyPlumpGoFastestNorth,
-    sAnim_QuintyPlumpGoFastestWest,
-    sAnim_QuintyPlumpGoFastestEast,
+    [ANIM_STD_FACE_SOUTH] = sAnim_QuintyPlumpFaceSouth,
+    [ANIM_STD_FACE_NORTH] = sAnim_QuintyPlumpFaceNorth,
+    [ANIM_STD_FACE_WEST] = sAnim_QuintyPlumpFaceWest,
+    [ANIM_STD_FACE_EAST] = sAnim_QuintyPlumpFaceEast,
+    [ANIM_STD_GO_SOUTH] = sAnim_QuintyPlumpGoSouth,
+    [ANIM_STD_GO_NORTH] = sAnim_QuintyPlumpGoNorth,
+    [ANIM_STD_GO_WEST] = sAnim_QuintyPlumpGoWest,
+    [ANIM_STD_GO_EAST] = sAnim_QuintyPlumpGoEast,
+    [ANIM_STD_GO_FAST_SOUTH] = sAnim_QuintyPlumpGoFastSouth,
+    [ANIM_STD_GO_FAST_NORTH] = sAnim_QuintyPlumpGoFastNorth,
+    [ANIM_STD_GO_FAST_WEST] = sAnim_QuintyPlumpGoFastWest,
+    [ANIM_STD_GO_FAST_EAST] = sAnim_QuintyPlumpGoFastEast,
+    [ANIM_STD_GO_FASTER_SOUTH] = sAnim_QuintyPlumpGoFasterSouth,
+    [ANIM_STD_GO_FASTER_NORTH] = sAnim_QuintyPlumpGoFasterNorth,
+    [ANIM_STD_GO_FASTER_WEST] = sAnim_QuintyPlumpGoFasterWest,
+    [ANIM_STD_GO_FASTER_EAST] = sAnim_QuintyPlumpGoFasterEast,
+    [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_QuintyPlumpGoFastestSouth,
+    [ANIM_STD_GO_FASTEST_NORTH] = sAnim_QuintyPlumpGoFastestNorth,
+    [ANIM_STD_GO_FASTEST_WEST] = sAnim_QuintyPlumpGoFastestWest,
+    [ANIM_STD_GO_FASTEST_EAST] = sAnim_QuintyPlumpGoFastestEast,
 };
 
 static const union AnimCmd *const sAnimTable_Standard[] = {
-    sAnim_FaceSouth,
-    sAnim_FaceNorth,
-    sAnim_FaceWest,
-    sAnim_FaceEast,
-    sAnim_GoSouth,
-    sAnim_GoNorth,
-    sAnim_GoWest,
-    sAnim_GoEast,
-    sAnim_GoFastSouth,
-    sAnim_GoFastNorth,
-    sAnim_GoFastWest,
-    sAnim_GoFastEast,
-    sAnim_GoFasterSouth,
-    sAnim_GoFasterNorth,
-    sAnim_GoFasterWest,
-    sAnim_GoFasterEast,
-    sAnim_GoFastestSouth,
-    sAnim_GoFastestNorth,
-    sAnim_GoFastestWest,
-    sAnim_GoFastestEast,
+    [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
+    [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
+    [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
+    [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
+    [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
+    [ANIM_STD_GO_NORTH] = sAnim_GoNorth,
+    [ANIM_STD_GO_WEST] = sAnim_GoWest,
+    [ANIM_STD_GO_EAST] = sAnim_GoEast,
+    [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
+    [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
+    [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
+    [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
+    [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
+    [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
+    [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
+    [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
+    [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
+    [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
+    [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
+    [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
 };
 
 static const union AnimCmd *const sAnimTable_HoOh[] = {
-    sAnim_FaceSouth,
-    sAnim_FaceNorth,
-    sAnim_FaceWest,
-    sAnim_FaceEast,
-    sAnim_HoOhFlapWings,
-    sAnim_HoOhStayStill,
-    sAnim_GoWest,
-    sAnim_GoEast,
-    sAnim_GoFastSouth,
-    sAnim_GoFastNorth,
-    sAnim_GoFastWest,
-    sAnim_GoFastEast,
-    sAnim_GoFasterSouth,
-    sAnim_GoFasterNorth,
-    sAnim_GoFasterWest,
-    sAnim_GoFasterEast,
-    sAnim_GoFastestSouth,
-    sAnim_GoFastestNorth,
-    sAnim_GoFastestWest,
-    sAnim_GoFastestEast,
-};
-
+    [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
+    [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
+    [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
+    [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
+    [ANIM_STD_GO_SOUTH] = sAnim_HoOhFlapWings,
+    [ANIM_STD_GO_NORTH] = sAnim_HoOhStayStill,
+    [ANIM_STD_GO_WEST] = sAnim_GoWest,
+    [ANIM_STD_GO_EAST] = sAnim_GoEast,
+    [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
+    [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
+    [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
+    [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
+    [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
+    [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
+    [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
+    [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
+    [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
+    [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
+    [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
+    [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
+};
+
+// The movements for going up use the animations for going right instead.
 static const union AnimCmd *const sAnimTable_GroudonSide[] = {
-    sAnim_FaceSouth,
-    sAnim_FaceNorth,
-    sAnim_FaceWest,
-    sAnim_FaceEast,
-    sAnim_GoSouth,
-    sAnim_GoEast,
-    sAnim_GoWest,
-    sAnim_GoEast,
-    sAnim_GoFastSouth,
-    sAnim_GoFastEast,
-    sAnim_GoFastWest,
-    sAnim_GoFastEast,
-    sAnim_GoFasterSouth,
-    sAnim_GoFasterEast,
-    sAnim_GoFasterWest,
-    sAnim_GoFasterEast,
-    sAnim_GoFastestSouth,
-    sAnim_GoFastestEast,
-    sAnim_GoFastestWest,
-    sAnim_GoFastestEast,
+    [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
+    [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
+    [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
+    [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
+    [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
+    [ANIM_STD_GO_NORTH] = sAnim_GoEast,
+    [ANIM_STD_GO_WEST] = sAnim_GoWest,
+    [ANIM_STD_GO_EAST] = sAnim_GoEast,
+    [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
+    [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastEast,
+    [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
+    [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
+    [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
+    [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterEast,
+    [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
+    [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
+    [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
+    [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestEast,
+    [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
+    [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
 };
 
 static const union AnimCmd sAnim_RayquazaCoiledAwake[] =
@@ -952,186 +953,185 @@ static const union AnimCmd sAnim_RayquazaFaceEast[] =
 // Though they correspond to facing/walking movements, Rayquaza doesn't have
 // equivalent images aside from flying up. Its other frames aside from the 'normal'
 // frame are for the sequence where it awakens on Sky Pillar.
-// The corresponding facing/walking movements are commented alongside
 static const union AnimCmd *const sAnimTable_Rayquaza[] = {
-    sAnim_RayquazaFaceSouth,       // Face South
-    sAnim_RayquazaFaceNorth,       // Face North
-    sAnim_RayquazaFaceWest,        // Face West
-    sAnim_RayquazaFaceEast,        // Face East
-    sAnim_RayquazaCoiledAsleep,    // Go South
-    sAnim_RayquazaFlyUp,           // Go North
-    sAnim_RayquazaCoiledMouthOpen, // Go West
-    sAnim_RayquazaNormal,          // Go East
-    sAnim_RayquazaCoiledAsleep,    // Go fast South
-    sAnim_RayquazaFlyUp,           // Go fast North
-    sAnim_RayquazaCoiledAwake,     // Go fast West
-    sAnim_RayquazaNormal,          // Go fast East
-    sAnim_RayquazaCoiledAsleep,    // Go faster South
-    sAnim_RayquazaFlyUp,           // Go faster North
-    sAnim_RayquazaCoiledMouthOpen, // Go faster West
-    sAnim_RayquazaNormal,          // Go faster East
-    sAnim_RayquazaCoiledAsleep,    // Go fastest South
-    sAnim_RayquazaFlyUp,           // Go fastest North
-    sAnim_RayquazaCoiledMouthOpen, // Go fastest West
-    sAnim_RayquazaNormal,          // Go fastest East
+    [ANIM_STD_FACE_SOUTH] = sAnim_RayquazaFaceSouth,
+    [ANIM_STD_FACE_NORTH] = sAnim_RayquazaFaceNorth,
+    [ANIM_STD_FACE_WEST] = sAnim_RayquazaFaceWest,
+    [ANIM_STD_FACE_EAST] = sAnim_RayquazaFaceEast,
+    [ANIM_STD_GO_SOUTH] = sAnim_RayquazaCoiledAsleep,
+    [ANIM_STD_GO_NORTH] = sAnim_RayquazaFlyUp,
+    [ANIM_STD_GO_WEST] = sAnim_RayquazaCoiledMouthOpen,
+    [ANIM_STD_GO_EAST] = sAnim_RayquazaNormal,
+    [ANIM_STD_GO_FAST_SOUTH] = sAnim_RayquazaCoiledAsleep,
+    [ANIM_STD_GO_FAST_NORTH] = sAnim_RayquazaFlyUp,
+    [ANIM_STD_GO_FAST_WEST] = sAnim_RayquazaCoiledAwake,
+    [ANIM_STD_GO_FAST_EAST] = sAnim_RayquazaNormal,
+    [ANIM_STD_GO_FASTER_SOUTH] = sAnim_RayquazaCoiledAsleep,
+    [ANIM_STD_GO_FASTER_NORTH] = sAnim_RayquazaFlyUp,
+    [ANIM_STD_GO_FASTER_WEST] = sAnim_RayquazaCoiledMouthOpen,
+    [ANIM_STD_GO_FASTER_EAST] = sAnim_RayquazaNormal,
+    [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_RayquazaCoiledAsleep,
+    [ANIM_STD_GO_FASTEST_NORTH] = sAnim_RayquazaFlyUp,
+    [ANIM_STD_GO_FASTEST_WEST] = sAnim_RayquazaCoiledMouthOpen,
+    [ANIM_STD_GO_FASTEST_EAST] = sAnim_RayquazaNormal,
 };
 
 static const union AnimCmd *const sAnimTable_BrendanMayNormal[] = {
-    sAnim_FaceSouth,
-    sAnim_FaceNorth,
-    sAnim_FaceWest,
-    sAnim_FaceEast,
-    sAnim_GoSouth,
-    sAnim_GoNorth,
-    sAnim_GoWest,
-    sAnim_GoEast,
-    sAnim_GoFastSouth,
-    sAnim_GoFastNorth,
-    sAnim_GoFastWest,
-    sAnim_GoFastEast,
-    sAnim_GoFasterSouth,
-    sAnim_GoFasterNorth,
-    sAnim_GoFasterWest,
-    sAnim_GoFasterEast,
-    sAnim_GoFastestSouth,
-    sAnim_GoFastestNorth,
-    sAnim_GoFastestWest,
-    sAnim_GoFastestEast,
-    sAnim_RunSouth,
-    sAnim_RunNorth,
-    sAnim_RunWest,
-    sAnim_RunEast,
+    [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
+    [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
+    [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
+    [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
+    [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
+    [ANIM_STD_GO_NORTH] = sAnim_GoNorth,
+    [ANIM_STD_GO_WEST] = sAnim_GoWest,
+    [ANIM_STD_GO_EAST] = sAnim_GoEast,
+    [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
+    [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
+    [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
+    [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
+    [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
+    [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
+    [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
+    [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
+    [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
+    [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
+    [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
+    [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
+    [ANIM_RUN_SOUTH] = sAnim_RunSouth,
+    [ANIM_RUN_NORTH] = sAnim_RunNorth,
+    [ANIM_RUN_WEST] = sAnim_RunWest,
+    [ANIM_RUN_EAST] = sAnim_RunEast,
 };
 
 static const union AnimCmd *const sAnimTable_AcroBike[] = {
-    sAnim_FaceSouth,
-    sAnim_FaceNorth,
-    sAnim_FaceWest,
-    sAnim_FaceEast,
-    sAnim_GoSouth,
-    sAnim_GoNorth,
-    sAnim_GoWest,
-    sAnim_GoEast,
-    sAnim_GoFastSouth,
-    sAnim_GoFastNorth,
-    sAnim_GoFastWest,
-    sAnim_GoFastEast,
-    sAnim_GoFasterSouth,
-    sAnim_GoFasterNorth,
-    sAnim_GoFasterWest,
-    sAnim_GoFasterEast,
-    sAnim_GoFastestSouth,
-    sAnim_GoFastestNorth,
-    sAnim_GoFastestWest,
-    sAnim_GoFastestEast,
-    sAnim_BunnyHoppyBackWheelSouth,
-    sAnim_BunnyHoppyBackWheelNorth,
-    sAnim_BunnyHoppyBackWheelWest,
-    sAnim_BunnyHoppyBackWheelEast,
-    sAnim_BunnyHoppyFrontWheelSouth,
-    sAnim_BunnyHoppyFrontWheelNorth,
-    sAnim_BunnyHoppyFrontWheelWest,
-    sAnim_BunnyHoppyFrontWheelEast,
-    sAnim_StandingWheelieBackWheelSouth,
-    sAnim_StandingWheelieBackWheelNorth,
-    sAnim_StandingWheelieBackWheelWest,
-    sAnim_StandingWheelieBackWheelEast,
-    sAnim_StandingWheelieFrontWheelSouth,
-    sAnim_StandingWheelieFrontWheelNorth,
-    sAnim_StandingWheelieFrontWheelWest,
-    sAnim_StandingWheelieFrontWheelEast,
-    sAnim_MovingWheelieSouth,
-    sAnim_MovingWheelieNorth,
-    sAnim_MovingWheelieWest,
-    sAnim_MovingWheelieEast,
+    [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
+    [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
+    [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
+    [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
+    [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
+    [ANIM_STD_GO_NORTH] = sAnim_GoNorth,
+    [ANIM_STD_GO_WEST] = sAnim_GoWest,
+    [ANIM_STD_GO_EAST] = sAnim_GoEast,
+    [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
+    [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
+    [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
+    [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
+    [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
+    [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
+    [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
+    [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
+    [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
+    [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
+    [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
+    [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
+    [ANIM_BUNNY_HOPPY_BACK_WHEEL_SOUTH] = sAnim_BunnyHoppyBackWheelSouth,
+    [ANIM_BUNNY_HOPPY_BACK_WHEEL_NORTH] = sAnim_BunnyHoppyBackWheelNorth,
+    [ANIM_BUNNY_HOPPY_BACK_WHEEL_WEST] = sAnim_BunnyHoppyBackWheelWest,
+    [ANIM_BUNNY_HOPPY_BACK_WHEEL_EAST] = sAnim_BunnyHoppyBackWheelEast,
+    [ANIM_BUNNY_HOPPY_FRONT_WHEEL_SOUTH] = sAnim_BunnyHoppyFrontWheelSouth,
+    [ANIM_BUNNY_HOPPY_FRONT_WHEEL_NORTH] = sAnim_BunnyHoppyFrontWheelNorth,
+    [ANIM_BUNNY_HOPPY_FRONT_WHEEL_WEST] = sAnim_BunnyHoppyFrontWheelWest,
+    [ANIM_BUNNY_HOPPY_FRONT_WHEEL_EAST] = sAnim_BunnyHoppyFrontWheelEast,
+    [ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH] = sAnim_StandingWheelieBackWheelSouth,
+    [ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH] = sAnim_StandingWheelieBackWheelNorth,
+    [ANIM_STANDING_WHEELIE_BACK_WHEEL_WEST] = sAnim_StandingWheelieBackWheelWest,
+    [ANIM_STANDING_WHEELIE_BACK_WHEEL_EAST] = sAnim_StandingWheelieBackWheelEast,
+    [ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH] = sAnim_StandingWheelieFrontWheelSouth,
+    [ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH] = sAnim_StandingWheelieFrontWheelNorth,
+    [ANIM_STANDING_WHEELIE_FRONT_WHEEL_WEST] = sAnim_StandingWheelieFrontWheelWest,
+    [ANIM_STANDING_WHEELIE_FRONT_WHEEL_EAST] = sAnim_StandingWheelieFrontWheelEast,
+    [ANIM_MOVING_WHEELIE_SOUTH] = sAnim_MovingWheelieSouth,
+    [ANIM_MOVING_WHEELIE_NORTH] = sAnim_MovingWheelieNorth,
+    [ANIM_MOVING_WHEELIE_WEST] = sAnim_MovingWheelieWest,
+    [ANIM_MOVING_WHEELIE_EAST] = sAnim_MovingWheelieEast,
 };
 
 static const union AnimCmd *const sAnimTable_Surfing[] = {
-    sAnim_FaceSouth,
-    sAnim_FaceNorth,
-    sAnim_FaceWest,
-    sAnim_FaceEast,
-    sAnim_GoSouth,
-    sAnim_GoNorth,
-    sAnim_GoWest,
-    sAnim_GoEast,
-    sAnim_GoFastSouth,
-    sAnim_GoFastNorth,
-    sAnim_GoFastWest,
-    sAnim_GoFastEast,
-    sAnim_GoFasterSouth,
-    sAnim_GoFasterNorth,
-    sAnim_GoFasterWest,
-    sAnim_GoFasterEast,
-    sAnim_GoFastestSouth,
-    sAnim_GoFastestNorth,
-    sAnim_GoFastestWest,
-    sAnim_GoFastestEast,
-    sAnim_GetOnOffSurfBlobSouth,
-    sAnim_GetOnOffSurfBlobNorth,
-    sAnim_GetOnOffSurfBlobWest,
-    sAnim_GetOnOffSurfBlobEast,
+    [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
+    [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
+    [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
+    [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
+    [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
+    [ANIM_STD_GO_NORTH] = sAnim_GoNorth,
+    [ANIM_STD_GO_WEST] = sAnim_GoWest,
+    [ANIM_STD_GO_EAST] = sAnim_GoEast,
+    [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
+    [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
+    [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
+    [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
+    [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
+    [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
+    [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest,
+    [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast,
+    [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
+    [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
+    [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
+    [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
+    [ANIM_GET_ON_OFF_POKEMON_SOUTH] = sAnim_GetOnOffSurfBlobSouth,
+    [ANIM_GET_ON_OFF_POKEMON_NORTH] = sAnim_GetOnOffSurfBlobNorth,
+    [ANIM_GET_ON_OFF_POKEMON_WEST] = sAnim_GetOnOffSurfBlobWest,
+    [ANIM_GET_ON_OFF_POKEMON_EAST] = sAnim_GetOnOffSurfBlobEast,
 };
 
 static const union AnimCmd *const sAnimTable_Nurse[] = {
-    sAnim_FaceSouth,
-    sAnim_FaceNorth,
-    sAnim_FaceWest,
-    sAnim_FaceEast,
-    sAnim_GoSouth,
-    sAnim_GoNorth,
-    sAnim_GoWest,
-    sAnim_GoEast,
-    sAnim_GoFastSouth,
-    sAnim_GoFastNorth,
-    sAnim_GoFastWest,
-    sAnim_GoFastEast,
-    sAnim_GoFasterSouth,
-    sAnim_GoFasterNorth,
-    sAnim_GoFasterWest,
-    sAnim_GoFasterEast,
-    sAnim_GoFastestSouth,
-    sAnim_GoFastestNorth,
-    sAnim_GoFastestWest,
-    sAnim_GoFastestEast,
-    sAnim_NurseBow,
+    [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth,
+    [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth,
+    [ANIM_STD_FACE_WEST] = sAnim_FaceWest,
+    [ANIM_STD_FACE_EAST] = sAnim_FaceEast,
+    [ANIM_STD_GO_SOUTH] = sAnim_GoSouth,
+    [ANIM_STD_GO_NORTH] = sAnim_GoNorth,
+    [ANIM_STD_GO_WEST] = sAnim_GoWest,
+    [ANIM_STD_GO_EAST] = sAnim_GoEast,
+    [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth,
+    [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth,
+    [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest,
+    [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast,
+    [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth,
+    [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth,
+    [ANIM_STD_GO_FASTER_WEST]  = sAnim_GoFasterWest,
+    [ANIM_STD_GO_FASTER_EAST]  = sAnim_GoFasterEast,
+    [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth,
+    [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth,
+    [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest,
+    [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast,
+    [ANIM_NURSE_BOW] = sAnim_NurseBow,
 };
 
 static const union AnimCmd *const sAnimTable_FieldMove[] = {
-    sAnim_FieldMove,
+    [ANIM_FIELD_MOVE] = sAnim_FieldMove,
 };
 
 static const union AnimCmd *const sAnimTable_BerryTree[] = {
-    sAnim_BerryTreeStage0,
-    sAnim_BerryTreeStage1,
-    sAnim_BerryTreeStage2,
-    sAnim_BerryTreeStage3,
-    sAnim_BerryTreeStage4,
+    [BERRY_STAGE_PLANTED - 1] = sAnim_BerryTreeStage0,
+    [BERRY_STAGE_SPROUTED - 1] = sAnim_BerryTreeStage1,
+    [BERRY_STAGE_TALLER - 1] = sAnim_BerryTreeStage2,
+    [BERRY_STAGE_FLOWERING - 1] = sAnim_BerryTreeStage3,
+    [BERRY_STAGE_BERRIES - 1] = sAnim_BerryTreeStage4,
 };
 
 static const union AnimCmd *const sAnimTable_BreakableRock[] = {
-    sAnim_StayStill,
-    sAnim_RockBreak,
+    [ANIM_STAY_STILL] = sAnim_StayStill,
+    [ANIM_REMOVE_OBSTACLE] = sAnim_RockBreak,
 };
 
 static const union AnimCmd *const sAnimTable_CuttableTree[] = {
-    sAnim_StayStill,
-    sAnim_TreeCut,
+    [ANIM_STAY_STILL] = sAnim_StayStill,
+    [ANIM_REMOVE_OBSTACLE] = sAnim_TreeCut,
 };
 
 static const union AnimCmd *const sAnimTable_Fishing[] = {
-    sAnim_TakeOutRodSouth,
-    sAnim_TakeOutRodNorth,
-    sAnim_TakeOutRodWest,
-    sAnim_TakeOutRodEast,
-    sAnim_PutAwayRodSouth,
-    sAnim_PutAwayRodNorth,
-    sAnim_PutAwayRodWest,
-    sAnim_PutAwayRodEast,
-    sAnim_HookedPokemonSouth,
-    sAnim_HookedPokemonNorth,
-    sAnim_HookedPokemonWest,
-    sAnim_HookedPokemonEast,
+    [ANIM_TAKE_OUT_ROD_SOUTH] = sAnim_TakeOutRodSouth,
+    [ANIM_TAKE_OUT_ROD_NORTH] = sAnim_TakeOutRodNorth,
+    [ANIM_TAKE_OUT_ROD_WEST] = sAnim_TakeOutRodWest,
+    [ANIM_TAKE_OUT_ROD_EAST] = sAnim_TakeOutRodEast,
+    [ANIM_PUT_AWAY_ROD_SOUTH] = sAnim_PutAwayRodSouth,
+    [ANIM_PUT_AWAY_ROD_NORTH] = sAnim_PutAwayRodNorth,
+    [ANIM_PUT_AWAY_ROD_WEST] = sAnim_PutAwayRodWest,
+    [ANIM_PUT_AWAY_ROD_EAST] = sAnim_PutAwayRodEast,
+    [ANIM_HOOKED_POKEMON_SOUTH] = sAnim_HookedPokemonSouth,
+    [ANIM_HOOKED_POKEMON_NORTH] = sAnim_HookedPokemonNorth,
+    [ANIM_HOOKED_POKEMON_WEST] = sAnim_HookedPokemonWest,
+    [ANIM_HOOKED_POKEMON_EAST] = sAnim_HookedPokemonEast,
 };
 
 static const union AffineAnimCmd *const sAffineAnimTable_KyogreGroudon[] = {