diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp
index 54aefffeab..44818b2259 100644
--- a/src/openrct2/ride/CableLift.cpp
+++ b/src/openrct2/ride/CableLift.cpp
@@ -287,7 +287,7 @@ bool Vehicle::CableLiftUpdateTrackMotionForwards()
 
         if (remaining_distance >= 13962)
         {
-            acceleration += Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+            acceleration += Geometry::getAccelerationFromPitch(pitch);
         }
     }
     return true;
@@ -338,7 +338,7 @@ bool Vehicle::CableLiftUpdateTrackMotionBackwards()
 
         nextVehiclePosition.z += GetRideTypeDescriptor(curRide->type).Heights.VehicleZOffset;
 
-        remaining_distance += OpenRCT2::RideVehicle::Geometry::getTranslationDistance(nextVehiclePosition - _vehicleCurPosition, false);
+        remaining_distance += Geometry::getTranslationDistance(nextVehiclePosition - _vehicleCurPosition, false);
 
         _vehicleCurPosition = nextVehiclePosition;
         Orientation = moveInfo->direction;
@@ -347,7 +347,7 @@ bool Vehicle::CableLiftUpdateTrackMotionBackwards()
 
         if (remaining_distance < 0)
         {
-            acceleration += Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+            acceleration += Geometry::getAccelerationFromPitch(pitch);
         }
     }
     return true;
@@ -378,7 +378,7 @@ int32_t Vehicle::CableLiftUpdateTrackMotion()
 
     for (Vehicle* vehicle = frontVehicle; vehicle != nullptr;)
     {
-        vehicle->acceleration = Geometry::kAccelerationFromPitch[EnumValue(vehicle->pitch)];
+        vehicle->acceleration = Geometry::getAccelerationFromPitch(vehicle->pitch);
         _vehicleUnkF64E10 = 1;
         vehicle->remaining_distance += _vehicleVelocityF64E0C;
 
@@ -399,7 +399,7 @@ int32_t Vehicle::CableLiftUpdateTrackMotion()
                     _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5;
                     _vehicleVelocityF64E0C -= vehicle->remaining_distance - 13962;
                     vehicle->remaining_distance = 13962;
-                    vehicle->acceleration += Geometry::kAccelerationFromPitch[EnumValue(vehicle->pitch)];
+                    vehicle->acceleration += Geometry::getAccelerationFromPitch(vehicle->pitch);
                     _vehicleUnkF64E10++;
                     continue;
                 }
@@ -412,7 +412,7 @@ int32_t Vehicle::CableLiftUpdateTrackMotion()
                 _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5;
                 _vehicleVelocityF64E0C -= vehicle->remaining_distance + 1;
                 vehicle->remaining_distance = -1;
-                vehicle->acceleration += Geometry::kAccelerationFromPitch[EnumValue(vehicle->pitch)];
+                vehicle->acceleration += Geometry::getAccelerationFromPitch(vehicle->pitch);
                 _vehicleUnkF64E10++;
             }
             vehicle->MoveTo(_vehicleCurPosition);
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index 5edcdb2e45..ac0dc5b6b2 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -5405,7 +5405,7 @@ void Vehicle::UpdateTrackMotionUpStopCheck() const
             gForces.LateralG = std::abs(gForces.LateralG);
             if (gForces.LateralG <= 150)
             {
-                if (Geometry::kAccelerationFromPitch[EnumValue(pitch)] < 0)
+                if (Geometry::getAccelerationFromPitch(pitch) < 0)
                 {
                     if (gForces.VerticalG > -40)
                     {
@@ -5431,7 +5431,7 @@ void Vehicle::UpdateTrackMotionUpStopCheck() const
         {
             auto gForces = GetGForces();
 
-            if (Geometry::kAccelerationFromPitch[EnumValue(pitch)] < 0)
+            if (Geometry::getAccelerationFromPitch(pitch) < 0)
             {
                 if (gForces.VerticalG > -45)
                 {
@@ -7260,7 +7260,6 @@ bool Vehicle::UpdateTrackMotionForwards(const CarEntry* carEntry, const Ride& cu
         // Loc6DB706
         const auto moveInfo = GetMoveInfo();
         trackType = GetTrackType();
-        uint8_t moveInfovehicleAnimationGroup;
         {
             auto nextVehiclePosition = TrackLocation
                 + CoordsXYZ{ moveInfo->x, moveInfo->y,
@@ -7289,8 +7288,6 @@ bool Vehicle::UpdateTrackMotionForwards(const CarEntry* carEntry, const Ride& cu
             roll = moveInfo->roll;
             pitch = moveInfo->pitch;
 
-            moveInfovehicleAnimationGroup = EnumValue(moveInfo->pitch);
-
             if ((carEntry->flags & CAR_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING) && moveInfo->pitch != VehiclePitch::flat)
             {
                 SwingSprite = 0;
@@ -7354,7 +7351,7 @@ bool Vehicle::UpdateTrackMotionForwards(const CarEntry* carEntry, const Ride& cu
             return true;
         }
 
-        acceleration += Geometry::kAccelerationFromPitch[moveInfovehicleAnimationGroup];
+        acceleration += Geometry::getAccelerationFromPitch(pitch);
         _vehicleUnkF64E10++;
     }
 }
@@ -7576,7 +7573,6 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
 
         // Loc6DBD42
         track_progress = newTrackProgress;
-        VehiclePitch moveInfoVehicleAnimationGroup;
         {
             const VehicleInfo* moveInfo = GetMoveInfo();
             auto nextVehiclePosition = TrackLocation
@@ -7589,7 +7585,6 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
             Orientation = moveInfo->direction;
             roll = moveInfo->roll;
             pitch = moveInfo->pitch;
-            moveInfoVehicleAnimationGroup = moveInfo->pitch;
 
             if ((carEntry->flags & CAR_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING) && pitch != VehiclePitch::flat)
             {
@@ -7650,7 +7645,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
         {
             return true;
         }
-        acceleration += Geometry::kAccelerationFromPitch[EnumValue(moveInfoVehicleAnimationGroup)];
+        acceleration += Geometry::getAccelerationFromPitch(pitch);
         _vehicleUnkF64E10++;
     }
 }
@@ -7671,7 +7666,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
             Loc6DCDE4(curRide);
             return Vehicle::UpdateMiniGolfSubroutineStatus::stop;
         }
-        acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+        acceleration = Geometry::getAccelerationFromPitch(pitch);
         _vehicleUnkF64E10++;
         return Vehicle::UpdateMiniGolfSubroutineStatus::restart;
     }
@@ -7693,7 +7688,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                 Loc6DCDE4(curRide);
                 return Vehicle::UpdateMiniGolfSubroutineStatus::stop;
             }
-            acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+            acceleration = Geometry::getAccelerationFromPitch(pitch);
             _vehicleUnkF64E10++;
             return Vehicle::UpdateMiniGolfSubroutineStatus::restart;
         }
@@ -7721,7 +7716,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                 Loc6DCDE4(curRide);
                 return Vehicle::UpdateMiniGolfSubroutineStatus::stop;
             }
-            acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+            acceleration = Geometry::getAccelerationFromPitch(pitch);
             _vehicleUnkF64E10++;
             return Vehicle::UpdateMiniGolfSubroutineStatus::restart;
         }
@@ -7738,7 +7733,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                 Loc6DCDE4(curRide);
                 return Vehicle::UpdateMiniGolfSubroutineStatus::stop;
             }
-            acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+            acceleration = Geometry::getAccelerationFromPitch(pitch);
             _vehicleUnkF64E10++;
             return Vehicle::UpdateMiniGolfSubroutineStatus::restart;
         }
@@ -7767,7 +7762,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                 Loc6DCDE4(curRide);
                 return Vehicle::UpdateMiniGolfSubroutineStatus::stop;
             }
-            acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+            acceleration = Geometry::getAccelerationFromPitch(pitch);
             _vehicleUnkF64E10++;
             return Vehicle::UpdateMiniGolfSubroutineStatus::restart;
         }
@@ -7784,7 +7779,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                 Loc6DCDE4(curRide);
                 return Vehicle::UpdateMiniGolfSubroutineStatus::stop;
             }
-            acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+            acceleration = Geometry::getAccelerationFromPitch(pitch);
             _vehicleUnkF64E10++;
             return Vehicle::UpdateMiniGolfSubroutineStatus::restart;
         }
@@ -7820,7 +7815,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                 Loc6DCDE4(curRide);
                 return Vehicle::UpdateMiniGolfSubroutineStatus::stop;
             }
-            acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+            acceleration = Geometry::getAccelerationFromPitch(pitch);
             _vehicleUnkF64E10++;
             return Vehicle::UpdateMiniGolfSubroutineStatus::restart;
         }
@@ -7859,7 +7854,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                 _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5;
                 _vehicleVelocityF64E0C -= remaining_distance + 1;
                 remaining_distance = -1;
-                acceleration += Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+                acceleration += Geometry::getAccelerationFromPitch(pitch);
                 _vehicleUnkF64E10++;
                 return UpdateMiniGolfSubroutineStatus::carryOn;
             }
@@ -7876,7 +7871,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                 {
                     Loc6DCDE4(curRide);
                 }
-                acceleration += Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+                acceleration += Geometry::getAccelerationFromPitch(pitch);
                 _vehicleUnkF64E10++;
                 return UpdateMiniGolfSubroutineStatus::carryOn;
             }
@@ -8034,7 +8029,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
             Loc6DCDE4(curRide);
             return UpdateMiniGolfSubroutineStatus::stop;
         }
-        acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+        acceleration = Geometry::getAccelerationFromPitch(pitch);
         _vehicleUnkF64E10++;
     }
 }
@@ -8052,7 +8047,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                 _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5;
                 _vehicleVelocityF64E0C -= remaining_distance + 1;
                 remaining_distance = -1;
-                acceleration += Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+                acceleration += Geometry::getAccelerationFromPitch(pitch);
                 _vehicleUnkF64E10++;
                 continue;
             }
@@ -8065,7 +8060,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                 _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5;
                 _vehicleVelocityF64E0C -= remaining_distance - 0x368A;
                 remaining_distance = 0x368A;
-                acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+                acceleration = Geometry::getAccelerationFromPitch(pitch);
                 _vehicleUnkF64E10++;
                 return Vehicle::UpdateMiniGolfSubroutineStatus::restart;
             }
@@ -8135,7 +8130,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
                         vEBP->velocity = vEDI->velocity >> 1;
                     }
                     _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_2;
-                    acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+                    acceleration = Geometry::getAccelerationFromPitch(pitch);
                     _vehicleUnkF64E10++;
                     return UpdateMiniGolfSubroutineStatus::restart;
                 }
@@ -8147,7 +8142,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
             Loc6DCDE4(curRide);
             return UpdateMiniGolfSubroutineStatus::stop;
         }
-        acceleration += Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+        acceleration += Geometry::getAccelerationFromPitch(pitch);
         _vehicleUnkF64E10++;
     }
 }
@@ -8161,7 +8156,7 @@ bool Vehicle::UpdateTrackMotionBackwards(const CarEntry* carEntry, const Ride& c
 void Vehicle::UpdateTrackMotionMiniGolfVehicle(const Ride& curRide, const RideObjectEntry& rideEntry, const CarEntry* carEntry)
 {
     _vehicleUnkF64E10 = 1;
-    acceleration = Geometry::kAccelerationFromPitch[EnumValue(pitch)];
+    acceleration = Geometry::getAccelerationFromPitch(pitch);
     if (!HasFlag(VehicleFlags::MoveSingleCar))
     {
         remaining_distance = _vehicleVelocityF64E0C + remaining_distance;
@@ -8487,7 +8482,7 @@ void Vehicle::UpdateTrackMotionPreUpdate(
     {
         car.UpdateAdditionalAnimation();
     }
-    car.acceleration = Geometry::kAccelerationFromPitch[EnumValue(car.pitch)];
+    car.acceleration = Geometry::getAccelerationFromPitch(car.pitch);
     _vehicleUnkF64E10 = 1;
 
     if (!car.HasFlag(VehicleFlags::MoveSingleCar))
@@ -8515,7 +8510,7 @@ void Vehicle::UpdateTrackMotionPreUpdate(
             {
                 break;
             }
-            car.acceleration += Geometry::kAccelerationFromPitch[EnumValue(car.pitch)];
+            car.acceleration += Geometry::getAccelerationFromPitch(car.pitch);
             _vehicleUnkF64E10++;
             continue;
         }
@@ -8533,7 +8528,7 @@ void Vehicle::UpdateTrackMotionPreUpdate(
         {
             break;
         }
-        car.acceleration = Geometry::kAccelerationFromPitch[EnumValue(car.pitch)];
+        car.acceleration = Geometry::getAccelerationFromPitch(car.pitch);
         _vehicleUnkF64E10++;
         continue;
     }
diff --git a/src/openrct2/ride/VehicleGeometry.h b/src/openrct2/ride/VehicleGeometry.h
index f7b48c1146..a7c5b65c14 100644
--- a/src/openrct2/ride/VehicleGeometry.h
+++ b/src/openrct2/ride/VehicleGeometry.h
@@ -39,4 +39,13 @@ namespace OpenRCT2::RideVehicle::Geometry
         return kSubpositionTranslationDistances[index];
     }
 
+    constexpr int32_t getAccelerationFromPitch(VehiclePitch pitch)
+    {
+        if (pitch >= VehiclePitch::pitchCount)
+        {
+            return 0;
+        }
+        return kAccelerationFromPitch[EnumValue(pitch)];
+    }
+
 } // namespace OpenRCT2::RideVehicle::Geometry