From f6d2db48dc0e1e06fc6fc3d0a47a8f308d334d45 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Fri, 23 Oct 2020 07:54:32 +0100 Subject: [PATCH] Name 98196C --- src/openrct2/paint/Paint.cpp | 59 +- src/openrct2/paint/Paint.h | 7 +- src/openrct2/paint/PaintHelpers.cpp | 12 +- src/openrct2/paint/Supports.cpp | 42 +- src/openrct2/paint/sprite/Paint.Misc.cpp | 14 +- .../paint/tile_element/Paint.Path.cpp | 4 +- .../paint/tile_element/Paint.Surface.cpp | 30 +- .../paint/tile_element/Paint.TileElement.cpp | 2 +- src/openrct2/ride/TrackPaint.cpp | 128 ++-- .../ride/coaster/BobsleighCoaster.cpp | 10 +- .../ride/coaster/BolligerMabillardTrack.cpp | 288 ++++---- .../ride/coaster/CompactInvertedCoaster.cpp | 254 +++---- .../ride/coaster/CorkscrewRollerCoaster.cpp | 196 ++--- .../ride/coaster/FlyingRollerCoaster.cpp | 480 ++++++------- src/openrct2/ride/coaster/GigaCoaster.cpp | 106 +-- .../ride/coaster/HeartlineTwisterCoaster.cpp | 2 +- src/openrct2/ride/coaster/HybridCoaster.cpp | 176 ++--- .../ride/coaster/InvertedHairpinCoaster.cpp | 32 +- .../ride/coaster/InvertedRollerCoaster.cpp | 366 +++++----- .../ride/coaster/JuniorRollerCoaster.cpp | 36 +- .../ride/coaster/LayDownRollerCoaster.cpp | 436 +++++------ .../ride/coaster/LimLaunchedRollerCoaster.cpp | 98 +-- .../ride/coaster/LoopingRollerCoaster.cpp | 202 +++--- src/openrct2/ride/coaster/MineRide.cpp | 26 +- .../ride/coaster/MineTrainCoaster.cpp | 66 +- .../ride/coaster/MiniRollerCoaster.cpp | 138 ++-- .../ride/coaster/MiniSuspendedCoaster.cpp | 138 ++-- .../coaster/MultiDimensionRollerCoaster.cpp | 130 ++-- .../ride/coaster/ReverserRollerCoaster.cpp | 40 +- .../coaster/SideFrictionRollerCoaster.cpp | 40 +- .../ride/coaster/StandUpRollerCoaster.cpp | 680 +++++++++--------- src/openrct2/ride/coaster/Steeplechase.cpp | 192 ++--- .../ride/coaster/SuspendedSwingingCoaster.cpp | 184 ++--- src/openrct2/ride/coaster/WildMouse.cpp | 6 +- .../ride/coaster/WoodenRollerCoaster.cpp | 128 ++-- src/openrct2/ride/coaster/WoodenWildMouse.cpp | 6 +- src/openrct2/ride/gentle/CarRide.cpp | 16 +- src/openrct2/ride/gentle/Dodgems.cpp | 2 +- src/openrct2/ride/gentle/Maze.cpp | 2 +- src/openrct2/ride/thrill/MagicCarpet.cpp | 2 +- .../ride/thrill/SwingingInverterShip.cpp | 6 +- src/openrct2/ride/thrill/SwingingShip.cpp | 24 +- src/openrct2/ride/transport/Monorail.cpp | 24 +- .../ride/transport/SuspendedMonorail.cpp | 28 +- src/openrct2/ride/water/DingySlide.cpp | 2 +- src/openrct2/ride/water/LogFlume.cpp | 4 +- src/openrct2/ride/water/SplashBoats.cpp | 12 +- src/openrct2/world/Location.hpp | 26 +- 48 files changed, 2429 insertions(+), 2473 deletions(-) diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 9c68264b8e..ba727be8fb 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -731,65 +731,18 @@ void PaintSessionFree([[maybe_unused]] paint_session* session) * @param z_offset (dx) * @return (ebp) paint_struct on success (CF == 0), nullptr on failure (CF == 1) */ -paint_struct* sub_98196C(paint_session* session, uint32_t image_id, const CoordsXYZ& offset, const CoordsXYZ& boundBoxSize) +paint_struct* PaintAddImageAsParent( + paint_session* session, uint32_t image_id, const CoordsXYZ& offset, const CoordsXYZ& boundBoxSize) { - session->LastPS = nullptr; - session->LastAttachedPS = nullptr; - - if (session->NoPaintStructsAvailable()) - { - return nullptr; - } - - auto g1Element = gfx_get_g1_element(image_id & 0x7FFFF); - if (g1Element == nullptr) - { - return nullptr; - } - - uint8_t swappedRotation = (session->CurrentRotation * 3) % 4; // swaps 1 and 3 - auto swappedRotCoord = CoordsXYZ{ offset.Rotate(swappedRotation), offset.z }; - swappedRotCoord += session->SpritePosition; - - const auto imagePos = translate_3d_to_2d_with_z(session->CurrentRotation, swappedRotCoord); - - if (!ImageWithinDPI(imagePos, *g1Element, session->DPI)) - { - return nullptr; - } - - const auto rotBoundBoxSize = RotateBoundBoxSize(boundBoxSize, session->CurrentRotation); - - paint_struct ps; - ps.image_id = image_id; - ps.x = imagePos.x; - ps.y = imagePos.y; - ps.bounds.x_end = swappedRotCoord.x + rotBoundBoxSize.x; - ps.bounds.y_end = swappedRotCoord.y + rotBoundBoxSize.y; - ps.bounds.z_end = swappedRotCoord.z + rotBoundBoxSize.z; - ps.bounds.x = swappedRotCoord.x; - ps.bounds.y = swappedRotCoord.y; - ps.bounds.z = swappedRotCoord.z; - ps.flags = 0; - ps.attached_ps = nullptr; - ps.children = nullptr; - ps.sprite_type = session->InteractionType; - ps.var_29 = 0; - ps.map_x = session->MapPosition.x; - ps.map_y = session->MapPosition.y; - ps.tileElement = reinterpret_cast(const_cast(session->CurrentlyDrawnItem)); - - auto* psPtr = session->AllocateRootPaintEntry(std::move(ps)); - PaintSessionAddPSToQuadrant(session, psPtr); - - return psPtr; + return PaintAddImageAsParent( + session, image_id, offset.x, offset.y, boundBoxSize.x, boundBoxSize.y, boundBoxSize.z, offset.z, 0, 0, 0); } -paint_struct* sub_98196C( +paint_struct* PaintAddImageAsParent( paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset) { - return sub_98196C( + return PaintAddImageAsParent( session, image_id, { x_offset, y_offset, z_offset }, { bound_box_length_x, bound_box_length_y, bound_box_length_z }); } diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h index ef1f5f8c5b..7f56349f1c 100644 --- a/src/openrct2/paint/Paint.h +++ b/src/openrct2/paint/Paint.h @@ -222,10 +222,11 @@ extern bool gPaintBoundingBoxes; extern bool gPaintBlockedTiles; extern bool gPaintWidePathsAsGhost; -paint_struct* sub_98196C( +paint_struct* PaintAddImageAsParent( paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset); -paint_struct* sub_98196C(paint_session* session, uint32_t image_id, const CoordsXYZ& offset, const CoordsXYZ& boundBoxSize); +paint_struct* PaintAddImageAsParent( + paint_session* session, uint32_t image_id, const CoordsXYZ& offset, const CoordsXYZ& boundBoxSize); paint_struct* PaintAddImageAsParent( paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x, @@ -242,7 +243,7 @@ paint_struct* PaintAddImageAsChild( paint_session* session, uint32_t image_id, const CoordsXYZ& offset, const CoordsXYZ& boundBoxLength, const CoordsXYZ& boundBoxOffset); -paint_struct* sub_98196C_rotated( +paint_struct* PaintAddImageAsParentRotated( paint_session* session, uint8_t direction, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset); paint_struct* PaintAddImageAsParentRotated( diff --git a/src/openrct2/paint/PaintHelpers.cpp b/src/openrct2/paint/PaintHelpers.cpp index 233dff97ad..e50c12f97e 100644 --- a/src/openrct2/paint/PaintHelpers.cpp +++ b/src/openrct2/paint/PaintHelpers.cpp @@ -11,19 +11,21 @@ #include "../ride/TrackPaint.h" #include "Paint.h" -paint_struct* sub_98196C_rotated( +paint_struct* PaintAddImageAsParentRotated( paint_session* session, uint8_t direction, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset) { if (direction & 1) { - return sub_98196C( - session, image_id, y_offset, x_offset, bound_box_length_y, bound_box_length_x, bound_box_length_z, z_offset); + return PaintAddImageAsParent( + session, image_id, { y_offset, x_offset, z_offset }, + { bound_box_length_y, bound_box_length_x, bound_box_length_z }); } else { - return sub_98196C( - session, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset); + return PaintAddImageAsParent( + session, image_id, { x_offset, y_offset, z_offset }, + { bound_box_length_x, bound_box_length_y, bound_box_length_z }); } } diff --git a/src/openrct2/paint/Supports.cpp b/src/openrct2/paint/Supports.cpp index a1fe3b43bf..1ed7334117 100644 --- a/src/openrct2/paint/Supports.cpp +++ b/src/openrct2/paint/Supports.cpp @@ -562,7 +562,7 @@ bool wooden_a_supports_paint_setup( if (drawFlatPiece) { int32_t imageId = WoodenSupportImageIds[supportType].flat | imageColourFlags; - sub_98196C(session, imageId, 0, 0, 32, 32, 0, z - 2); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, 0, z - 2); hasSupports = true; } @@ -574,7 +574,7 @@ bool wooden_a_supports_paint_setup( // Full support int32_t imageId = WoodenSupportImageIds[supportType].full | imageColourFlags; uint8_t ah = height == 2 ? 23 : 28; - sub_98196C(session, imageId, 0, 0, 32, 32, ah, z); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, ah, z); hasSupports = true; z += 32; height -= 2; @@ -584,7 +584,7 @@ bool wooden_a_supports_paint_setup( // Half support int32_t imageId = WoodenSupportImageIds[supportType].half | imageColourFlags; uint8_t ah = height == 1 ? 7 : 12; - sub_98196C(session, imageId, 0, 0, 32, 32, ah, z); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, ah, z); hasSupports = true; z += 16; height -= 1; @@ -742,7 +742,7 @@ bool wooden_b_supports_paint_setup( } else { - sub_98196C(session, WoodenSupportImageIds[supportType].flat | imageColourFlags, 0, 0, 32, 32, 0, baseHeight - 2); + PaintAddImageAsParent(session, WoodenSupportImageIds[supportType].flat | imageColourFlags, 0, 0, 32, 32, 0, baseHeight - 2); _9E32B1 = true; } } @@ -753,7 +753,7 @@ bool wooden_b_supports_paint_setup( { if (baseHeight & 0x10 || heightSteps == 1 || baseHeight + 16 == session->WaterHeight) { - sub_98196C( + PaintAddImageAsParent( session, WoodenSupportImageIds[supportType].half | imageColourFlags, 0, 0, 32, 32, ((heightSteps == 1) ? 7 : 12), baseHeight); heightSteps -= 1; @@ -762,7 +762,7 @@ bool wooden_b_supports_paint_setup( } else { - sub_98196C( + PaintAddImageAsParent( session, WoodenSupportImageIds[supportType].full | imageColourFlags, 0, 0, 32, 32, ((heightSteps == 2) ? 23 : 28), baseHeight); heightSteps -= 2; @@ -884,7 +884,7 @@ bool metal_a_supports_paint_setup( uint32_t image_id = _metalSupportTypeToCrossbeamImages[supportType][ebp]; image_id |= imageColourFlags; - sub_98196C(session, image_id, xOffset, yOffset, boundBoxLengthX, boundBoxLengthY, 1, height); + PaintAddImageAsParent(session, image_id, xOffset, yOffset, boundBoxLengthX, boundBoxLengthY, 1, height); segment = newSegment; } @@ -903,7 +903,7 @@ bool metal_a_supports_paint_setup( image_id += metal_supports_slope_image_map[supportSegments[segment].slope & TILE_ELEMENT_SURFACE_SLOPE_MASK]; image_id |= imageColourFlags; - sub_98196C(session, image_id, xOffset, yOffset, 0, 0, 5, supportSegments[segment].height); + PaintAddImageAsParent(session, image_id, xOffset, yOffset, 0, 0, 5, supportSegments[segment].height); height = supportSegments[segment].height + 6; } @@ -927,7 +927,7 @@ bool metal_a_supports_paint_setup( image_id += heightDiff - 1; image_id |= imageColourFlags; - sub_98196C(session, image_id, xOffset, yOffset, 0, 0, heightDiff - 1, height); + PaintAddImageAsParent(session, image_id, xOffset, yOffset, 0, 0, heightDiff - 1, height); } height += heightDiff; @@ -958,7 +958,7 @@ bool metal_a_supports_paint_setup( if (count == 3 && z == 0x10) image_id++; - sub_98196C(session, image_id, xOffset, yOffset, 0, 0, z - 1, height); + PaintAddImageAsParent(session, image_id, xOffset, yOffset, 0, 0, z - 1, height); height += z; } @@ -1077,7 +1077,7 @@ bool metal_b_supports_paint_setup( return true; // STC } - sub_98196C( + PaintAddImageAsParent( session, _metalSupportTypeToCrossbeamImages[supportType][ebp] | imageColourFlags, SupportBoundBoxes[originalSegment].x + loc_97B052[ebp].x, SupportBoundBoxes[originalSegment].y + loc_97B052[ebp].y, _97B062[ebp].x, _97B062[ebp].y, 1, baseHeight); @@ -1095,7 +1095,7 @@ bool metal_b_supports_paint_setup( uint32_t imageOffset = metal_supports_slope_image_map[supportSegments[segment].slope & TILE_ELEMENT_SURFACE_SLOPE_MASK]; uint32_t imageId = _97B15C[supportType].base_id + imageOffset; - sub_98196C( + PaintAddImageAsParent( session, imageId | imageColourFlags, SupportBoundBoxes[segment].x, SupportBoundBoxes[segment].y, 0, 0, 5, supportSegments[segment].height); @@ -1111,7 +1111,7 @@ bool metal_b_supports_paint_setup( heightDiff -= baseHeight; if (heightDiff > 0) { - sub_98196C( + PaintAddImageAsParent( session, (_97B15C[supportType].beam_id + (heightDiff - 1)) | imageColourFlags, SupportBoundBoxes[segment].x, SupportBoundBoxes[segment].y, 0, 0, heightDiff - 1, baseHeight); } @@ -1147,7 +1147,7 @@ bool metal_b_supports_paint_setup( } } - sub_98196C( + PaintAddImageAsParent( session, imageId | imageColourFlags, SupportBoundBoxes[segment].x, SupportBoundBoxes[segment].y, 0, 0, beamLength - 1, baseHeight); @@ -1234,7 +1234,7 @@ bool path_a_supports_paint_setup( if (session->Support.slope & 0x20) { // save dx2 - sub_98196C(session, (railingEntry->bridge_image + 48) | imageColourFlags, 0, 0, 32, 32, 0, baseHeight - 2); + PaintAddImageAsParent(session, (railingEntry->bridge_image + 48) | imageColourFlags, 0, 0, 32, 32, 0, baseHeight - 2); hasSupports = true; } else if (session->Support.slope & 0x10) @@ -1283,7 +1283,7 @@ bool path_a_supports_paint_setup( { uint32_t imageId = (supportType * 24) + railingEntry->bridge_image + 23; - sub_98196C(session, imageId | imageColourFlags, 0, 0, 32, 32, ((heightSteps == 1) ? 7 : 12), baseHeight); + PaintAddImageAsParent(session, imageId | imageColourFlags, 0, 0, 32, 32, ((heightSteps == 1) ? 7 : 12), baseHeight); heightSteps -= 1; baseHeight += 16; hasSupports = true; @@ -1292,7 +1292,7 @@ bool path_a_supports_paint_setup( { uint32_t imageId = (supportType * 24) + railingEntry->bridge_image + 22; - sub_98196C(session, imageId | imageColourFlags, 0, 0, 32, 32, ((heightSteps == 2) ? 23 : 28), baseHeight); + PaintAddImageAsParent(session, imageId | imageColourFlags, 0, 0, 32, 32, ((heightSteps == 2) ? 23 : 28), baseHeight); heightSteps -= 2; baseHeight += 32; hasSupports = true; @@ -1379,7 +1379,7 @@ bool path_b_supports_paint_setup( uint8_t imageOffset = metal_supports_slope_image_map[supportSegments[segment].slope & TILE_ELEMENT_SURFACE_SLOPE_MASK]; baseHeight = supportSegments[segment].height; - sub_98196C( + PaintAddImageAsParent( session, (railingEntry->bridge_image + 37 + imageOffset) | imageColourFlags, SupportBoundBoxes[segment].x, SupportBoundBoxes[segment].y, 0, 0, 5, baseHeight); baseHeight += 6; @@ -1398,7 +1398,7 @@ bool path_b_supports_paint_setup( if (heightDiff > 0) { - sub_98196C( + PaintAddImageAsParent( session, (railingEntry->bridge_image + 20 + (heightDiff - 1)) | imageColourFlags, SupportBoundBoxes[segment].x, SupportBoundBoxes[segment].y, 0, 0, heightDiff - 1, baseHeight); } @@ -1431,7 +1431,7 @@ bool path_b_supports_paint_setup( break; } - sub_98196C( + PaintAddImageAsParent( session, (railingEntry->bridge_image + 20 + (z - 1)) | imageColourFlags, SupportBoundBoxes[segment].x, SupportBoundBoxes[segment].y, 0, 0, (z - 1), baseHeight); @@ -1449,7 +1449,7 @@ bool path_b_supports_paint_setup( imageId += 1; } - sub_98196C( + PaintAddImageAsParent( session, imageId | imageColourFlags, SupportBoundBoxes[segment].x, SupportBoundBoxes[segment].y, 0, 0, (z - 1), baseHeight); diff --git a/src/openrct2/paint/sprite/Paint.Misc.cpp b/src/openrct2/paint/sprite/Paint.Misc.cpp index 2bc0d678c8..26f3c7ba7a 100644 --- a/src/openrct2/paint/sprite/Paint.Misc.cpp +++ b/src/openrct2/paint/sprite/Paint.Misc.cpp @@ -41,7 +41,7 @@ void misc_paint(paint_session* session, const SpriteBase* misc, int32_t imageDir if (particle == nullptr) return; uint32_t imageId = 22637 + (particle->frame / 256); - sub_98196C(session, imageId, 0, 0, 1, 1, 0, particle->z); + PaintAddImageAsParent(session, imageId, 0, 0, 1, 1, 0, particle->z); break; } @@ -73,7 +73,7 @@ void misc_paint(paint_session* session, const SpriteBase* misc, int32_t imageDir uint32_t imageId = vehicle_particle_base_sprites[particle->crashed_sprite_base] + particle->frame / 256; imageId = imageId | (particle->colour[0] << 19) | (particle->colour[1] << 24) | IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS; - sub_98196C(session, imageId, 0, 0, 1, 1, 0, particle->z); + PaintAddImageAsParent(session, imageId, 0, 0, 1, 1, 0, particle->z); break; } @@ -83,7 +83,7 @@ void misc_paint(paint_session* session, const SpriteBase* misc, int32_t imageDir if (particle == nullptr) return; uint32_t imageId = 22878 + (particle->frame / 256); - sub_98196C(session, imageId, 0, 0, 1, 1, 0, particle->z); + PaintAddImageAsParent(session, imageId, 0, 0, 1, 1, 0, particle->z); break; } @@ -93,7 +93,7 @@ void misc_paint(paint_session* session, const SpriteBase* misc, int32_t imageDir if (crashSplash == nullptr) return; uint32_t imageId = 22927 + (crashSplash->frame / 256); - sub_98196C(session, imageId, 0, 0, 1, 1, 0, crashSplash->z); + PaintAddImageAsParent(session, imageId, 0, 0, 1, 1, 0, crashSplash->z); break; } @@ -104,7 +104,7 @@ void misc_paint(paint_session* session, const SpriteBase* misc, int32_t imageDir if (flare == nullptr) return; uint32_t imageId = 22896 + (flare->frame / 256); - sub_98196C(session, imageId, 0, 0, 1, 1, 0, flare->z); + PaintAddImageAsParent(session, imageId, 0, 0, 1, 1, 0, flare->z); break; } @@ -158,7 +158,7 @@ void misc_paint(paint_session* session, const SpriteBase* misc, int32_t imageDir } imageId = imageId | (balloon->colour << 19) | IMAGE_TYPE_REMAP; - sub_98196C(session, imageId, 0, 0, 1, 1, 0, balloon->z); + PaintAddImageAsParent(session, imageId, 0, 0, 1, 1, 0, balloon->z); break; } @@ -171,7 +171,7 @@ void misc_paint(paint_session* session, const SpriteBase* misc, int32_t imageDir uint32_t imageId = duck->GetFrameImage(imageDirection); if (imageId != 0) { - sub_98196C(session, imageId, 0, 0, 1, 1, 0, duck->z); + PaintAddImageAsParent(session, imageId, 0, 0, 1, 1, 0, duck->z); } } break; diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index a9c42244de..1172160203 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -921,7 +921,7 @@ void path_paint(paint_session* session, uint16_t height, const TileElement* tile patrolAreaBaseZ += 16; } - sub_98196C(session, imageId | patrolColour << 19 | IMAGE_TYPE_REMAP, 16, 16, 1, 1, 0, patrolAreaBaseZ + 2); + PaintAddImageAsParent(session, imageId | patrolColour << 19 | IMAGE_TYPE_REMAP, 16, 16, 1, 1, 0, patrolAreaBaseZ + 2); } } @@ -935,7 +935,7 @@ void path_paint(paint_session* session, uint16_t height, const TileElement* tile uint32_t imageId = (SPR_HEIGHT_MARKER_BASE + heightMarkerBaseZ / 16) | COLOUR_GREY << 19 | IMAGE_TYPE_REMAP; imageId += get_height_marker_offset(); imageId -= gMapBaseZ; - sub_98196C(session, imageId, 16, 16, 1, 1, 0, heightMarkerBaseZ); + PaintAddImageAsParent(session, imageId, 16, 16, 1, 1, 0, heightMarkerBaseZ); } PathSurfaceEntry* footpathEntry = tile_element->AsPath()->GetSurfaceEntry(); diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index be91c6b59a..a7b9c6f60b 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -647,7 +647,7 @@ static void viewport_surface_draw_tile_side_bottom( if (curHeight != cornerHeight1 && curHeight != cornerHeight2) { uint32_t image_id = base_image_id + image_offset; - sub_98196C(session, image_id, offset.x, offset.y, bounds.x, bounds.y, 15, curHeight * COORDS_Z_PER_TINY_Z); + PaintAddImageAsParent(session, image_id, offset.x, offset.y, bounds.x, bounds.y, 15, curHeight * COORDS_Z_PER_TINY_Z); curHeight++; } } @@ -671,7 +671,7 @@ static void viewport_surface_draw_tile_side_bottom( } const uint32_t image_id = base_image_id + image_offset; - sub_98196C(session, image_id, offset.x, offset.y, bounds.x, bounds.y, 15, curHeight * COORDS_Z_PER_TINY_Z); + PaintAddImageAsParent(session, image_id, offset.x, offset.y, bounds.x, bounds.y, 15, curHeight * COORDS_Z_PER_TINY_Z); return; } @@ -686,7 +686,7 @@ static void viewport_surface_draw_tile_side_bottom( if (isWater || curHeight != tunnelArray[tunnelIndex].height) { - sub_98196C(session, base_image_id, offset.x, offset.y, bounds.x, bounds.y, 15, curHeight * COORDS_Z_PER_TINY_Z); + PaintAddImageAsParent(session, base_image_id, offset.x, offset.y, bounds.x, bounds.y, 15, curHeight * COORDS_Z_PER_TINY_Z); curHeight++; continue; @@ -863,7 +863,7 @@ static void viewport_surface_draw_tile_side_top( if (cur_height != cornerHeight1 && cur_height != cornerHeight2) { const uint32_t image_id = base_image_id + image_offset; - sub_98196C(session, image_id, offset.x, offset.y, bounds.x, bounds.y, 15, cur_height * COORDS_Z_PER_TINY_Z); + PaintAddImageAsParent(session, image_id, offset.x, offset.y, bounds.x, bounds.y, 15, cur_height * COORDS_Z_PER_TINY_Z); cur_height++; } } @@ -878,7 +878,7 @@ static void viewport_surface_draw_tile_side_top( while (cur_height < cornerHeight1 && cur_height < neighbourCornerHeight1) { - sub_98196C(session, base_image_id, offset.x, offset.y, bounds.x, bounds.y, 15, cur_height * COORDS_Z_PER_TINY_Z); + PaintAddImageAsParent(session, base_image_id, offset.x, offset.y, bounds.x, bounds.y, 15, cur_height * COORDS_Z_PER_TINY_Z); cur_height++; } @@ -894,7 +894,7 @@ static void viewport_surface_draw_tile_side_top( } const uint32_t image_id = base_image_id + image_offset; - sub_98196C(session, image_id, offset.x, offset.y, bounds.x, bounds.y, 15, cur_height * COORDS_Z_PER_TINY_Z); + PaintAddImageAsParent(session, image_id, offset.x, offset.y, bounds.x, bounds.y, 15, cur_height * COORDS_Z_PER_TINY_Z); } /** @@ -1027,7 +1027,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c image_id += get_height_marker_offset(); image_id -= gMapBaseZ; - sub_98196C(session, image_id, 16, 16, 1, 1, 0, height); + PaintAddImageAsParent(session, image_id, 16, 16, 1, 1, 0, height); } bool has_surface = false; @@ -1066,7 +1066,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c imageId |= 0x41880000; } - sub_98196C(session, imageId, 0, 0, 32, 32, -1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, -1, height); has_surface = true; } @@ -1109,7 +1109,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c image_id |= patrolColour << 19; paint_struct* backup = session->LastPS; - sub_98196C(session, image_id, 0, 0, 32, 32, 1, local_height); + PaintAddImageAsParent(session, image_id, 0, 0, 32, 32, 1, local_height); session->LastPS = backup; } } @@ -1123,11 +1123,11 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c { if ((spawn.x & 0xFFE0) == pos.x && (spawn.y & 0xFFE0) == pos.y) { - sub_98196C(session, SPR_TERRAIN_SELECTION_SQUARE_SIMPLE, 0, 0, 32, 32, 16, spawn.z); + PaintAddImageAsParent(session, SPR_TERRAIN_SELECTION_SQUARE_SIMPLE, 0, 0, 32, 32, 16, spawn.z); const int32_t offset = (direction_reverse(spawn.direction) + rotation) & 3; const uint32_t image_id = (PEEP_SPAWN_ARROW_0 + offset) | 0x20380000; - sub_98196C(session, image_id, 0, 0, 32, 32, 19, spawn.z); + PaintAddImageAsParent(session, image_id, 0, 0, 32, 32, 19, spawn.z); } } } @@ -1145,7 +1145,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c const CoordsXY& pos = session->MapPosition; const int32_t height2 = (tile_element_height({ pos.x + 16, pos.y + 16 })) + 3; paint_struct* backup = session->LastPS; - sub_98196C(session, SPR_LAND_OWNERSHIP_AVAILABLE, 16, 16, 1, 1, 0, height2); + PaintAddImageAsParent(session, SPR_LAND_OWNERSHIP_AVAILABLE, 16, 16, 1, 1, 0, height2); session->LastPS = backup; } } @@ -1162,7 +1162,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c const CoordsXY& pos = session->MapPosition; const int32_t height2 = tile_element_height({ pos.x + 16, pos.y + 16 }); paint_struct* backup = session->LastPS; - sub_98196C(session, SPR_LAND_CONSTRUCTION_RIGHTS_AVAILABLE, 16, 16, 1, 1, 0, height2 + 3); + PaintAddImageAsParent(session, SPR_LAND_CONSTRUCTION_RIGHTS_AVAILABLE, 16, 16, 1, 1, 0, height2 + 3); session->LastPS = backup; } } @@ -1217,7 +1217,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c const int32_t image_id = (SPR_TERRAIN_SELECTION_CORNER + byte_97B444[local_surfaceShape]) | 0x21300000; paint_struct* backup = session->LastPS; - sub_98196C(session, image_id, 0, 0, 32, 32, 1, local_height); + PaintAddImageAsParent(session, image_id, 0, 0, 32, 32, 1, local_height); session->LastPS = backup; } } @@ -1308,7 +1308,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c const int32_t image_id = (SPR_WATER_MASK + image_offset) | IMAGE_TYPE_REMAP | IMAGE_TYPE_TRANSPARENT | PALETTE_WATER << 19; - sub_98196C(session, image_id, 0, 0, 32, 32, -1, waterHeight); + PaintAddImageAsParent(session, image_id, 0, 0, 32, 32, -1, waterHeight); PaintAttachToPreviousPS(session, SPR_WATER_OVERLAY + image_offset, 0, 0); diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp index 902235f0a6..cfab5ba8de 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.cpp +++ b/src/openrct2/paint/tile_element/Paint.TileElement.cpp @@ -125,7 +125,7 @@ static void blank_tiles_paint(paint_session* session, int32_t x, int32_t y) session->SpritePosition.x = x; session->SpritePosition.y = y; session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE; - sub_98196C(session, SPR_BLANK_TILE, 0, 0, 32, 32, -1, 16); + PaintAddImageAsParent(session, SPR_BLANK_TILE, 0, 0, 32, 32, -1, 16); } bool gShowSupportSegmentHeights = false; diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index f2cce0faec..e9bfd4070b 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -364,7 +364,7 @@ static void track_paint_util_draw_station_impl( imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_SW_NE : SPR_STATION_PLATFORM_SW_NE) | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 0, 0, 32, 8, 1, height + fenceOffsetA); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 8, 1, height + fenceOffsetA); // height -= 5 (height) track_paint_util_draw_station_covers(session, EDGE_NW, hasFence, stationObj, coverHeight); // height += 5 (height + 5) @@ -382,7 +382,7 @@ static void track_paint_util_draw_station_impl( { imageId = SPR_STATION_PLATFORM_SW_NE | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 0, 24, 32, 8, 1, height + fenceOffsetA); + PaintAddImageAsParent(session, imageId, 0, 24, 32, 8, 1, height + fenceOffsetA); // height += 2 (height + 7) hasFence = track_paint_util_has_fence(EDGE_SE, position, tileElement, ride, session->CurrentRotation); @@ -400,19 +400,19 @@ static void track_paint_util_draw_station_impl( { imageId = SPR_STATION_FENCE_SW_NE | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 0, 31, 32, 1, 7, height + fenceOffsetB); + PaintAddImageAsParent(session, imageId, 0, 31, 32, 1, 7, height + fenceOffsetB); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::BeginStation && direction == 0) { // Addition: draw only small fence if there is an entrance/exit at the beginning imageId = SPR_STATION_FENCE_SMALL_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 31, 23, 1, 8, 7, height + fenceOffsetB); + PaintAddImageAsParent(session, imageId, 31, 23, 1, 8, 7, height + fenceOffsetB); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::EndStation && direction == 2) { // Addition: draw only small fence if there is an entrance/exit at the end imageId = SPR_STATION_LIGHT_BACK_NE_SW | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 31, 23, 1, 8, 7, height + fenceOffsetB); + PaintAddImageAsParent(session, imageId, 31, 23, 1, 8, 7, height + fenceOffsetB); } // height -= 7 (height) track_paint_util_draw_station_covers(session, EDGE_SE, hasFence, stationObj, coverHeight); @@ -421,12 +421,12 @@ static void track_paint_util_draw_station_impl( if (tileElement->AsTrack()->GetTrackType() == TrackElemType::BeginStation && direction == 0) { imageId = SPR_STATION_FENCE_SMALL_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 31, 0, 1, 8, 7, height + fenceOffsetB); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 8, 7, height + fenceOffsetB); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::EndStation && direction == 2) { imageId = SPR_STATION_LIGHT_BACK_NE_SW | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 31, 0, 1, 8, 7, height + fenceOffsetB); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 8, 7, height + fenceOffsetB); } } else if (direction == 1 || direction == 3) @@ -459,7 +459,7 @@ static void track_paint_util_draw_station_impl( imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_NW_SE : SPR_STATION_PLATFORM_NW_SE) | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 0, 0, 8, 32, 1, height + fenceOffsetA); + PaintAddImageAsParent(session, imageId, 0, 0, 8, 32, 1, height + fenceOffsetA); // height -= 5 (height) track_paint_util_draw_station_covers(session, EDGE_NE, hasFence, stationObj, coverHeight); // height += 5 (height + 5) @@ -477,7 +477,7 @@ static void track_paint_util_draw_station_impl( { imageId = SPR_STATION_PLATFORM_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 24, 0, 8, 32, 1, height + fenceOffsetA); + PaintAddImageAsParent(session, imageId, 24, 0, 8, 32, 1, height + fenceOffsetA); // height += 2 (height + 7) hasFence = track_paint_util_has_fence(EDGE_SW, position, tileElement, ride, session->CurrentRotation); @@ -495,19 +495,19 @@ static void track_paint_util_draw_station_impl( { imageId = SPR_STATION_FENCE_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 31, 0, 1, 32, 7, height + fenceOffsetB); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 32, 7, height + fenceOffsetB); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::BeginStation && direction == 3) { // Addition: draw only small fence if there is an entrance/exit at the beginning imageId = SPR_STATION_FENCE_SMALL_SW_NE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 23, 31, 8, 1, 7, height + fenceOffsetB); + PaintAddImageAsParent(session, imageId, 23, 31, 8, 1, 7, height + fenceOffsetB); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::EndStation && direction == 1) { // Addition: draw only small fence if there is an entrance/exit at the end imageId = SPR_STATION_LIGHT_BACK_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 23, 31, 8, 1, 7, height + fenceOffsetB); + PaintAddImageAsParent(session, imageId, 23, 31, 8, 1, 7, height + fenceOffsetB); } // height -= 7 (height) @@ -517,12 +517,12 @@ static void track_paint_util_draw_station_impl( if (tileElement->AsTrack()->GetTrackType() == TrackElemType::BeginStation && direction == 3) { imageId = SPR_STATION_FENCE_SMALL_SW_NE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 31, 8, 1, 7, height + fenceOffsetB); + PaintAddImageAsParent(session, imageId, 0, 31, 8, 1, 7, height + fenceOffsetB); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::EndStation && direction == 1) { imageId = SPR_STATION_LIGHT_BACK_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 31, 8, 1, 7, height + fenceOffsetB); + PaintAddImageAsParent(session, imageId, 0, 31, 8, 1, 7, height + fenceOffsetB); } } } @@ -572,7 +572,7 @@ void track_paint_util_draw_station_inverted( imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_SW_NE : SPR_STATION_PLATFORM_SW_NE) | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 0, 0, 32, 8, 1, height + 6); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 8, 1, height + 6); // height -= 5 (height) track_paint_util_draw_station_covers_2(session, EDGE_NW, hasFence, stationObj, height, stationVariant); // height += 5 (height + 5) @@ -590,7 +590,7 @@ void track_paint_util_draw_station_inverted( { imageId = SPR_STATION_PLATFORM_SW_NE | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 0, 24, 32, 8, 1, height + 6); + PaintAddImageAsParent(session, imageId, 0, 24, 32, 8, 1, height + 6); // height += 2 (height + 7) hasFence = track_paint_util_has_fence(EDGE_SE, position, tileElement, ride, session->CurrentRotation); @@ -608,19 +608,19 @@ void track_paint_util_draw_station_inverted( { imageId = SPR_STATION_INVERTED_FENCE_SW_NE | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 0, 31, 32, 1, 7, height + 8); + PaintAddImageAsParent(session, imageId, 0, 31, 32, 1, 7, height + 8); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::BeginStation && direction == 0) { // Addition: draw only small fence if there is an entrance/exit at the beginning imageId = SPR_STATION_FENCE_SMALL_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 31, 23, 1, 8, 7, height + 8); + PaintAddImageAsParent(session, imageId, 31, 23, 1, 8, 7, height + 8); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::EndStation && direction == 2) { // Addition: draw only small fence if there is an entrance/exit at the end imageId = SPR_STATION_LIGHT_BACK_NE_SW | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 31, 23, 1, 8, 7, height + 8); + PaintAddImageAsParent(session, imageId, 31, 23, 1, 8, 7, height + 8); } // height -= 7 (height) track_paint_util_draw_station_covers_2(session, EDGE_SE, hasFence, stationObj, height, stationVariant); @@ -629,12 +629,12 @@ void track_paint_util_draw_station_inverted( if (tileElement->AsTrack()->GetTrackType() == TrackElemType::BeginStation && direction == 0) { imageId = SPR_STATION_FENCE_SMALL_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 31, 0, 1, 8, 7, height + 8); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 8, 7, height + 8); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::EndStation && direction == 2) { imageId = SPR_STATION_LIGHT_BACK_NE_SW | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 31, 0, 1, 8, 7, height + 8); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 8, 7, height + 8); } } else if (direction == 1 || direction == 3) @@ -667,7 +667,7 @@ void track_paint_util_draw_station_inverted( imageId = (hasFence ? SPR_STATION_PLATFORM_FENCED_NW_SE : SPR_STATION_PLATFORM_NW_SE) | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 0, 0, 8, 32, 1, height + 6); + PaintAddImageAsParent(session, imageId, 0, 0, 8, 32, 1, height + 6); // height -= 5 (height) track_paint_util_draw_station_covers_2(session, EDGE_NE, hasFence, stationObj, height, stationVariant); // height += 5 (height + 5) @@ -685,7 +685,7 @@ void track_paint_util_draw_station_inverted( { imageId = SPR_STATION_PLATFORM_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 24, 0, 8, 32, 1, height + 6); + PaintAddImageAsParent(session, imageId, 24, 0, 8, 32, 1, height + 6); // height += 2 (height + 7) hasFence = track_paint_util_has_fence(EDGE_SW, position, tileElement, ride, session->CurrentRotation); @@ -703,19 +703,19 @@ void track_paint_util_draw_station_inverted( { imageId = SPR_STATION_INVERTED_FENCE_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; } - sub_98196C(session, imageId, 31, 0, 1, 32, 7, height + 8); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 32, 7, height + 8); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::BeginStation && direction == 3) { // Addition: draw only small fence if there is an entrance/exit at the beginning imageId = SPR_STATION_FENCE_SMALL_SW_NE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 23, 31, 8, 1, 7, height + 8); + PaintAddImageAsParent(session, imageId, 23, 31, 8, 1, 7, height + 8); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::EndStation && direction == 1) { // Addition: draw only small fence if there is an entrance/exit at the end imageId = SPR_STATION_LIGHT_BACK_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 23, 31, 8, 1, 7, height + 8); + PaintAddImageAsParent(session, imageId, 23, 31, 8, 1, 7, height + 8); } // height -= 7 (height) @@ -725,12 +725,12 @@ void track_paint_util_draw_station_inverted( if (tileElement->AsTrack()->GetTrackType() == TrackElemType::BeginStation && direction == 3) { imageId = SPR_STATION_FENCE_SMALL_SW_NE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 31, 8, 1, 7, height + 8); + PaintAddImageAsParent(session, imageId, 0, 31, 8, 1, 7, height + 8); } else if (tileElement->AsTrack()->GetTrackType() == TrackElemType::EndStation && direction == 1) { imageId = SPR_STATION_LIGHT_BACK_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 31, 8, 1, 7, height + 8); + PaintAddImageAsParent(session, imageId, 0, 31, 8, 1, 7, height + 8); } } } @@ -848,17 +848,17 @@ void track_paint_util_draw_station_platform( bool hasFence = track_paint_util_has_fence(EDGE_NE, position, tileElement, ride, session->CurrentRotation); uint32_t imageId = (hasFence ? SPR_STATION_NARROW_EDGE_FENCED_NE : SPR_STATION_NARROW_EDGE_NE) | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 0, 8, 32, 1, height + zOffset); + PaintAddImageAsParent(session, imageId, 0, 0, 8, 32, 1, height + zOffset); track_paint_util_draw_station_covers(session, EDGE_NE, hasFence, stationObj, height); imageId = SPR_STATION_NARROW_EDGE_SW | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 24, 0, 8, 32, 1, height + zOffset); + PaintAddImageAsParent(session, imageId, 24, 0, 8, 32, 1, height + zOffset); hasFence = track_paint_util_has_fence(EDGE_SW, position, tileElement, ride, session->CurrentRotation); if (hasFence) { imageId = SPR_STATION_FENCE_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 31, 0, 1, 32, 7, height + zOffset + 2); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 32, 7, height + zOffset + 2); } track_paint_util_draw_station_covers(session, EDGE_SW, hasFence, stationObj, height); } @@ -867,17 +867,17 @@ void track_paint_util_draw_station_platform( bool hasFence = track_paint_util_has_fence(EDGE_NW, position, tileElement, ride, session->CurrentRotation); uint32_t imageId = (hasFence ? SPR_STATION_NARROW_EDGE_FENCED_NW : SPR_STATION_NARROW_EDGE_NW) | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 0, 32, 8, 1, height + zOffset); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 8, 1, height + zOffset); track_paint_util_draw_station_covers(session, EDGE_NW, hasFence, stationObj, height); imageId = SPR_STATION_NARROW_EDGE_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 24, 32, 8, 1, height + zOffset); + PaintAddImageAsParent(session, imageId, 0, 24, 32, 8, 1, height + zOffset); hasFence = track_paint_util_has_fence(EDGE_SE, position, tileElement, ride, session->CurrentRotation); if (hasFence) { imageId = SPR_STATION_FENCE_SW_NE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 31, 32, 1, 7, height + zOffset + 2); + PaintAddImageAsParent(session, imageId, 0, 31, 32, 1, 7, height + zOffset + 2); } track_paint_util_draw_station_covers(session, EDGE_SE, hasFence, stationObj, height); } @@ -899,13 +899,13 @@ void track_paint_util_draw_pier( track_paint_util_draw_station_covers(session, EDGE_NE, hasFence, stationObj, height); imageId = SPR_STATION_PIER_EDGE_SW | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 24, 0, 8, 32, 1, height); + PaintAddImageAsParent(session, imageId, 24, 0, 8, 32, 1, height); hasFence = track_paint_util_has_fence(EDGE_SW, position, tileElement, ride, session->CurrentRotation); if (hasFence) { imageId = SPR_STATION_PIER_FENCE_SW | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 31, 0, 1, 32, 7, height + 2); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 32, 7, height + 2); } track_paint_util_draw_station_covers(session, EDGE_SW, hasFence, stationObj, height); } @@ -918,13 +918,13 @@ void track_paint_util_draw_pier( track_paint_util_draw_station_covers(session, EDGE_NW, hasFence, stationObj, height); imageId = SPR_STATION_PIER_EDGE_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 24, 32, 8, 1, height); + PaintAddImageAsParent(session, imageId, 0, 24, 32, 8, 1, height); hasFence = track_paint_util_has_fence(EDGE_SE, position, tileElement, ride, rotation); if (hasFence) { imageId = SPR_STATION_PIER_FENCE_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 31, 32, 1, 7, height + 2); + PaintAddImageAsParent(session, imageId, 0, 31, 32, 1, 7, height + 2); } track_paint_util_draw_station_covers(session, EDGE_SE, hasFence, stationObj, height); } @@ -1483,7 +1483,7 @@ void track_paint_util_right_quarter_turn_5_tiles_paint_3( const sprite_bb* spriteBB = &sprites[direction][sprite]; uint32_t imageId = spriteBB->sprite_id | colourFlags; - sub_98196C( + PaintAddImageAsParent( session, imageId, static_cast(spriteBB->offset.x), static_cast(spriteBB->offset.y), spriteBB->bb_size.x, spriteBB->bb_size.y, static_cast(spriteBB->bb_size.z), height + spriteBB->offset.z); } @@ -1742,7 +1742,7 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_4( const sprite_bb* spriteBB = &sprites[direction][sprite]; uint32_t imageId = spriteBB->sprite_id | colourFlags; - sub_98196C( + PaintAddImageAsParent( session, imageId, static_cast(spriteBB->offset.x), static_cast(spriteBB->offset.y), spriteBB->bb_size.x, spriteBB->bb_size.y, static_cast(spriteBB->bb_size.z), height + spriteBB->offset.z); } @@ -2028,24 +2028,24 @@ void track_paint_util_onride_photo_small_paint( switch (direction) { case 0: - sub_98196C(session, imageId, 26, 0, 1, 1, 19, height); - sub_98196C(session, imageId, 26, 31, 1, 1, 19, height); - sub_98196C(session, flashImageId, 6, 0, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 26, 0, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 26, 31, 1, 1, 19, height); + PaintAddImageAsParent(session, flashImageId, 6, 0, 1, 1, 19, height); break; case 1: - sub_98196C(session, imageId, 0, 6, 1, 1, 19, height); - sub_98196C(session, imageId, 31, 6, 1, 1, 19, height); - sub_98196C(session, flashImageId, 0, 26, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 0, 6, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 31, 6, 1, 1, 19, height); + PaintAddImageAsParent(session, flashImageId, 0, 26, 1, 1, 19, height); break; case 2: - sub_98196C(session, imageId, 6, 0, 1, 1, 19, height); - sub_98196C(session, imageId, 6, 31, 1, 1, 19, height); - sub_98196C(session, flashImageId, 26, 31, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 6, 0, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 6, 31, 1, 1, 19, height); + PaintAddImageAsParent(session, flashImageId, 26, 31, 1, 1, 19, height); break; case 3: - sub_98196C(session, imageId, 0, 26, 1, 1, 19, height); - sub_98196C(session, imageId, 31, 26, 1, 1, 19, height); - sub_98196C(session, flashImageId, 31, 6, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 0, 26, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 31, 26, 1, 1, 19, height); + PaintAddImageAsParent(session, flashImageId, 31, 6, 1, 1, 19, height); break; } } @@ -2066,24 +2066,24 @@ void track_paint_util_onride_photo_paint( switch (direction) { case 0: - sub_98196C(session, imageId, 26, 0, 1, 1, 19, height); - sub_98196C(session, imageId, 26, 31, 1, 1, 19, height); - sub_98196C(session, flashImageId, 6, 0, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 26, 0, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 26, 31, 1, 1, 19, height); + PaintAddImageAsParent(session, flashImageId, 6, 0, 1, 1, 19, height); break; case 1: - sub_98196C(session, imageId, 0, 6, 1, 1, 19, height); - sub_98196C(session, imageId, 31, 6, 1, 1, 19, height); - sub_98196C(session, flashImageId, 0, 26, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 0, 6, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 31, 6, 1, 1, 19, height); + PaintAddImageAsParent(session, flashImageId, 0, 26, 1, 1, 19, height); break; case 2: - sub_98196C(session, imageId, 6, 0, 1, 1, 19, height); - sub_98196C(session, imageId, 6, 31, 1, 1, 19, height); - sub_98196C(session, flashImageId, 26, 31, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 6, 0, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 6, 31, 1, 1, 19, height); + PaintAddImageAsParent(session, flashImageId, 26, 31, 1, 1, 19, height); break; case 3: - sub_98196C(session, imageId, 0, 26, 1, 1, 19, height); - sub_98196C(session, imageId, 31, 26, 1, 1, 19, height); - sub_98196C(session, flashImageId, 31, 6, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 0, 26, 1, 1, 19, height); + PaintAddImageAsParent(session, imageId, 31, 26, 1, 1, 19, height); + PaintAddImageAsParent(session, flashImageId, 31, 6, 1, 1, 19, height); break; } } diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index 17b8accd3d..74cda2c0dc 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -92,7 +92,7 @@ static void bobsleigh_rc_track_station( PaintAddImageAsParentRotated( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station(session, rideIndex, direction, height, tileElement); @@ -3516,7 +3516,7 @@ static void bobsleigh_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( @@ -3525,7 +3525,7 @@ static void bobsleigh_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 14574, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( @@ -3534,7 +3534,7 @@ static void bobsleigh_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 14575, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( @@ -3544,7 +3544,7 @@ static void bobsleigh_rc_track_on_ride_photo( break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index c8447c0052..3a1c52dd53 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -79,7 +79,7 @@ void bolliger_mabillard_track_station( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); } - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2( session, direction, height, session->TrackColours[SCHEME_SUPPORTS], supportType); @@ -1367,11 +1367,11 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17345, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17350, 0, 0, 32, 16, 3, height); break; case 2: @@ -1411,7 +1411,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17361, 0, 0, 16, 16, 3, height); break; } @@ -1431,11 +1431,11 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17352, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17357, 0, 0, 16, 32, 3, height); break; case 3: @@ -1540,11 +1540,11 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17335, 0, 0, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17340, 0, 0, 32, 16, 3, height); break; } @@ -1559,7 +1559,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17326, 0, 0, 16, 16, 3, height); break; case 1: @@ -1594,11 +1594,11 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17332, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17337, 0, 0, 16, 32, 3, height); break; case 3: @@ -1708,12 +1708,12 @@ void bolliger_mabillard_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17309, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17313, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -1745,12 +1745,12 @@ void bolliger_mabillard_track_s_bend_left( session, direction, session->TrackColours[SCHEME_TRACK] | 17314, 0, 0, 32, 26, 3, height, 0, 6, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17309, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17313, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -1848,11 +1848,11 @@ void bolliger_mabillard_track_s_bend_right( metal_a_supports_paint_setup(session, supportType, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17318, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17322, 0, 0, 32, 26, 3, height); break; } @@ -1867,11 +1867,11 @@ void bolliger_mabillard_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17318, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17322, 0, 0, 32, 26, 3, height); break; case 2: @@ -1939,22 +1939,22 @@ void bolliger_mabillard_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17594, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17602, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17601, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17609, 0, 6, 32, 20, 7, height); metal_a_supports_paint_setup(session, supportType, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -1974,22 +1974,22 @@ void bolliger_mabillard_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17595, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17603, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup(session, supportType, 4, 11, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17600, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17608, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -2033,19 +2033,19 @@ void bolliger_mabillard_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17597, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17605, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17598, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17606, 0, 16, 32, 16, 3, height + 32); break; } @@ -2066,19 +2066,19 @@ void bolliger_mabillard_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17598, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17606, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17597, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17605, 0, 0, 32, 16, 3, height + 32); break; } @@ -2121,22 +2121,22 @@ void bolliger_mabillard_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17600, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17608, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17595, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17603, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup(session, supportType, 4, 11, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -2152,22 +2152,22 @@ void bolliger_mabillard_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17601, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17609, 0, 6, 32, 20, 7, height); metal_a_supports_paint_setup(session, supportType, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17594, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17602, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -2201,19 +2201,19 @@ void bolliger_mabillard_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17625, 0, 6, 32, 20, 7, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17617, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17618, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17610, 0, 6, 32, 20, 3, height); break; } @@ -2228,22 +2228,22 @@ void bolliger_mabillard_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17624, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17616, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17619, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup(session, supportType, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17611, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -2280,19 +2280,19 @@ void bolliger_mabillard_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17622, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17614, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17621, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17613, 0, 0, 32, 16, 3, height + 32); break; } @@ -2308,19 +2308,19 @@ void bolliger_mabillard_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17621, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17613, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17622, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17614, 0, 16, 32, 16, 3, height + 32); break; } @@ -2356,22 +2356,22 @@ void bolliger_mabillard_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17619, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup(session, supportType, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17611, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17624, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17616, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -2382,19 +2382,19 @@ void bolliger_mabillard_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17618, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17610, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17625, 0, 6, 32, 20, 7, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17617, 0, 6, 32, 20, 3, height); break; } @@ -2656,19 +2656,19 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17375, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17377, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17379, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17373, 0, 6, 32, 20, 3, height); break; } @@ -2691,19 +2691,19 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17374, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17376, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17378, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17372, 6, 0, 20, 32, 3, height); break; } @@ -2734,19 +2734,19 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17364, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17366, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17368, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17370, 0, 6, 32, 20, 3, height); break; } @@ -2769,22 +2769,22 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17365, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17367, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17369, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17371, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -4203,28 +4203,28 @@ void bolliger_mabillard_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, supportType, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, supportType, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17146, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, supportType, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, supportType, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17147, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, supportType, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, supportType, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17146, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, supportType, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, supportType, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( @@ -8507,22 +8507,22 @@ void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17725, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17727, 0, 6, 32, 20, 3, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17731, 0, 6, 32, 1, 26, height, 0, 27, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17729, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17723, 0, 6, 32, 20, 3, height); break; } @@ -8545,19 +8545,19 @@ void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17724, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17726, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17728, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17722, 6, 0, 20, 32, 3, height); break; } @@ -8588,22 +8588,22 @@ void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17714, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17716, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17718, 0, 6, 32, 20, 3, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17730, 0, 6, 32, 1, 26, height, 0, 27, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17720, 0, 6, 32, 20, 3, height); break; } @@ -8626,22 +8626,22 @@ void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17715, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17717, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17719, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17721, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -8672,22 +8672,22 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17717, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17719, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17721, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17715, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -8710,22 +8710,22 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17716, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17718, 6, 0, 20, 32, 3, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17730, 6, 0, 1, 32, 26, height, 27, 0, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17720, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17714, 6, 0, 20, 32, 3, height); break; } @@ -8756,19 +8756,19 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17722, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17724, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17726, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17728, 0, 6, 32, 20, 3, height); break; } @@ -8791,22 +8791,22 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17723, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17725, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17727, 6, 0, 20, 32, 3, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17731, 6, 0, 1, 32, 26, height, 27, 0, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17729, 6, 0, 20, 32, 3, height); break; } @@ -8864,7 +8864,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18025, 0, 6, 32, 20, 3, height); break; case 1: @@ -8873,11 +8873,11 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18029, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18023, 0, 6, 32, 20, 3, height); break; } @@ -8900,7 +8900,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18024, 6, 0, 20, 32, 3, height); break; case 1: @@ -8914,7 +8914,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18022, 6, 0, 20, 32, 3, height); break; } @@ -8945,11 +8945,11 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18014, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18016, 0, 6, 32, 20, 3, height); break; case 2: @@ -8958,7 +8958,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18020, 0, 6, 32, 20, 3, height); break; } @@ -8981,7 +8981,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18015, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -8998,7 +8998,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( metal_a_supports_paint_setup(session, supportType, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18021, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -9080,7 +9080,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17979, 0, 0, 32, 16, 3, height); break; case 1: @@ -9125,7 +9125,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17995, 0, 0, 16, 16, 3, height); break; } @@ -9264,7 +9264,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17974, 0, 0, 32, 16, 3, height); break; } @@ -9279,7 +9279,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17960, 0, 0, 16, 16, 3, height); break; case 1: @@ -10312,19 +10312,19 @@ void bolliger_mabillard_track_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17626, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17634, 0, 6, 32, 20, 11, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17633, 0, 6, 32, 20, 9, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17641, 0, 6, 32, 20, 7, height); break; } @@ -10358,7 +10358,7 @@ void bolliger_mabillard_track_half_loop_up( metal_a_supports_paint_setup(session, supportType, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17640, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, supportType, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -10370,7 +10370,7 @@ void bolliger_mabillard_track_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17628, 16, 0, 2, 16, 119, height); break; case 1: @@ -10379,7 +10379,7 @@ void bolliger_mabillard_track_half_loop_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17631, 10, 16, 4, 12, 119, height); break; case 3: @@ -10399,19 +10399,19 @@ void bolliger_mabillard_track_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17629, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17637, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17630, 0, 16, 32, 12, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17638, 0, 16, 32, 12, 3, height + 32); break; } diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index 00135ce093..faa52ea5b5 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -741,11 +741,11 @@ static void compact_inverted_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26693, 0, 0, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26698, 0, 0, 32, 16, 3, height + 29); break; case 2: @@ -785,7 +785,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5( height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26687, 0, 0, 16, 16, 3, height + 29); break; } @@ -805,11 +805,11 @@ static void compact_inverted_rc_track_left_quarter_turn_5( height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26696, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26701, 0, 0, 16, 32, 3, height + 29); break; case 3: @@ -1102,11 +1102,11 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26737, 0, 0, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26742, 0, 0, 32, 16, 3, height + 29); break; case 2: @@ -1146,7 +1146,7 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5( height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26731, 0, 0, 16, 16, 3, height + 29); break; } @@ -1166,11 +1166,11 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5( height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26740, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26745, 0, 0, 16, 32, 3, height + 29); break; case 3: @@ -1607,19 +1607,19 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26949, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26954, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26959, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26964, 0, 6, 32, 20, 3, height + 29); break; } @@ -1643,19 +1643,19 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26950, 0, 0, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26955, 0, 0, 32, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26960, 0, 16, 32, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26965, 0, 16, 32, 16, 3, height + 29); break; } @@ -1670,19 +1670,19 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26951, 0, 16, 16, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26956, 16, 16, 16, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26961, 16, 0, 16, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26966, 0, 0, 16, 16, 3, height + 29); break; } @@ -1697,19 +1697,19 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26952, 16, 0, 16, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26957, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26962, 0, 0, 16, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26967, 16, 0, 16, 32, 3, height + 29); break; } @@ -1724,19 +1724,19 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26953, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26958, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26963, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26968, 6, 0, 20, 32, 3, height + 29); break; } @@ -1772,19 +1772,19 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26929, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26934, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26939, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26944, 0, 6, 32, 20, 3, height + 29); break; } @@ -1808,19 +1808,19 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26930, 0, 16, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26935, 0, 16, 32, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26940, 0, 0, 32, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26945, 0, 0, 32, 16, 3, height + 29); break; } @@ -1835,19 +1835,19 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26931, 0, 0, 16, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26936, 16, 0, 16, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26941, 16, 16, 16, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26946, 0, 16, 16, 16, 3, height + 29); break; } @@ -1862,19 +1862,19 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26932, 16, 0, 16, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26937, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26942, 0, 0, 16, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26947, 16, 0, 16, 32, 3, height + 29); break; } @@ -1889,19 +1889,19 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26933, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26938, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26943, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26948, 6, 0, 20, 32, 3, height + 29); break; } @@ -1993,11 +1993,11 @@ static void compact_inverted_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26642, 0, 0, 32, 26, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26646, 0, 0, 32, 26, 3, height + 29); break; case 2: @@ -2045,11 +2045,11 @@ static void compact_inverted_rc_track_s_bend_left( height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26642, 0, 0, 32, 26, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26646, 0, 0, 32, 26, 3, height + 29); break; } @@ -2174,11 +2174,11 @@ static void compact_inverted_rc_track_s_bend_right( height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26651, 0, 0, 32, 26, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26655, 0, 0, 32, 26, 3, height + 29); break; } @@ -2206,11 +2206,11 @@ static void compact_inverted_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26651, 0, 0, 32, 26, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26655, 0, 0, 32, 26, 3, height + 29); break; case 2: @@ -2958,7 +2958,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3( height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26712, 0, 0, 16, 16, 3, height + 29); break; case 2: @@ -3171,19 +3171,19 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26924, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26926, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26928, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26922, 0, 6, 32, 20, 3, height + 29); break; } @@ -3210,19 +3210,19 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26923, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26925, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26927, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26921, 6, 0, 20, 32, 3, height + 29); break; } @@ -3258,19 +3258,19 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26913, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26915, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26917, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26919, 0, 6, 32, 20, 3, height + 29); break; } @@ -3297,19 +3297,19 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26914, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26916, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26918, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26920, 6, 0, 20, 32, 3, height + 29); break; } @@ -3365,19 +3365,19 @@ static void compact_inverted_rc_track_left_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26993, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26999, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26998, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27004, 0, 6, 32, 20, 3, height + 29); break; } @@ -3400,19 +3400,19 @@ static void compact_inverted_rc_track_left_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26994, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27000, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26997, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27003, 0, 6, 32, 20, 3, height + 29); break; } @@ -3427,19 +3427,19 @@ static void compact_inverted_rc_track_left_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26995, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27001, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26996, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27002, 0, 6, 32, 20, 3, height); break; } @@ -3475,19 +3475,19 @@ static void compact_inverted_rc_track_right_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27005, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27011, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27010, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27016, 0, 6, 32, 20, 3, height + 29); break; } @@ -3510,19 +3510,19 @@ static void compact_inverted_rc_track_right_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27006, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27012, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27009, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27015, 0, 6, 32, 20, 3, height + 29); break; } @@ -3537,19 +3537,19 @@ static void compact_inverted_rc_track_right_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27007, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27013, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27008, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27014, 0, 6, 32, 20, 3, height); break; } @@ -3585,19 +3585,19 @@ static void compact_inverted_rc_track_left_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26996, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27002, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26995, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27001, 0, 6, 32, 20, 3, height); break; } @@ -3618,19 +3618,19 @@ static void compact_inverted_rc_track_left_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26997, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27003, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26994, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27000, 0, 6, 32, 20, 3, height + 29); break; } @@ -3645,19 +3645,19 @@ static void compact_inverted_rc_track_left_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26998, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27004, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26993, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26999, 0, 6, 32, 20, 3, height + 29); break; } @@ -3695,19 +3695,19 @@ static void compact_inverted_rc_track_right_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27008, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27014, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27007, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27013, 0, 6, 32, 20, 3, height); break; } @@ -3728,19 +3728,19 @@ static void compact_inverted_rc_track_right_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27009, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27015, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27006, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27012, 0, 6, 32, 20, 3, height + 29); break; } @@ -3755,19 +3755,19 @@ static void compact_inverted_rc_track_right_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27010, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27016, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27005, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27011, 0, 6, 32, 20, 3, height + 29); break; } @@ -5091,7 +5091,7 @@ static void compact_inverted_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -5101,7 +5101,7 @@ static void compact_inverted_rc_track_on_ride_photo( height + 29); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -5111,7 +5111,7 @@ static void compact_inverted_rc_track_on_ride_photo( height + 29); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -5121,7 +5121,7 @@ static void compact_inverted_rc_track_on_ride_photo( height + 29); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index 44dd108320..47da3b21d1 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -100,7 +100,7 @@ static void corkscrew_rc_track_station( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); } - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11); @@ -1398,11 +1398,11 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16511, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16516, 0, 0, 32, 16, 3, height); break; case 2: @@ -1442,7 +1442,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16527, 0, 0, 16, 16, 3, height); break; } @@ -1462,11 +1462,11 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16518, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16523, 0, 0, 16, 32, 3, height); break; case 3: @@ -1572,11 +1572,11 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16501, 0, 0, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16506, 0, 0, 32, 16, 3, height); break; } @@ -1591,7 +1591,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16492, 0, 0, 16, 16, 3, height); break; case 1: @@ -1626,11 +1626,11 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16498, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16503, 0, 0, 16, 32, 3, height); break; case 3: @@ -1743,13 +1743,13 @@ static void corkscrew_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16403, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16407, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -1782,13 +1782,13 @@ static void corkscrew_rc_track_s_bend_left( session, direction, session->TrackColours[SCHEME_TRACK] | 16408, 0, 0, 32, 26, 3, height, 0, 6, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16403, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16407, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -1890,11 +1890,11 @@ static void corkscrew_rc_track_s_bend_right( session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16412, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16416, 0, 0, 32, 26, 3, height); break; } @@ -1909,11 +1909,11 @@ static void corkscrew_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16412, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16416, 0, 0, 32, 26, 3, height); break; case 2: @@ -1984,25 +1984,25 @@ static void corkscrew_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16562, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16570, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16569, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16577, 0, 6, 32, 20, 7, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2023,25 +2023,25 @@ static void corkscrew_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16563, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16571, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16568, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16576, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2086,19 +2086,19 @@ static void corkscrew_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16565, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16573, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16566, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16574, 0, 16, 32, 16, 3, height + 32); break; } @@ -2119,19 +2119,19 @@ static void corkscrew_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16566, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16574, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16565, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16573, 0, 0, 32, 16, 3, height + 32); break; } @@ -2174,25 +2174,25 @@ static void corkscrew_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16568, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16576, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16563, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16571, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2209,25 +2209,25 @@ static void corkscrew_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16569, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16577, 0, 6, 32, 20, 7, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16562, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16570, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2263,19 +2263,19 @@ static void corkscrew_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16593, 0, 6, 32, 20, 7, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16585, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16586, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16578, 0, 6, 32, 20, 3, height); break; } @@ -2290,25 +2290,25 @@ static void corkscrew_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16592, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16584, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16587, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 12, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16579, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2346,19 +2346,19 @@ static void corkscrew_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16590, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16582, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16589, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16581, 0, 0, 32, 16, 3, height + 32); break; } @@ -2374,19 +2374,19 @@ static void corkscrew_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16589, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16581, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16590, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16582, 0, 16, 32, 16, 3, height + 32); break; } @@ -2422,25 +2422,25 @@ static void corkscrew_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16587, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 12, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16579, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16592, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16584, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2452,19 +2452,19 @@ static void corkscrew_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16586, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16578, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16593, 0, 6, 32, 20, 7, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16585, 0, 6, 32, 20, 3, height); break; } @@ -2729,19 +2729,19 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16541, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16543, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16545, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16539, 0, 6, 32, 20, 3, height); break; } @@ -2764,19 +2764,19 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16540, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16542, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16544, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16538, 6, 0, 20, 32, 3, height); break; } @@ -2808,19 +2808,19 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16530, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16532, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16534, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16536, 0, 6, 32, 20, 3, height); break; } @@ -2843,25 +2843,25 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16531, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16533, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16535, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16537, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2914,19 +2914,19 @@ static void corkscrew_rc_track_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16594, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16602, 0, 6, 32, 20, 11, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16601, 0, 6, 32, 20, 9, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16609, 0, 6, 32, 20, 7, height); break; } @@ -2963,7 +2963,7 @@ static void corkscrew_rc_track_half_loop_up( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16608, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2976,7 +2976,7 @@ static void corkscrew_rc_track_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16596, 16, 0, 2, 16, 119, height); break; case 1: @@ -2985,7 +2985,7 @@ static void corkscrew_rc_track_half_loop_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16599, 10, 16, 4, 12, 119, height); break; case 3: @@ -3005,19 +3005,19 @@ static void corkscrew_rc_track_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16597, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16605, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16598, 0, 16, 32, 12, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16606, 0, 16, 32, 12, 3, height + 32); break; } @@ -4589,28 +4589,28 @@ static void corkscrew_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16224, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16225, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16224, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index cddfef46ad..f52c95258f 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -178,7 +178,7 @@ static void flying_rc_track_station( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); } - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 11); track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11); @@ -1947,11 +1947,11 @@ static void flying_rc_track_banked_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27161, 0, 0, 32, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27166, 0, 0, 32, 16, 3, height + 24); break; case 2: @@ -1991,7 +1991,7 @@ static void flying_rc_track_banked_left_quarter_turn_5( 0, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27155, 0, 0, 16, 16, 3, height + 24); break; } @@ -2012,11 +2012,11 @@ static void flying_rc_track_banked_left_quarter_turn_5( 0, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27164, 0, 0, 16, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27169, 0, 0, 16, 32, 3, height + 24); break; case 3: @@ -2704,11 +2704,11 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17345, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17350, 0, 0, 32, 16, 3, height); break; case 2: @@ -2748,7 +2748,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17361, 0, 0, 16, 16, 3, height); break; } @@ -2769,11 +2769,11 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17352, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17357, 0, 0, 16, 32, 3, height); break; case 3: @@ -2839,19 +2839,19 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27317, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27322, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27327, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27332, 0, 6, 32, 20, 3, height + 24); break; } @@ -2876,19 +2876,19 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27318, 0, 0, 32, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27323, 0, 0, 32, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27328, 0, 16, 32, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27333, 0, 16, 32, 16, 3, height + 24); break; } @@ -2903,19 +2903,19 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27319, 0, 16, 16, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27324, 16, 16, 16, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27329, 16, 0, 16, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27334, 0, 0, 16, 16, 3, height + 24); break; } @@ -2931,19 +2931,19 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27320, 16, 0, 16, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27325, 0, 0, 16, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27330, 0, 0, 16, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27335, 16, 0, 16, 32, 3, height + 24); break; } @@ -2958,19 +2958,19 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27321, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27326, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27331, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27336, 6, 0, 20, 32, 3, height + 24); break; } @@ -3058,11 +3058,11 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17335, 0, 0, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17340, 0, 0, 32, 16, 3, height); break; } @@ -3077,7 +3077,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17326, 0, 0, 16, 16, 3, height); break; case 1: @@ -3113,11 +3113,11 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17332, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17337, 0, 0, 16, 32, 3, height); break; case 3: @@ -3183,19 +3183,19 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27297, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27302, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27307, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27312, 0, 6, 32, 20, 3, height + 24); break; } @@ -3220,19 +3220,19 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27298, 0, 16, 32, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27303, 0, 16, 32, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27308, 0, 0, 32, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27313, 0, 0, 32, 16, 3, height + 24); break; } @@ -3247,19 +3247,19 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27299, 0, 0, 16, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27304, 16, 0, 16, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27309, 16, 16, 16, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27314, 0, 16, 16, 16, 3, height + 24); break; } @@ -3275,19 +3275,19 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27300, 16, 0, 16, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27305, 0, 0, 16, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27310, 0, 0, 16, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27315, 16, 0, 16, 32, 3, height + 24); break; } @@ -3302,19 +3302,19 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27301, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27306, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27311, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27316, 6, 0, 20, 32, 3, height + 24); break; } @@ -3407,13 +3407,13 @@ static void flying_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17309, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17313, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -3450,13 +3450,13 @@ static void flying_rc_track_s_bend_left( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17309, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17313, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -3748,11 +3748,11 @@ static void flying_rc_track_s_bend_right( session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17318, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17322, 0, 0, 32, 26, 3, height); break; } @@ -3767,11 +3767,11 @@ static void flying_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17318, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17322, 0, 0, 32, 26, 3, height); break; case 2: @@ -4528,19 +4528,19 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17375, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17377, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17379, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17373, 0, 6, 32, 20, 3, height); break; } @@ -4565,19 +4565,19 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17374, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17376, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17378, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17372, 6, 0, 20, 32, 3, height); break; } @@ -4607,19 +4607,19 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27422, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27424, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27426, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27420, 0, 6, 32, 20, 3, height + 24); break; } @@ -4647,19 +4647,19 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27421, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27423, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27425, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27419, 6, 0, 20, 32, 3, height + 24); break; } @@ -4699,19 +4699,19 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17364, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17366, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17368, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17370, 0, 6, 32, 20, 3, height); break; } @@ -4736,25 +4736,25 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17365, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17367, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17369, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17371, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4784,19 +4784,19 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27411, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27413, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27415, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27417, 0, 6, 32, 20, 3, height + 24); break; } @@ -4824,19 +4824,19 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27412, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27414, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27416, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27418, 6, 0, 20, 32, 3, height + 24); break; } @@ -7297,7 +7297,7 @@ static void flying_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7306,7 +7306,7 @@ static void flying_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 17146, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7315,7 +7315,7 @@ static void flying_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 17147, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7324,7 +7324,7 @@ static void flying_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 17146, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7343,7 +7343,7 @@ static void flying_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7353,7 +7353,7 @@ static void flying_rc_track_on_ride_photo( height + 24); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7363,7 +7363,7 @@ static void flying_rc_track_on_ride_photo( height + 24); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7373,7 +7373,7 @@ static void flying_rc_track_on_ride_photo( height + 24); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -14348,19 +14348,19 @@ static void flying_rc_track_left_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27430, 0, 6, 32, 20, 3, height - 5); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27436, 0, 6, 32, 20, 3, height - 5); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27429, 0, 6, 32, 20, 3, height - 5); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27435, 0, 6, 32, 20, 3, height - 5); break; } @@ -14386,15 +14386,15 @@ static void flying_rc_track_left_flyer_twist_up( height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27437, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27428, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27434, 0, 6, 32, 20, 3, height + 24); break; } @@ -14414,15 +14414,15 @@ static void flying_rc_track_left_flyer_twist_up( height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27438, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27427, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27433, 0, 6, 32, 20, 3, height + 24); break; } @@ -14460,19 +14460,19 @@ static void flying_rc_track_right_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27442, 0, 6, 32, 20, 3, height - 5); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27448, 0, 6, 32, 20, 3, height - 5); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27441, 0, 6, 32, 20, 3, height - 5); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27447, 0, 6, 32, 20, 3, height - 5); break; } @@ -14493,19 +14493,19 @@ static void flying_rc_track_right_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27443, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27449, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27440, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27446, 0, 6, 32, 20, 3, height + 24); break; } @@ -14520,19 +14520,19 @@ static void flying_rc_track_right_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27444, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27450, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27439, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27445, 0, 6, 32, 20, 3, height + 24); break; } @@ -14570,11 +14570,11 @@ static void flying_rc_track_left_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27427, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27433, 0, 6, 32, 20, 3, height + 24); break; case 2: @@ -14583,7 +14583,7 @@ static void flying_rc_track_left_flyer_twist_down( height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27438, 0, 6, 32, 20, 3, height + 24); break; } @@ -14606,11 +14606,11 @@ static void flying_rc_track_left_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27428, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27434, 0, 6, 32, 20, 3, height + 24); break; case 2: @@ -14619,7 +14619,7 @@ static void flying_rc_track_left_flyer_twist_down( height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27437, 0, 6, 32, 20, 3, height + 24); break; } @@ -14634,19 +14634,19 @@ static void flying_rc_track_left_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27429, 0, 6, 32, 20, 3, height - 5); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27435, 0, 6, 32, 20, 3, height - 5); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27430, 0, 6, 32, 20, 3, height - 5); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27436, 0, 6, 32, 20, 3, height - 5); break; } @@ -14682,19 +14682,19 @@ static void flying_rc_track_right_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27439, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27445, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27444, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27450, 0, 6, 32, 20, 3, height + 24); break; } @@ -14717,19 +14717,19 @@ static void flying_rc_track_right_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27440, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27446, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27443, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27449, 0, 6, 32, 20, 3, height + 24); break; } @@ -14744,19 +14744,19 @@ static void flying_rc_track_right_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27441, 0, 6, 32, 20, 3, height - 5); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27447, 0, 6, 32, 20, 3, height - 5); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27442, 0, 6, 32, 20, 3, height - 5); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27448, 0, 6, 32, 20, 3, height - 5); break; } @@ -14792,19 +14792,19 @@ static void flying_rc_track_flyer_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17626, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17634, 0, 6, 32, 20, 11, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17633, 0, 6, 32, 20, 9, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17641, 0, 6, 32, 20, 7, height); break; } @@ -14842,7 +14842,7 @@ static void flying_rc_track_flyer_half_loop_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17640, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -14855,7 +14855,7 @@ static void flying_rc_track_flyer_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17628, 16, 0, 2, 16, 119, height); break; case 1: @@ -14864,7 +14864,7 @@ static void flying_rc_track_flyer_half_loop_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17631, 10, 16, 4, 12, 119, height); break; case 3: @@ -14884,19 +14884,19 @@ static void flying_rc_track_flyer_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17629, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17637, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17630, 0, 16, 32, 12, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17638, 0, 16, 32, 12, 3, height + 32); break; } @@ -14922,19 +14922,19 @@ static void flying_rc_track_flyer_half_loop_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17629, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17637, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17630, 0, 16, 32, 12, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17638, 0, 16, 32, 12, 3, height + 32); break; } @@ -14950,7 +14950,7 @@ static void flying_rc_track_flyer_half_loop_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17628, 16, 0, 2, 16, 119, height); break; case 1: @@ -14959,7 +14959,7 @@ static void flying_rc_track_flyer_half_loop_down( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17631, 10, 16, 4, 12, 119, height); break; case 3: @@ -14999,7 +14999,7 @@ static void flying_rc_track_flyer_half_loop_down( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17640, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -15012,19 +15012,19 @@ static void flying_rc_track_flyer_half_loop_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17626, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17634, 0, 6, 32, 20, 11, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17633, 0, 6, 32, 20, 9, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17641, 0, 6, 32, 20, 7, height); break; } @@ -15112,7 +15112,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18025, 0, 6, 32, 20, 3, height); break; case 1: @@ -15121,11 +15121,11 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18029, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18023, 0, 6, 32, 20, 3, height); break; } @@ -15150,7 +15150,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18024, 6, 0, 20, 32, 3, height); break; case 1: @@ -15164,7 +15164,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18022, 6, 0, 20, 32, 3, height); break; } @@ -15194,19 +15194,19 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27762, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27764, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27766, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27760, 0, 6, 32, 20, 3, height + 24); break; } @@ -15234,19 +15234,19 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27761, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27763, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27765, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27759, 6, 0, 20, 32, 3, height + 24); break; } @@ -15286,11 +15286,11 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18014, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18016, 0, 6, 32, 20, 3, height); break; case 2: @@ -15299,7 +15299,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18020, 0, 6, 32, 20, 3, height); break; } @@ -15324,7 +15324,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18015, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -15344,7 +15344,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18021, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -15374,19 +15374,19 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27751, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27753, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27755, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27757, 0, 6, 32, 20, 3, height + 24); break; } @@ -15414,19 +15414,19 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27752, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27754, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27756, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27758, 6, 0, 20, 32, 3, height + 24); break; } @@ -15524,7 +15524,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17979, 0, 0, 32, 16, 3, height); break; case 1: @@ -15569,7 +15569,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17995, 0, 0, 16, 16, 3, height); break; } @@ -15662,19 +15662,19 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27787, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27792, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27797, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27802, 0, 6, 32, 20, 3, height + 24); break; } @@ -15699,19 +15699,19 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27788, 0, 0, 32, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27793, 0, 0, 32, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27798, 0, 16, 32, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27803, 0, 16, 32, 16, 3, height + 24); break; } @@ -15726,19 +15726,19 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27789, 0, 16, 16, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27794, 16, 16, 16, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27799, 16, 0, 16, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27804, 0, 0, 16, 16, 3, height + 24); break; } @@ -15754,19 +15754,19 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27790, 16, 0, 16, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27795, 0, 0, 16, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27800, 0, 0, 16, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27805, 16, 0, 16, 32, 3, height + 24); break; } @@ -15781,19 +15781,19 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27791, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27796, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27801, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27806, 6, 0, 20, 32, 3, height + 24); break; } @@ -15886,7 +15886,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17974, 0, 0, 32, 16, 3, height); break; } @@ -15901,7 +15901,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17960, 0, 0, 16, 16, 3, height); break; case 1: @@ -16009,19 +16009,19 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27767, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27772, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27777, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27782, 0, 6, 32, 20, 3, height + 24); break; } @@ -16046,19 +16046,19 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27768, 0, 16, 32, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27773, 0, 16, 32, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27778, 0, 0, 32, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27783, 0, 0, 32, 16, 3, height + 24); break; } @@ -16073,19 +16073,19 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27769, 0, 0, 16, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27774, 16, 0, 16, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27779, 16, 16, 16, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27784, 0, 16, 16, 16, 3, height + 24); break; } @@ -16101,19 +16101,19 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27770, 16, 0, 16, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27775, 0, 0, 16, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27780, 0, 0, 16, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27785, 16, 0, 16, 32, 3, height + 24); break; } @@ -16128,19 +16128,19 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27771, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27776, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27781, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27786, 6, 0, 20, 32, 3, height + 24); break; } diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 16080396c2..54be599157 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -119,7 +119,7 @@ static void giga_rc_track_station( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); } - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11); @@ -1495,11 +1495,11 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18275, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18280, 0, 0, 32, 16, 3, height); break; case 2: @@ -1539,7 +1539,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18291, 0, 0, 16, 16, 3, height); break; } @@ -1559,11 +1559,11 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18282, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18287, 0, 0, 16, 32, 3, height); break; case 3: @@ -1669,11 +1669,11 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18265, 0, 0, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18270, 0, 0, 32, 16, 3, height); break; } @@ -1688,7 +1688,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18256, 0, 0, 16, 16, 3, height); break; case 1: @@ -1723,11 +1723,11 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18262, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18267, 0, 0, 16, 32, 3, height); break; case 3: @@ -1838,13 +1838,13 @@ static void giga_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18239, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18243, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -1877,13 +1877,13 @@ static void giga_rc_track_s_bend_left( session, direction, session->TrackColours[SCHEME_TRACK] | 18244, 0, 0, 32, 26, 3, height, 0, 6, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18239, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18243, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -1985,11 +1985,11 @@ static void giga_rc_track_s_bend_right( session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18248, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18252, 0, 0, 32, 26, 3, height); break; } @@ -2004,11 +2004,11 @@ static void giga_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18248, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18252, 0, 0, 32, 26, 3, height); break; case 2: @@ -2312,19 +2312,19 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18305, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18307, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18309, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18303, 0, 6, 32, 20, 3, height); break; } @@ -2347,19 +2347,19 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18304, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18306, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18308, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18302, 6, 0, 20, 32, 3, height); break; } @@ -2391,19 +2391,19 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18294, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18296, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18298, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18300, 0, 6, 32, 20, 3, height); break; } @@ -2426,25 +2426,25 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18295, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18297, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18299, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18301, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -3886,28 +3886,28 @@ static void giga_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18074, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18075, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18074, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( @@ -7762,7 +7762,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18655, 0, 6, 32, 20, 3, height); break; case 1: @@ -7771,11 +7771,11 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18659, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18653, 0, 6, 32, 20, 3, height); break; } @@ -7798,7 +7798,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18654, 6, 0, 20, 32, 3, height); break; case 1: @@ -7812,7 +7812,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18652, 6, 0, 20, 32, 3, height); break; } @@ -7844,11 +7844,11 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18644, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18646, 0, 6, 32, 20, 3, height); break; case 2: @@ -7857,7 +7857,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18650, 0, 6, 32, 20, 3, height); break; } @@ -7880,7 +7880,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18645, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -7900,7 +7900,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18651, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -7986,7 +7986,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18625, 0, 0, 32, 16, 3, height); break; case 1: @@ -8031,7 +8031,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18641, 0, 0, 16, 16, 3, height); break; } @@ -8171,7 +8171,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18620, 0, 0, 32, 16, 3, height); break; } @@ -8186,7 +8186,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18606, 0, 0, 16, 16, 3, height); break; case 1: diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 9f506a989e..7dfde2aa92 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -99,7 +99,7 @@ static void heartline_twister_rc_track_station( PaintAddImageAsParentRotated( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station(session, rideIndex, direction, height, tileElement); diff --git a/src/openrct2/ride/coaster/HybridCoaster.cpp b/src/openrct2/ride/coaster/HybridCoaster.cpp index 74f5c4438c..e598dc6dc2 100644 --- a/src/openrct2/ride/coaster/HybridCoaster.cpp +++ b/src/openrct2/ride/coaster/HybridCoaster.cpp @@ -5581,25 +5581,25 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 0), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 2), 0, 6, 34, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 4), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 6), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -5640,25 +5640,25 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 1), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 3), 6, 0, 20, 34, 3, height); wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 5), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 7), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -5689,25 +5689,25 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 8), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 10), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 12), 0, 6, 34, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 14), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -5748,25 +5748,25 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 9), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 11), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 13), 6, 0, 20, 34, 3, height); wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE + 15), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -5853,13 +5853,13 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE + 1), 0, 0, 32, 16, 3, height); wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE + 6), 0, 0, 32, 16, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -5906,7 +5906,7 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE + 17), 0, 0, 16, 16, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -5935,13 +5935,13 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE + 8), 0, 0, 16, 32, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE + 13), 0, 0, 16, 32, 3, height); wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -6065,13 +6065,13 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE + 31), 0, 0, 32, 16, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE + 36), 0, 0, 32, 16, 3, height); wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -6088,7 +6088,7 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE + 22), 0, 0, 16, 16, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -6135,13 +6135,13 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE + 28), 0, 0, 16, 32, 3, height); wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE + 33), 0, 0, 16, 32, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -7164,13 +7164,13 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 0), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 2), 0, 6, 32, 20, 3, height); PaintAddImageAsParentRotated( @@ -7179,13 +7179,13 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 6), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 9), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -7226,13 +7226,13 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 1), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 4), 6, 0, 20, 32, 3, height); PaintAddImageAsParentRotated( @@ -7241,7 +7241,7 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 1, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 7), 6, 0, 20, 32, 3, height); PaintAddImageAsParentRotated( @@ -7250,7 +7250,7 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 10), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -7281,19 +7281,19 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 11), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 13), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 16), 0, 6, 32, 20, 3, height); PaintAddImageAsParentRotated( @@ -7302,7 +7302,7 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 20), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -7343,13 +7343,13 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 12), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 14), 6, 0, 20, 32, 3, height); PaintAddImageAsParentRotated( @@ -7358,7 +7358,7 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 18), 6, 0, 20, 32, 3, height); PaintAddImageAsParentRotated( @@ -7367,7 +7367,7 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_SMALL_CURVE_BANKED + 21), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -7457,13 +7457,13 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE_BANKED + 1), 0, 0, 32, 16, 3, height); wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE_BANKED + 7), 0, 0, 32, 16, 3, height); PaintAddImageAsParentRotated( @@ -7516,7 +7516,7 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE_BANKED + 23), 0, 0, 16, 16, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -7696,7 +7696,7 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE_BANKED + 48), 0, 0, 32, 16, 3, height); wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -7713,7 +7713,7 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_GENTLE_MEDIUM_CURVE_BANKED + 28), 0, 0, 16, 16, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -7901,13 +7901,13 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_S_BEND + 1), 0, 0, 32, 26, 3, height); wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_S_BEND + 5), 0, 0, 34, 26, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -7948,13 +7948,13 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_S_BEND + 1), 0, 0, 32, 26, 3, height); wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_S_BEND + 5), 0, 0, 34, 26, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -8067,13 +8067,13 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_S_BEND + 10), 0, 0, 34, 26, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_S_BEND + 14), 0, 0, 32, 26, 3, height); wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -8090,13 +8090,13 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_S_BEND + 10), 0, 0, 34, 26, 3, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_S_BEND + 14), 0, 0, 32, 26, 3, height); wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -10090,7 +10090,7 @@ namespace HybridRC paint_session* session, uint16_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_FLAT + (direction & 1)), 0, 0, 32, 20, 0, height, 0, 6, height + 3); @@ -10448,13 +10448,13 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 0), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 2), 0, 6, 32, 20, 3, height); PaintAddImageAsParentRotated( @@ -10463,13 +10463,13 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 5), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 7), 0, 6, 32, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -10510,25 +10510,25 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 1), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 4), 6, 0, 20, 34, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 6), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 8), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -10559,19 +10559,19 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 9), 0, 6, 32, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 11), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 13), 0, 6, 32, 20, 3, height); PaintAddImageAsParentRotated( @@ -10580,7 +10580,7 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 16), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -10621,25 +10621,25 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 10), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 12), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 15), 6, 0, 20, 34, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 17), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -10670,25 +10670,25 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 12), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 15), 0, 6, 34, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 17), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 10), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -10729,13 +10729,13 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 11), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 13), 6, 0, 20, 32, 3, height); PaintAddImageAsParentRotated( @@ -10744,13 +10744,13 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 16), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 9), 6, 0, 32, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -10781,25 +10781,25 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 8), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 1), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 4), 0, 6, 34, 20, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 6), 0, 6, 32, 20, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -10840,19 +10840,19 @@ namespace HybridRC switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 7), 6, 0, 32, 32, 3, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 0), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 2), 6, 0, 20, 32, 3, height); PaintAddImageAsParentRotated( @@ -10861,7 +10861,7 @@ namespace HybridRC wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_TURN_BANK_TRANSITION + 5), 6, 0, 20, 32, 3, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 09d2eb0e5a..120e70afdf 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -838,19 +838,19 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17141, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17143, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17145, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17139, 0, 6, 32, 20, 3, height + 24); break; } @@ -877,19 +877,19 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17140, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17142, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17144, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17138, 6, 0, 20, 32, 3, height + 24); break; } @@ -925,19 +925,19 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17130, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17132, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17134, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17136, 0, 6, 32, 20, 3, height + 24); break; } @@ -964,19 +964,19 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17131, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17133, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17135, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 17137, 6, 0, 20, 32, 3, height + 24); break; } diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index c112082a90..da28e95172 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -639,11 +639,11 @@ static void inverted_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27141, 0, 0, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27146, 0, 0, 32, 16, 3, height + 29); break; case 2: @@ -683,7 +683,7 @@ static void inverted_rc_track_left_quarter_turn_5( height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27135, 0, 0, 16, 16, 3, height + 29); break; } @@ -703,11 +703,11 @@ static void inverted_rc_track_left_quarter_turn_5( height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27144, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27149, 0, 0, 16, 32, 3, height + 29); break; case 3: @@ -996,11 +996,11 @@ static void inverted_rc_track_banked_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27161, 0, 0, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27166, 0, 0, 32, 16, 3, height + 29); break; case 2: @@ -1040,7 +1040,7 @@ static void inverted_rc_track_banked_left_quarter_turn_5( height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27155, 0, 0, 16, 16, 3, height + 29); break; } @@ -1060,11 +1060,11 @@ static void inverted_rc_track_banked_left_quarter_turn_5( height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27164, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27169, 0, 0, 16, 32, 3, height + 29); break; case 3: @@ -1495,19 +1495,19 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27317, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27322, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27327, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27332, 0, 6, 32, 20, 3, height + 29); break; } @@ -1531,19 +1531,19 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27318, 0, 0, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27323, 0, 0, 32, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27328, 0, 16, 32, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27333, 0, 16, 32, 16, 3, height + 29); break; } @@ -1558,19 +1558,19 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27319, 0, 16, 16, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27324, 16, 16, 16, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27329, 16, 0, 16, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27334, 0, 0, 16, 16, 3, height + 29); break; } @@ -1585,19 +1585,19 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27320, 16, 0, 16, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27325, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27330, 0, 0, 16, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27335, 16, 0, 16, 32, 3, height + 29); break; } @@ -1612,19 +1612,19 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27321, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27326, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27331, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27336, 6, 0, 20, 32, 3, height + 29); break; } @@ -1660,19 +1660,19 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27297, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27302, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27307, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27312, 0, 6, 32, 20, 3, height + 29); break; } @@ -1696,19 +1696,19 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27298, 0, 16, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27303, 0, 16, 32, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27308, 0, 0, 32, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27313, 0, 0, 32, 16, 3, height + 29); break; } @@ -1723,19 +1723,19 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27299, 0, 0, 16, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27304, 16, 0, 16, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27309, 16, 16, 16, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27314, 0, 16, 16, 16, 3, height + 29); break; } @@ -1750,19 +1750,19 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27300, 16, 0, 16, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27305, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27310, 0, 0, 16, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27315, 16, 0, 16, 32, 3, height + 29); break; } @@ -1777,19 +1777,19 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27301, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27306, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27311, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27316, 6, 0, 20, 32, 3, height + 29); break; } @@ -1881,11 +1881,11 @@ static void inverted_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27254, 0, 0, 32, 26, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27258, 0, 0, 32, 26, 3, height + 29); break; case 2: @@ -1933,11 +1933,11 @@ static void inverted_rc_track_s_bend_left( height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27254, 0, 0, 32, 26, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27258, 0, 0, 32, 26, 3, height + 29); break; } @@ -2062,11 +2062,11 @@ static void inverted_rc_track_s_bend_right( height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27263, 0, 0, 32, 26, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27267, 0, 0, 32, 26, 3, height + 29); break; } @@ -2094,11 +2094,11 @@ static void inverted_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27263, 0, 0, 32, 26, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27267, 0, 0, 32, 26, 3, height + 29); break; case 2: @@ -2846,7 +2846,7 @@ static void inverted_rc_track_left_quarter_turn_3( height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27394, 0, 0, 16, 16, 3, height + 29); break; case 2: @@ -3058,19 +3058,19 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27422, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27424, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27426, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27420, 0, 6, 32, 20, 3, height + 29); break; } @@ -3097,19 +3097,19 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27421, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27423, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27425, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27419, 6, 0, 20, 32, 3, height + 29); break; } @@ -3145,19 +3145,19 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27411, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27413, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27415, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27417, 0, 6, 32, 20, 3, height + 29); break; } @@ -3184,19 +3184,19 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27412, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27414, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27416, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27418, 6, 0, 20, 32, 3, height + 29); break; } @@ -3252,19 +3252,19 @@ static void inverted_rc_track_left_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27427, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27433, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27432, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27438, 0, 6, 32, 20, 3, height + 29); break; } @@ -3287,19 +3287,19 @@ static void inverted_rc_track_left_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27428, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27434, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27431, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27437, 0, 6, 32, 20, 3, height + 29); break; } @@ -3314,19 +3314,19 @@ static void inverted_rc_track_left_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27429, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27435, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27430, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27436, 0, 6, 32, 20, 3, height); break; } @@ -3361,19 +3361,19 @@ static void inverted_rc_track_right_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27439, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27445, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27444, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27450, 0, 6, 32, 20, 3, height + 29); break; } @@ -3396,19 +3396,19 @@ static void inverted_rc_track_right_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27440, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27446, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27443, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27449, 0, 6, 32, 20, 3, height + 29); break; } @@ -3423,19 +3423,19 @@ static void inverted_rc_track_right_twist_down_to_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27441, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27447, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27442, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27448, 0, 6, 32, 20, 3, height); break; } @@ -3470,19 +3470,19 @@ static void inverted_rc_track_left_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27430, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27436, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27429, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27435, 0, 6, 32, 20, 3, height); break; } @@ -3502,19 +3502,19 @@ static void inverted_rc_track_left_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27431, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27437, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27428, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27434, 0, 6, 32, 20, 3, height + 29); break; } @@ -3529,19 +3529,19 @@ static void inverted_rc_track_left_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27432, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27438, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27427, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27433, 0, 6, 32, 20, 3, height + 29); break; } @@ -3579,19 +3579,19 @@ static void inverted_rc_track_right_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27442, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27448, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27441, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27447, 0, 6, 32, 20, 3, height); break; } @@ -3611,19 +3611,19 @@ static void inverted_rc_track_right_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27443, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27449, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27440, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27446, 0, 6, 32, 20, 3, height + 29); break; } @@ -3638,19 +3638,19 @@ static void inverted_rc_track_right_twist_up_to_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27444, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27450, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27439, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27445, 0, 6, 32, 20, 3, height + 29); break; } @@ -5093,7 +5093,7 @@ static void inverted_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( @@ -5101,7 +5101,7 @@ static void inverted_rc_track_on_ride_photo( height + 29); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( @@ -5109,7 +5109,7 @@ static void inverted_rc_track_on_ride_photo( height + 29); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( @@ -5117,7 +5117,7 @@ static void inverted_rc_track_on_ride_photo( height + 29); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( @@ -8982,19 +8982,19 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27762, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27764, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27766, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27760, 0, 6, 32, 20, 3, height + 29); break; } @@ -9021,19 +9021,19 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27761, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27763, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27765, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27759, 6, 0, 20, 32, 3, height + 29); break; } @@ -9069,19 +9069,19 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27751, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27753, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27755, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27757, 0, 6, 32, 20, 3, height + 29); break; } @@ -9108,19 +9108,19 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27752, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27754, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27756, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27758, 6, 0, 20, 32, 3, height + 29); break; } @@ -9176,19 +9176,19 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27787, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27792, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27797, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27802, 0, 6, 32, 20, 3, height + 29); break; } @@ -9212,19 +9212,19 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27788, 0, 0, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27793, 0, 0, 32, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27798, 0, 16, 32, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27803, 0, 16, 32, 16, 3, height + 29); break; } @@ -9239,19 +9239,19 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27789, 0, 16, 16, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27794, 16, 16, 16, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27799, 16, 0, 16, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27804, 0, 0, 16, 16, 3, height + 29); break; } @@ -9266,19 +9266,19 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27790, 16, 0, 16, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27795, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27800, 0, 0, 16, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27805, 16, 0, 16, 32, 3, height + 29); break; } @@ -9293,19 +9293,19 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27791, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27796, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27801, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27806, 6, 0, 20, 32, 3, height + 29); break; } @@ -9341,19 +9341,19 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27767, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27772, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27777, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27782, 0, 6, 32, 20, 3, height + 29); break; } @@ -9377,19 +9377,19 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27768, 0, 16, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27773, 0, 16, 32, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27778, 0, 0, 32, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27783, 0, 0, 32, 16, 3, height + 29); break; } @@ -9404,19 +9404,19 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27769, 0, 0, 16, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27774, 16, 0, 16, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27779, 16, 16, 16, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27784, 0, 16, 16, 16, 3, height + 29); break; } @@ -9431,19 +9431,19 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27770, 16, 0, 16, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27775, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27780, 0, 0, 16, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27785, 16, 0, 16, 32, 3, height + 29); break; } @@ -9458,19 +9458,19 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27771, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27776, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27781, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 27786, 6, 0, 20, 32, 3, height + 29); break; } diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index b877120875..d5fbd591e8 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -1625,7 +1625,7 @@ void junior_rc_paint_track_flat( const TileElement* tileElement, JuniorRcChainType chainType) { uint32_t imageId = junior_rc_track_pieces_flat[EnumValue(chainType)][direction] | session->TrackColours[SCHEME_TRACK]; - sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height); + PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -1703,7 +1703,7 @@ void junior_rc_paint_track_25_deg_up( const TileElement* tileElement, JuniorRcChainType chainType) { uint32_t imageId = junior_rc_track_pieces_25_deg_up[EnumValue(chainType)][direction] | session->TrackColours[SCHEME_TRACK]; - sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height); + PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height); int8_t tunnelHeights[4] = { -8, 8, 8, -8 }; uint8_t tunnelType[4] = { TUNNEL_1, TUNNEL_2, TUNNEL_2, TUNNEL_1 }; @@ -1727,7 +1727,7 @@ void junior_rc_paint_track_flat_to_25_deg_up( uint32_t imageId = junior_rc_track_pieces_flat_to_25_deg_up[EnumValue(chainType)][direction] | session->TrackColours[SCHEME_TRACK]; - sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height); + PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height); if (direction == 0 || direction == 3) { paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); @@ -1755,7 +1755,7 @@ void junior_rc_paint_track_25_deg_up_to_flat( { uint32_t imageId = junior_rc_track_pieces_25_deg_up_to_flat[EnumValue(chainType)][direction] | session->TrackColours[SCHEME_TRACK]; - sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height); + PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height); uint8_t tunnelType; int16_t tunnelHeight; @@ -2734,12 +2734,12 @@ static void junior_rc_s_bend_left_paint_setup( CoordsXY bounds = boundsList[trackSequence]; if (direction == 0 || direction == 2) { - sub_98196C( + PaintAddImageAsParent( session, imageId, static_cast(offset.x), static_cast(offset.y), bounds.x, bounds.y, 1, height); } else { - sub_98196C( + PaintAddImageAsParent( session, imageId, static_cast(offset.y), static_cast(offset.x), bounds.y, bounds.x, 1, height); } @@ -2840,12 +2840,12 @@ static void junior_rc_s_bend_right_paint_setup( CoordsXY bounds = boundsList[trackSequence]; if (direction == 0 || direction == 2) { - sub_98196C( + PaintAddImageAsParent( session, imageId, static_cast(offset.x), static_cast(offset.y), bounds.x, bounds.y, 1, height); } else { - sub_98196C( + PaintAddImageAsParent( session, imageId, static_cast(offset.y), static_cast(offset.x), bounds.y, bounds.x, 1, height); } @@ -3660,13 +3660,13 @@ static void junior_rc_brake_paint_setup( image_id = junior_rc_track_pieces_brake[direction] | session->TrackColours[SCHEME_TRACK]; if (direction & 1) { - sub_98196C(session, image_id, 6, 0, 20, 32, 1, height); + PaintAddImageAsParent(session, image_id, 6, 0, 20, 32, 1, height); paint_util_push_tunnel_right(session, height, TUNNEL_0); } else { - sub_98196C(session, image_id, 0, 6, 32, 20, 1, height); + PaintAddImageAsParent(session, image_id, 0, 6, 32, 20, 1, height); paint_util_push_tunnel_left(session, height, TUNNEL_0); } @@ -3696,13 +3696,13 @@ static void junior_rc_block_brake_paint_setup( image_id = junior_rc_track_pieces_block_brake[isBraked][direction] | session->TrackColours[SCHEME_TRACK]; if (direction & 1) { - sub_98196C(session, image_id, 6, 0, 20, 32, 1, height); + PaintAddImageAsParent(session, image_id, 6, 0, 20, 32, 1, height); paint_util_push_tunnel_right(session, height, TUNNEL_0); } else { - sub_98196C(session, image_id, 0, 6, 32, 20, 1, height); + PaintAddImageAsParent(session, image_id, 0, 6, 32, 20, 1, height); paint_util_push_tunnel_left(session, height, TUNNEL_0); } @@ -5646,13 +5646,13 @@ static void junior_rc_booster_paint_setup( { if (direction & 1) { - sub_98196C(session, SPR_JUNIOR_RC_BOOSTER_NE_SW | session->TrackColours[SCHEME_TRACK], 0, 0, 20, 32, 1, height); + PaintAddImageAsParent(session, SPR_JUNIOR_RC_BOOSTER_NE_SW | session->TrackColours[SCHEME_TRACK], 0, 0, 20, 32, 1, height); paint_util_push_tunnel_right(session, height, TUNNEL_0); } else { - sub_98196C(session, SPR_JUNIOR_RC_BOOSTER_NW_SE | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height); + PaintAddImageAsParent(session, SPR_JUNIOR_RC_BOOSTER_NW_SE | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height); paint_util_push_tunnel_left(session, height, TUNNEL_0); } @@ -5678,7 +5678,7 @@ static void junior_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height + photoCameraOffset); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 5, 6, height + photoCameraOffset, session->TrackColours[SCHEME_SUPPORTS]); @@ -5687,7 +5687,7 @@ static void junior_rc_track_on_ride_photo( PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height + photoCameraOffset); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 6, 6, height + photoCameraOffset, session->TrackColours[SCHEME_SUPPORTS]); @@ -5696,7 +5696,7 @@ static void junior_rc_track_on_ride_photo( PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height + photoCameraOffset); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 5, 6, height + photoCameraOffset, session->TrackColours[SCHEME_SUPPORTS]); @@ -5705,7 +5705,7 @@ static void junior_rc_track_on_ride_photo( PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height + photoCameraOffset); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 6, 6, height + photoCameraOffset, session->TrackColours[SCHEME_SUPPORTS]); diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index 7c39916ef8..23d68e4afa 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -179,7 +179,7 @@ static void lay_down_rc_track_station( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); } - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 11); track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11); @@ -2072,11 +2072,11 @@ static void lay_down_rc_track_banked_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26737, 0, 0, 32, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26742, 0, 0, 32, 16, 3, height + 24); break; case 2: @@ -2116,7 +2116,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5( 0, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26731, 0, 0, 16, 16, 3, height + 24); break; } @@ -2137,11 +2137,11 @@ static void lay_down_rc_track_banked_left_quarter_turn_5( 0, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26740, 0, 0, 16, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26745, 0, 0, 16, 32, 3, height + 24); break; case 3: @@ -2829,11 +2829,11 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16511, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16516, 0, 0, 32, 16, 3, height); break; case 2: @@ -2873,7 +2873,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16527, 0, 0, 16, 16, 3, height); break; } @@ -2894,11 +2894,11 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16518, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16523, 0, 0, 16, 32, 3, height); break; case 3: @@ -2964,19 +2964,19 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26949, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26954, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26959, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26964, 0, 6, 32, 20, 3, height + 24); break; } @@ -3001,19 +3001,19 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26950, 0, 0, 32, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26955, 0, 0, 32, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26960, 0, 16, 32, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26965, 0, 16, 32, 16, 3, height + 24); break; } @@ -3028,19 +3028,19 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26951, 0, 16, 16, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26956, 16, 16, 16, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26961, 16, 0, 16, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26966, 0, 0, 16, 16, 3, height + 24); break; } @@ -3056,19 +3056,19 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26952, 16, 0, 16, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26957, 0, 0, 16, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26962, 0, 0, 16, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26967, 16, 0, 16, 32, 3, height + 24); break; } @@ -3083,19 +3083,19 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26953, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26958, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26963, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26968, 6, 0, 20, 32, 3, height + 24); break; } @@ -3183,11 +3183,11 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16501, 0, 0, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16506, 0, 0, 32, 16, 3, height); break; } @@ -3202,7 +3202,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16492, 0, 0, 16, 16, 3, height); break; case 1: @@ -3238,11 +3238,11 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16498, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16503, 0, 0, 16, 32, 3, height); break; case 3: @@ -3308,19 +3308,19 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26929, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26934, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26939, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26944, 0, 6, 32, 20, 3, height + 24); break; } @@ -3345,19 +3345,19 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26930, 0, 16, 32, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26935, 0, 16, 32, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26940, 0, 0, 32, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26945, 0, 0, 32, 16, 3, height + 24); break; } @@ -3372,19 +3372,19 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26931, 0, 0, 16, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26936, 16, 0, 16, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26941, 16, 16, 16, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26946, 0, 16, 16, 16, 3, height + 24); break; } @@ -3400,19 +3400,19 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26932, 16, 0, 16, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26937, 0, 0, 16, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26942, 0, 0, 16, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26947, 16, 0, 16, 32, 3, height + 24); break; } @@ -3427,19 +3427,19 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26933, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26938, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26943, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26948, 6, 0, 20, 32, 3, height + 24); break; } @@ -3534,13 +3534,13 @@ static void lay_down_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16403, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16407, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -3577,13 +3577,13 @@ static void lay_down_rc_track_s_bend_left( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16403, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16407, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -3875,11 +3875,11 @@ static void lay_down_rc_track_s_bend_right( session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16412, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16416, 0, 0, 32, 26, 3, height); break; } @@ -3894,11 +3894,11 @@ static void lay_down_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16412, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16416, 0, 0, 32, 26, 3, height); break; case 2: @@ -4151,25 +4151,25 @@ static void lay_down_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16562, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16570, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16569, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16577, 0, 6, 32, 20, 7, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4190,25 +4190,25 @@ static void lay_down_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16563, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16571, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16568, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16576, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4253,19 +4253,19 @@ static void lay_down_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16565, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16573, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16566, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16574, 0, 16, 32, 16, 3, height + 32); break; } @@ -4286,19 +4286,19 @@ static void lay_down_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16566, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16574, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16565, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16573, 0, 0, 32, 16, 3, height + 32); break; } @@ -4341,25 +4341,25 @@ static void lay_down_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16568, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16576, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16563, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16571, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4376,25 +4376,25 @@ static void lay_down_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16569, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16577, 0, 6, 32, 20, 7, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16562, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16570, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4430,19 +4430,19 @@ static void lay_down_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16593, 0, 6, 32, 20, 7, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16585, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16586, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16578, 0, 6, 32, 20, 3, height); break; } @@ -4458,25 +4458,25 @@ static void lay_down_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16592, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16584, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16587, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 12, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16579, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4514,19 +4514,19 @@ static void lay_down_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16590, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16582, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16589, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16581, 0, 0, 32, 16, 3, height + 32); break; } @@ -4542,19 +4542,19 @@ static void lay_down_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16589, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16581, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16590, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16582, 0, 16, 32, 16, 3, height + 32); break; } @@ -4590,25 +4590,25 @@ static void lay_down_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16587, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 12, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16579, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16592, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16584, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4620,19 +4620,19 @@ static void lay_down_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16586, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16578, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16593, 0, 6, 32, 20, 7, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16585, 0, 6, 32, 20, 3, height); break; } @@ -5169,19 +5169,19 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16541, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16543, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16545, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16539, 0, 6, 32, 20, 3, height); break; } @@ -5206,19 +5206,19 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16540, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16542, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16544, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16538, 6, 0, 20, 32, 3, height); break; } @@ -5248,19 +5248,19 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26924, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26926, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26928, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26922, 0, 6, 32, 20, 3, height + 24); break; } @@ -5288,19 +5288,19 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26923, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26925, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26927, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26921, 6, 0, 20, 32, 3, height + 24); break; } @@ -5340,19 +5340,19 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16530, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16532, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16534, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16536, 0, 6, 32, 20, 3, height); break; } @@ -5377,25 +5377,25 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16531, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16533, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16535, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16537, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -5425,19 +5425,19 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26913, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26915, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26917, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26919, 0, 6, 32, 20, 3, height + 24); break; } @@ -5465,19 +5465,19 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26914, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26916, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26918, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26920, 6, 0, 20, 32, 3, height + 24); break; } @@ -6966,7 +6966,7 @@ static void lay_down_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -6975,7 +6975,7 @@ static void lay_down_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 16224, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -6984,7 +6984,7 @@ static void lay_down_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 16225, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -6993,7 +6993,7 @@ static void lay_down_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 16224, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7012,7 +7012,7 @@ static void lay_down_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7022,7 +7022,7 @@ static void lay_down_rc_track_on_ride_photo( height + 24); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7032,7 +7032,7 @@ static void lay_down_rc_track_on_ride_photo( height + 24); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7042,7 +7042,7 @@ static void lay_down_rc_track_on_ride_photo( height + 24); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -14001,19 +14001,19 @@ static void lay_down_rc_track_left_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26972, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26978, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26971, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26977, 0, 6, 32, 20, 3, height); break; } @@ -14039,15 +14039,15 @@ static void lay_down_rc_track_left_flyer_twist_up( height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26979, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26970, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26976, 0, 6, 32, 20, 3, height + 24); break; } @@ -14067,15 +14067,15 @@ static void lay_down_rc_track_left_flyer_twist_up( height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26980, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26969, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26975, 0, 6, 32, 20, 3, height + 24); break; } @@ -14113,19 +14113,19 @@ static void lay_down_rc_track_right_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26984, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26990, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26983, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26989, 0, 6, 32, 20, 3, height); break; } @@ -14146,19 +14146,19 @@ static void lay_down_rc_track_right_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26985, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26991, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26982, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26988, 0, 6, 32, 20, 3, height + 24); break; } @@ -14173,19 +14173,19 @@ static void lay_down_rc_track_right_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26986, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26992, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26981, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26987, 0, 6, 32, 20, 3, height + 24); break; } @@ -14223,11 +14223,11 @@ static void lay_down_rc_track_left_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26969, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26975, 0, 6, 32, 20, 3, height + 24); break; case 2: @@ -14236,7 +14236,7 @@ static void lay_down_rc_track_left_flyer_twist_down( height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26980, 0, 6, 32, 20, 3, height + 24); break; } @@ -14259,11 +14259,11 @@ static void lay_down_rc_track_left_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26970, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26976, 0, 6, 32, 20, 3, height + 24); break; case 2: @@ -14272,7 +14272,7 @@ static void lay_down_rc_track_left_flyer_twist_down( height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26979, 0, 6, 32, 20, 3, height + 24); break; } @@ -14287,19 +14287,19 @@ static void lay_down_rc_track_left_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26971, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26977, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26972, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26978, 0, 6, 32, 20, 3, height); break; } @@ -14335,19 +14335,19 @@ static void lay_down_rc_track_right_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26981, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26987, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26986, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26992, 0, 6, 32, 20, 3, height + 24); break; } @@ -14370,19 +14370,19 @@ static void lay_down_rc_track_right_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26982, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26988, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26985, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26991, 0, 6, 32, 20, 3, height + 24); break; } @@ -14397,19 +14397,19 @@ static void lay_down_rc_track_right_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26983, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26989, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26984, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26990, 0, 6, 32, 20, 3, height); break; } @@ -14445,19 +14445,19 @@ static void lay_down_rc_track_flyer_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16594, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16602, 0, 6, 32, 20, 11, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16601, 0, 6, 32, 20, 9, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16609, 0, 6, 32, 20, 7, height); break; } @@ -14495,7 +14495,7 @@ static void lay_down_rc_track_flyer_half_loop_up( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16608, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -14508,7 +14508,7 @@ static void lay_down_rc_track_flyer_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16596, 16, 0, 2, 16, 119, height); break; case 1: @@ -14517,7 +14517,7 @@ static void lay_down_rc_track_flyer_half_loop_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16599, 10, 16, 4, 12, 119, height); break; case 3: @@ -14537,19 +14537,19 @@ static void lay_down_rc_track_flyer_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16597, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16605, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16598, 0, 16, 32, 12, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16606, 0, 16, 32, 12, 3, height + 32); break; } @@ -14575,19 +14575,19 @@ static void lay_down_rc_track_flyer_half_loop_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16597, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16605, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16598, 0, 16, 32, 12, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16606, 0, 16, 32, 12, 3, height + 32); break; } @@ -14603,7 +14603,7 @@ static void lay_down_rc_track_flyer_half_loop_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16596, 16, 0, 2, 16, 119, height); break; case 1: @@ -14612,7 +14612,7 @@ static void lay_down_rc_track_flyer_half_loop_down( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16599, 10, 16, 4, 12, 119, height); break; case 3: @@ -14652,7 +14652,7 @@ static void lay_down_rc_track_flyer_half_loop_down( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16608, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -14665,19 +14665,19 @@ static void lay_down_rc_track_flyer_half_loop_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16594, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16602, 0, 6, 32, 20, 11, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16601, 0, 6, 32, 20, 9, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 16609, 0, 6, 32, 20, 7, height); break; } diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index 4759b47aac..5c962d5489 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -43,7 +43,7 @@ static void lim_launched_rc_track_station( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); } - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station(session, rideIndex, direction, height, tileElement); @@ -63,25 +63,25 @@ static void lim_launched_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15388, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15396, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15395, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15403, 0, 6, 32, 20, 7, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -102,19 +102,19 @@ static void lim_launched_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15389, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15397, 0, 14, 32, 2, 63, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15394, 0, 6, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15402, 0, 6, 32, 26, 3, height); break; } @@ -157,19 +157,19 @@ static void lim_launched_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15391, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15399, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15392, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15400, 0, 16, 32, 16, 3, height + 32); break; } @@ -190,19 +190,19 @@ static void lim_launched_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15392, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15400, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15391, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15399, 0, 0, 32, 16, 3, height + 32); break; } @@ -245,19 +245,19 @@ static void lim_launched_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15394, 0, 6, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15402, 0, 6, 32, 26, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15389, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15397, 0, 14, 32, 2, 63, height); break; } @@ -272,25 +272,25 @@ static void lim_launched_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15395, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15403, 0, 6, 32, 20, 7, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15388, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15396, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -326,19 +326,19 @@ static void lim_launched_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15419, 0, 6, 32, 20, 7, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15411, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15412, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15404, 0, 6, 32, 20, 3, height); break; } @@ -353,19 +353,19 @@ static void lim_launched_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15418, 0, 6, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15410, 0, 6, 32, 26, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15413, 0, 14, 32, 2, 63, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15405, 0, 0, 32, 26, 3, height); break; } @@ -401,19 +401,19 @@ static void lim_launched_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15416, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15408, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15415, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15407, 0, 0, 32, 16, 3, height + 32); break; } @@ -429,19 +429,19 @@ static void lim_launched_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15415, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15407, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15416, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15408, 0, 16, 32, 16, 3, height + 32); break; } @@ -477,19 +477,19 @@ static void lim_launched_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15413, 0, 14, 32, 2, 63, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15405, 0, 0, 32, 26, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15418, 0, 6, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15410, 0, 6, 32, 26, 3, height); break; } @@ -499,19 +499,19 @@ static void lim_launched_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15412, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15404, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15419, 0, 6, 32, 20, 7, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15411, 0, 6, 32, 20, 3, height); break; } diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index c166bf5a8c..509679e03f 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -96,7 +96,7 @@ static void looping_rc_track_station( PaintAddImageAsParentRotated( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station(session, rideIndex, direction, height, tileElement); @@ -1394,11 +1394,11 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15297, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15302, 0, 0, 32, 16, 3, height); break; case 2: @@ -1438,7 +1438,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15313, 0, 0, 16, 16, 3, height); break; } @@ -1458,11 +1458,11 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15304, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15309, 0, 0, 16, 32, 3, height); break; case 3: @@ -1568,11 +1568,11 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15287, 0, 0, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15292, 0, 0, 32, 16, 3, height); break; } @@ -1587,7 +1587,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15278, 0, 0, 16, 16, 3, height); break; case 1: @@ -1622,11 +1622,11 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15284, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15289, 0, 0, 16, 32, 3, height); break; case 3: @@ -1738,13 +1738,13 @@ static void looping_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15261, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15265, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -1777,13 +1777,13 @@ static void looping_rc_track_s_bend_left( session, direction, session->TrackColours[SCHEME_TRACK] | 15266, 0, 0, 32, 26, 3, height, 0, 6, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15261, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15265, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -1885,11 +1885,11 @@ static void looping_rc_track_s_bend_right( session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15270, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15274, 0, 0, 32, 26, 3, height); break; } @@ -1904,11 +1904,11 @@ static void looping_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15270, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15274, 0, 0, 32, 26, 3, height); break; case 2: @@ -1979,19 +1979,19 @@ static void looping_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15348, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15356, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15355, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15363, 0, 6, 32, 20, 7, height); break; } @@ -2010,19 +2010,19 @@ static void looping_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15349, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15357, 0, 14, 32, 2, 63, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15354, 0, 6, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15362, 0, 6, 32, 26, 3, height); break; } @@ -2085,19 +2085,19 @@ static void looping_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15351, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15359, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15352, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15360, 0, 16, 32, 16, 3, height + 32); break; } @@ -2118,19 +2118,19 @@ static void looping_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15352, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15360, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15351, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15359, 0, 0, 32, 16, 3, height + 32); break; } @@ -2193,19 +2193,19 @@ static void looping_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15354, 0, 6, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15362, 0, 6, 32, 26, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15349, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15357, 0, 14, 32, 2, 63, height); break; } @@ -2220,19 +2220,19 @@ static void looping_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15355, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15363, 0, 6, 32, 20, 7, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15348, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15356, 0, 6, 32, 20, 3, height); break; } @@ -2266,19 +2266,19 @@ static void looping_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15383, 0, 6, 32, 20, 7, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15375, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15376, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15368, 0, 6, 32, 20, 3, height); break; } @@ -2292,19 +2292,19 @@ static void looping_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15382, 0, 6, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15374, 0, 6, 32, 26, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15377, 0, 14, 32, 2, 63, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15369, 0, 0, 32, 26, 3, height); break; } @@ -2360,19 +2360,19 @@ static void looping_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15380, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15372, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15379, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15371, 0, 0, 32, 16, 3, height + 32); break; } @@ -2388,19 +2388,19 @@ static void looping_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15379, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15371, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15380, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15372, 0, 16, 32, 16, 3, height + 32); break; } @@ -2456,19 +2456,19 @@ static void looping_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15377, 0, 14, 32, 2, 63, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15369, 0, 0, 32, 26, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15382, 0, 6, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15374, 0, 6, 32, 26, 3, height); break; } @@ -2478,19 +2478,19 @@ static void looping_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15376, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15368, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15383, 0, 6, 32, 20, 7, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15375, 0, 6, 32, 20, 3, height); break; } @@ -2754,19 +2754,19 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15327, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15329, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15331, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15325, 0, 6, 32, 20, 3, height); break; } @@ -2789,19 +2789,19 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15326, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15328, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15330, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15324, 6, 0, 20, 32, 3, height); break; } @@ -2833,19 +2833,19 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15316, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15318, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15320, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15322, 0, 6, 32, 20, 3, height); break; } @@ -2868,25 +2868,25 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15317, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15319, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15321, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15323, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4320,7 +4320,7 @@ static void looping_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_MISC] | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4328,7 +4328,7 @@ static void looping_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 15004, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_MISC] | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4336,7 +4336,7 @@ static void looping_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 15005, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_MISC] | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4344,7 +4344,7 @@ static void looping_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 15004, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_MISC] | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -8006,7 +8006,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15689, 0, 6, 32, 20, 3, height); break; case 1: @@ -8015,11 +8015,11 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15693, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15687, 0, 6, 32, 20, 3, height); break; } @@ -8042,7 +8042,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15688, 6, 0, 20, 32, 3, height); break; case 1: @@ -8056,7 +8056,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15686, 6, 0, 20, 32, 3, height); break; } @@ -8088,11 +8088,11 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15678, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15680, 0, 6, 32, 20, 3, height); break; case 2: @@ -8101,7 +8101,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15684, 0, 6, 32, 20, 3, height); break; } @@ -8124,7 +8124,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15679, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -8144,7 +8144,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15685, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -8230,7 +8230,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15659, 0, 0, 32, 16, 3, height); break; case 1: @@ -8275,7 +8275,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15675, 0, 0, 16, 16, 3, height); break; } @@ -8415,7 +8415,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15654, 0, 0, 32, 16, 3, height); break; } @@ -8430,7 +8430,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15640, 0, 0, 16, 16, 3, height); break; case 1: diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index 0b09a84bcc..a5d84a3371 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -67,7 +67,7 @@ static void mine_ride_track_station( PaintAddImageAsParentRotated( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11); @@ -1252,13 +1252,13 @@ static void mine_ride_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19461, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 5, 3, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19465, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 6, 6, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -1291,13 +1291,13 @@ static void mine_ride_track_s_bend_left( session, direction, session->TrackColours[SCHEME_TRACK] | 19466, 0, 0, 32, 26, 3, height, 0, 6, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19461, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 5, 3, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19465, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 6, 6, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -1413,11 +1413,11 @@ static void mine_ride_track_s_bend_right( session, METAL_SUPPORTS_FORK_ALT, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19470, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19474, 0, 0, 32, 26, 3, height); break; } @@ -1432,11 +1432,11 @@ static void mine_ride_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19470, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19474, 0, 0, 32, 26, 3, height); break; case 2: @@ -3064,14 +3064,14 @@ static void mine_ride_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 5, 6, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 8, 6, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19338, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 6, 6, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -3080,14 +3080,14 @@ static void mine_ride_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 19339, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 5, 6, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 8, 6, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19338, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 6, 6, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index b49c7b64ab..d945638051 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -537,12 +537,12 @@ static void mine_train_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20154, 0, 0, 32, 16, 1, height); wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20159, 0, 0, 32, 16, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -588,7 +588,7 @@ static void mine_train_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20148, 0, 0, 16, 16, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -616,12 +616,12 @@ static void mine_train_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20157, 0, 0, 16, 32, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20162, 0, 0, 16, 32, 1, height); wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -886,7 +886,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20174, 0, 0, 32, 16, 1, height); wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -938,7 +938,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20168, 0, 0, 16, 16, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -972,7 +972,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20182, 0, 0, 16, 32, 1, height); wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -1729,12 +1729,12 @@ static void mine_train_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20271, 0, 0, 32, 26, 1, height); wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20275, 0, 0, 32, 26, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -1770,12 +1770,12 @@ static void mine_train_rc_track_s_bend_left( wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20271, 0, 0, 32, 26, 1, height); wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20275, 0, 0, 32, 26, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -1878,12 +1878,12 @@ static void mine_train_rc_track_s_bend_right( wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20280, 0, 0, 32, 26, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20284, 0, 0, 32, 26, 1, height); wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -1899,12 +1899,12 @@ static void mine_train_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20280, 0, 0, 32, 26, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20284, 0, 0, 32, 26, 1, height); wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -2030,7 +2030,7 @@ static void mine_train_rc_track_left_quarter_turn_3( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20195, 0, 0, 16, 16, 1, height); break; case 2: @@ -2247,22 +2247,22 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20225, 0, 6, 32, 20, 1, height); wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20227, 0, 6, 32, 20, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20229, 0, 6, 32, 20, 1, height); wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20223, 0, 6, 32, 20, 1, height); wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -2301,22 +2301,22 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20224, 6, 0, 20, 32, 1, height); wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20226, 6, 0, 20, 32, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20228, 6, 0, 20, 32, 1, height); wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20222, 6, 0, 20, 32, 1, height); wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -2347,22 +2347,22 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20214, 0, 6, 32, 20, 1, height); wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20216, 0, 6, 32, 20, 1, height); wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20218, 0, 6, 32, 20, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20220, 0, 6, 32, 20, 1, height); wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -2401,22 +2401,22 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20215, 6, 0, 20, 32, 1, height); wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20217, 6, 0, 20, 32, 1, height); wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20219, 6, 0, 20, 32, 1, height); wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 20221, 6, 0, 20, 32, 1, height); wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index 33361bd16e..ea6c9291b5 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -121,7 +121,7 @@ static void mini_rc_track_station( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); } - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11); @@ -1647,11 +1647,11 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18937, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18942, 0, 0, 32, 16, 3, height); break; case 2: @@ -1691,7 +1691,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18953, 0, 0, 16, 16, 3, height); break; } @@ -1711,11 +1711,11 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18944, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18949, 0, 0, 16, 32, 3, height); break; case 3: @@ -1835,11 +1835,11 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18927, 0, 0, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18932, 0, 0, 32, 16, 3, height); break; } @@ -1854,7 +1854,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18918, 0, 0, 16, 16, 3, height); break; case 1: @@ -1889,11 +1889,11 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up( height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18924, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18929, 0, 0, 16, 32, 3, height); break; case 3: @@ -2018,13 +2018,13 @@ static void mini_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18901, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 5, 3, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18905, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 6, 6, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2057,13 +2057,13 @@ static void mini_rc_track_s_bend_left( session, direction, session->TrackColours[SCHEME_TRACK] | 18906, 0, 0, 32, 26, 3, height, 0, 6, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18901, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 5, 3, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18905, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 6, 6, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2179,11 +2179,11 @@ static void mini_rc_track_s_bend_right( session, METAL_SUPPORTS_FORK_ALT, 7, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18910, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18914, 0, 0, 32, 26, 3, height); break; } @@ -2198,11 +2198,11 @@ static void mini_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18910, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18914, 0, 0, 32, 26, 3, height); break; case 2: @@ -2541,25 +2541,25 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18967, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18969, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18971, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18965, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2583,25 +2583,25 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18966, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18968, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18970, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18964, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2634,25 +2634,25 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18956, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18958, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18960, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18962, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2676,25 +2676,25 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18957, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18959, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18961, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18963, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -4268,14 +4268,14 @@ static void mini_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 5, 6, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 8, 6, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18738, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 6, 6, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -4284,14 +4284,14 @@ static void mini_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 18739, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 5, 6, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_FORK, 8, 6, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 18738, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 6, 6, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -7564,7 +7564,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19317, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -7577,13 +7577,13 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19321, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19315, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -7607,7 +7607,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19316, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -7627,7 +7627,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19314, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -7660,13 +7660,13 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19306, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19308, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -7679,7 +7679,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19312, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -7703,7 +7703,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19307, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -7723,7 +7723,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up( session, METAL_SUPPORTS_FORK_ALT, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19313, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -7816,7 +7816,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19287, 0, 0, 32, 16, 3, height); break; case 1: @@ -7861,7 +7861,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19303, 0, 0, 16, 16, 3, height); break; } @@ -8015,7 +8015,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up( height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19282, 0, 0, 32, 16, 3, height); break; } @@ -8030,7 +8030,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19268, 0, 0, 16, 16, 3, height); break; case 1: @@ -8967,25 +8967,25 @@ static void mini_rc_track_left_curved_lift_hill( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19333, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19335, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19337, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19331, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -9009,25 +9009,25 @@ static void mini_rc_track_left_curved_lift_hill( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19332, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 17, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19334, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 17, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19336, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 17, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19330, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 17, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -9059,25 +9059,25 @@ static void mini_rc_track_right_curved_lift_hill( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19322, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19324, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19326, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19328, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -9101,25 +9101,25 @@ static void mini_rc_track_right_curved_lift_hill( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19323, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 17, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19325, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 17, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19327, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK_ALT, 4, 17, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 19329, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_FORK, 4, 17, height, session->TrackColours[SCHEME_SUPPORTS]); diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index 107e21ab25..c835db3741 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -30,12 +30,12 @@ static void mini_suspended_rc_track_flat( { case 0: case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28433, 0, 6, 32, 20, 1, height + 24); break; case 1: case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28434, 0, 6, 32, 20, 1, height + 24); break; } @@ -46,12 +46,12 @@ static void mini_suspended_rc_track_flat( { case 0: case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28383, 0, 6, 32, 20, 1, height + 24); break; case 1: case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28384, 0, 6, 32, 20, 1, height + 24); break; } @@ -94,7 +94,7 @@ static void mini_suspended_rc_track_station( PaintAddImageAsParentRotated( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2, height); - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height + 24); PaintAddImageAsChildRotated( session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24, 0, 2, @@ -423,19 +423,19 @@ static void mini_suspended_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28406, 0, 6, 32, 20, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28411, 0, 6, 32, 20, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28416, 0, 6, 32, 20, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28401, 0, 6, 32, 20, 1, height + 24); break; } @@ -470,19 +470,19 @@ static void mini_suspended_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28405, 0, 0, 32, 16, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28410, 0, 0, 32, 16, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28415, 0, 16, 32, 16, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28400, 0, 16, 32, 16, 1, height + 24); break; } @@ -497,19 +497,19 @@ static void mini_suspended_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28404, 0, 16, 16, 16, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28409, 16, 16, 16, 16, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28414, 16, 0, 16, 16, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28399, 0, 0, 16, 16, 1, height + 24); break; } @@ -524,19 +524,19 @@ static void mini_suspended_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28403, 16, 0, 16, 32, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28408, 0, 0, 16, 32, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28413, 0, 0, 16, 32, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28398, 16, 0, 16, 32, 1, height + 24); break; } @@ -551,19 +551,19 @@ static void mini_suspended_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28402, 6, 0, 20, 32, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28407, 6, 0, 20, 32, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28412, 6, 0, 20, 32, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28397, 6, 0, 20, 32, 1, height + 24); break; } @@ -619,19 +619,19 @@ static void mini_suspended_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28421, 0, 6, 32, 20, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28428, 0, 6, 32, 20, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28424, 0, 6, 32, 20, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28425, 0, 6, 32, 20, 1, height + 24); break; } @@ -662,19 +662,19 @@ static void mini_suspended_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28422, 0, 0, 32, 26, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28427, 0, 0, 32, 26, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28423, 0, 6, 32, 26, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28426, 0, 6, 32, 26, 1, height + 24); break; } @@ -702,19 +702,19 @@ static void mini_suspended_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28423, 0, 6, 32, 26, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28426, 0, 6, 32, 26, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28422, 0, 0, 32, 26, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28427, 0, 0, 32, 26, 1, height + 24); break; } @@ -742,19 +742,19 @@ static void mini_suspended_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28424, 0, 6, 32, 20, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28425, 0, 6, 32, 20, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28421, 0, 6, 32, 20, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28428, 0, 6, 32, 20, 1, height + 24); break; } @@ -800,19 +800,19 @@ static void mini_suspended_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28417, 0, 6, 32, 20, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28432, 0, 6, 32, 20, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28420, 0, 6, 32, 20, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28429, 0, 6, 32, 20, 1, height + 24); break; } @@ -843,19 +843,19 @@ static void mini_suspended_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28418, 0, 6, 32, 26, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28431, 0, 6, 32, 26, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28419, 0, 0, 32, 26, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28430, 0, 0, 32, 26, 1, height + 24); break; } @@ -883,19 +883,19 @@ static void mini_suspended_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28419, 0, 0, 32, 26, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28430, 0, 0, 32, 26, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28418, 0, 6, 32, 26, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28431, 0, 6, 32, 26, 1, height + 24); break; } @@ -923,19 +923,19 @@ static void mini_suspended_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28420, 0, 6, 32, 20, 1, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28429, 0, 6, 32, 20, 1, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28417, 0, 6, 32, 20, 1, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28432, 0, 6, 32, 20, 1, height + 24); break; } @@ -981,19 +981,19 @@ static void mini_suspended_rc_track_left_quarter_turn_3( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28452, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28455, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28458, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28449, 0, 6, 32, 20, 3, height + 24); break; } @@ -1028,19 +1028,19 @@ static void mini_suspended_rc_track_left_quarter_turn_3( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28451, 16, 0, 16, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28454, 0, 0, 16, 16, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28457, 0, 16, 16, 16, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28448, 16, 16, 16, 16, 3, height + 24); break; } @@ -1052,19 +1052,19 @@ static void mini_suspended_rc_track_left_quarter_turn_3( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28450, 6, 0, 20, 32, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28453, 6, 0, 20, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28456, 6, 0, 20, 32, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28447, 6, 0, 20, 32, 3, height + 24); break; } diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index e44b0eba26..7f2f701473 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -1836,11 +1836,11 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26353, 0, 0, 32, 16, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26358, 0, 0, 32, 16, 3, height + 24); break; case 2: @@ -1880,7 +1880,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5( 0, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26347, 0, 0, 16, 16, 3, height + 24); break; } @@ -1901,11 +1901,11 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5( 0, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26356, 0, 0, 16, 32, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26361, 0, 0, 16, 32, 3, height + 24); break; case 3: @@ -2588,13 +2588,13 @@ static void multi_dimension_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15817, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15821, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2627,13 +2627,13 @@ static void multi_dimension_rc_track_s_bend_left( height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15817, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15821, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2917,11 +2917,11 @@ static void multi_dimension_rc_track_s_bend_right( session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15826, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15830, 0, 0, 32, 26, 3, height); break; } @@ -2932,11 +2932,11 @@ static void multi_dimension_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15826, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 15830, 0, 0, 32, 26, 3, height); break; case 2: @@ -4913,7 +4913,7 @@ static void multi_dimension_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -4922,7 +4922,7 @@ static void multi_dimension_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 15806, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -4931,7 +4931,7 @@ static void multi_dimension_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 15807, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -4940,7 +4940,7 @@ static void multi_dimension_rc_track_on_ride_photo( session, direction, session->TrackColours[SCHEME_TRACK] | 15806, 0, 0, 32, 20, 0, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -4959,7 +4959,7 @@ static void multi_dimension_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -4969,7 +4969,7 @@ static void multi_dimension_rc_track_on_ride_photo( height + 24); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -4979,7 +4979,7 @@ static void multi_dimension_rc_track_on_ride_photo( height + 24); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -4989,7 +4989,7 @@ static void multi_dimension_rc_track_on_ride_photo( height + 24); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES_INVERTED, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup( @@ -11852,19 +11852,19 @@ static void multi_dimension_rc_track_left_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26368, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26374, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26367, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26373, 0, 6, 32, 20, 3, height); break; } @@ -11890,15 +11890,15 @@ static void multi_dimension_rc_track_left_flyer_twist_up( height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26375, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26366, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26372, 0, 6, 32, 20, 3, height + 24); break; } @@ -11918,15 +11918,15 @@ static void multi_dimension_rc_track_left_flyer_twist_up( height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26376, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26365, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26371, 0, 6, 32, 20, 3, height + 24); break; } @@ -11964,19 +11964,19 @@ static void multi_dimension_rc_track_right_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26380, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26386, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26379, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26385, 0, 6, 32, 20, 3, height); break; } @@ -11997,19 +11997,19 @@ static void multi_dimension_rc_track_right_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26381, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26387, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26378, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26384, 0, 6, 32, 20, 3, height + 24); break; } @@ -12024,19 +12024,19 @@ static void multi_dimension_rc_track_right_flyer_twist_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26382, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26388, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26377, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26383, 0, 6, 32, 20, 3, height + 24); break; } @@ -12074,11 +12074,11 @@ static void multi_dimension_rc_track_left_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26365, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26371, 0, 6, 32, 20, 3, height + 24); break; case 2: @@ -12087,7 +12087,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down( height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26376, 0, 6, 32, 20, 3, height + 24); break; } @@ -12110,11 +12110,11 @@ static void multi_dimension_rc_track_left_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26366, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26372, 0, 6, 32, 20, 3, height + 24); break; case 2: @@ -12123,7 +12123,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down( height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26375, 0, 6, 32, 20, 3, height + 24); break; } @@ -12138,19 +12138,19 @@ static void multi_dimension_rc_track_left_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26367, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26373, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26368, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26374, 0, 6, 32, 20, 3, height); break; } @@ -12186,19 +12186,19 @@ static void multi_dimension_rc_track_right_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26377, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26383, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26382, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26388, 0, 6, 32, 20, 3, height + 24); break; } @@ -12221,19 +12221,19 @@ static void multi_dimension_rc_track_right_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26378, 0, 6, 32, 20, 3, height + 24); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26384, 0, 6, 32, 20, 3, height + 24); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26381, 0, 6, 32, 20, 3, height + 24); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26387, 0, 6, 32, 20, 3, height + 24); break; } @@ -12248,19 +12248,19 @@ static void multi_dimension_rc_track_right_flyer_twist_down( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26379, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26385, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26380, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26386, 0, 6, 32, 20, 3, height); break; } diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index 08b36bdd86..52034432ee 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -355,22 +355,22 @@ static void reverser_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21543, 0, 2, 32, 27, 2, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21548, 0, 2, 32, 27, 2, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21553, 0, 2, 32, 32, 2, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21538, 0, 2, 32, 32, 2, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -391,22 +391,22 @@ static void reverser_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21542, 0, 0, 32, 16, 2, height); wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21547, 0, 0, 32, 16, 2, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21552, 0, 16, 32, 16, 2, height); wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21537, 0, 16, 32, 16, 2, height); wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -422,22 +422,22 @@ static void reverser_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21541, 0, 16, 16, 16, 2, height); wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21546, 16, 16, 16, 16, 2, height); wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21551, 16, 0, 16, 16, 2, height); wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21536, 0, 0, 16, 16, 2, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -459,22 +459,22 @@ static void reverser_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21540, 16, 0, 16, 34, 2, height); wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21545, 0, 0, 16, 32, 2, height); wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21550, 0, 0, 16, 32, 2, height); wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21535, 16, 0, 16, 32, 2, height); wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; @@ -490,22 +490,22 @@ static void reverser_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21539, 2, 0, 32, 32, 2, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21544, 2, 0, 27, 32, 2, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21549, 2, 0, 27, 32, 2, height); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21534, 2, 0, 32, 32, 2, height); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index 217300412b..4efbe19574 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -449,7 +449,7 @@ static void side_friction_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21727, 0, 2, 32, 27, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21747, 0, 2, 32, 27, 0, height, 0, 2, @@ -457,7 +457,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21732, 0, 2, 32, 27, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21752, 0, 2, 32, 27, 0, height, 0, 2, @@ -465,7 +465,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21737, 0, 2, 32, 32, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21757, 0, 2, 32, 32, 0, height, 0, 2, @@ -473,7 +473,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21722, 0, 2, 32, 32, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21742, 0, 2, 32, 32, 0, height, 0, 2, @@ -497,7 +497,7 @@ static void side_friction_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21726, 0, 0, 32, 16, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21746, 0, 0, 32, 16, 0, height, 0, 0, @@ -505,7 +505,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21731, 0, 0, 32, 16, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21751, 0, 0, 32, 16, 0, height, 0, 0, @@ -513,7 +513,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21736, 0, 16, 32, 16, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21756, 0, 16, 32, 16, 0, height, 0, 16, @@ -521,7 +521,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21721, 0, 16, 32, 16, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21741, 0, 16, 32, 16, 0, height, 0, 16, @@ -540,7 +540,7 @@ static void side_friction_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21725, 0, 16, 16, 16, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21745, 0, 16, 16, 16, 0, height, 0, 16, @@ -548,7 +548,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21730, 16, 16, 16, 16, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21750, 16, 16, 16, 16, 0, height, 16, 16, @@ -556,7 +556,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21735, 16, 0, 16, 16, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21755, 16, 0, 16, 16, 0, height, 16, 0, @@ -564,7 +564,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21720, 0, 0, 16, 16, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21740, 0, 0, 16, 16, 0, height, 0, 0, @@ -589,7 +589,7 @@ static void side_friction_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21724, 16, 0, 16, 34, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21744, 16, 0, 16, 34, 0, height, 16, 0, @@ -597,7 +597,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21729, 0, 0, 16, 32, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21749, 0, 0, 16, 32, 0, height, 0, 0, @@ -605,7 +605,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21734, 0, 0, 16, 32, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21754, 0, 0, 16, 32, 0, height, 0, 0, @@ -613,7 +613,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21719, 16, 0, 16, 32, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21739, 16, 0, 16, 32, 0, height, 16, 0, @@ -632,7 +632,7 @@ static void side_friction_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21723, 2, 0, 32, 32, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21743, 2, 0, 32, 32, 0, height, 2, 0, @@ -640,7 +640,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21728, 2, 0, 27, 32, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21748, 2, 0, 27, 32, 0, height, 2, 0, @@ -648,7 +648,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21733, 2, 0, 27, 32, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21753, 2, 0, 27, 32, 0, height, 2, 0, @@ -656,7 +656,7 @@ static void side_friction_rc_track_left_quarter_turn_5( wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21718, 2, 0, 32, 32, 2, height); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 21738, 2, 0, 32, 32, 0, height, 2, 0, diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index c5d722b658..4d72a241ef 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -29,16 +29,16 @@ static void stand_up_rc_track_flat( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25383, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25383, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25384, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25384, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25453, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25453, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25454, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25454, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -52,11 +52,11 @@ static void stand_up_rc_track_flat( { case 0: case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25229, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25229, 0, 6, 32, 20, 3, height); break; case 1: case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25230, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25230, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -94,7 +94,7 @@ static void stand_up_rc_track_station( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height, 0, 6, height + 3); } - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0); track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11); @@ -113,16 +113,16 @@ static void stand_up_rc_track_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25385, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25385, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25397, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25397, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25389, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25389, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25399, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25399, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -135,16 +135,16 @@ static void stand_up_rc_track_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25231, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25231, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25243, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25243, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25235, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25235, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25245, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25245, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -175,7 +175,7 @@ static void stand_up_rc_track_60_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25386, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25386, 0, 6, 32, 20, 3, height); break; case 1: PaintAddImageAsParentRotated( @@ -186,7 +186,7 @@ static void stand_up_rc_track_60_deg_up( session, direction, session->TrackColours[SCHEME_TRACK] | 25390, 0, 6, 1, 10, 75, height, 29, 10, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25400, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25400, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -199,7 +199,7 @@ static void stand_up_rc_track_60_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25232, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25232, 0, 6, 32, 20, 3, height); break; case 1: PaintAddImageAsParentRotated( @@ -210,7 +210,7 @@ static void stand_up_rc_track_60_deg_up( session, direction, session->TrackColours[SCHEME_TRACK] | 25236, 0, 6, 1, 10, 75, height, 29, 10, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25246, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25246, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -241,16 +241,16 @@ static void stand_up_rc_track_flat_to_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25387, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25387, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25401, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25401, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25391, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25391, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25403, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25403, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -263,16 +263,16 @@ static void stand_up_rc_track_flat_to_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25233, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25233, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25247, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25247, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25237, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25237, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25249, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25249, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -303,7 +303,7 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25388, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25388, 0, 6, 32, 20, 3, height); break; case 1: PaintAddImageAsParentRotated( @@ -318,7 +318,7 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up( session, direction, session->TrackColours[SCHEME_TRACK] | 25392, 0, 6, 32, 2, 43, height, 0, 4, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25404, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25404, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -331,7 +331,7 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25234, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25234, 0, 6, 32, 20, 3, height); break; case 1: PaintAddImageAsParentRotated( @@ -346,7 +346,7 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up( session, direction, session->TrackColours[SCHEME_TRACK] | 25238, 0, 6, 32, 2, 43, height, 0, 4, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25250, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25250, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -377,7 +377,7 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25396, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25396, 0, 6, 32, 20, 3, height); break; case 1: PaintAddImageAsParentRotated( @@ -392,7 +392,7 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up( session, direction, session->TrackColours[SCHEME_TRACK] | 25394, 0, 6, 32, 2, 43, height, 0, 4, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25406, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25406, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -405,7 +405,7 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25242, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25242, 0, 6, 32, 20, 3, height); break; case 1: PaintAddImageAsParentRotated( @@ -420,7 +420,7 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up( session, direction, session->TrackColours[SCHEME_TRACK] | 25240, 0, 6, 32, 2, 43, height, 0, 4, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25252, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25252, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -451,16 +451,16 @@ static void stand_up_rc_track_25_deg_up_to_flat( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25395, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25395, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25407, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25407, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25393, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25393, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25405, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25405, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -473,16 +473,16 @@ static void stand_up_rc_track_25_deg_up_to_flat( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25241, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25241, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25253, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25253, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25239, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25239, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25251, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25251, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -562,19 +562,19 @@ static void stand_up_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25264, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25269, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25274, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25259, 0, 6, 32, 20, 3, height); break; } @@ -594,19 +594,19 @@ static void stand_up_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25263, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25268, 0, 0, 32, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25273, 0, 16, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25258, 0, 16, 32, 16, 3, height); break; } @@ -621,19 +621,19 @@ static void stand_up_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25262, 0, 16, 16, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25267, 16, 16, 16, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25272, 16, 0, 16, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25257, 0, 0, 16, 16, 3, height); break; } @@ -648,19 +648,19 @@ static void stand_up_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25261, 16, 0, 16, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25266, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25271, 0, 0, 16, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25256, 16, 0, 16, 32, 3, height); break; } @@ -675,19 +675,19 @@ static void stand_up_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25260, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25265, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25270, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25255, 6, 0, 20, 32, 3, height); break; } @@ -725,16 +725,16 @@ static void stand_up_rc_track_flat_to_left_bank( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25281, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25281, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25286, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25286, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25280, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25280, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25283, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25283, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -755,16 +755,16 @@ static void stand_up_rc_track_flat_to_right_bank( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25279, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25279, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25284, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25284, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25282, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25282, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25285, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25285, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -785,16 +785,16 @@ static void stand_up_rc_track_left_bank_to_flat( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25282, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25282, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25285, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25285, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25279, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25279, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25284, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25284, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -815,16 +815,16 @@ static void stand_up_rc_track_right_bank_to_flat( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25280, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25280, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25283, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25283, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25281, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25281, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25286, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25286, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -1028,16 +1028,16 @@ static void stand_up_rc_track_left_bank_to_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25315, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25315, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25316, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25316, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25317, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25317, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25318, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25318, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -1065,16 +1065,16 @@ static void stand_up_rc_track_right_bank_to_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25319, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25319, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25320, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25320, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25321, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25321, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25322, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25322, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -1102,16 +1102,16 @@ static void stand_up_rc_track_25_deg_up_to_left_bank( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25311, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25311, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25312, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25312, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25313, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25313, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25314, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25314, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -1139,16 +1139,16 @@ static void stand_up_rc_track_25_deg_up_to_right_bank( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25307, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25307, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25308, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25308, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25309, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25309, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25310, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25310, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -1208,16 +1208,16 @@ static void stand_up_rc_track_left_bank( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25323, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25323, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25324, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25324, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25325, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25325, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25326, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25326, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -1251,19 +1251,19 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25433, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25438, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25443, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25448, 0, 6, 32, 20, 3, height); break; } @@ -1275,19 +1275,19 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25347, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25352, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25357, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25362, 0, 6, 32, 20, 3, height); break; } @@ -1311,19 +1311,19 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25434, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25439, 0, 0, 32, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25444, 0, 16, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25449, 0, 16, 32, 16, 3, height); break; } @@ -1333,19 +1333,19 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25348, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25353, 0, 0, 32, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25358, 0, 16, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25363, 0, 16, 32, 16, 3, height); break; } @@ -1363,19 +1363,19 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25435, 0, 16, 16, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25440, 16, 16, 16, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25445, 16, 0, 16, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25450, 0, 0, 16, 16, 3, height); break; } @@ -1385,19 +1385,19 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25349, 0, 16, 16, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25354, 16, 16, 16, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25359, 16, 0, 16, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25364, 0, 0, 16, 16, 3, height); break; } @@ -1415,19 +1415,19 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25436, 16, 0, 16, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25441, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25446, 0, 0, 16, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25451, 16, 0, 16, 32, 3, height); break; } @@ -1437,19 +1437,19 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25350, 16, 0, 16, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25355, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25360, 0, 0, 16, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25365, 16, 0, 16, 32, 3, height); break; } @@ -1467,19 +1467,19 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25437, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25442, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25447, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25452, 6, 0, 20, 32, 3, height); break; } @@ -1491,19 +1491,19 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25351, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25356, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25361, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25366, 6, 0, 20, 32, 3, height); break; } @@ -1539,19 +1539,19 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25413, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25418, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25423, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25428, 0, 6, 32, 20, 3, height); break; } @@ -1563,19 +1563,19 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25327, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25332, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25337, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25342, 0, 6, 32, 20, 3, height); break; } @@ -1599,19 +1599,19 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25414, 0, 16, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25419, 0, 16, 32, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25424, 0, 0, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25429, 0, 0, 32, 16, 3, height); break; } @@ -1621,19 +1621,19 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25328, 0, 16, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25333, 0, 16, 32, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25338, 0, 0, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25343, 0, 0, 32, 16, 3, height); break; } @@ -1651,19 +1651,19 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25415, 0, 0, 16, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25420, 16, 0, 16, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25425, 16, 16, 16, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25430, 0, 16, 16, 16, 3, height); break; } @@ -1673,19 +1673,19 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25329, 0, 0, 16, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25334, 16, 0, 16, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25339, 16, 16, 16, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25344, 0, 16, 16, 16, 3, height); break; } @@ -1703,19 +1703,19 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25416, 16, 0, 16, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25421, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25426, 0, 0, 16, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25431, 16, 0, 16, 32, 3, height); break; } @@ -1725,19 +1725,19 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25330, 16, 0, 16, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25335, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25340, 0, 0, 16, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25345, 16, 0, 16, 32, 3, height); break; } @@ -1755,19 +1755,19 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25417, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25422, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25427, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25432, 6, 0, 20, 32, 3, height); break; } @@ -1779,19 +1779,19 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25331, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25336, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25341, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25346, 6, 0, 20, 32, 3, height); break; } @@ -1845,19 +1845,19 @@ static void stand_up_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25371, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25378, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25374, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25375, 0, 6, 32, 20, 3, height); break; } @@ -1874,23 +1874,23 @@ static void stand_up_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25372, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25377, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25373, 0, 6, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25376, 0, 6, 32, 26, 3, height); break; } @@ -1905,21 +1905,21 @@ static void stand_up_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25373, 0, 6, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25376, 0, 6, 32, 26, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25372, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25377, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -1936,19 +1936,19 @@ static void stand_up_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25374, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25375, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25371, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25378, 0, 6, 32, 20, 3, height); break; } @@ -1980,19 +1980,19 @@ static void stand_up_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25367, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25382, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25370, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25379, 0, 6, 32, 20, 3, height); break; } @@ -2009,23 +2009,23 @@ static void stand_up_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25368, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25381, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25369, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25380, 0, 0, 32, 26, 3, height); break; } @@ -2040,21 +2040,21 @@ static void stand_up_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25369, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25380, 0, 0, 32, 26, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25368, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25381, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2071,19 +2071,19 @@ static void stand_up_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25370, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25379, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25367, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25382, 0, 6, 32, 20, 3, height); break; } @@ -2115,19 +2115,19 @@ static void stand_up_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25477, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25485, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25484, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25492, 0, 6, 32, 20, 7, height); break; } @@ -2147,25 +2147,25 @@ static void stand_up_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25478, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25486, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25483, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25491, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2182,19 +2182,19 @@ static void stand_up_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25479, 16, 0, 5, 16, 119, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25487, 12, 0, 3, 16, 119, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25482, 10, 16, 4, 16, 119, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25490, 16, 16, 4, 16, 119, height); break; } @@ -2206,19 +2206,19 @@ static void stand_up_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25480, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25488, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25481, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25489, 0, 16, 32, 16, 3, height + 32); break; } @@ -2239,19 +2239,19 @@ static void stand_up_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25481, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25489, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25480, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25488, 0, 0, 32, 16, 3, height + 32); break; } @@ -2266,19 +2266,19 @@ static void stand_up_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25482, 10, 16, 4, 16, 119, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25490, 16, 16, 4, 16, 119, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25479, 16, 0, 5, 16, 119, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25487, 12, 0, 3, 16, 119, height); break; } @@ -2290,25 +2290,25 @@ static void stand_up_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25483, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25491, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25478, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25486, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2325,19 +2325,19 @@ static void stand_up_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25484, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25492, 0, 6, 32, 20, 7, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25477, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25485, 0, 6, 32, 20, 3, height); break; } @@ -2372,19 +2372,19 @@ static void stand_up_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25508, 0, 6, 32, 20, 7, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25500, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25501, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25493, 0, 6, 32, 20, 3, height); break; } @@ -2399,25 +2399,25 @@ static void stand_up_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25507, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25499, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25502, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25494, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2429,19 +2429,19 @@ static void stand_up_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25506, 16, 16, 4, 16, 119, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25498, 10, 16, 4, 16, 119, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25503, 12, 0, 3, 16, 119, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25495, 16, 0, 5, 16, 119, height); break; } @@ -2451,19 +2451,19 @@ static void stand_up_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25505, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25497, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25504, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25496, 0, 0, 32, 16, 3, height + 32); break; } @@ -2479,19 +2479,19 @@ static void stand_up_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25504, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25496, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25505, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25497, 0, 16, 32, 16, 3, height + 32); break; } @@ -2501,19 +2501,19 @@ static void stand_up_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25503, 12, 0, 3, 16, 119, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25495, 16, 0, 5, 16, 119, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25506, 16, 16, 4, 16, 119, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25498, 10, 16, 4, 16, 119, height); break; } @@ -2523,25 +2523,25 @@ static void stand_up_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25502, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25494, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25507, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25499, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2553,19 +2553,19 @@ static void stand_up_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25501, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25493, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25508, 0, 6, 32, 20, 7, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25500, 0, 6, 32, 20, 3, height); break; } @@ -2597,19 +2597,19 @@ static void stand_up_rc_track_left_quarter_turn_3( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25514, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25517, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25520, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25511, 0, 6, 32, 20, 3, height); break; } @@ -2629,19 +2629,19 @@ static void stand_up_rc_track_left_quarter_turn_3( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25513, 16, 0, 16, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25516, 0, 0, 16, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25519, 0, 16, 16, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25510, 16, 16, 16, 16, 3, height); break; } @@ -2653,19 +2653,19 @@ static void stand_up_rc_track_left_quarter_turn_3( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25512, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25515, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25518, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25509, 6, 0, 20, 32, 3, height); break; } @@ -2829,19 +2829,19 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25562, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25564, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25566, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25560, 0, 6, 32, 20, 3, height); break; } @@ -2853,19 +2853,19 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25546, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25548, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25550, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25544, 0, 6, 32, 20, 3, height); break; } @@ -2892,19 +2892,19 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25561, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25563, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25565, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25559, 6, 0, 20, 32, 3, height); break; } @@ -2916,19 +2916,19 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25545, 6, 0, 20, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25547, 6, 0, 20, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25549, 6, 0, 20, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25543, 6, 0, 20, 32, 3, height); break; } @@ -2964,19 +2964,19 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25551, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25553, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25555, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25557, 0, 6, 32, 20, 3, height); break; } @@ -2988,19 +2988,19 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25535, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25537, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25539, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25541, 0, 6, 32, 20, 3, height); break; } @@ -3027,25 +3027,25 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25552, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25554, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25556, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25558, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -3057,25 +3057,25 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25536, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25538, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25540, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25542, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -3129,19 +3129,19 @@ static void stand_up_rc_track_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25575, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25583, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25582, 0, 6, 32, 20, 9, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25590, 0, 6, 32, 20, 7, height); break; } @@ -3164,7 +3164,7 @@ static void stand_up_rc_track_half_loop_up( session, METAL_SUPPORTS_TUBES, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25584, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -3176,7 +3176,7 @@ static void stand_up_rc_track_half_loop_up( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25589, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -3189,15 +3189,15 @@ static void stand_up_rc_track_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25577, 16, 0, 2, 16, 119, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25585, 12, 0, 3, 16, 119, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25580, 10, 16, 4, 12, 119, height); break; case 3: @@ -3217,19 +3217,19 @@ static void stand_up_rc_track_half_loop_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25578, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25586, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25579, 0, 16, 32, 12, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25587, 0, 16, 32, 12, 3, height + 32); break; } @@ -4682,11 +4682,11 @@ static void stand_up_rc_track_brakes( { case 0: case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25569, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25569, 0, 6, 32, 20, 3, height); break; case 1: case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25570, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25570, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) @@ -4707,28 +4707,28 @@ static void stand_up_rc_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25229, 0, 6, 32, 20, 1, height, 0, 6, height + 3); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25230, 0, 6, 32, 20, 1, height, 0, 6, height + 3); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25229, 0, 6, 32, 20, 1, height, 0, 6, height + 3); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); PaintAddImageAsParentRotated( @@ -8338,11 +8338,11 @@ static void stand_up_rc_track_block_brakes( { case 0: case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25571, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25571, 0, 6, 32, 20, 3, height); break; case 1: case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25572, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 25572, 0, 6, 32, 20, 3, height); break; } if (track_paint_util_should_paint_supports(session->MapPosition)) diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index f49318f833..5a05e3fc5b 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -30,13 +30,13 @@ static void steeplechase_track_flat( { case 0: case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -48,13 +48,13 @@ static void steeplechase_track_flat( { case 0: case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28633, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28633, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28634, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28634, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -100,22 +100,22 @@ static void steeplechase_track_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28649, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28649, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28655, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28655, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28651, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28651, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28656, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28656, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -126,22 +126,22 @@ static void steeplechase_track_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28637, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28637, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28643, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28643, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28639, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28639, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28644, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28644, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -170,22 +170,22 @@ static void steeplechase_track_flat_to_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28650, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28650, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 3, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28657, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28657, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28652, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28652, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28658, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28658, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -196,22 +196,22 @@ static void steeplechase_track_flat_to_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28638, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28638, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 3, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28645, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28645, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28640, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28640, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28646, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28646, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 2, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -240,22 +240,22 @@ static void steeplechase_track_25_deg_up_to_flat( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28654, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28654, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28660, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28660, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28653, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28653, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 5, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28659, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28659, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 5, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -266,22 +266,22 @@ static void steeplechase_track_25_deg_up_to_flat( switch (direction) { case 0: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28642, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28642, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28648, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28648, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28641, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28641, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 5, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28647, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28647, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 5, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -335,25 +335,25 @@ static void steeplechase_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28698, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28703, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28708, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height - 3, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28693, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height - 1, session->TrackColours[SCHEME_SUPPORTS]); @@ -374,19 +374,19 @@ static void steeplechase_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28697, 0, 0, 32, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28702, 0, 0, 32, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28707, 0, 16, 32, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28692, 0, 16, 32, 16, 3, height); break; } @@ -401,19 +401,19 @@ static void steeplechase_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28696, 0, 16, 16, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28701, 16, 16, 16, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28706, 16, 0, 16, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28691, 0, 0, 16, 16, 3, height); break; } @@ -428,19 +428,19 @@ static void steeplechase_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28695, 16, 0, 16, 32, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28700, 0, 0, 16, 32, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28705, 0, 0, 16, 32, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28690, 16, 0, 16, 32, 3, height); break; } @@ -455,25 +455,25 @@ static void steeplechase_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28694, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height - 3, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28699, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28704, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28689, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height - 2, session->TrackColours[SCHEME_SUPPORTS]); @@ -515,25 +515,25 @@ static void steeplechase_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28665, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28672, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28668, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28669, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height - 2, session->TrackColours[SCHEME_SUPPORTS]); @@ -551,23 +551,23 @@ static void steeplechase_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28666, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28671, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28667, 0, 6, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28670, 0, 6, 32, 26, 3, height); break; } @@ -582,21 +582,21 @@ static void steeplechase_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28667, 0, 6, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28670, 0, 6, 32, 26, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28666, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28671, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -613,25 +613,25 @@ static void steeplechase_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28668, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28669, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height - 2, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28665, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28672, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -664,25 +664,25 @@ static void steeplechase_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28661, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28676, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28664, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28673, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -700,23 +700,23 @@ static void steeplechase_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28662, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 8, 0, height - 2, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28675, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28663, 0, 0, 32, 26, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28674, 0, 0, 32, 26, 3, height); break; } @@ -731,21 +731,21 @@ static void steeplechase_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28663, 0, 0, 32, 26, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28674, 0, 0, 32, 26, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28662, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 8, 0, height - 2, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28675, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -762,25 +762,25 @@ static void steeplechase_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28664, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28673, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28661, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28676, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -813,25 +813,25 @@ static void steeplechase_track_left_quarter_turn_3( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28682, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 3, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28685, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28688, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28679, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height - 3, session->TrackColours[SCHEME_SUPPORTS]); @@ -852,19 +852,19 @@ static void steeplechase_track_left_quarter_turn_3( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28681, 16, 0, 16, 16, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28684, 0, 0, 16, 16, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28687, 0, 16, 16, 16, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28678, 16, 16, 16, 16, 3, height); break; } @@ -876,25 +876,25 @@ static void steeplechase_track_left_quarter_turn_3( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28680, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28683, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 1, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28686, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 3, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 28677, 6, 0, 20, 32, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK, 4, 0, height - 3, session->TrackColours[SCHEME_SUPPORTS]); @@ -934,12 +934,12 @@ static void steeplechase_track_brakes( { case 0: case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; @@ -2288,12 +2288,12 @@ static void steeplechase_track_block_brakes( { case 0: case 2: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28635, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup(session, METAL_SUPPORTS_STICK, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: case 3: - sub_98196C_rotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height); + PaintAddImageAsParentRotated(session, direction, session->TrackColours[SCHEME_TRACK] | 28636, 0, 6, 32, 20, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_STICK_ALT, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]); break; diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index 153a645414..6d359c22bd 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -676,11 +676,11 @@ static void suspended_swinging_rc_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26013, 0, 0, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26018, 0, 0, 32, 16, 3, height + 29); break; case 2: @@ -720,7 +720,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5( height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26007, 0, 0, 16, 16, 3, height + 29); break; } @@ -740,11 +740,11 @@ static void suspended_swinging_rc_track_left_quarter_turn_5( height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26016, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26021, 0, 0, 16, 32, 3, height + 29); break; case 3: @@ -826,19 +826,19 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26097, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26102, 0, 6, 32, 20, 11, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26107, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26112, 0, 6, 32, 20, 3, height + 29); break; } @@ -862,19 +862,19 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26098, 0, 0, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26103, 0, 0, 32, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26108, 0, 16, 32, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26113, 0, 16, 32, 16, 3, height + 29); break; } @@ -889,19 +889,19 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26099, 0, 16, 16, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26104, 16, 16, 16, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26109, 16, 0, 16, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26114, 0, 0, 16, 16, 3, height + 29); break; } @@ -916,15 +916,15 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26100, 16, 0, 16, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26105, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26110, 0, 0, 16, 32, 3, height + 29); break; case 3: @@ -944,19 +944,19 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26101, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26106, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26111, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26116, 6, 0, 20, 32, 3, height + 29); break; } @@ -992,19 +992,19 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26077, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26082, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26087, 0, 6, 32, 20, 11, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26092, 0, 6, 32, 20, 3, height + 29); break; } @@ -1028,19 +1028,19 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26078, 0, 16, 32, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26083, 0, 16, 32, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26088, 0, 0, 32, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26093, 0, 0, 32, 16, 3, height + 29); break; } @@ -1055,19 +1055,19 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26079, 0, 0, 16, 16, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26084, 16, 0, 16, 16, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26089, 16, 16, 16, 16, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26094, 0, 16, 16, 16, 3, height + 29); break; } @@ -1087,15 +1087,15 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up( height + 37); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26085, 0, 0, 16, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26090, 0, 0, 16, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26095, 16, 0, 16, 32, 3, height + 29); break; } @@ -1110,19 +1110,19 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26081, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26086, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26091, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26096, 6, 0, 20, 32, 3, height + 29); break; } @@ -1178,19 +1178,19 @@ static void suspended_swinging_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26139, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26146, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26142, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26143, 0, 6, 32, 20, 3, height + 29); break; } @@ -1210,19 +1210,19 @@ static void suspended_swinging_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26140, 0, 0, 32, 26, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26145, 0, 0, 32, 26, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26141, 0, 6, 32, 26, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26144, 0, 6, 32, 26, 3, height + 29); break; } @@ -1250,19 +1250,19 @@ static void suspended_swinging_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26141, 0, 6, 32, 26, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26144, 0, 6, 32, 26, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26140, 0, 0, 32, 26, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26145, 0, 0, 32, 26, 3, height + 29); break; } @@ -1290,19 +1290,19 @@ static void suspended_swinging_rc_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26142, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26143, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26139, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26146, 0, 6, 32, 20, 3, height + 29); break; } @@ -1337,19 +1337,19 @@ static void suspended_swinging_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26135, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26150, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26138, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26147, 0, 6, 32, 20, 3, height + 29); break; } @@ -1369,19 +1369,19 @@ static void suspended_swinging_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26136, 0, 6, 32, 26, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26149, 0, 6, 32, 26, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26137, 0, 0, 32, 26, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26148, 0, 0, 32, 26, 3, height + 29); break; } @@ -1409,19 +1409,19 @@ static void suspended_swinging_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26137, 0, 0, 32, 26, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26148, 0, 0, 32, 26, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26136, 0, 6, 32, 26, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26149, 0, 6, 32, 26, 3, height + 29); break; } @@ -1449,19 +1449,19 @@ static void suspended_swinging_rc_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26138, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26147, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26135, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26150, 0, 6, 32, 20, 3, height + 29); break; } @@ -1541,7 +1541,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3( height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26072, 0, 0, 16, 16, 3, height + 29); break; case 2: @@ -1625,19 +1625,19 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26130, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26132, 0, 6, 32, 20, 11, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26134, 0, 6, 32, 20, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26128, 0, 6, 32, 20, 3, height + 29); break; } @@ -1664,19 +1664,19 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26129, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26131, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26133, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26127, 6, 0, 20, 32, 3, height + 29); break; } @@ -1712,19 +1712,19 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26119, 0, 6, 32, 20, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26121, 0, 6, 32, 20, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26123, 0, 6, 32, 20, 11, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26125, 0, 6, 32, 20, 3, height + 29); break; } @@ -1751,19 +1751,19 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26120, 6, 0, 20, 32, 3, height + 29); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26122, 6, 0, 20, 32, 3, height + 29); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26124, 6, 0, 20, 32, 3, height + 29); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 26126, 6, 0, 20, 32, 3, height + 29); break; } diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index 81476deca2..95fea44fd2 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -589,7 +589,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down( { int32_t part = trackSequence == 0 ? 0 : 1; const sprite_bb* sbb = &imageIds[direction][part]; - sub_98196C( + PaintAddImageAsParent( session, sbb->sprite_id | session->TrackColours[SCHEME_TRACK], static_cast(sbb->offset.x), static_cast(sbb->offset.y), sbb->bb_size.x, sbb->bb_size.y, static_cast(sbb->bb_size.z), height + static_cast(sbb->offset.z)); @@ -658,7 +658,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up( { int32_t part = trackSequence == 0 ? 0 : 1; const sprite_bb* sbb = &imageIds[direction][part]; - sub_98196C( + PaintAddImageAsParent( session, sbb->sprite_id | session->TrackColours[SCHEME_TRACK], static_cast(sbb->offset.x), static_cast(sbb->offset.y), sbb->bb_size.x, sbb->bb_size.y, static_cast(sbb->bb_size.z), height + static_cast(sbb->offset.z)); @@ -736,7 +736,7 @@ static void wild_mouse_track_left_quarter_turn_1( PaintAddImageAsParent(session, imageId, 0, 0, 26, 24, 2, height, 6, 2, height); break; case 1: - sub_98196C(session, imageId, 0, 0, 26, 26, 2, height); + PaintAddImageAsParent(session, imageId, 0, 0, 26, 26, 2, height); break; case 2: PaintAddImageAsParent(session, imageId, 0, 0, 24, 26, 2, height, 2, 6, height); diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index ad95826255..09418845d0 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -2659,19 +2659,19 @@ static void wooden_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23453, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23461, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23460, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23468, 0, 6, 32, 20, 7, height); break; } @@ -2691,25 +2691,25 @@ static void wooden_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23454, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23462, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 9, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23459, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23467, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2726,19 +2726,19 @@ static void wooden_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23455, 16, 0, 5, 16, 119, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23463, 12, 0, 3, 16, 119, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23458, 10, 16, 4, 16, 119, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23466, 16, 16, 4, 16, 119, height); break; } @@ -2750,19 +2750,19 @@ static void wooden_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23456, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23464, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23457, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23465, 0, 16, 32, 16, 3, height + 32); break; } @@ -2783,19 +2783,19 @@ static void wooden_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23457, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23465, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23456, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23464, 0, 0, 32, 16, 3, height + 32); break; } @@ -2810,19 +2810,19 @@ static void wooden_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23458, 10, 16, 4, 16, 119, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23466, 16, 16, 4, 16, 119, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23455, 16, 0, 5, 16, 119, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23463, 12, 0, 3, 16, 119, height); break; } @@ -2834,25 +2834,25 @@ static void wooden_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23459, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23467, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23454, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23462, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 9, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2869,19 +2869,19 @@ static void wooden_rc_track_left_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23460, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23468, 0, 6, 32, 20, 7, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23453, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23461, 0, 6, 32, 20, 3, height); break; } @@ -2916,19 +2916,19 @@ static void wooden_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23484, 0, 6, 32, 20, 7, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23476, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23477, 0, 6, 32, 20, 3, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23469, 0, 6, 32, 20, 3, height); break; } @@ -2943,25 +2943,25 @@ static void wooden_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23483, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23475, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23478, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 9, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23470, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -2973,19 +2973,19 @@ static void wooden_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23482, 16, 16, 4, 16, 119, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23474, 10, 16, 4, 16, 119, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23479, 12, 0, 3, 16, 119, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23471, 16, 0, 5, 16, 119, height); break; } @@ -2995,19 +2995,19 @@ static void wooden_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23481, 0, 16, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23473, 0, 16, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23480, 0, 0, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23472, 0, 0, 32, 16, 3, height + 32); break; } @@ -3023,19 +3023,19 @@ static void wooden_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23480, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23472, 0, 0, 32, 16, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23481, 0, 16, 32, 16, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23473, 0, 16, 32, 16, 3, height + 32); break; } @@ -3045,19 +3045,19 @@ static void wooden_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23479, 12, 0, 3, 16, 119, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23471, 16, 0, 5, 16, 119, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23482, 16, 16, 4, 16, 119, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23474, 10, 16, 4, 16, 119, height); break; } @@ -3067,25 +3067,25 @@ static void wooden_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23478, 0, 14, 32, 2, 63, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 9, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23470, 0, 0, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 20, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23483, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23475, 0, 6, 32, 26, 3, height); metal_a_supports_paint_setup( session, METAL_SUPPORTS_BOXED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]); @@ -3097,19 +3097,19 @@ static void wooden_rc_track_right_vertical_loop( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23477, 0, 6, 32, 20, 3, height); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23469, 0, 6, 32, 20, 3, height); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23484, 0, 6, 32, 20, 7, height); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, wooden_rc_get_rails_colour(session) | 23476, 0, 6, 32, 20, 3, height); break; } diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index 0e1867f333..a3780942b3 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -134,7 +134,7 @@ static void wooden_wild_mouse_track_flat( }; uint32_t imageId = imageIds[direction] | session->TrackColours[SCHEME_TRACK]; - sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height); + PaintAddImageAsParentRotated(session, direction, imageId, 0, 6, 32, 20, 1, height); wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0); paint_util_set_segment_support_height( @@ -574,13 +574,13 @@ static void wooden_wild_mouse_track_left_quarter_turn_1( PaintAddImageAsParent(session, imageId, 6, 0, 26, 24, 1, height, 6, 2, height); break; case 1: - sub_98196C(session, imageId, 0, 0, 26, 26, 1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 26, 26, 1, height); break; case 2: PaintAddImageAsParent(session, imageId, 0, 6, 24, 26, 1, height, 2, 6, height); break; case 3: - sub_98196C(session, imageId, 6, 6, 24, 24, 1, height); + PaintAddImageAsParent(session, imageId, 6, 6, 24, 24, 1, height); break; } wooden_a_supports_paint_setup(session, supportType[direction], 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index 4c1fcdb3d8..cc5799d0a7 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -152,11 +152,11 @@ static void paint_car_ride_track_flat( if (direction == 0 || direction == 2) { - sub_98196C(session, imageId, 0, 6, 32, 20, 1, height); + PaintAddImageAsParent(session, imageId, 0, 6, 32, 20, 1, height); } else { - sub_98196C(session, imageId, 6, 0, 20, 32, 1, height); + PaintAddImageAsParent(session, imageId, 6, 0, 20, 32, 1, height); } if (direction == 0 || direction == 2) @@ -426,13 +426,13 @@ static void paint_car_ride_track_left_quarter_turn_1_tile( PaintAddImageAsParent(session, imageId, 6, 0, 26, 24, 1, height, 6, 2, height); break; case 1: - sub_98196C(session, imageId, 0, 0, 26, 26, 1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 26, 26, 1, height); break; case 2: PaintAddImageAsParent(session, imageId, 0, 6, 24, 26, 1, height, 2, 6, height); break; case 3: - sub_98196C(session, imageId, 6, 6, 24, 24, 1, height); + PaintAddImageAsParent(session, imageId, 6, 6, 24, 24, 1, height); break; } @@ -461,11 +461,11 @@ static void paint_car_ride_track_spinning_tunnel( if (direction == 0 || direction == 2) { - sub_98196C(session, imageId, 0, 6, 32, 20, 1, height); + PaintAddImageAsParent(session, imageId, 0, 6, 32, 20, 1, height); } else { - sub_98196C(session, imageId, 6, 0, 20, 32, 1, height); + PaintAddImageAsParent(session, imageId, 6, 0, 20, 32, 1, height); } track_paint_util_spinning_tunnel_paint(session, 1, height, direction); @@ -679,11 +679,11 @@ static void paint_car_ride_track_log_bumps( if (direction == 0 || direction == 2) { - sub_98196C(session, imageId, 0, 6, 32, 20, 1, height); + PaintAddImageAsParent(session, imageId, 0, 6, 32, 20, 1, height); } else { - sub_98196C(session, imageId, 6, 0, 20, 32, 1, height); + PaintAddImageAsParent(session, imageId, 6, 0, 20, 32, 1, height); } if (direction == 0 || direction == 2) diff --git a/src/openrct2/ride/gentle/Dodgems.cpp b/src/openrct2/ride/gentle/Dodgems.cpp index 468aca5da6..de23a855ee 100644 --- a/src/openrct2/ride/gentle/Dodgems.cpp +++ b/src/openrct2/ride/gentle/Dodgems.cpp @@ -30,7 +30,7 @@ static constexpr const uint32_t dodgems_fence_sprites[] = { SPR_DODGEMS_FENCE_TO static void paint_dodgems_roof(paint_session* session, int32_t height, int32_t offset) { uint32_t image_id = (SPR_DODGEMS_ROOF_FRAME + offset) | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, image_id, 0, 0, 32, 32, 2, height); + PaintAddImageAsParent(session, image_id, 0, 0, 32, 32, 2, height); image_id = (SPR_DODGEMS_ROOF_GLASS + offset) | (PALETTE_DARKEN_3 << 19) | IMAGE_TYPE_TRANSPARENT; PaintAttachToPreviousPS(session, image_id, 0, 0); diff --git a/src/openrct2/ride/gentle/Maze.cpp b/src/openrct2/ride/gentle/Maze.cpp index c859d6231f..424aab5e3b 100644 --- a/src/openrct2/ride/gentle/Maze.cpp +++ b/src/openrct2/ride/gentle/Maze.cpp @@ -54,7 +54,7 @@ static void maze_paint_setup( uint32_t rotation = session->CurrentRotation; // draw ground int32_t image_id = SPR_TERRAIN_DIRT | session->TrackColours[SCHEME_MISC]; - sub_98196C(session, image_id, 0, 0, 32, 32, 0, height); + PaintAddImageAsParent(session, image_id, 0, 0, 32, 32, 0, height); wooden_a_supports_paint_setup(session, (rotation & 1) ? 0 : 1, 0, height, session->TrackColours[SCHEME_3], nullptr); diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index d68fa9591c..ee98a98dc5 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -240,7 +240,7 @@ static void paint_magic_carpet( } uint32_t imageId = SPR_STATION_BASE_D | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 0, 32, 32, 1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, 1, height); break; } diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index f34992d554..74e0b56999 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -142,17 +142,17 @@ static void paint_swinging_inverter_ship( } imageId = SPR_STATION_BASE_D | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 0, 32, 32, 1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, 1, height); switch (direction) { case 0: imageId = SPR_STATION_PLATFORM_SW_NE | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 0, 24, 32, 8, 1, height + 9); + PaintAddImageAsParent(session, imageId, 0, 24, 32, 8, 1, height + 9); break; case 1: imageId = SPR_STATION_PLATFORM_NW_SE | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 24, 0, 8, 32, 1, height + 9); + PaintAddImageAsParent(session, imageId, 24, 0, 8, 32, 1, height + 9); break; case 2: imageId = SPR_STATION_PLATFORM_SW_NE | session->TrackColours[SCHEME_TRACK]; diff --git a/src/openrct2/ride/thrill/SwingingShip.cpp b/src/openrct2/ride/thrill/SwingingShip.cpp index 6b25845a64..dbfe375b2d 100644 --- a/src/openrct2/ride/thrill/SwingingShip.cpp +++ b/src/openrct2/ride/thrill/SwingingShip.cpp @@ -189,7 +189,7 @@ static void paint_swinging_ship( metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]); imageId = SPR_STATION_BASE_A_NW_SE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 0, 32, 32, 1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, 1, height); } else { @@ -197,7 +197,7 @@ static void paint_swinging_ship( metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); imageId = SPR_STATION_BASE_A_SW_NE | session->TrackColours[SCHEME_SUPPORTS]; - sub_98196C(session, imageId, 0, 0, 32, 32, 1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, 1, height); } paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); @@ -221,7 +221,7 @@ static void paint_swinging_ship( imageId = (relativeTrackSequence == 2 ? SPR_STATION_PLATFORM_BEGIN_NW_SE : SPR_STATION_PLATFORM_NW_SE) | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 24, 0, 8, 32, 1, height + 9); + PaintAddImageAsParent(session, imageId, 24, 0, 8, 32, 1, height + 9); hasFence = track_paint_util_has_fence(EDGE_SW, session->MapPosition, tileElement, ride, session->CurrentRotation); if (relativeTrackSequence == 3) @@ -229,21 +229,21 @@ static void paint_swinging_ship( if (hasFence) { imageId = SPR_STATION_BEGIN_ANGLE_FENCE_NW_SE | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 31, 0, 1, 32, 7, height + 11); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 32, 7, height + 11); } else { imageId = SPR_STATION_FENCE_SMALL_SW_NE | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 23, 31, 8, 1, 7, height + 11); + PaintAddImageAsParent(session, imageId, 23, 31, 8, 1, 7, height + 11); } imageId = SPR_STATION_FENCE_SMALL_SW_NE | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 0, 31, 8, 1, 7, height + 11); + PaintAddImageAsParent(session, imageId, 0, 31, 8, 1, 7, height + 11); } else if (hasFence) { imageId = SPR_STATION_FENCE_NW_SE | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 31, 0, 1, 32, 7, height + 11); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 32, 7, height + 11); } } } @@ -266,7 +266,7 @@ static void paint_swinging_ship( imageId = (relativeTrackSequence == 2 ? SPR_STATION_PLATFORM_BEGIN_SW_NE : SPR_STATION_PLATFORM_SW_NE) | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 0, 24, 32, 8, 1, height + 9); + PaintAddImageAsParent(session, imageId, 0, 24, 32, 8, 1, height + 9); hasFence = track_paint_util_has_fence(EDGE_SE, session->MapPosition, tileElement, ride, session->CurrentRotation); if (relativeTrackSequence == 3) @@ -274,21 +274,21 @@ static void paint_swinging_ship( if (hasFence) { imageId = SPR_STATION_BEGIN_ANGLE_FENCE_SW_NE | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 0, 31, 32, 1, 7, height + 11); + PaintAddImageAsParent(session, imageId, 0, 31, 32, 1, 7, height + 11); } else { imageId = SPR_STATION_FENCE_SMALL_NW_SE | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 31, 23, 1, 8, 7, height + 11); + PaintAddImageAsParent(session, imageId, 31, 23, 1, 8, 7, height + 11); } imageId = SPR_STATION_FENCE_SMALL_NW_SE | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 31, 0, 1, 8, 7, height + 11); + PaintAddImageAsParent(session, imageId, 31, 0, 1, 8, 7, height + 11); } else if (hasFence) { imageId = SPR_STATION_FENCE_SW_NE | session->TrackColours[SCHEME_TRACK]; - sub_98196C(session, imageId, 0, 31, 32, 1, 7, height + 11); + PaintAddImageAsParent(session, imageId, 0, 31, 32, 1, 7, height + 11); } } } diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index f1ef27aab6..d564f70c28 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -426,11 +426,11 @@ static void paint_monorail_track_flat( if (direction == 0 || direction == 2) { - sub_98196C(session, imageId, 0, 6, 32, 20, 3, height); + PaintAddImageAsParent(session, imageId, 0, 6, 32, 20, 3, height); } else { - sub_98196C(session, imageId, 6, 0, 20, 32, 3, height); + PaintAddImageAsParent(session, imageId, 6, 0, 20, 32, 3, height); } if (direction == 0 || direction == 2) @@ -515,11 +515,11 @@ static void paint_monorail_track_25_deg_up( if (direction == 0 || direction == 2) { - sub_98196C(session, imageId, 0, 6, 32, 20, 3, height); + PaintAddImageAsParent(session, imageId, 0, 6, 32, 20, 3, height); } else { - sub_98196C(session, imageId, 6, 0, 20, 32, 3, height); + PaintAddImageAsParent(session, imageId, 6, 0, 20, 32, 3, height); } switch (direction) @@ -557,11 +557,11 @@ static void paint_monorail_track_flat_to_25_deg_up( if (direction == 0 || direction == 2) { - sub_98196C(session, imageId, 0, 6, 32, 20, 3, height); + PaintAddImageAsParent(session, imageId, 0, 6, 32, 20, 3, height); } else { - sub_98196C(session, imageId, 6, 0, 20, 32, 3, height); + PaintAddImageAsParent(session, imageId, 6, 0, 20, 32, 3, height); } switch (direction) @@ -599,11 +599,11 @@ static void paint_monorail_track_25_deg_up_to_flat( if (direction == 0 || direction == 2) { - sub_98196C(session, imageId, 0, 6, 32, 20, 3, height); + PaintAddImageAsParent(session, imageId, 0, 6, 32, 20, 3, height); } else { - sub_98196C(session, imageId, 6, 0, 20, 32, 3, height); + PaintAddImageAsParent(session, imageId, 6, 0, 20, 32, 3, height); } switch (direction) @@ -758,12 +758,12 @@ static void paint_monorail_track_s_bend_left( CoordsXY bounds = boundsList[trackSequence]; if (direction == 0 || direction == 2) { - sub_98196C( + PaintAddImageAsParent( session, imageId, static_cast(offset.x), static_cast(offset.y), bounds.x, bounds.y, 3, height); } else { - sub_98196C( + PaintAddImageAsParent( session, imageId, static_cast(offset.y), static_cast(offset.x), bounds.y, bounds.x, 3, height); } @@ -864,12 +864,12 @@ static void paint_monorail_track_s_bend_right( CoordsXY bounds = boundsList[trackSequence]; if (direction == 0 || direction == 2) { - sub_98196C( + PaintAddImageAsParent( session, imageId, static_cast(offset.x), static_cast(offset.y), bounds.x, bounds.y, 3, height); } else { - sub_98196C( + PaintAddImageAsParent( session, imageId, static_cast(offset.y), static_cast(offset.x), bounds.y, bounds.x, 3, height); } diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 203fb399da..24b340f232 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -348,11 +348,11 @@ static void suspended_monorail_track_left_quarter_turn_5( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25875, 0, 0, 32, 16, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25880, 0, 0, 32, 16, 3, height + 32); break; case 2: @@ -392,7 +392,7 @@ static void suspended_monorail_track_left_quarter_turn_5( height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25869, 0, 0, 16, 16, 3, height + 32); break; } @@ -412,11 +412,11 @@ static void suspended_monorail_track_left_quarter_turn_5( height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25878, 0, 0, 16, 32, 3, height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25883, 0, 0, 16, 32, 3, height + 32); break; case 3: @@ -533,11 +533,11 @@ static void suspended_monorail_track_s_bend_left( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25920, 0, 0, 32, 26, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25924, 0, 0, 32, 26, 3, height + 32); break; case 2: @@ -585,11 +585,11 @@ static void suspended_monorail_track_s_bend_left( height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25920, 0, 0, 32, 26, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25924, 0, 0, 32, 26, 3, height + 32); break; } @@ -714,11 +714,11 @@ static void suspended_monorail_track_s_bend_right( height + 32); break; case 2: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25929, 0, 0, 32, 26, 3, height + 32); break; case 3: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25933, 0, 0, 32, 26, 3, height + 32); break; } @@ -746,11 +746,11 @@ static void suspended_monorail_track_s_bend_right( switch (direction) { case 0: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25929, 0, 0, 32, 26, 3, height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25933, 0, 0, 32, 26, 3, height + 32); break; case 2: @@ -884,7 +884,7 @@ static void suspended_monorail_track_left_quarter_turn_3( height + 32); break; case 1: - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, session->TrackColours[SCHEME_TRACK] | 25862, 0, 0, 16, 16, 3, height + 32); break; case 2: diff --git a/src/openrct2/ride/water/DingySlide.cpp b/src/openrct2/ride/water/DingySlide.cpp index dc5fab9111..e14dffa480 100644 --- a/src/openrct2/ride/water/DingySlide.cpp +++ b/src/openrct2/ride/water/DingySlide.cpp @@ -401,7 +401,7 @@ static void dinghy_slide_track_station( PaintAddImageAsParentRotated( session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6, height + 3); - sub_98196C_rotated( + PaintAddImageAsParentRotated( session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height); metal_a_supports_paint_setup( diff --git a/src/openrct2/ride/water/LogFlume.cpp b/src/openrct2/ride/water/LogFlume.cpp index cb15bc2051..9c381a1741 100644 --- a/src/openrct2/ride/water/LogFlume.cpp +++ b/src/openrct2/ride/water/LogFlume.cpp @@ -197,7 +197,7 @@ static void paint_log_flume_track_station( { imageId = SPR_STATION_BASE_B_SW_NE | session->TrackColours[SCHEME_MISC]; } - sub_98196C(session, imageId, 0, 0, 32, 32, 1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, 1, height); if (direction & 1) { @@ -756,7 +756,7 @@ static void paint_log_flume_track_on_ride_photo( const TileElement* tileElement) { uint32_t imageId = SPR_STATION_BASE_D | IMAGE_TYPE_REMAP; - sub_98196C(session, imageId, 0, 0, 32, 32, 1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, 1, height); if (direction & 1) { diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index c176f320b1..7f47866b94 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -790,7 +790,7 @@ static void paint_splash_boats_station( PaintAddImageAsParent(session, imageId, 0, 0, 20, 32, 1, height, 6, 0, height + 3); imageId = SPR_STATION_BASE_B_NW_SE | session->TrackColours[SCHEME_MISC]; - sub_98196C(session, imageId, 0, 0, 32, 32, 1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, 1, height); } else { @@ -799,7 +799,7 @@ static void paint_splash_boats_station( PaintAddImageAsParent(session, imageId, 0, 0, 32, 20, 1, height, 0, 6, height + 3); imageId = SPR_STATION_BASE_B_SW_NE | session->TrackColours[SCHEME_MISC]; - sub_98196C(session, imageId, 0, 0, 32, 32, 1, height); + PaintAddImageAsParent(session, imageId, 0, 0, 32, 32, 1, height); } wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr); @@ -1167,16 +1167,16 @@ static void paint_splash_boats_track_on_ride_photo( switch (direction) { case 0: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 0, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 0, 1, height); break; case 1: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 0, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 0, 1, height); break; case 2: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 0, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 0, 1, height); break; case 3: - sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 0, 1, height); + PaintAddImageAsParentRotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 0, 1, height); break; } diff --git a/src/openrct2/world/Location.hpp b/src/openrct2/world/Location.hpp index 7c646c73af..c677b834e8 100644 --- a/src/openrct2/world/Location.hpp +++ b/src/openrct2/world/Location.hpp @@ -125,41 +125,41 @@ struct CoordsXY { } - CoordsXY& operator+=(const CoordsXY& rhs) + constexpr CoordsXY& operator+=(const CoordsXY& rhs) { x += rhs.x; y += rhs.y; return *this; } - CoordsXY& operator-=(const CoordsXY& rhs) + constexpr CoordsXY& operator-=(const CoordsXY& rhs) { x -= rhs.x; y -= rhs.y; return *this; } - bool operator>=(const CoordsXY& rhs) const + constexpr bool operator>=(const CoordsXY& rhs) const { return x >= rhs.x && y >= rhs.y; } - bool operator<=(const CoordsXY& rhs) const + constexpr bool operator<=(const CoordsXY& rhs) const { return x <= rhs.x && y <= rhs.y; } - const CoordsXY operator+(const CoordsXY& rhs) const + constexpr const CoordsXY operator+(const CoordsXY& rhs) const { return { x + rhs.x, y + rhs.y }; } - const CoordsXY operator-(const CoordsXY& rhs) const + constexpr const CoordsXY operator-(const CoordsXY& rhs) const { return { x - rhs.x, y - rhs.y }; } - CoordsXY Rotate(int32_t direction) const + constexpr CoordsXY Rotate(int32_t direction) const { CoordsXY rotatedCoords; switch (direction & 3) @@ -186,32 +186,32 @@ struct CoordsXY return rotatedCoords; } - bool operator==(const CoordsXY& other) const + constexpr bool operator==(const CoordsXY& other) const { return x == other.x && y == other.y; } - bool operator!=(const CoordsXY& other) const + constexpr bool operator!=(const CoordsXY& other) const { return !(*this == other); } - CoordsXY ToTileCentre() const + constexpr CoordsXY ToTileCentre() const { return ToTileStart() + CoordsXY{ COORDS_XY_HALF_TILE, COORDS_XY_HALF_TILE }; } - CoordsXY ToTileStart() const + constexpr CoordsXY ToTileStart() const { return { floor2(x, COORDS_XY_STEP), floor2(y, COORDS_XY_STEP) }; } - bool isNull() const + constexpr bool isNull() const { return x == COORDS_NULL; }; - void setNull() + constexpr void setNull() { x = COORDS_NULL; y = 0;