mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

name more vehicle paint functions (#18520) 

* rename un-renamed vehicle paint functions

* fix unfixed names
This commit is contained in:
spacek531 2022-11-06 00:44:59 -07:00 committed by GitHub
parent d8447a70fd
commit 22a2d11cfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 78 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

248
src/openrct2/ride/VehiclePaint.cpp
View File

@ -1032,7 +1032,7 @@ static void VehicleSpritePaintRestraints(
#pragma region FlatSlope #pragma region FlatSlope
// 6D51DE // 6D51DE
static void VehicleSpriteFlatUnbanked( static void VehiclePitchFlatUnbanked(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
// Restraint animations are only drawn for vehicles that are in a cardinal direction (north, east, south, west) // Restraint animations are only drawn for vehicles that are in a cardinal direction (north, east, south, west)
@ -1048,7 +1048,7 @@ static void VehicleSpriteFlatUnbanked(
} }
// 6D4EE7 // 6D4EE7
static void vehicle_sprite_0_1( static void VehiclePitchFlatBankedLeft22(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (carEntry->GroupEnabled(SpriteGroupType::FlatBanked22)) if (carEntry->GroupEnabled(SpriteGroupType::FlatBanked22))
@ -1059,12 +1059,12 @@ static void vehicle_sprite_0_1(
} }
else else
{ {
VehicleSpriteFlatUnbanked(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatUnbanked(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D4F34 // 6D4F34
static void vehicle_sprite_0_2( static void VehiclePitchFlatBankedLeft45(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (carEntry->GroupEnabled(SpriteGroupType::FlatBanked45)) if (carEntry->GroupEnabled(SpriteGroupType::FlatBanked45))
@ -1075,12 +1075,12 @@ static void vehicle_sprite_0_2(
} }
else else
{ {
VehicleSpriteFlatUnbanked(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatUnbanked(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D4F0C // 6D4F0C
static void vehicle_sprite_0_3( static void VehiclePitchFlatBankedRight22(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (carEntry->GroupEnabled(SpriteGroupType::FlatBanked22)) if (carEntry->GroupEnabled(SpriteGroupType::FlatBanked22))
@ -1091,12 +1091,12 @@ static void vehicle_sprite_0_3(
} }
else else
{ {
VehicleSpriteFlatUnbanked(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatUnbanked(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D4F5C // 6D4F5C
static void vehicle_sprite_0_4( static void VehiclePitchFlatBankedRight45(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (carEntry->GroupEnabled(SpriteGroupType::FlatBanked45)) if (carEntry->GroupEnabled(SpriteGroupType::FlatBanked45))
@ -1107,12 +1107,12 @@ static void vehicle_sprite_0_4(
} }
else else
{ {
VehicleSpriteFlatUnbanked(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatUnbanked(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D4F84 // 6D4F84
static void vehicle_sprite_0_5( static void VehiclePitchFlatBankedLeft67(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)) if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES))
@ -1127,12 +1127,12 @@ static void vehicle_sprite_0_5(
} }
else else
{ {
vehicle_sprite_0_2(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft45(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D4FE4 // 6D4FE4
static void vehicle_sprite_0_6( static void VehiclePitchFlatBankedLeft90(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)) if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES))
@ -1147,12 +1147,12 @@ static void vehicle_sprite_0_6(
} }
else else
{ {
vehicle_sprite_0_2(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft45(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D5055 // 6D5055
static void vehicle_sprite_0_7( static void VehiclePitchFlatBankedLeft112(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)) if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES))
@ -1167,12 +1167,12 @@ static void vehicle_sprite_0_7(
} }
else else
{ {
vehicle_sprite_0_2(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft45(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D50C6 // 6D50C6
static void vehicle_sprite_0_8( static void VehiclePitchFlatBankedLeft135(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)) if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES))
@ -1187,12 +1187,12 @@ static void vehicle_sprite_0_8(
} }
else else
{ {
vehicle_sprite_0_2(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft45(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D5137 // 6D5137
static void vehicle_sprite_0_9( static void VehiclePitchFlatBankedLeft157(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)) if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES))
@ -1207,12 +1207,12 @@ static void vehicle_sprite_0_9(
} }
else else
{ {
vehicle_sprite_0_2(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft45(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D4FB1 // 6D4FB1
static void vehicle_sprite_0_10( static void VehiclePitchFlatBankedRight67(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)) if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES))
@ -1227,12 +1227,12 @@ static void vehicle_sprite_0_10(
} }
else else
{ {
vehicle_sprite_0_4(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight45(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D501B // 6D501B
static void vehicle_sprite_0_11( static void VehiclePitchFlatBankedRight90(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)) if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES))
@ -1247,12 +1247,12 @@ static void vehicle_sprite_0_11(
} }
else else
{ {
vehicle_sprite_0_4(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight45(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D508C // 6D508C
static void vehicle_sprite_0_12( static void VehiclePitchFlatBankedRight112(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)) if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES))
@ -1267,12 +1267,12 @@ static void vehicle_sprite_0_12(
} }
else else
{ {
vehicle_sprite_0_4(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight45(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D50FD // 6D50FD
static void vehicle_sprite_0_13( static void VehiclePitchFlatBankedRight135(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)) if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES))
@ -1287,12 +1287,12 @@ static void vehicle_sprite_0_13(
} }
else else
{ {
vehicle_sprite_0_4(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight45(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D516E // 6D516E
static void vehicle_sprite_0_14( static void VehiclePitchFlatBankedRight157(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)) if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES))
@ -1307,40 +1307,40 @@ static void vehicle_sprite_0_14(
} }
else else
{ {
vehicle_sprite_0_2(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft45(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D4EE4 // 6D4EE4
static void vehicle_sprite_0_16( static void VehiclePitchUninvertedFlatBankedLeft22(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
carEntry--; carEntry--;
vehicle_sprite_0_1(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft22(session, vehicle, imageDirection, z, carEntry);
} }
// 6D4F31 // 6D4F31
static void vehicle_sprite_0_17( static void VehiclePitchUninvertedFlatBankedLeft45(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
carEntry--; carEntry--;
vehicle_sprite_0_2(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft45(session, vehicle, imageDirection, z, carEntry);
} }
// 6D4F09 // 6D4F09
static void vehicle_sprite_0_18( static void VehiclePitchUninvertedFlatBankedRight22(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
carEntry--; carEntry--;
vehicle_sprite_0_3(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight22(session, vehicle, imageDirection, z, carEntry);
} }
// 6D4F59 // 6D4F59
static void vehicle_sprite_0_19( static void VehiclePitchUninvertedFlatBankedRight45(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
carEntry--; carEntry--;
vehicle_sprite_0_4(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight45(session, vehicle, imageDirection, z, carEntry);
} }
// 6D51D7 // 6D51D7
@ -1351,65 +1351,65 @@ static void VehiclePitchFlat(
switch (vehicle->bank_rotation) switch (vehicle->bank_rotation)
{ {
case 0: case 0:
VehicleSpriteFlatUnbanked(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatUnbanked(session, vehicle, imageDirection, z, carEntry);
break; break;
case 1: case 1:
vehicle_sprite_0_1(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft22(session, vehicle, imageDirection, z, carEntry);
break; break;
case 2: case 2:
vehicle_sprite_0_2(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft45(session, vehicle, imageDirection, z, carEntry);
break; break;
case 3: case 3:
vehicle_sprite_0_3(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight22(session, vehicle, imageDirection, z, carEntry);
break; break;
case 4: case 4:
vehicle_sprite_0_4(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight45(session, vehicle, imageDirection, z, carEntry);
break; break;
case 5: case 5:
vehicle_sprite_0_5(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft67(session, vehicle, imageDirection, z, carEntry);
break; break;
case 6: case 6:
vehicle_sprite_0_6(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft90(session, vehicle, imageDirection, z, carEntry);
break; break;
case 7: case 7:
vehicle_sprite_0_7(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft112(session, vehicle, imageDirection, z, carEntry);
break; break;
case 8: case 8:
vehicle_sprite_0_8(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft135(session, vehicle, imageDirection, z, carEntry);
break; break;
case 9: case 9:
vehicle_sprite_0_9(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedLeft157(session, vehicle, imageDirection, z, carEntry);
break; break;
case 10: case 10:
vehicle_sprite_0_10(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight67(session, vehicle, imageDirection, z, carEntry);
break; break;
case 11: case 11:
vehicle_sprite_0_11(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight90(session, vehicle, imageDirection, z, carEntry);
break; break;
case 12: case 12:
vehicle_sprite_0_12(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight112(session, vehicle, imageDirection, z, carEntry);
break; break;
case 13: case 13:
vehicle_sprite_0_13(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight135(session, vehicle, imageDirection, z, carEntry);
break; break;
case 14: case 14:
vehicle_sprite_0_14(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatBankedRight157(session, vehicle, imageDirection, z, carEntry);
break; break;
case 15: case 15:
// what is roll 15? // what is roll 15?
VehicleSpriteFlatUnbanked(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatUnbanked(session, vehicle, imageDirection, z, carEntry);
break; break;
case 16: case 16:
vehicle_sprite_0_16(session, vehicle, imageDirection, z, carEntry); VehiclePitchUninvertedFlatBankedLeft22(session, vehicle, imageDirection, z, carEntry);
break; break;
case 17: case 17:
vehicle_sprite_0_17(session, vehicle, imageDirection, z, carEntry); VehiclePitchUninvertedFlatBankedLeft45(session, vehicle, imageDirection, z, carEntry);
break; break;
case 18: case 18:
vehicle_sprite_0_18(session, vehicle, imageDirection, z, carEntry); VehiclePitchUninvertedFlatBankedRight22(session, vehicle, imageDirection, z, carEntry);
break; break;
case 19: case 19:
vehicle_sprite_0_19(session, vehicle, imageDirection, z, carEntry); VehiclePitchUninvertedFlatBankedRight45(session, vehicle, imageDirection, z, carEntry);
break; break;
} }
} }
@ -3132,7 +3132,7 @@ static void VehiclePitchCorkscrew(
} }
else else
{ {
VehicleSpriteFlatUnbanked(session, vehicle, imageDirection, z, carEntry); VehiclePitchFlatUnbanked(session, vehicle, imageDirection, z, carEntry);
} }
} }
@ -3143,7 +3143,7 @@ static void VehiclePitchCorkscrew(
#pragma region SlopeUp8 #pragma region SlopeUp8
// 6D4D67 // 6D4D67
static void vehicle_sprite_50_0( static void VehiclePitchUp8Unbanked(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (carEntry->GroupEnabled(SpriteGroupType::Slopes8)) if (carEntry->GroupEnabled(SpriteGroupType::Slopes8))
@ -3159,7 +3159,7 @@ static void vehicle_sprite_50_0(
} }
// 6D4DB5 // 6D4DB5
static void vehicle_sprite_50_1( static void VehiclePitchUp8BankedLeft22(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (carEntry->GroupEnabled(SpriteGroupType::Slopes8Banked22)) if (carEntry->GroupEnabled(SpriteGroupType::Slopes8Banked22))
@ -3170,12 +3170,12 @@ static void vehicle_sprite_50_1(
} }
else else
{ {
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry); VehiclePitchUp8Unbanked(session, vehicle, imageDirection, z, carEntry);
} }
} }
// 6D4DD3 // 6D4DD3
static void vehicle_sprite_50_3( static void VehiclePitchUp8BankedRight22(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (carEntry->GroupEnabled(SpriteGroupType::Slopes8Banked22)) if (carEntry->GroupEnabled(SpriteGroupType::Slopes8Banked22))
@ -3186,7 +3186,7 @@ static void vehicle_sprite_50_3(
} }
else else
{ {
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry); VehiclePitchUp8Unbanked(session, vehicle, imageDirection, z, carEntry);
} }
} }
@ -3198,64 +3198,18 @@ static void VehiclePitchUp8(
switch (vehicle->bank_rotation) switch (vehicle->bank_rotation)
{ {
case 0: case 0:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry); VehiclePitchUp8Unbanked(session, vehicle, imageDirection, z, carEntry);
break; break;
case 1: case 1:
vehicle_sprite_50_1(session, vehicle, imageDirection, z, carEntry); case 16:
break; VehiclePitchUp8BankedLeft22(session, vehicle, imageDirection, z, carEntry);
case 2:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break; break;
case 3: case 3:
vehicle_sprite_50_3(session, vehicle, imageDirection, z, carEntry);
break;
case 4:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 5:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 6:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 7:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 8:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 9:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 10:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 11:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 12:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 13:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 14:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 15:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 16:
vehicle_sprite_50_1(session, vehicle, imageDirection, z, carEntry);
break;
case 17:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry);
break;
case 18: case 18:
vehicle_sprite_50_3(session, vehicle, imageDirection, z, carEntry); VehiclePitchUp8BankedRight22(session, vehicle, imageDirection, z, carEntry);
break; break;
case 19: default:
vehicle_sprite_50_0(session, vehicle, imageDirection, z, carEntry); VehiclePitchUp8Unbanked(session, vehicle, imageDirection, z, carEntry);
break; break;
} }
} }
@ -3309,7 +3263,7 @@ static void VehiclePitchUp50(
#pragma region SlopeDown8 #pragma region SlopeDown8
// 6D4D90 // 6D4D90
static void vehicle_sprite_53_0( static void VehiclePitchDown8Unbanked(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (carEntry->GroupEnabled(SpriteGroupType::Slopes8)) if (carEntry->GroupEnabled(SpriteGroupType::Slopes8))
@ -3325,7 +3279,7 @@ static void vehicle_sprite_53_0(
} }
// 6D4DF4 // 6D4DF4
static void vehicle_sprite_53_1( static void VehiclePitchDown8BankedLeft22(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (carEntry->GroupEnabled(SpriteGroupType::Slopes8Banked22)) if (carEntry->GroupEnabled(SpriteGroupType::Slopes8Banked22))
@ -3341,7 +3295,7 @@ static void vehicle_sprite_53_1(
} }
// 6D4E15 // 6D4E15
static void vehicle_sprite_53_3( static void VehiclePitchDown8BankedRight22(
PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry) PaintSession& session, const Vehicle* vehicle, int32_t imageDirection, int32_t z, const CarEntry* carEntry)
{ {
if (carEntry->GroupEnabled(SpriteGroupType::Slopes8Banked22)) if (carEntry->GroupEnabled(SpriteGroupType::Slopes8Banked22))
@ -3364,64 +3318,18 @@ static void VehiclePitchDown8(
switch (vehicle->bank_rotation) switch (vehicle->bank_rotation)
{ {
case 0: case 0:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry); VehiclePitchDown8Unbanked(session, vehicle, imageDirection, z, carEntry);
break; break;
case 1: case 1:
vehicle_sprite_53_1(session, vehicle, imageDirection, z, carEntry); case 16:
break; VehiclePitchDown8BankedLeft22(session, vehicle, imageDirection, z, carEntry);
case 2:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break; break;
case 3: case 3:
vehicle_sprite_53_3(session, vehicle, imageDirection, z, carEntry);
break;
case 4:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 5:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 6:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 7:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 8:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 9:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 10:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 11:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 12:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 13:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 14:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 15:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 16:
vehicle_sprite_53_1(session, vehicle, imageDirection, z, carEntry);
break;
case 17:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry);
break;
case 18: case 18:
vehicle_sprite_53_3(session, vehicle, imageDirection, z, carEntry); VehiclePitchDown8BankedRight22(session, vehicle, imageDirection, z, carEntry);
break; break;
case 19: default:
vehicle_sprite_53_0(session, vehicle, imageDirection, z, carEntry); VehiclePitchDown8Unbanked(session, vehicle, imageDirection, z, carEntry);
break; break;
} }
} }